X-Git-Url: https://git.ralfj.de/saartuer.git/blobdiff_plain/eb3e24210b024a3393e629f133bef7c66eddceae..e56993183ffa8362215d92913445106aea245d97:/tuerd?ds=sidebyside

diff --git a/tuerd b/tuerd
index ec51c94..942c495 100755
--- 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,23 +30,26 @@ 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:
 	the_socket.accept()
 except KeyboardInterrupt:
 	# this is what we waited for!
-	logger.info("Got SIGINT, terminating...")
 	pass
 
+logger.info("Terminating...") # somehow this does not arrive in the syslog
+
 # 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