X-Git-Url: https://git.ralfj.de/saartuer.git/blobdiff_plain/e489f494d0bb7ee28ef8c41ef47069ceebe118ee..56645e3cebe9fd8a49c60d1e7969fe6754625dfd:/tuerd?ds=sidebyside diff --git a/tuerd b/tuerd index 8290c83..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 @@ -31,7 +31,8 @@ GPIO.setmode(GPIO.BOARD) # bring 'em all up the_actor = actor.Actor() the_waker = waker.Waker() -the_machine = statemachine.StateMachine(the_actor, the_waker, args.fallback) +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) @@ -40,13 +41,15 @@ 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() # 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