Refactor sud JSON pot params under a nested 'pot' key
Top-level pot_mass/pot_material/L/Td/grain_mass/water_mass and their per-step overrides are now grouped under a 'pot' sub-object, matching the structure already applied to sud_0010.json's parent level. Updated all sude/*.json files and the parsing/consuming code in components/sud.py, tasks/sud.py, components/sud_forecast.py, and scripts/demos/sud/demo_sud.py. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01T52JH848ojhXXHn1bAzdC3
This commit is contained in:
+12
-8
@@ -1,19 +1,23 @@
|
||||
{
|
||||
"Name": "GuiTest",
|
||||
"Description": "Small, fast schedule for exercising the GUI (load/start/pause/stop/restart) without waiting through a real brew",
|
||||
"pot_mass": 5.96,
|
||||
"pot_material": "Edelstahl 18/10",
|
||||
"L": 0.2,
|
||||
"Td": 30,
|
||||
"grain_mass": 5.21,
|
||||
"water_mass": 22,
|
||||
"pot": {
|
||||
"mass": 5.96,
|
||||
"material": "Edelstahl 18/10",
|
||||
"L": 0.2,
|
||||
"Td": 30,
|
||||
"grain_mass": 5.21,
|
||||
"water_mass": 22
|
||||
},
|
||||
"default": {
|
||||
"step": {
|
||||
"descr": "Put description here",
|
||||
"user_message": "Put user message here",
|
||||
"user_wait_for_continue": false,
|
||||
"grain_mass": 5.21,
|
||||
"water_mass": 22,
|
||||
"pot": {
|
||||
"grain_mass": 5.21,
|
||||
"water_mass": 22
|
||||
},
|
||||
"temperature": 0,
|
||||
"ramp": {
|
||||
"rate": 5.0,
|
||||
|
||||
@@ -1,19 +1,23 @@
|
||||
{
|
||||
"Name": "GuiTest - No User",
|
||||
"Description": "Small, fast schedule for exercising the GUI (load/start/pause/stop/restart) without waiting through a real brew",
|
||||
"pot_mass": 5.96,
|
||||
"pot_material": "Edelstahl 18/10",
|
||||
"L": 0.2,
|
||||
"Td": 30,
|
||||
"grain_mass": 5.21,
|
||||
"water_mass": 22,
|
||||
"pot": {
|
||||
"mass": 5.96,
|
||||
"material": "Edelstahl 18/10",
|
||||
"L": 0.2,
|
||||
"Td": 30,
|
||||
"grain_mass": 5.21,
|
||||
"water_mass": 22
|
||||
},
|
||||
"default": {
|
||||
"step": {
|
||||
"descr": "Put description here",
|
||||
"user_message": "Put user message here",
|
||||
"user_wait_for_continue": false,
|
||||
"grain_mass": 5.21,
|
||||
"water_mass": 22,
|
||||
"pot": {
|
||||
"grain_mass": 5.21,
|
||||
"water_mass": 22
|
||||
},
|
||||
"temperature": 0,
|
||||
"ramp": {
|
||||
"rate": 5.0,
|
||||
|
||||
+18
-10
@@ -1,19 +1,23 @@
|
||||
{
|
||||
"Name": "Sud-0010",
|
||||
"Description": "Rotfraenkisch, Dunkles Lager",
|
||||
"pot_mass": 5.96,
|
||||
"pot_material": "Edelstahl 18/10",
|
||||
"L": 0.2,
|
||||
"Td": 30,
|
||||
"grain_mass": 0,
|
||||
"water_mass": 22,
|
||||
"pot": {
|
||||
"mass": 5.96,
|
||||
"material": "Edelstahl 18/10",
|
||||
"L": 0.2,
|
||||
"Td": 30,
|
||||
"grain_mass": 0,
|
||||
"water_mass": 22
|
||||
},
|
||||
"default": {
|
||||
"step": {
|
||||
"descr": "Put description here",
|
||||
"user_message": "Put user message here",
|
||||
"user_wait_for_continue": false,
|
||||
"grain_mass": 5.21,
|
||||
"water_mass": 22,
|
||||
"pot": {
|
||||
"grain_mass": 5.21,
|
||||
"water_mass": 22
|
||||
},
|
||||
"temperature": 0,
|
||||
"ramp": {
|
||||
"rate": 1.0,
|
||||
@@ -35,7 +39,9 @@
|
||||
},
|
||||
"steps": [
|
||||
{
|
||||
"grain_mass": 0,
|
||||
"pot": {
|
||||
"grain_mass": 0
|
||||
},
|
||||
"descr": "Heizen für Einmaischen",
|
||||
"temperature": 57,
|
||||
"ramp": {
|
||||
@@ -91,7 +97,9 @@
|
||||
}
|
||||
},
|
||||
{
|
||||
"water_mass": 20,
|
||||
"pot": {
|
||||
"water_mass": 20
|
||||
},
|
||||
"descr": "Abmaischen",
|
||||
"user_message": "Quittieren zum Abmaischen",
|
||||
"user_wait_for_continue": true,
|
||||
|
||||
@@ -1,19 +1,23 @@
|
||||
{
|
||||
"Name": "Sud-0010",
|
||||
"Description": "Rotfraenkisch, Dunkles Lager",
|
||||
"pot_mass": 5.96,
|
||||
"pot_material": "Edelstahl 18/10",
|
||||
"L": 0.2,
|
||||
"Td": 30,
|
||||
"grain_mass": 0,
|
||||
"water_mass": 22,
|
||||
"pot": {
|
||||
"mass": 5.96,
|
||||
"material": "Edelstahl 18/10",
|
||||
"L": 0.2,
|
||||
"Td": 30,
|
||||
"grain_mass": 0,
|
||||
"water_mass": 22
|
||||
},
|
||||
"default": {
|
||||
"step": {
|
||||
"descr": "Put description here",
|
||||
"user_message": "Put user message here",
|
||||
"user_wait_for_continue": false,
|
||||
"grain_mass": 5.21,
|
||||
"water_mass": 22,
|
||||
"pot": {
|
||||
"grain_mass": 5.21,
|
||||
"water_mass": 22
|
||||
},
|
||||
"ramp": {
|
||||
"rate": 1.0,
|
||||
"temp": 0,
|
||||
@@ -35,8 +39,10 @@
|
||||
},
|
||||
"steps": [
|
||||
{
|
||||
"grain_mass": 0,
|
||||
"descr": "Heizen f\u00fcr Einmaischen",
|
||||
"pot": {
|
||||
"grain_mass": 0
|
||||
},
|
||||
"descr": "Heizen für Einmaischen",
|
||||
"ramp": {
|
||||
"rate": 1.8,
|
||||
"temp": 57,
|
||||
@@ -46,8 +52,8 @@
|
||||
}
|
||||
},
|
||||
{
|
||||
"descr": "Einmaischen einf\u00fcllen",
|
||||
"user_message": "Bitte Malz einf\u00fcllen und best\u00e4tigen",
|
||||
"descr": "Einmaischen einfüllen",
|
||||
"user_message": "Bitte Malz einfüllen und bestätigen",
|
||||
"user_wait_for_continue": true,
|
||||
"hold": {
|
||||
"stirrer": {
|
||||
@@ -97,7 +103,9 @@
|
||||
}
|
||||
},
|
||||
{
|
||||
"water_mass": 20,
|
||||
"pot": {
|
||||
"water_mass": 20
|
||||
},
|
||||
"descr": "Heizen Abmaischen",
|
||||
"ramp": {
|
||||
"rate": 1.0,
|
||||
@@ -105,7 +113,9 @@
|
||||
}
|
||||
},
|
||||
{
|
||||
"water_mass": 20,
|
||||
"pot": {
|
||||
"water_mass": 20
|
||||
},
|
||||
"descr": "Halten Abmaischen",
|
||||
"user_message": "Quittieren zum Abmaischen",
|
||||
"user_wait_for_continue": true,
|
||||
@@ -117,4 +127,4 @@
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
+19
-11
@@ -1,19 +1,23 @@
|
||||
{
|
||||
"Name": "Sud-0020",
|
||||
"Description": "Bavarian, Dunkles (Todo: Pot temperature drop at malt fill in)",
|
||||
"pot_mass": 5.96,
|
||||
"pot_material": "Edelstahl 18/10",
|
||||
"L": 0.2,
|
||||
"Td": 30,
|
||||
"grain_mass": 0,
|
||||
"water_mass": 10,
|
||||
"pot": {
|
||||
"mass": 5.96,
|
||||
"material": "Edelstahl 18/10",
|
||||
"L": 0.2,
|
||||
"Td": 30,
|
||||
"grain_mass": 0,
|
||||
"water_mass": 10
|
||||
},
|
||||
"default": {
|
||||
"step": {
|
||||
"descr": "Put description here",
|
||||
"user_message": "Put user message here",
|
||||
"user_wait_for_continue": false,
|
||||
"grain_mass": 2.51,
|
||||
"water_mass": 10,
|
||||
"pot": {
|
||||
"grain_mass": 2.51,
|
||||
"water_mass": 10
|
||||
},
|
||||
"temperature": 0,
|
||||
"ramp": {
|
||||
"rate": 1.0,
|
||||
@@ -35,7 +39,9 @@
|
||||
},
|
||||
"steps": [
|
||||
{
|
||||
"grain_mass": 0,
|
||||
"pot": {
|
||||
"grain_mass": 0
|
||||
},
|
||||
"descr": "Heizen für Einmaischen",
|
||||
"temperature": 57,
|
||||
"ramp": {
|
||||
@@ -57,7 +63,7 @@
|
||||
},
|
||||
{
|
||||
"descr": "Einmaischen Rast",
|
||||
"temperature": 55 ,
|
||||
"temperature": 55,
|
||||
"hold": {
|
||||
"duration": 20
|
||||
}
|
||||
@@ -92,7 +98,9 @@
|
||||
}
|
||||
},
|
||||
{
|
||||
"water_mass": 20,
|
||||
"pot": {
|
||||
"water_mass": 20
|
||||
},
|
||||
"descr": "Abmaischen",
|
||||
"user_message": "Quittieren zum Abmaischen",
|
||||
"user_wait_for_continue": true,
|
||||
|
||||
Reference in New Issue
Block a user