Home-IoT/craftbeerpi4-pione
1
0
Fork 0
mirror of https://github.com/PiBrewing/craftbeerpi4.git synced 2024-12-31 18:01:46 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed Recipe import in case of two kettles

Browse source 
In case of different boil kettle, sensor from first kettle was used by external recipe import. Thi sis now fixed.
In case of different boil kettle, Sensor specified for this kettle will be used during external recipe import
This commit is contained in:
avollkopf 2022-01-03 17:53:22 +01:00
parent 78a0832fd2
commit 49362aa098
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cbpi/__init__.py
View file

@ -1 +1 @@
__version__ = "4.0.1.a5" __version__ = "4.0.1.a6"

10
cbpi/controller/upload_controller.py
View file

@ -264,7 +264,7 @@ class UploadController:
"props": { "props": {
"AutoMode": self.AutoMode, "AutoMode": self.AutoMode,
"Kettle": self.boilid, "Kettle": self.boilid,
"Sensor": self.kettle.sensor, "Sensor": self.boilkettle.sensor,
"Temp": int(self.BoilTemp), "Temp": int(self.BoilTemp),
"Timer": BoilTime, "Timer": BoilTime,
"First_Wort": FirstWort, "First_Wort": FirstWort,
@ -393,7 +393,7 @@ class UploadController:
step_type = self.boil if self.boil != "" else "BoilStep" step_type = self.boil if self.boil != "" else "BoilStep"
step_time = str(int(boil_time)) step_time = str(int(boil_time))
step_temp = self.BoilTemp step_temp = self.BoilTemp
sensor = self.kettle.sensor sensor = self.boilkettle.sensor
LidAlert = "Yes" LidAlert = "Yes"
step_string = { "name": "Boil Step", step_string = { "name": "Boil Step",
@ -584,7 +584,7 @@ class UploadController:
step_time = str(int(BoilTime)) step_time = str(int(BoilTime))
step_type = self.boil if self.boil != "" else "BoilStep" step_type = self.boil if self.boil != "" else "BoilStep"
step_temp = self.BoilTemp step_temp = self.BoilTemp
sensor = self.kettle.sensor sensor = self.boilkettle.sensor
LidAlert = "Yes" LidAlert = "Yes"
step_string = { "name": "Boil Step", step_string = { "name": "Boil Step",
@ -697,7 +697,7 @@ class UploadController:
if step_type == "CooldownStep": if step_type == "CooldownStep":
cooldown_sensor = self.cbpi.config.get("steps_cooldown_sensor", None) cooldown_sensor = self.cbpi.config.get("steps_cooldown_sensor", None)
if cooldown_sensor is None or cooldown_sensor == '': if cooldown_sensor is None or cooldown_sensor == '':
cooldown_sensor = self.kettle.sensor # fall back to kettle sensor if no other sensor is specified cooldown_sensor = self.boilkettle.sensor # fall back to boilkettle sensor if no other sensor is specified
step_timer = "" step_timer = ""
step_temp = int(self.CoolDownTemp) step_temp = int(self.CoolDownTemp)
step_string = { "name": "Cooldown", step_string = { "name": "Cooldown",
@ -744,7 +744,7 @@ class UploadController:
try: try:
self.boilkettle = self.cbpi.kettle.find_by_id(self.boilid) self.boilkettle = self.cbpi.kettle.find_by_id(self.boilid)
except: except:
pass self.boilkettle = self.kettle
config_values = { "kettle": self.kettle, config_values = { "kettle": self.kettle,
"kettle_id": str(self.id), "kettle_id": str(self.id),