From: Ralf Jung Date: Wed, 23 Oct 2013 17:13:54 +0000 (+0200) Subject: Open the space when the switch is toggled while we are closed X-Git-Url: https://git.ralfj.de/saartuer.git/commitdiff_plain/92e7d7b2f8cd46ea9043f8f3aa5f877d688130e0?hp=--cc Open the space when the switch is toggled while we are closed --- 92e7d7b2f8cd46ea9043f8f3aa5f877d688130e0 diff --git a/actor.py b/actor.py index 25939a6..f2f1ad2 100644 --- a/actor.py +++ b/actor.py @@ -35,7 +35,7 @@ class Actor: CMD_GREEN_ON: CMD("green on", pin=23, tid=2, todo=[(True, 0)]), CMD_GREEN_OFF: CMD("green off", pin=23, tid=2, todo=[(False, 0)]), CMD_RED_ON: CMD("red on", pin=26, tid=2, todo=[(True, 0)]), - CMD_RED_OFF: CMD("red on", pin=26, tid=2, todo=[(False, 0)]), + CMD_RED_OFF: CMD("red off", pin=26, tid=2, todo=[(False, 0)]), } def __init__(self): diff --git a/statemachine.py b/statemachine.py index 7c75a7a..ca58e1d 100644 --- a/statemachine.py +++ b/statemachine.py @@ -116,6 +116,9 @@ 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): @@ -127,7 +130,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)