X-Git-Url: https://git.ralfj.de/saartuer.git/blobdiff_plain/bdf4adf1c9155148f713dd6e7eda955c495155b3..e489f494d0bb7ee28ef8c41ef47069ceebe118ee:/statemachine.py?ds=sidebyside

diff --git a/statemachine.py b/statemachine.py
index 3a27ada..a3a24d4 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
@@ -138,24 +138,25 @@ class StateMachine():
 	
 	class StateStart(State):
 		def __init__(self, sm, nervlist = None, fallback=False):
-			super().__init__(self, sm, nervlist)
+			super().__init__(sm, nervlist)
 			self.fallback = fallback
 		def handle_pins_event(self):
 			pins = self.pins()
 			if not (pins.door_locked is None or pins.door_closed is None or pins.space_active is None or pins.bell_ringing is None):
-				logger.info("All sensors got a value, switching to a proper state")
 				if self.fallback:
 					logger.info("Going to StateFallback because running in fallback mode")
 					return StateMachine.StateFallback(self.state_machine)
 				if pins.door_locked:
+					logger.info("All sensors got a value, switching to a proper state: Space is closed")
 					return StateMachine.StateZu(self.state_machine)
 				else:
+					logger.info("All sensors got a value, switching to a proper state: Space is (about to) open")
 					return StateMachine.StateAboutToOpen(self.state_machine)
 			return super().handle_pins_event()
 	
 	class StateFallback(State):
 		def __init__(self, sm, nervlist = None):
-			super().__init__(self, sm, nervlist)
+			super().__init__(sm, nervlist)
 			self._last_blink_time = time.time()
 			self._red_state = False
 		def handle_pins_event(self):
@@ -174,10 +175,8 @@ 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()
-			# without return because we want to stay in fallback mode
-			super().handle_pins_event()
+				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
 			now = time.time()
@@ -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.current_state = StateMachine.StateStart(self, None, 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()