X-Git-Url: https://git.ralfj.de/saartuer.git/blobdiff_plain/bdf4adf1c9155148f713dd6e7eda955c495155b3..56645e3cebe9fd8a49c60d1e7969fe6754625dfd:/tuerd?ds=inline

diff --git a/tuerd b/tuerd
index 50fe03f..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
 
@@ -22,28 +22,34 @@ else:
 	# to avoid exceptions or getting None
 	args.fallback = False
 
+# Not let's go!
+logger.info("Starting up...")
+
 # initialize GPIO stuff
 GPIO.setmode(GPIO.BOARD)
 
 # bring 'em all up
 the_actor = actor.Actor()
-the_machine = statemachine.StateMachine(the_actor, args.fallback)
+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