X-Git-Url: https://git.ralfj.de/saartuer.git/blobdiff_plain/3313462175e847d3c0c5075e1ecc589f1d264ca7..d72b6eb3b787ea31c165de06a996dfca93d10146:/actor.py?ds=sidebyside

diff --git a/actor.py b/actor.py
index 8dd7323..f2f1ad2 100644
--- a/actor.py
+++ b/actor.py
@@ -3,32 +3,57 @@ import RPi.GPIO as GPIO
 import time
 	
 class Actor:
-	CMD_BUZZ = 0
-	CMD_UNLOCK = 1
-	CMD_LOCK = 2
+	CMD_BUZZ      = 0
+	CMD_UNLOCK    = 1
+	CMD_LOCK      = 2
+	CMD_GREEN_ON  = 3
+	CMD_GREEN_OFF = 4
+	CMD_RED_ON    = 5
+	CMD_RED_OFF   = 6
+	
+	class CMD():
+		def __init__(self, name, pin, tid, todo):
+			self.name = name
+			self.pin = pin
+			self.tid = tid
+			self.todo = todo
+			# don't do the GPIO setup here, the main init did not yet run
+		
+		def execute(self):
+			logger.info("Actor: Running command %s" % self.name)
+			for (value, delay) in self.todo:
+				if value is not None:
+					logger.debug("Actor: Setting pin %d to %d" % (self.pin, value))
+					GPIO.output(self.pin, value)
+				if delay > 0:
+					time.sleep(delay)
 	
 	CMDs = {
-		CMD_UNLOCK:  ("unlock", 12, [(None, 0.2), (True, 0.3), (False, 0.5)]),
-		CMD_LOCK:  ("lock", 16, [(None, 0.2), (True, 0.3), (False, 0.5)]),
-		CMD_BUZZ: ("buzz", 22, [(None, 0.2), (True, 2.0), (False, 0.5)]),
+		CMD_UNLOCK:  CMD("unlock",         pin=12, tid=0, todo=[(True, 0.3), (False, 0.1)]),
+		CMD_LOCK:  CMD("lock",             pin=16, tid=0, todo=[(True, 0.3), (False, 0.1)]),
+		CMD_BUZZ: CMD("buzz",              pin=22, tid=1, todo=[(True, 2.5), (False, 0.1)]),
+		CMD_GREEN_ON: CMD("green on",      pin=23, tid=2, todo=[(True, 0)]),
+		CMD_GREEN_OFF: CMD("green off",    pin=23, tid=2, todo=[(False, 0)]),
+		CMD_RED_ON: CMD("red on",          pin=26, tid=2, todo=[(True, 0)]),
+		CMD_RED_OFF: CMD("red off",        pin=26, tid=2, todo=[(False, 0)]),
 	}
 	
 	def __init__(self):
-		self.act = ThreadFunction(self._act, name="Actor")
-		for (name, pin, todo) in self.CMDs.values():
-			GPIO.setup(pin, GPIO.OUT)
+		# launch threads, all running the "_execute" method
+		self.threads = {}
+		for cmd in Actor.CMDs.values():
+			GPIO.setup(cmd.pin, GPIO.OUT)
+			GPIO.output(cmd.pin, False)
+			if not cmd.tid in self.threads:
+				self.threads[cmd.tid] = ThreadFunction(self._execute, "Actor TID %d" % cmd.tid)
 	
-	def _act(self, cmd):
-		if cmd in self.CMDs:
-			(name, pin, todo) = self.CMDs[cmd]
-			logger.info("Actor: Running command %s" % name)
-			for (value, delay) in todo:
-				if value is not None:
-					logger.debug("Actor: Setting pin %d to %d" % (pin, value))
-					GPIO.output(pin, value)
-				time.sleep(delay)
-		else:
-			logger.critical("Actor: Got unknown command %d" % cmd)
+	def _execute(self, cmd):
+		Actor.CMDs[cmd].execute()
+	
+	def act(self, cmd):
+		# dispatch command to correct thread
+		self.threads[Actor.CMDs[cmd].tid](cmd)
 	
 	def stop(self):
-		self.act.stop()
+		for thread in self.threads.values():
+			thread.stop()