update the SpaceAPI at least once every 10 minutes (so the server could check for...

[saartuer.git] / tuerd

diff --git a/tuerd b/tuerd
index ec51c94ee15fb65645a4190820e584ed40e2051d..220b2bca8078dd1efe57be8d1105d0154123846b 100755 (executable)
--- a/tuerd
+++ b/tuerd
@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 import RPi.GPIO as GPIO
-import statemachine, actor, pins, tysock, waker
+import statemachine, actor, pins, tysock, waker, spaceapi
 from libtuer import logger
 import argparse
 
@@ -9,10 +9,18 @@ parser = argparse.ArgumentParser(description='Run a door')
 parser.add_argument("-d", "--debug",
                                        action="store_true", dest="debug",
                                        help="Don't send emails")
+parser.add_argument("-f", "--fallback",
+                                       action="store_true", dest="fallback",
+                                       help="Fallback mode for unfunctional hardware: Depend on less sensor input")
 args = parser.parse_args()
 if args.debug:
        import libtuer
        libtuer.mailAddress = []
+if args.fallback:
+       logger.info("Starting in fallback mode")
+else:
+       # to avoid exceptions or getting None
+       args.fallback = False
 
 # Not let's go!
 logger.info("Starting up...")
@@ -22,10 +30,11 @@ GPIO.setmode(GPIO.BOARD)
 
 # bring 'em all up
 the_actor = actor.Actor()
-the_machine = statemachine.StateMachine(the_actor)
+the_waker = waker.Waker()
+the_api   = spaceapi.SpaceApi(the_waker)
+the_machine = statemachine.StateMachine(the_actor, the_waker, the_api, args.fallback)
 the_socket = tysock.TySocket(the_machine)
 the_pins = pins.PinsWatcher(the_machine)
-the_waker = waker.Waker(the_machine)
 
 # we do the socket accept thing in the main thread
 try:
@@ -36,9 +45,10 @@ except KeyboardInterrupt:
        pass
 
 # bring 'em all down
-the_waker.stop()
-the_pins.stop()
+the_waker.stop() # this one first, it "randomly" calls other threads
+the_pins.stop() # as does this
 the_machine.stop()
+the_api.stop()
 the_actor.stop()
 
 # shutdown GPIO stuff