-8from libtuer import ThreadFunction, logger, fire_and_forget
+from libtuer import ThreadFunction, logger, fire_and_forget
from actor import Actor
-import os, random
+import os, random, time
# logger.{debug,info,warning,error,critical}
# StateUnlocking constants
-OPEN_REPEAT_TIMEOUT = 8
+OPEN_REPEAT_TIMEOUT = 7
OPEN_REPEAT_NUMBER = 3
# StateLocking constants
-CLOSE_REPEAT_TIMEOUT = 8
+CLOSE_REPEAT_TIMEOUT = 7
CLOSE_REPEAT_NUMBER = 3
# StateAboutToOpen constants
-ABOUTOPEN_NERVLIST = [(5, lambda : play_sound("flipswitch")), (5, lambda:play_sound("flipswitch")), (0, lambda:Logger.warning("Space open but switch not flipped for 10 seconds")),\
- (10, lambda:play_sound("flipswitch")), (10, lambda:play_sound("flipswitch")), (0, lambda:Logger.error("Space open but switch not flipped for 30 seconds")),\
- (10, lambda:play_sound("flipswitch")), (10, lambda:play_sound("flipswitch")), (6, lambda:play_sound("flipswitch")), (4, lambda:Logger.critical("Space open but switch not flipped for 60 seconds"))]
+ABOUTOPEN_NERVLIST = [(5, lambda : play_sound("flipswitch")), (5, lambda:play_sound("flipswitch")), (0, lambda:logger.warning("Space open but switch not flipped for 10 seconds")),\
+ (10, lambda:play_sound("flipswitch")), (10, lambda:play_sound("flipswitch")), (0, lambda:logger.error("Space open but switch not flipped for 30 seconds")),\
+ (10, lambda:play_sound("flipswitch")), (10, lambda:play_sound("flipswitch")), (6, lambda:play_sound("flipswitch")), (4, lambda:logger.critical("Space open but switch not flipped for 60 seconds"))]
# StateAuf constants
# time that must pass between two bell_ringing events to buzz the door again (seconds)
# Timeout we wait after the switch was switched to "Closed", until we assume nobody will open the door and we just lock it
# ALso the time we wait after the door was opend, till we assume something went wrong and start nerving
-LEAVE_TIMEOUT = 30
+LEAVE_TIMEOUT = 20
# play_sound constants
SOUNDS_DIRECTORY = "/opt/tuer/sounds/"
def nerv(self):
if len(self.nervlist):
- (time, f) = self.nervlist[0]
+ (wait_time, f) = self.nervlist[0]
now = time.time()
time_gone = now-self.last_event_time
# check if the first element is to be triggered
- if time_gone >= time:
+ if time_gone >= wait_time:
self.nervlist = self.nervlist[1:] # "pop" the first element, but do not modify original list
self.last_event_time = now
return f()
def handle_pins_event(self):
pass # one needn't implement this
def handle_buzz_event(self,arg): # this shouldn't be overwritten
- self.actor.act(Actor.CMD_BUZZ)
+ self.actor().act(Actor.CMD_BUZZ)
arg("200 okay: buzz executed")
def handle_cmd_unlock_event(self,arg):
if arg is not None:
def actor(self):
return self.state_machine.actor
def handle_event(self,ev,arg): # don't override
- if arg is CMD_PINS:
- self.handle_pins_event()
- elif arg is CMD_BUZZ:
- self.handle_buzz_event(arg)
- elif arg is CMD_UNLOCK:
- self.handle_cmd_unlock_event(arg)
- elif arg is CMD_WAKEUP:
- self.handle_wakeup_event()
+ if ev == StateMachine.CMD_PINS:
+ return self.handle_pins_event()
+ elif ev == StateMachine.CMD_BUZZ:
+ return self.handle_buzz_event(arg)
+ elif ev == StateMachine.CMD_UNLOCK:
+ return self.handle_cmd_unlock_event(arg)
+ elif ev == StateMachine.CMD_WAKEUP:
+ return self.handle_wakeup_event()
else:
raise Exception("Unknown command number: %d" % ev)
class StateStart(State):
def handle_pins_event(self):
super().handle_pins_event()
- thepins = self.pins()
- for pin in thepins:
- if pin is None:
- return None
- if thepins.door_locked:
- return StateZu(self.state_machine)
+ pins = self.pins()
+ if pins.door_locked is None or pins.door_closed is None or pins.space_dactive is None or pins.bell_ringing is None:
+ return None # wait till we have all sensors non-None
+ if pins.door_locked:
+ return StateMachine.StateZu(self.state_machine)
else:
- return StateAuf(self.state_machine)
-
+ return StateMachine.StateAuf(self.state_machine)
+
class StateZu(State):
def handle_pins_event(self):
super().handle_pins_event()
pins = self.pins()
if not pins.door_locked:
- return StateAboutToOpen(self.state_machine)
+ return StateMachine.StateAboutToOpen(self.state_machine)
def handle_cmd_unlock_event(self,callback):
# intentionally not calling super() implementation
- return StateUnlocking(self.state_machine, callback)
+ return StateMachine.StateUnlocking(self.state_machine, callback)
class StateUnlocking(State):
def __init__(self,sm,callback=None):
# construct a nervlist
- nervlist = [(OPEN_REPEAT_TIMEOUT, lambda: self.actor().act(Actor.CMD_UNLOCK)) for t in xrange(OPEN_REPEAT_NUMBER)]
+ nervlist = [(OPEN_REPEAT_TIMEOUT, lambda: self.actor().act(Actor.CMD_UNLOCK)) for t in range(OPEN_REPEAT_NUMBER)]
nervlist += [(OPEN_REPEAT_TIMEOUT, self.could_not_open)]
super().__init__(sm,nervlist)
self.callbacks=[callback]
pins = self.pins()
if not pins.door_locked:
self.notify(True)
- return StateAboutToOpen(self.state_machine)
+ return StateMachine.StateAboutToOpen(self.state_machine)
def handle_cmd_unlock_event(self,callback):
# intentionally not calling super() implementation
# TODO: 202 notification also here if possible
def could_not_open(self):
logger.critical("Couldn't open door after %d tries. Going back to StateZu." % OPEN_REPEAT_NUMBER)
self.notify(False)
- return StateZu(self.state_machine)
+ return StateMachine.StateZu(self.state_machine)
class AbstractStateWhereOpeningIsRedundant(State):
def handle_cmd_unlock_event(self, callback):
super().handle_pins_event()
pins = self.pins()
if pins.door_locked:
- return StateZu(self.state_machine)
+ return StateMachine.StateZu(self.state_machine)
elif pins.space_active:
- return StateAuf(self.state_machine)
+ return StateMachine.StateAuf(self.state_machine)
class StateAuf(AbstractStateWhereOpeningIsRedundant):
def __init__(self,sm):
self.last_buzzed = now
if not pins.space_active:
logger.info("space switch off - starting leaving procedure")
- return StateAboutToLeave(self.state_machine)
+ return StateMachine.StateAboutToLeave(self.state_machine)
if pins.door_locked:
logger.info("door manually locked, but space switch on - going to StateZu")
play_sound("manual_lock")
- return StateZu(self.state_machine)
+ return StateMachine.StateZu(self.state_machine)
class StateLocking(State):
# TODO: share code with StateUnlocking
nervlist = [(CLOSE_REPEAT_TIMEOUT, lambda: self.actor().act(Actor.CMD_LOCK)) for t in range(CLOSE_REPEAT_NUMBER)]
nervlist += [(CLOSE_REPEAT_TIMEOUT, self.could_not_close)]
super().__init__(sm, nervlist)
- if not pins.door_closed: # this should always be true, but just to be sure...
+ if self.pins().door_closed: # this should always be true, but just to be sure...
self.actor().act(Actor.CMD_LOCK)
def handle_pins_event(self):
pins = self.pins()
if not pins.door_closed:
# TODO play a sound? This shouldn't happen, door was opened while we are locking
logger.warning("door manually opened during locking")
- return StateAboutToOpen(self.state_machine)
+ return StateMachine.StateAboutToOpen(self.state_machine)
if pins.door_locked:
- return SpaceZu(self.state_machine)
+ return StateMachine.StateZu(self.state_machine)
def handle_cmd_unlock_event(self,callback):
callback("409 conflict: The server is currently trying to lock the door. Try again later.")
def could_not_close(self):
logger.critical("Couldn't close door after %d tries. Going back to StateAboutToOpen." % CLOSE_REPEAT_NUMBER)
- return StateAboutToOpen(self.state_machine)
+ return StateMachine.StateAboutToOpen(self.state_machine)
class StateAboutToLeave(State):
def __init__(self, sm):
- nervlist = [(LEAVE_TIMEOUT, lambda: StateLocking(self.state_machine))]
+ nervlist = [(LEAVE_TIMEOUT, lambda: StateMachine.StateLocking(self.state_machine))]
super().__init__(sm, nervlist)
def handle_pins_event(self):
if not self.pins().door_closed:
- return StateLeaving(self.state_machine)
+ return StateMachine.StateLeaving(self.state_machine)
if self.pins().door_locked:
- return StateZu(self.state_machine)
+ return StateMachine.StateZu(self.state_machine)
+ if self.pins().space_active:
+ return StateMachine.StateAuf(self.state_machine)
class StateLeaving(State):
def __init__(self, sm):
- nervlist = [(LEAVE_TIMEOUT, lambda: StateAboutToOpen(self.state_machine))]
+ nervlist = [(LEAVE_TIMEOUT, lambda: StateMachine.StateAboutToOpen(self.state_machine))]
super().__init__(sm, nervlist)
def handle_pins_event(self):
if self.pins().door_closed:
- return StateLocking(self.state_machine)
+ return StateMachine.StateLocking(self.state_machine)
if self.pins().door_locked:
- return StateZu(self.state_machine)
+ return StateMachine.StateZu(self.state_machine)
+ if self.pins().space_active:
+ return StateMachine.StateAuf(self.state_machine)
def __init__(self, actor):
self.actor = actor
- self.callback = ThreadFunction(self._callback)
- self.current_state = StateStart(self)
+ self.callback = ThreadFunction(self._callback, name="StateMachine")
+ self.current_state = StateMachine.StateStart(self)
self.pins = None
self.old_pins = None
newstate = self.current_state.handle_event(cmd,arg) # returns None or an instance of the new state
self.old_pins = self.pins
while newstate is not None:
- logger.info("StateMachine: new state = %s" % newstate.__class__.__name__)
+ logger.debug("StateMachine: new state = %s" % newstate.__class__.__name__)
self.current_state = newstate
newstate = self.current_state.handle_event(StateMachine.CMD_PINS, self.pins)
projects / saartuer.git / blobdiff