X-Git-Url: https://git.ralfj.de/saartuer.git/blobdiff_plain/cf244d9312e36b30583da60d3b9918db57ab3610..eb3e24210b024a3393e629f133bef7c66eddceae:/statemachine.py

diff --git a/statemachine.py b/statemachine.py
index 850eb0e..c73bea0 100644
--- a/statemachine.py
+++ b/statemachine.py
@@ -30,7 +30,7 @@ ABOUTOPEN_NERVLIST = [(5, lambda : play_sound("flipswitch")), (5, lambda:play_so
 
 # Timeout we wait after the switch was switched to "Closed", until we assume nobody will open the door and we just lock it
 # ALso the time we wait after the door was opend, till we assume something went wrong and start nerving
-LEAVE_TIMEOUT = 4
+LEAVE_TIMEOUT = 20
 
 # play_sound constants
 SOUNDS_DIRECTORY = "/opt/tuer/sounds/"
@@ -99,21 +99,34 @@ class StateMachine():
 			else:
 				raise Exception("Unknown command number: %d" % ev)
 	
-	class AbstractLockedState(State):
+	class AbstractNonStartState(State):
+		def handle_pins_event(self):
+			if self.pins().door_locked != (not self.pins().space_active):
+				self.actor().act(Actor.CMD_RED_ON)
+			else:
+				self.actor().act(Actor.CMD_RED_OFF)
+			return super().handle_pins_event()
+	
+	class AbstractLockedState(AbstractNonStartState):
 		'''A state with invariant "The space is locked", switching to StateAboutToOpen when the space becomes unlocked'''
+		def __init__(self, sm, nervlist = None):
+			super().__init__(sm, nervlist)
+			self.actor().act(Actor.CMD_GREEN_OFF)
 		def handle_pins_event(self):
 			if not self.pins().door_locked:
 				logger.info("Door unlocked, space is about to open")
 				return StateMachine.StateAboutToOpen(self.state_machine)
 			return super().handle_pins_event()
 	
-	class AbstractUnlockedState(State):
+	class AbstractUnlockedState(AbstractNonStartState):
 		'''A state with invariant "The space is unlocked", switching to StateZu when the space becomes locked'''
+		def __init__(self, sm, nervlist = None):
+			super().__init__(sm, nervlist)
+			self.actor().act(Actor.CMD_GREEN_ON)
 		def handle_pins_event(self):
 			if self.pins().door_locked:
 				logger.info("Door locked, closing space")
 				if self.pins().space_active:
-					# FIXME the same state can be reached by first locking the door, and then activating the space. What to do then?
 					logger.warning("StateMachine: door manually locked, but space switch is still on - going to StateZu")
 					play_sound("manual_lock")
 				return StateMachine.StateZu(self.state_machine)
@@ -123,16 +136,22 @@ 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 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 StateZu(AbstractLockedState):
 		def handle_cmd_unlock_event(self,callback):
 			return StateMachine.StateUnlocking(self.state_machine, callback)
+		def handle_pins_event(self):
+			if not self.old_pins().space_active and self.pins().space_active: # first thing to check: edge detection
+				logger.info("Space toggled to active while it was closed - unlocking the door")
+				return StateMachine.StateUnlocking(self.state_machine)
+			return super().handle_pins_event()
 	
 	class StateUnlocking(AbstractLockedState):
 		def __init__(self,sm,callback=None):
@@ -180,7 +199,7 @@ class StateMachine():
 			self.last_buzzed = None
 		def handle_pins_event(self):
 			pins = self.pins()
-			if pins.bell_ringing and not self.old_pins().bell_ringing:
+			if pins.bell_ringing and not self.old_pins().bell_ringing: # first thing to check: edge detection
 				# someone just pressed the bell
 				logger.info("StateMachine: buzzing because of bell ringing in StateAuf")
 				self.actor().act(Actor.CMD_BUZZ)