From: Ralf Jung <post@ralfj.de>
Date: Thu, 24 Oct 2013 17:45:26 +0000 (+0200)
Subject: Merge branch 'master' of ralfj.de:saartuer
X-Git-Url: https://git.ralfj.de/saartuer.git/commitdiff_plain/344d58d13b3ec1d7fb26d13de114d6e8afbe3218

Merge branch 'master' of ralfj.de:saartuer

Conflicts:
	statemachine.py
---

344d58d13b3ec1d7fb26d13de114d6e8afbe3218
diff --cc statemachine.py
index c73bea0,3a27ada..a3c4aff
--- a/statemachine.py
+++ b/statemachine.py
@@@ -136,14 -143,57 +143,57 @@@ class StateMachine()
  		def handle_pins_event(self):
  			pins = self.pins()
  			if not (pins.door_locked is None or pins.door_closed is None or pins.space_active is None or pins.bell_ringing is None):
 -				logger.info("All sensors got a value, switching to a proper state")
+ 				if self.fallback:
+ 					logger.info("Going to StateFallback because running in fallback mode")
+ 					return StateMachine.StateFallback(self.state_machine)
  				if pins.door_locked:
 +					logger.info("All sensors got a value, switching to a proper state: Space is closed")
  					return StateMachine.StateZu(self.state_machine)
  				else:
 +					logger.info("All sensors got a value, switching to a proper state: Space is (about to) open")
  					return StateMachine.StateAboutToOpen(self.state_machine)
  			return super().handle_pins_event()
  	
+ 	class StateFallback(State):
+ 		def __init__(self, sm, nervlist = None):
+ 			super().__init__(self, sm, nervlist)
+ 			self._last_blink_time = time.time()
+ 			self._red_state = False
+ 		def handle_pins_event(self):
+ 			pins = self.pins()
+ 			# buzz if open and bell rang
+ 			if pins.space_active and pins.bell_ringing and not self.old_pins().bell_ringing:
+ 				logger.info("StateFallback: Space switch on and door bell rung => buzzing")
+ 				self.actor().act(Actor.CMD_BUZZ)
+ 			# set green LED according to space switch
+ 			if pins.space_active:
+ 				self.actor().act(Actor.CMD_GREEN_ON)
+ 			else:
+ 				self.actor().act(Actor.CMD_GREEN_OFF)
+ 			# primitive leaving procedure if space switch turned off
+ 			if not pins.space_active and self.old_pins().space_active:
+ 				def _close_after_time():
+ 					time.sleep(FALLBACK_LEAVE_DELAY_LOCK)
+ 					self.actor().act(Actor.CMD_LOCK)
+ 				t = threading.Thread(target=_close_after_time)
+ 				t.start()
 -			# without return because we want to stay in fallback mode
 -			super().handle_pins_event()
++			# not calling superclass because we want to stay in fallback mode
+ 		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
+ 		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.")
+ 			self.actor().act(Actor.CMD_UNLOCK)
+ 	
  	class StateZu(AbstractLockedState):
  		def handle_cmd_unlock_event(self,callback):
  			return StateMachine.StateUnlocking(self.state_machine, callback)
diff --cc tuerd
index ec51c94,50fe03f..92c4122
--- a/tuerd
+++ b/tuerd
@@@ -13,10 -16,12 +16,15 @@@ args = parser.parse_args(
  if args.debug:
  	import libtuer
  	libtuer.mailAddress = []
+ if args.fallback:
+ 	logger.info("Starting in fallback mode")
+ else:
+ 	# to avoid exceptions or getting None
+ 	args.fallback = False
  
 +# Not let's go!
 +logger.info("Starting up...")
 +
  # initialize GPIO stuff
  GPIO.setmode(GPIO.BOARD)