diff --git a/cbpi/__init__.py b/cbpi/__init__.py index a8133c9..d18225d 100644 --- a/cbpi/__init__.py +++ b/cbpi/__init__.py @@ -1,2 +1 @@ -__version__ = "4.0.1.a8" - +__version__ = "4.0.1.a9" diff --git a/cbpi/controller/basic_controller2.py b/cbpi/controller/basic_controller2.py index 0444da9..53c3445 100644 --- a/cbpi/controller/basic_controller2.py +++ b/cbpi/controller/basic_controller2.py @@ -55,9 +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)))) - 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()) + #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 16c152e..5bb7611 100644 --- a/cbpi/controller/fermentation_controller.py +++ b/cbpi/controller/fermentation_controller.py @@ -111,10 +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)))) - self.cbpi.push_update("cbpi/{}".format(self.update_key), list(map(lambda item: item.to_dict(), self.data))) + #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()) + 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 da059c0..876d5c7 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.info("Add step") + logging.debug("Add step") item.id = shortuuid.uuid() item.status = StepState.INITIAL try: diff --git a/cbpi/extension/FermentationStep/__init__.py b/cbpi/extension/FermentationStep/__init__.py index 93b8430..37c2e22 100644 --- a/cbpi/extension/FermentationStep/__init__.py +++ b/cbpi/extension/FermentationStep/__init__.py @@ -226,6 +226,6 @@ def setup(cbpi): :return: ''' - cbpi.plugin.register("NotificationStep", NotificationStep) - cbpi.plugin.register("TargetTempStep", TargetTempStep) + cbpi.plugin.register("FermenterNotificationStep", FermenterNotificationStep) + cbpi.plugin.register("FermenterTargetTempStep", FermenterTargetTempStep) cbpi.plugin.register("FermentationStep", FermentationStep)