From 311d7fb5023a6c80ce370d79a6f52495fd54d867 Mon Sep 17 00:00:00 2001 From: Constantin Berhard Date: Thu, 10 Oct 2013 14:55:13 +0200 Subject: [PATCH] statemachine weitergecodet StateAboutToOpen, StateOpening und StateAuf fertig StateMachine hat jetzt old_pins --- statemachine.py | 65 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 51 insertions(+), 14 deletions(-) diff --git a/statemachine.py b/statemachine.py index 82665e3..fe92682 100644 --- a/statemachine.py +++ b/statemachine.py @@ -23,6 +23,10 @@ ABOUTOPEN_NERVLIST = [(5, lambda : play_sound("flipswitch")), (10, lambda:play_s (20, lambda:play_sound("flipswitch")), (30, lambda:play_sound("flipswitch")), (30, lambda:Logger.error("Space open but switch not flipped for 30 seconds")),\ (40, lambda:play_sound("flipswitch")), (50, lambda:play_sound("flipswitch")), (56, lambda:play_sound("flipswitch")), (60, 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) +AUF_BELLBUZZ_REPEAT_TIME = 2 + # play_sound constants SOUNDS_DIRECTORY = "/opt/tuer/sounds/" SOUNDS_PLAYER = "/usr/bin/mplayer" @@ -41,6 +45,7 @@ class StateMachine(): self.state_machine = state_machine self.time_entered = time.time() self.theDict = None + self.last_wakeup = self.time_entered def handle_pins_event(self): pass # one needn't implement this def handle_buzz_event(self,arg): # this shouldn't be overwritten @@ -50,12 +55,12 @@ class StateMachine(): if arg is not None: arg("412 Precondition Failed: The current state (%s) cannot handle the OPEN event" % self.__class__.__name__) def handle_wakeup_event(self): - pass # one needn't implement this + self.last_wakeup = time.time() def pins(self): return self.state_machine.pins def actor(self): return self.state_machine.actor - def handle_event(self,ev,arg): + def handle_event(self,ev,arg): # don't override if arg is CMD_PINS: self.handle_pins_event() elif arg is CMD_BUZZ: @@ -94,6 +99,7 @@ class StateMachine(): def __init__(self,callback,sm): State.__init__(self,sm) self.callbacks=[callback] + # FIXME: can we send "202 processing: Trying to open the door" here? Are the callbacks multi-use? self.tries = 0 self.actor().act(Actor.CMD_OPEN) def notify(self, did_it_work): @@ -107,6 +113,7 @@ class StateMachine(): self.notify(True) return StateAboutToOpen(self.state_machine) def handle_open_event(self,callback): + # FIXME: 202 notification also here if possible self.callbacks.append(callback) def handle_wakeup_event(self): over = time.time() - self.time_entered @@ -116,28 +123,56 @@ class StateMachine(): self.actor().act(Actor.CMD_OPEN) self.tries += 1 else: - #TODO: LOG ERROR und EMAIL an Admins + logger.critical("Couldn't open door after %d tries. Going back to StateZu." % OPEN_REPEAT_NUMBER) self.notify(False) return StateZu(self.state_machine) - class StateAboutToOpen(State): + class AbstractStateWhereOpeningIsRedundant(State): + def __init__ (self,sm): + State.__init__(sm): + def handle_open_event(self, callback): + callback("299 redundant: Space seems to be already open. Still processing your request tough.") + logger.warning("Received OPEN command in StateAboutToOpen. This should not be necessary.") + self.actor().act(Actor.CMD_OPEN) + + class StateAboutToOpen(AbstractStateWhereOpeningIsRedundant): def __init__(self, sm): - State.__init__(sm) + AbstractStateWhereOpeningIsRedundant.__init__(sm) def handle_pins_event(self): pins = self.pins() if pins.door_locked: return StateZu(self.state_machine) elif pins.space_active: return StateAuf(self.state_machine) - else: - over = time.time() - self.time_entered - # TODO: Nerv - logger.debug("AboutToOpen since %f seconds. TODO: nerv the user" % over) - # TODO Conny + def handle_wakeup_event(self): + now = time.time() + lasttime = self.last_wakeup - self.time_entered + thistime = now - self.time_entered + for (t,f) in filter(lambda (t,f): t<=thistime and t>lasttime, ABOUTOPEN_NERVLIST): + ret = f(); + if ret is not None: + return ret - class StateAuf(State): - #TODO Conny - pass + class StateAuf(AbstractStateWhereOpeningIsRedundant): + def __init__(self,sm): + AbstractStateWhereOpeningIsRedundant.__init__(sm) + self.last_buzzed = None + def handle_pins_event(self): + pins = self.pins() + if pins.bell_ringing: + now = time.time() + if self.last_buzzed is None or now-self.last_buzzed < AUF_BELLBUZZ_REPEAT_TIME: + logger.info("buzzing because of bell ringing in state auf") + self.actor().act(Actor.CMD_BUZZ) + self.last_buzzed = now + if not pins.space_active: + logger.info("space switch off - starting leaving procedure") + return StateAboutToLeave(self.state_machine) + if pins.door_locked: + logger.error("door manually locked, but space switch on - going to StateZu") + play_sound("manual_lock") + return StateZu(self.state_machine) + # handle_wakeup_event intentionally not overwritten class StateClosing(State): #TODO Ralf/Conny @@ -154,8 +189,9 @@ class StateMachine(): def __init__(self, actor): self.actor = actor self.callback = ThreadFunction(self._callback) - self.current_state = None + self.current_state = StateStart(self) self.pins = None + self.old_pins = None def stop (self): self.callback.stop() @@ -163,6 +199,7 @@ class StateMachine(): def _callback(self, cmd, arg=None): # update pins if cmd == StateMachine.CMD_PINS: + self.old_pins = self.pins self.pins = arg # handle stuff newstate = self.current_state.handle_event(cmd,arg) # returns None or an instance of the new state -- 2.30.2