From bffa3c36e37c4fc9373bd992b188ea631ccbf877 Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Wed, 8 Mar 2023 06:58:17 +0100 Subject: [PATCH] minor changes to timer code --- cbpi/__init__.py | 2 +- cbpi/extension/timer/__init__.py | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/cbpi/__init__.py b/cbpi/__init__.py index 395c18a..321c091 100644 --- a/cbpi/__init__.py +++ b/cbpi/__init__.py @@ -1,3 +1,3 @@ -__version__ = "4.1.6.b3" +__version__ = "4.1.6.b4" __codename__ = "Groundhog Day" diff --git a/cbpi/extension/timer/__init__.py b/cbpi/extension/timer/__init__.py index 2e3cbdf..69f66ed 100644 --- a/cbpi/extension/timer/__init__.py +++ b/cbpi/extension/timer/__init__.py @@ -27,10 +27,9 @@ class AlarmTimer(CBPiSensor): self.stopped=False self.time = float(time) self.value=self.calculate_time(self.time) - await self.timer.stop() + if self.timer is None: + await self.timer.stop() self.timer = Timer(int(self.time * 60), on_update=self.on_timer_update, on_done=self.on_timer_done) - self.timer.start() - await self.timer.stop() self.timer.is_running = False logging.info("Set Timer") @@ -56,11 +55,10 @@ class AlarmTimer(CBPiSensor): @action(key="Reset Timer", parameters=[]) async def Reset(self , **kwargs): self.stopped=False - await self.timer.stop() + if self.timer is None: + await self.timer.stop() self.value=self.calculate_time(self.time) self.timer = Timer(int(self.time * 60), on_update=self.on_timer_update, on_done=self.on_timer_done) - self.timer.start() - await self.timer.stop() self.timer.is_running = False logging.info("Reset Timer")