From: Ralf Jung <post@ralfj.de>
Date: Sun, 27 Oct 2013 17:59:33 +0000 (+0100)
Subject: Merge branch 'master' of ralfj.de:saartuer
X-Git-Url: https://git.ralfj.de/saartuer.git/commitdiff_plain/78609160138984cdd732e2a27c73f4dbd7a12935?ds=inline;hp=-c

Merge branch 'master' of ralfj.de:saartuer
---

78609160138984cdd732e2a27c73f4dbd7a12935
diff --combined statemachine.py
index dcee055,cd1b04c..a019eef
--- a/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