X-Git-Url: https://git.ralfj.de/saartuer.git/blobdiff_plain/344d58d13b3ec1d7fb26d13de114d6e8afbe3218..dfe98478e79cf926b2867677b3e1b90e6b679024:/statemachine.py

diff --git a/statemachine.py b/statemachine.py
index a3c4aff..59951d4 100644
--- a/statemachine.py
+++ b/statemachine.py
@@ -11,7 +11,7 @@ def play_sound (what):
 		logger.error("StateMachine: Unable to list sound files in %s" % (SOUNDS_DIRECTORY+what))
 		return
 	soundfile = SOUNDS_DIRECTORY + what + '/' + random.choice(soundfiles)
-	fire_and_forget ([SOUNDS_PLAYER,soundfile], logger.error, "StateMachine: ")
+	fire_and_forget_cmd ([SOUNDS_PLAYER,soundfile], logger.error, "StateMachine: ")
 
 
 # StateUnlocking constants
@@ -175,8 +175,7 @@ class StateMachine():
 				def _close_after_time():
 					time.sleep(FALLBACK_LEAVE_DELAY_LOCK)
 					self.actor().act(Actor.CMD_LOCK)
-				t = threading.Thread(target=_close_after_time)
-				t.start()
+				fire_and_forget(_close_after_time)
 			# not calling superclass because we want to stay in fallback mode
 		def handle_wakeup_event(self):
 			# blink red LED
@@ -305,12 +304,13 @@ class StateMachine():
 				return StateMachine.StateAuf(self.state_machine)
 			return super().handle_pins_event()
 	
-	def __init__(self, actor, fallback = False):
+	def __init__(self, actor, waker, fallback = False):
 		self.actor = actor
 		self.callback = ThreadFunction(self._callback, name="StateMachine")
 		self.current_state = StateMachine.StateStart(self, fallback)
 		self.pins = None
 		self.old_pins = None
+		waker.register(lambda: self.callback(StateMachine.CMD_WAKEUP), 1.0) # wake up every second
 	
 	def stop (self):
 		self.callback.stop()