From 79fd2b8727ded69c9e8826f1bfa43be36209e8e0 Mon Sep 17 00:00:00 2001 From: Manuel Fritsch Date: Sat, 20 Feb 2021 12:59:23 +0100 Subject: [PATCH] "fix actor satellite issue" --- cbpi/__init__.py | 2 +- cbpi/controller/actor_controller.py | 2 +- cbpi/extension/mashstep/__init__.py | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/cbpi/__init__.py b/cbpi/__init__.py index 32a213a..f5b9f8a 100644 --- a/cbpi/__init__.py +++ b/cbpi/__init__.py @@ -1 +1 @@ -__version__ = "4.0.0.25" \ No newline at end of file +__version__ = "4.0.0.26" \ No newline at end of file diff --git a/cbpi/controller/actor_controller.py b/cbpi/controller/actor_controller.py index fe5abba..67f26c9 100644 --- a/cbpi/controller/actor_controller.py +++ b/cbpi/controller/actor_controller.py @@ -16,7 +16,7 @@ class ActorController(BasicController): if item.instance.state is False: await item.instance.on() await self.push_udpate() - await self.cbpi.satellite.publish("cbpi/actor/on", "ACTOR ON") + #await self.cbpi.satellite.publish("cbpi/actor/on", "ACTOR ON") except Exception as e: logging.error("Faild to switch on Actor {} {}".format(id, e)) diff --git a/cbpi/extension/mashstep/__init__.py b/cbpi/extension/mashstep/__init__.py index 154e030..b0da35e 100644 --- a/cbpi/extension/mashstep/__init__.py +++ b/cbpi/extension/mashstep/__init__.py @@ -12,6 +12,14 @@ import logging Property.Kettle(label="Kettle")]) class MashStep(CBPiStep): + @action(key="Custom Step Action", parameters=[]) + async def hello(self, **kwargs): + print("ACTION") + + @action(key="Custom Step Action 2", parameters=[]) + async def hello2(self, **kwargs): + print("ACTION2") + async def on_timer_done(self,timer): self.summary = "" await self.next() @@ -45,6 +53,14 @@ class MashStep(CBPiStep): @parameters([Property.Number(label="Timer", description="Time in Minutes", configurable=True)]) class WaitStep(CBPiStep): + @action(key="Custom Step Action", parameters=[]) + async def hello(self, **kwargs): + print("ACTION") + + @action(key="Custom Step Action 2", parameters=[]) + async def hello2(self, **kwargs): + print("ACTION2") + async def on_timer_done(self,timer): self.summary = "" await self.next()