Merge branch 'master' of ralfj.de:saartuer

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

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: