diff --git a/cbpi/__init__.py b/cbpi/__init__.py index bfd8966..a8133c9 100644 --- a/cbpi/__init__.py +++ b/cbpi/__init__.py @@ -1 +1,2 @@ __version__ = "4.0.1.a8" + diff --git a/cbpi/controller/basic_controller2.py b/cbpi/controller/basic_controller2.py index 18c2914..0444da9 100644 --- a/cbpi/controller/basic_controller2.py +++ b/cbpi/controller/basic_controller2.py @@ -55,8 +55,9 @@ class BasicController: async def push_udpate(self): self.cbpi.ws.send(dict(topic=self.update_key, data=list(map(lambda item: item.to_dict(), self.data)))) - for item in self.data: - self.cbpi.push_update("cbpi/{}/{}".format(self.update_key,item.id), item.to_dict()) + self.cbpi.push_update("cbpi/{}".format(self.update_key), list(map(lambda item: item.to_dict(), self.data))) + #for item in self.data: + # self.cbpi.push_update("cbpi/{}/{}".format(self.update_key,item.id), item.to_dict()) def find_by_id(self, id): return next((item for item in self.data if item.id == id), None) diff --git a/cbpi/controller/fermentation_controller.py b/cbpi/controller/fermentation_controller.py index ef455d2..16c152e 100644 --- a/cbpi/controller/fermentation_controller.py +++ b/cbpi/controller/fermentation_controller.py @@ -111,8 +111,10 @@ class FermentationController: def push_update(self): self.cbpi.ws.send(dict(topic=self.update_key, data=list(map(lambda item: item.to_dict(), self.data)))) - for item in self.data: - self.cbpi.push_update("cbpi/{}/{}".format(self.update_key,item.id), item.to_dict()) + self.cbpi.push_update("cbpi/{}".format(self.update_key), list(map(lambda item: item.to_dict(), self.data))) + + #for item in self.data: + # self.cbpi.push_update("cbpi/{}/{}".format(self.update_key,item.id), item.to_dict()) pass async def shutdown(self, app=None): diff --git a/cbpi/controller/step_controller.py b/cbpi/controller/step_controller.py index db9493d..da059c0 100644 --- a/cbpi/controller/step_controller.py +++ b/cbpi/controller/step_controller.py @@ -72,7 +72,7 @@ class StepController: self._loop.create_task(self.start_step(active_step)) async def add(self, item: Step): - logging.debug("Add step") + logging.info("Add step") item.id = shortuuid.uuid() item.status = StepState.INITIAL try: @@ -265,10 +265,12 @@ class StepController: self.cbpi.push_update(topic="cbpi/stepupdate/{}".format(item.id), data=(item.to_dict())) else: self.cbpi.ws.send(dict(topic="step_update", data=list(map(lambda item: item.to_dict(), self.profile)))) + step = self.find_by_status(StepState.ACTIVE) if step != None: self.cbpi.push_update(topic="cbpi/stepupdate/{}".format(step.id), data=(step.to_dict())) + async def start_step(self,step): try: logging.info("Try to start step %s" % step) diff --git a/cbpi/extension/FermentationStep/__init__.py b/cbpi/extension/FermentationStep/__init__.py index e4499cd..93b8430 100644 --- a/cbpi/extension/FermentationStep/__init__.py +++ b/cbpi/extension/FermentationStep/__init__.py @@ -21,7 +21,7 @@ import warnings @parameters([Property.Text(label="Notification",configurable = True, description = "Text for notification"), Property.Select(label="AutoNext",options=["Yes","No"], description="Automatically move to next step (Yes) or pause after Notification (No)")]) -class NotificationStep(CBPiFermentationStep): +class FermenterNotificationStep(CBPiFermentationStep): async def NextStep(self, **kwargs): await self.next() @@ -65,7 +65,7 @@ class NotificationStep(CBPiFermentationStep): Property.Kettle(label="Kettle"), Property.Text(label="Notification",configurable = True, description = "Text for notification when Temp is reached"), Property.Select(label="AutoMode",options=["Yes","No"], description="Switch Kettlelogic automatically on and off -> Yes")]) -class TargetTempStep(CBPiFermentationStep): +class FermenterTargetTempStep(CBPiFermentationStep): async def NextStep(self, **kwargs): await self.next() @@ -228,4 +228,4 @@ def setup(cbpi): cbpi.plugin.register("NotificationStep", NotificationStep) cbpi.plugin.register("TargetTempStep", TargetTempStep) - cbpi.plugin.register("FermentationStep", FermentationStep) \ No newline at end of file + cbpi.plugin.register("FermentationStep", FermentationStep)