Merge branch 'master' of ralfj.de:saartuer

diff --git a/statemachine.py b/statemachine.py
index dcee055c6413962986df6e635c7a8889e81f0219..a019eef83ad0054d6108b0d2c457365db92df319 100644 (file)
--- 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
@@ -180,14 +179,13 @@ class StateMachine():
                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.")

diff --git a/waker.py b/waker.py
index 4898c25ab31c0754f79699c97a0983477a8c23af..79eff81cd0f31e60a5c4216fae9d0f2f1e1b7d2e 100644 (file)
--- a/waker.py
+++ b/waker.py
@@ -21,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:
-                       self._tobewokens.append(ToBeWoken(f, time, 0, one_shot))
+                       self._tobewokens.append(ToBeWoken(f, time, one_shot))
        
        def _wake(self):
                with self._tobewokens_lock: