X-Git-Url: https://git.ralfj.de/saartuer.git/blobdiff_plain/41111d6443061891dd2ec7d5bf5ab856c0546fc0..f1430a05b39770f59427e33ba17e51a77bc59427:/statemachine.py

diff --git a/statemachine.py b/statemachine.py
index 7c75a7a..d8b7c53 100644
--- a/statemachine.py
+++ b/statemachine.py
@@ -127,7 +127,6 @@ class StateMachine():
 			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)
@@ -147,6 +146,11 @@ class StateMachine():
 	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):
@@ -194,7 +198,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)