Commit d72b6eb3 authored by Ralf's avatar Ralf
Browse files

Only wait for space switches while we are in StateZu

parent 6b78b1cc
...@@ -116,9 +116,6 @@ class StateMachine(): ...@@ -116,9 +116,6 @@ 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):
...@@ -149,6 +146,11 @@ class StateMachine(): ...@@ -149,6 +146,11 @@ class StateMachine():
class StateZu(AbstractLockedState): class StateZu(AbstractLockedState):
def handle_cmd_unlock_event(self,callback): def handle_cmd_unlock_event(self,callback):
return StateMachine.StateUnlocking(self.state_machine, 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): class StateUnlocking(AbstractLockedState):
def __init__(self,sm,callback=None): def __init__(self,sm,callback=None):
...@@ -196,7 +198,7 @@ class StateMachine(): ...@@ -196,7 +198,7 @@ class StateMachine():
self.last_buzzed = None self.last_buzzed = None
def handle_pins_event(self): def handle_pins_event(self):
pins = self.pins() 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 # someone just pressed the bell
logger.info("StateMachine: buzzing because of bell ringing in StateAuf") logger.info("StateMachine: buzzing because of bell ringing in StateAuf")
self.actor().act(Actor.CMD_BUZZ) self.actor().act(Actor.CMD_BUZZ)
......
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