more information in the logfile

[saartuer.git] / actor.py

diff --git a/actor.py b/actor.py
index 439a7bb0cd2bc0d783d1d01831f420e9b47a0a18..fb72df73b268a843843e56c2ab9a8ee5ed652e84 100644 (file)
--- a/actor.py
+++ b/actor.py
@@ -3,30 +3,43 @@ import RPi.GPIO as GPIO
 import time
        
 class Actor:
 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():
        
        class CMD():

-               def __init__(self, name, pin, tid, todo):
+               def __init__(self, name, pin, tid, todo, verbose = True):

                        self.name = name
                        self.pin = pin
                        self.tid = tid
                        self.todo = todo
                        self.name = name
                        self.pin = pin
                        self.tid = tid
                        self.todo = todo

+                       self.verbose = verbose

                        # don't do the GPIO setup here, the main init did not yet run
                
                def execute(self):
                        # 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)
+                       if self.verbose:
+                               logger.info("Actor: Running command %s" % self.name)
+                       else:
+                               logger.debug("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)
                        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)

-                               time.sleep(delay)
+                               if delay > 0:
+                                       time.sleep(delay)

        
        CMDs = {
        
        CMDs = {

-               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.0), (False, 0.1)]),
+               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, verbose=False, todo=[(True, 0)]),
+               CMD_GREEN_OFF: CMD("green off",    pin=23, tid=2, verbose=False, todo=[(False, 0)]),
+               CMD_RED_ON: CMD("red on",          pin=26, tid=2, verbose=False, todo=[(True, 0)]),
+               CMD_RED_OFF: CMD("red off",        pin=26, tid=2, verbose=False, todo=[(False, 0)]),

        }
        
        def __init__(self):
        }
        
        def __init__(self):


@@ -34,6 +47,7 @@ class Actor:
                self.threads = {}
                for cmd in Actor.CMDs.values():
                        GPIO.setup(cmd.pin, GPIO.OUT)
                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)
        
                        if not cmd.tid in self.threads:
                                self.threads[cmd.tid] = ThreadFunction(self._execute, "Actor TID %d" % cmd.tid)