tidied up fire_and_forget_cmd for sound playing

[saartuer.git] / tuerd

diff --git a/tuerd b/tuerd
index 8290c83cf718fa0f22c1357ef7f50cca89361da9..942c495267403d957e1e01ee579a3d88414e4a47 100755 (executable)
--- a/tuerd
+++ b/tuerd
@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 import RPi.GPIO as GPIO
 #!/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
 
 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()
 # 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)
 
 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!
        the_socket.accept()
 except KeyboardInterrupt:
        # this is what we waited for!

-       logger.info("Got SIGINT, terminating...")

        pass
 
        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()
 # 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
 the_actor.stop()
 
 # shutdown GPIO stuff