buzz twice to give users more time

[saartuer.git] / statemachine.py

diff --git a/statemachine.py b/statemachine.py
index 62f523a346305c39f125bcfeb08a3b8a7897300c..a5e52f69b9bbe522ef839a3f98b23158116ad25a 100644 (file)
--- a/statemachine.py
+++ b/statemachine.py
@@ -12,7 +12,7 @@ def play_sound (what):
                return
        soundfile = SOUNDS_DIRECTORY + what + '/' + random.choice(soundfiles)
        hour = datetime.datetime.time(datetime.datetime.now()).hour
-       volume = 60 if hour >= 22 or hour <= 6 else 95
+       volume = 60 if hour >= 22 or hour <= 6 else 90
        fire_and_forget_cmd ([SOUNDS_PLAYER, "-volume", str(volume), soundfile], "StateMachine: ")
 
 # convert an absolute nervlist to a relative one
@@ -83,6 +83,10 @@ class StateMachine():
        CMD_UNLOCK = 2
        CMD_WAKEUP = 3
        CMD_LAST = 4
+       CMD_LOCK = 5
+       CMD_FALLBACK_ON = 6
+       CMD_FALLBACK_OFF = 7
+       CMD_STATUS = 8
        
        class State():
                def __init__(self, state_machine, nervlist = None):
@@ -91,6 +95,8 @@ class StateMachine():
                def handle_pins_event(self):
                        pass # one needn't implement this
                def handle_buzz_event(self,arg): # this shouldn't be overwritten
+                       # Buzz twice to give users more time to run ;-)
+                       self.actor().act(Actor.CMD_BUZZ)
                        self.actor().act(Actor.CMD_BUZZ)
                        arg("200 okay: buzz executed")
                def handle_cmd_unlock_event(self,arg):
@@ -99,6 +105,17 @@ class StateMachine():
                def handle_wakeup_event(self):
                        if self._nerver is not None:
                                return self._nerver.nerv()
+               def handle_cmd_lock_event(self,arg):
+                       arg("412 Precondition Failed: If not in fallback mode, use the hardware switch to lock the space.")
+               def handle_cmd_fallback_on_event(self,arg):
+                       arg("200 okay: Entering fallback mode and notifying admins.")
+                       logger.critical("Entering fallback mode. Somebody thinks, the hardware sensors are broken.")
+                       return StateMachine.StateFallback(self.state_machine)
+               def handle_cmd_fallback_off_event(self,arg):
+                       arg("412 Precondition Failed: Not in fallback mode!")
+               def handle_cmd_status_event(self,arg):
+                       # TODO use a proper JSON lib
+                       arg('200 okay: {state:\"%s\"}' % self.__class__.__name__)
                def on_leave(self):
                        pass
                def pins(self):
@@ -118,6 +135,14 @@ class StateMachine():
                                return self.handle_cmd_unlock_event(arg)
                        elif ev == StateMachine.CMD_WAKEUP:
                                return self.handle_wakeup_event()
+                       elif ev == StateMachine.CMD_LOCK:
+                               return self.handle_cmd_lock_event(arg)
+                       elif ev == StateMachine.CMD_FALLBACK_ON:
+                               return self.handle_cmd_fallback_on_event(arg)
+                       elif ev == StateMachine.CMD_FALLBACK_OFF:
+                               return self.handle_cmd_fallback_off_event(arg)
+                       elif ev == StateMachine.CMD_STATUS:
+                               return self.handle_cmd_status_event(arg)
                        else:
                                raise Exception("Unknown command number: %d" % ev)
        
@@ -178,10 +203,6 @@ class StateMachine():
                        self._red_state = False
                def handle_pins_event(self):
                        pins = self.pins()
-                       # buzz if open and bell rang
-                       if pins.space_active and pins.bell_ringing and not self.old_pins().bell_ringing:
-                               logger.info("StateFallback: Space switch on and door bell rung => buzzing")
-                               self.actor().act(Actor.CMD_BUZZ)
                        # set green LED according to space switch
                        if pins.space_active:
                                self.actor().act(Actor.CMD_GREEN_ON)
@@ -204,8 +225,18 @@ class StateMachine():
                                self._red_state = True
                def handle_cmd_unlock_event(self,arg):
                        if arg is not None:
-                               arg("298 Fallback Okay: Trying to unlock the door. The System is in fallback mode, success information is not available.")
+                               arg("200 okay: Trying to unlock the door. The System is in fallback mode, success information is not available.")
                        self.actor().act(Actor.CMD_UNLOCK)
+               def handle_cmd_lock_event(self,arg):
+                       if arg is not None:
+                               arg("200 okay: Trying to lock the door. The System is in fallback mode, success information is not available.")
+                       self.actor().act(Actor.CMD_LOCK)
+               def handle_cmd_fallback_on_event(self,arg):
+                       arg("412 Precondition Failed: Fallback mode already active.")
+               def handle_cmd_fallback_off_event(self,arg):
+                       arg("200 okay: Leaving fallback mode and notifying admins.")
+                       logger.critical("Leaving fallback mode. Somebody thinks, the sensors are working again.")
+                       return StateMachine.StateStart(self.state_machine)
        
        class StateZu(AbstractLockedState):
                def handle_cmd_unlock_event(self,callback):
@@ -340,6 +371,7 @@ class StateMachine():
        def stop (self):
                self.callback.stop()
        
+       # actually call this.callback (is set in the constructor to make this thread safe)
        def _callback(self, cmd, arg=None):
                # update pins
                if cmd == StateMachine.CMD_PINS:
@@ -350,6 +382,6 @@ class StateMachine():
                while newstate is not None:
                        assert isinstance(newstate, StateMachine.State), "I should get a state"
                        self.current_state.on_leave()
-                       logger.debug("StateMachine: Doing state transition %s -> %s" % (self.current_state.__class__.__name__, newstate.__class__.__name__))
+                       logger.info("StateMachine: Doing state transition %s -> %s" % (self.current_state.__class__.__name__, newstate.__class__.__name__))
                        self.current_state = newstate
                        newstate = self.current_state.handle_event(StateMachine.CMD_PINS, self.pins)