diff --git a/cbpi/__init__.py b/cbpi/__init__.py index 3489099..dc85dce 100644 --- a/cbpi/__init__.py +++ b/cbpi/__init__.py @@ -1 +1 @@ -__version__ = "4.0.1.6" +__version__ = "4.0.1.7" diff --git a/cbpi/controller/upload_controller.py b/cbpi/controller/upload_controller.py index eb41501..c7db2bb 100644 --- a/cbpi/controller/upload_controller.py +++ b/cbpi/controller/upload_controller.py @@ -977,7 +977,8 @@ class UploadController: "Kettle": self.boilid, "Timer": step_timer, "Temp": step_temp, - "Sensor": cooldown_sensor + "Sensor": cooldown_sensor, + "Actor": self.CoolDownActor }, "status_text": "", "status": "I", @@ -1001,6 +1002,7 @@ class UploadController: self.BoilTemp = self.cbpi.config.get("steps_boil_temp", 98) #get default cooldown temp alarm setting self.CoolDownTemp = self.cbpi.config.get("steps_cooldown_temp", 25) + self.CoolDownActor = self.cbpi.config.get("steps_cooldown_actor", None) # get default Kettle from Settings self.id = self.cbpi.config.get('MASH_TUN', None) self.boilid = self.cbpi.config.get('BoilKettle', None) @@ -1030,6 +1032,7 @@ class UploadController: "cooldown": str(self.cooldown), "boiltemp": str(self.BoilTemp), "cooldowntemp": str(self.CoolDownTemp), + "cooldownactor": self.CoolDownActor, "temp_unit": str(self.TEMP_UNIT), "AutoMode": str(self.AutoMode) } diff --git a/cbpi/extension/ConfigUpdate/__init__.py b/cbpi/extension/ConfigUpdate/__init__.py index a6714f7..ae4704f 100644 --- a/cbpi/extension/ConfigUpdate/__init__.py +++ b/cbpi/extension/ConfigUpdate/__init__.py @@ -28,6 +28,7 @@ class ConfigUpdate(CBPiExtension): default_cool_temp = 20 if TEMP_UNIT == "C" else 68 boil_temp = self.cbpi.config.get("steps_boil_temp", None) cooldown_sensor = self.cbpi.config.get("steps_cooldown_sensor", None) + cooldown_actor = self.cbpi.config.get("steps_cooldown_actor", None) cooldown_temp = self.cbpi.config.get("steps_cooldown_temp", None) mashin_step = self.cbpi.config.get("steps_mashin", None) mash_step = self.cbpi.config.get("steps_mash", None) @@ -60,6 +61,13 @@ class ConfigUpdate(CBPiExtension): except: logger.warning('Unable to update database') + if cooldown_actor is None: + logger.info("INIT Cooldown Actor Setting") + try: + await self.cbpi.config.add("steps_cooldown_actor", "", ConfigType.ACTOR, "Actor to trigger cooldown water on and off (default: None)") + except: + logger.warning('Unable to update database') + if cooldown_temp is None: logger.info("INIT Cooldown Temp Setting") try: