Better logging

[saartuer.git] / statemachine.py

diff --git a/statemachine.py b/statemachine.py
index ca58e1d08b747ed003448f17a764142883c05430..c73bea0321c0f42dd99350fc09f10e45e2c4e057 100644 (file)
--- a/statemachine.py
+++ b/statemachine.py
@@ -116,9 +116,6 @@ class StateMachine():
                        if not self.pins().door_locked:
                                logger.info("Door unlocked, space is about to open")
                                return StateMachine.StateAboutToOpen(self.state_machine)
-                       if not self.old_pins().space_active and self.pins().space_active:
-                               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 AbstractUnlockedState(AbstractNonStartState):
@@ -139,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):
@@ -196,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)