X-Git-Url: https://git.ralfj.de/saartuer.git/blobdiff_plain/e489f494d0bb7ee28ef8c41ef47069ceebe118ee..615e31f78190bfc6d32f198b735eb1198b73df7f:/statemachine.py diff --git a/statemachine.py b/statemachine.py index a3a24d4..12e8bd5 100644 --- a/statemachine.py +++ b/statemachine.py @@ -23,7 +23,6 @@ CLOSE_REPEAT_TIMEOUT = 7 CLOSE_REPEAT_NUMBER = 3 # StateFallback constants -FALLBACK_BLINK_SPEED = 0.5 # seconds FALLBACK_LEAVE_DELAY_LOCK = 5 # seconds # StateAboutToOpen constants @@ -157,7 +156,6 @@ class StateMachine(): class StateFallback(State): def __init__(self, sm, nervlist = None): super().__init__(sm, nervlist) - self._last_blink_time = time.time() self._red_state = False def handle_pins_event(self): pins = self.pins() @@ -179,15 +177,12 @@ class StateMachine(): # not calling superclass because we want to stay in fallback mode def handle_wakeup_event(self): # blink red LED - now = time.time() - if now - self._last_blink_time < FALLBACK_BLINK_SPEED: - if self._red_state: - self.actor().act(Actor.CMD_RED_OFF) - self._red_state = False - else: - self.actor().act(Actor.CMD_RED_ON) - self._red_state = True - self._last_blink_time = now + if self._red_state: + self.actor().act(Actor.CMD_RED_OFF) + self._red_state = False + else: + self.actor().act(Actor.CMD_RED_ON) + self._red_state = True def handle_cmd_unlock_event(self,arg): if arg is not None: arg("298 Fallback Okay: Trying to unlock the door. The System is in fallback mode, success information is not available.") @@ -307,7 +302,7 @@ class StateMachine(): def __init__(self, actor, waker, fallback = False): self.actor = actor self.callback = ThreadFunction(self._callback, name="StateMachine") - self.current_state = StateMachine.StateStart(self, None, fallback) + self.current_state = StateMachine.StateStart(self, fallback=fallback) self.pins = None self.old_pins = None waker.register(lambda: self.callback(StateMachine.CMD_WAKEUP), 1.0) # wake up every second