X-Git-Url: https://git.ralfj.de/saartuer.git/blobdiff_plain/dfe98478e79cf926b2867677b3e1b90e6b679024..0889e9a1ec6bda2c4b16dabf0ab40793ac17756c:/tuerd?ds=sidebyside diff --git a/tuerd b/tuerd index e828ebb..220b2bc 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 @@ -30,8 +30,9 @@ GPIO.setmode(GPIO.BOARD) # bring 'em all up the_actor = actor.Actor() -the_waker = waker.Waker(the_machine) -the_machine = statemachine.StateMachine(the_actor, the_waker, 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) @@ -47,6 +48,7 @@ except KeyboardInterrupt: 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