buzz twice to give users more time

[saartuer.git] / statemachine.py

diff --git a/statemachine.py b/statemachine.py
index e6a27570c45c2731607d95c3f0d9646ff45024db..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
@@ -86,6 +86,7 @@ class StateMachine():
        CMD_LOCK = 5
        CMD_FALLBACK_ON = 6
        CMD_FALLBACK_OFF = 7
+       CMD_STATUS = 8
        
        class State():
                def __init__(self, state_machine, nervlist = None):
@@ -94,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):
@@ -110,6 +113,9 @@ class StateMachine():
                        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):
@@ -135,6 +141,8 @@ class StateMachine():
                                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)
        
@@ -374,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)