Commit 92e7d7b2 authored by Ralf's avatar Ralf
Browse files

Open the space when the switch is toggled while we are closed

parent 7896e93d
...@@ -35,7 +35,7 @@ class Actor: ...@@ -35,7 +35,7 @@ class Actor:
CMD_GREEN_ON: CMD("green on", pin=23, tid=2, todo=[(True, 0)]), 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_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_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): def __init__(self):
......
...@@ -116,6 +116,9 @@ class StateMachine(): ...@@ -116,6 +116,9 @@ class StateMachine():
if not self.pins().door_locked: if not self.pins().door_locked:
logger.info("Door unlocked, space is about to open") logger.info("Door unlocked, space is about to open")
return StateMachine.StateAboutToOpen(self.state_machine) 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() return super().handle_pins_event()
class AbstractUnlockedState(AbstractNonStartState): class AbstractUnlockedState(AbstractNonStartState):
...@@ -127,7 +130,6 @@ class StateMachine(): ...@@ -127,7 +130,6 @@ class StateMachine():
if self.pins().door_locked: if self.pins().door_locked:
logger.info("Door locked, closing space") logger.info("Door locked, closing space")
if self.pins().space_active: 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") logger.warning("StateMachine: door manually locked, but space switch is still on - going to StateZu")
play_sound("manual_lock") play_sound("manual_lock")
return StateMachine.StateZu(self.state_machine) return StateMachine.StateZu(self.state_machine)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment