mirror of
https://github.com/PiBrewing/craftbeerpi4.git
synced 2025-01-24 05:14:37 +01:00
Merge pull request #33 from pascal1404/master
Mashout step for MMuM-JSON import
This commit is contained in:
commit
370f9c3c5a
1 changed files with 19 additions and 1 deletions
|
@ -388,11 +388,13 @@ class UploadController:
|
||||||
# AutoMode is yes to start and stop automatic mode or each step
|
# AutoMode is yes to start and stop automatic mode or each step
|
||||||
MashIn_Flag = True
|
MashIn_Flag = True
|
||||||
step_kettle = self.id
|
step_kettle = self.id
|
||||||
|
last_step_temp = 0
|
||||||
logging.info(step_kettle) ###################################################
|
logging.info(step_kettle) ###################################################
|
||||||
for row in self.getSteps(Recipe_ID, "json"):
|
for row in self.getSteps(Recipe_ID, "json"):
|
||||||
step_name = str(row.get("name"))
|
step_name = str(row.get("name"))
|
||||||
step_timer = str(int(row.get("timer")))
|
step_timer = str(int(row.get("timer")))
|
||||||
step_temp = str(int(row.get("temp")))
|
step_temp = str(int(row.get("temp")))
|
||||||
|
last_step_temp = step_temp
|
||||||
sensor = self.kettle.sensor
|
sensor = self.kettle.sensor
|
||||||
if MashIn_Flag == True:
|
if MashIn_Flag == True:
|
||||||
if row.get("timer") == 0:
|
if row.get("timer") == 0:
|
||||||
|
@ -446,8 +448,24 @@ class UploadController:
|
||||||
}
|
}
|
||||||
|
|
||||||
await self.create_step(step_string)
|
await self.create_step(step_string)
|
||||||
|
# MashOut -> mashStep to reach mashout-temp for 1 min
|
||||||
|
if last_step_temp != e["Abmaischtemperatur"]:
|
||||||
|
step_string = { "name": "MashOut",
|
||||||
|
"props": {
|
||||||
|
"AutoMode": self.AutoMode,
|
||||||
|
"Kettle": self.id,
|
||||||
|
"Sensor": self.kettle.sensor,
|
||||||
|
"Temp": e["Abmaischtemperatur"],
|
||||||
|
"Timer": 1,
|
||||||
|
"Notification": ""
|
||||||
|
},
|
||||||
|
"status_text": "",
|
||||||
|
"status": "I",
|
||||||
|
"type": "MashStep"
|
||||||
|
}
|
||||||
|
|
||||||
# MashOut -> Simple step that sends notification and waits for user input to move to next step (AutoNext=No)
|
await self.create_step(step_string)
|
||||||
|
# Lautering -> Simple step that sends notification and waits for user input to move to next step (AutoNext=No)
|
||||||
if self.mashout == "NotificationStep":
|
if self.mashout == "NotificationStep":
|
||||||
step_string = { "name": "Lautering",
|
step_string = { "name": "Lautering",
|
||||||
"props": {
|
"props": {
|
||||||
|
|
Loading…
Add table
Reference in a new issue