Merge branch 'master' of ralfj.de:saartuer

[saartuer.git] / statemachine.py

diff --git a/statemachine.py b/statemachine.py
index 0f325a80ea93a61bad5a4ebfb61bf4533e341c47..a019eef83ad0054d6108b0d2c457365db92df319 100644 (file)
--- a/statemachine.py
+++ b/statemachine.py
@@ -23,7 +23,6 @@ CLOSE_REPEAT_TIMEOUT = 7
 CLOSE_REPEAT_NUMBER = 3
 
 # StateFallback constants
 CLOSE_REPEAT_NUMBER = 3
 
 # StateFallback constants

-FALLBACK_BLINK_SPEED = 0.5 # seconds

 FALLBACK_LEAVE_DELAY_LOCK = 5 # seconds
 
 # StateAboutToOpen constants
 FALLBACK_LEAVE_DELAY_LOCK = 5 # seconds
 
 # StateAboutToOpen constants


@@ -138,7 +137,7 @@ class StateMachine():
        
        class StateStart(State):
                def __init__(self, sm, nervlist = None, fallback=False):
        
        class StateStart(State):
                def __init__(self, sm, nervlist = None, fallback=False):

-                       super().__init__(self, sm, nervlist)
+                       super().__init__(sm, nervlist)

                        self.fallback = fallback
                def handle_pins_event(self):
                        pins = self.pins()
                        self.fallback = fallback
                def handle_pins_event(self):
                        pins = self.pins()


@@ -156,7 +155,7 @@ class StateMachine():
        
        class StateFallback(State):
                def __init__(self, sm, nervlist = None):
        
        class StateFallback(State):
                def __init__(self, sm, nervlist = None):

-                       super().__init__(self, sm, nervlist)
+                       super().__init__(sm, nervlist)

                        self._last_blink_time = time.time()
                        self._red_state = False
                def handle_pins_event(self):
                        self._last_blink_time = time.time()
                        self._red_state = False
                def handle_pins_event(self):


@@ -180,14 +179,13 @@ class StateMachine():
                def handle_wakeup_event(self):
                        # blink red LED
                        now = time.time()
                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
+                       self._last_blink_time = now

                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.")
                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.")


@@ -304,12 +302,13 @@ class StateMachine():
                                return StateMachine.StateAuf(self.state_machine)
                        return super().handle_pins_event()
        
                                return StateMachine.StateAuf(self.state_machine)
                        return super().handle_pins_event()
        

-       def __init__(self, actor, fallback = False):
+       def __init__(self, actor, waker, fallback = False):

                self.actor = actor
                self.callback = ThreadFunction(self._callback, name="StateMachine")
                self.actor = actor
                self.callback = ThreadFunction(self._callback, name="StateMachine")

-               self.current_state = StateMachine.StateStart(self, fallback)
+               self.current_state = StateMachine.StateStart(self, fallback=fallback)

                self.pins = None
                self.old_pins = None
                self.pins = None
                self.old_pins = None

+               waker.register(lambda: self.callback(StateMachine.CMD_WAKEUP), 1.0) # wake up every second

        
        def stop (self):
                self.callback.stop()
        
        def stop (self):
                self.callback.stop()