Fallback mode works now (software side)

diff --git a/statemachine.py b/statemachine.py
index a3a24d4cea68b09a2ae770640a6688621380cb53..cd1b04ce93f89a929cec1c05d5d871e6c5c2e118 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


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

diff --git a/waker.py b/waker.py
index dc4627b3565d05882d8d1f4d6cb8a687aef01e08..79eff81cd0f31e60a5c4216fae9d0f2f1e1b7d2e 100644 (file)
--- a/waker.py
+++ b/waker.py
@@ -1,10 +1,15 @@
 from libtuer import ThreadRepeater
 from libtuer import ThreadRepeater

-from collections import namedtuple

 from threading import Lock
 
 SLEEP_TIME = 0.5
 
 from threading import Lock
 
 SLEEP_TIME = 0.5
 

-ToBeWoken = namedtuple('ToBeWoken','f period time_since_call one_shot')
+class ToBeWoken:
+       '''a simple struct storing information about a to-be-woken function'''
+       def __init__(self, f, period, one_shot):
+               self.f = f
+               self.period = period
+               self.time_since_call = 0
+               self.one_shot = one_shot

 
 class Waker():
        def __init__(self):
 
 class Waker():
        def __init__(self):


@@ -16,7 +21,7 @@ class Waker():
                '''Register a function which is called approximately every <time> seconds (or just once, if one_shot is True). f should return quickly, or it will delay the waker!'''
                time = max(time//SLEEP_TIME, 1)
                with self._tobewokens_lock:
                '''Register a function which is called approximately every <time> seconds (or just once, if one_shot is True). f should return quickly, or it will delay the waker!'''
                time = max(time//SLEEP_TIME, 1)
                with self._tobewokens_lock:

-                       self._tobewokens.append(ToBeWoken(f, time, 0, one_shot))
+                       self._tobewokens.append(ToBeWoken(f, time, one_shot))

        
        def _wake(self):
                with self._tobewokens_lock:
        
        def _wake(self):
                with self._tobewokens_lock: