Merge branch 'master' of ralfj.de:saartuer

diff --combined statemachine.py
index dcee055c6413962986df6e635c7a8889e81f0219,cd1b04ce93f89a929cec1c05d5d871e6c5c2e118..a019eef83ad0054d6108b0d2c457365db92df319
--- 1/statemachine.py
--- 2/statemachine.py
+++ b/statemachine.py
@@@ -23,7 -23,6 +23,6 @@@ CLOSE_REPEAT_TIMEOUT = 
  CLOSE_REPEAT_NUMBER = 3
  
  # StateFallback constants
- FALLBACK_BLINK_SPEED = 0.5 # seconds
  FALLBACK_LEAVE_DELAY_LOCK = 5 # seconds
  
  # StateAboutToOpen constants
@@@ -180,14 -179,13 +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.")
@@@ -307,7 -305,7 +305,7 @@@
        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