diff --git a/cbpi/__init__.py b/cbpi/__init__.py index 04681be..875186b 100644 --- a/cbpi/__init__.py +++ b/cbpi/__init__.py @@ -1,3 +1,3 @@ -__version__ = "4.4.1.a2" +__version__ = "4.4.1.a3" __codename__ = "Yeast Starter" diff --git a/cbpi/controller/upload_controller.py b/cbpi/controller/upload_controller.py index 46f16e0..f86b6e7 100644 --- a/cbpi/controller/upload_controller.py +++ b/cbpi/controller/upload_controller.py @@ -185,13 +185,12 @@ class UploadController: row = c.fetchone() try: if self.cbpi.config.get("TEMP_UNIT", "C") == "C": - mashin_temp = str(float(row[0])) + mashin_temp = str(int(row[0])) else: - mashin_temp = str(round(9.0 / 5.0 * float(row[0]) + 32)) + mashin_temp = str(round(9.0 / 5.0 * int(row[0]) + 32)) except: pass - logging.error(mashin_temp) # get the hop addition times c.execute('SELECT Zeit, Name FROM Hopfengaben WHERE Vorderwuerze <> 1 AND SudID = ?', (Recipe_ID,)) hops = c.fetchall() @@ -242,7 +241,7 @@ class UploadController: "AutoMode": self.AutoMode, "Kettle": self.id, "Sensor": self.kettle.sensor, - "Temp": str(float(row[1])) if self.TEMP_UNIT == "C" else str(round(9.0 / 5.0 * float(row[1]) + 32)), + "Temp": str(int(row[1])) if self.TEMP_UNIT == "C" else str(round(9.0 / 5.0 * int(row[1]) + 32)), "Timer": "0", "Notification": "Target temperature reached. Please add malt." }, @@ -259,7 +258,7 @@ class UploadController: "AutoMode": self.AutoMode, "Kettle": self.id, "Sensor": self.kettle.sensor, - "Temp": str(float(row[1])) if self.TEMP_UNIT == "C" else str(round(9.0 / 5.0 * float(row[1]) + 32)), + "Temp": str(int(row[1])) if self.TEMP_UNIT == "C" else str(round(9.0 / 5.0 * int(row[1]) + 32)), "Timer": str(int(row[2])) }, "status_text": "", @@ -267,7 +266,7 @@ class UploadController: "type": step_type } await self.create_step(step_string) - + # MashOut -> Notification step that sends notification and waits for user input to move to next step (AutoNext=No) if self.mashout == "NotificationStep": step_string = { "name": "Lautering", @@ -800,6 +799,7 @@ class UploadController: else: step_temp = str(round((9.0 / 5.0 * int(step['stepTemp']) + 32))) + logging.error(step_temp) sensor = self.kettle.sensor if MashIn_Flag == True: