status report command introduced

[saartuer.git] / statemachine.py

diff --git a/statemachine.py b/statemachine.py
index 62f523a346305c39f125bcfeb08a3b8a7897300c..dd9dc542bbe51524c24978bc5263bade5b1650de 100644 (file)
--- a/statemachine.py
+++ b/statemachine.py
@@ -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):
@@ -99,6 +103,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 +133,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 +201,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 +223,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 +369,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: