small updates, preparation

power_mqtt1.py

@@ -3,14 +3,41 @@
 import smbus
 import time
 import paho.mqtt.client as mqt
+from datetime import datetime
+from datetime import timedelta
 
 bus = smbus.SMBus(1)
 mqtc = mqt.Client()
 
 
 
+
+access = {}
+# [ code : [last_access, penalty] ]
+
+
+def allowed(code):
+    print (access)
+    if code in access:
+        if millis_since(access[code][0]) > 3000+access[code][1]:
+            access[code] = [datetime.now(),0]
+            return True
+        else:
+            access[code] = [datetime.now(),access[code][1]+3000]
+            return False
+    else:
+        access[code] = [datetime.now(),0]
+        return True
+
+def millis_since(start_time):
+    dt = datetime.now() - start_time
+    ms = (dt.days * 24 * 60 * 60 + dt.seconds) * 1000 + dt.microseconds / 1000.0
+    return ms
+
+
+
 # Settings for connection
-host = "mqtt.chaospott.de"
+host = "10.42.0.244"
 topic= "foobar/oben/licht"
 port = 1883
 
@@ -18,14 +45,14 @@ port = 1883
 rc = 0
 
 def on_connect(mosq, obj, foo ,bar ):
-	print( "Connected" )
+    print( "Connected" )
 
 def on_message(mosq, obj, msg):
-	#print( "Received on topic: " + msg.topic + " Message: "+str(msg.payload) );
-	msgs(msg.payload)
+    #print( "Received on topic: " + msg.topic + " Message: "+str(msg.payload) );
+    msgs(msg.payload, msg.topic)
 
 def on_subscribe(mosq, obj, mid, granted_qos):
-	print("Subscribed OK")
+    print("Subscribed OK")
 
 # Set callbacks
 mqtc.on_message = on_message
@@ -54,28 +81,56 @@ def clear_bit(value, bit):
 
 #Buttonbefehle
 def switch(i,speed=0.5):
-    o = 0
-    if i > 7:
-        o = set_bit(o,i-8)
-        bus.write_byte(0x21,255-o)
-        time.sleep(speed)
-        o = clear_bit(o,i)
-        bus.write_byte(0x21,255-o)
-    else:
-        o = set_bit(o, i)
-        bus.write_byte(0x3f,255-o)
-        time.sleep(speed)
-        o = clear_bit(o,i)
-        bus.write_byte(0x21,255-o)
+    if allowed(i):
+        o = 0
+        if i > 7:
+            o = set_bit(o,i-8)
+            bus.write_byte(0x21,255-o)
+            time.sleep(speed)
+            o = clear_bit(o,i-8)
+            bus.write_byte(0x21,255-o)
+        else:
+            o = set_bit(o, i)
+            bus.write_byte(0x3f,255-o)
+            time.sleep(speed)
+            o = clear_bit(o,i)
+            bus.write_byte(0x3f,255-o)
     
 
-commands = { "flur" : 0, "baellebad" : 1, "lounge-front": 2, "lounge-back" : 3,"baellebad-ein" : 4, "lounge-ein" : 5, "cantina-ein" : 6, "zentral-aus" : 7,  "flur-strobo": 100, "cantina" : 8, "cantina-strobo": 99}
+commands = { "flur" : 0, "baellebad" : 1, "lounge-front": 2, "lounge-back" : 3,"baellebad-ein" : 4, "lounge-ein" : 5, "cantina-ein" : 6, "zentral-aus" : 7, "cantina" : 8}
+power = { "zentral-aus" : 7 , "baellebad" : 4, "lounge" : 5, "cantina" : 6 }
+light = { "flur" : 0, "baellebad" : 1, "lounge-front" : 2, "lounge-back" : 3, "cantina" : 8 }
+state  = []
 
-def msgs(inp):
+def decode_topic(topic):
+    #lazy
+    parts = topic.explode("/")
+    if parts[0] == "foobar" and parts[4] == "action":
+        if parts[2] == "licht":
+            return (parts[3],lights)
+        elif parts[2] == "power":
+            return (parts[3],power)
+    return ("err", [] )
+
+def msgs(inp, topic):
     c = inp.decode("utf-8")
     l = len(c)
     # supporting number commands
-    if l < 3:
+    if c == "OFF" or c == "ON":
+        (name,lookup) = decode_topic(topic)
+        if name == "err":
+            return
+        switch(lookup[name])
+        if i in state:
+            if state[i] == 0:
+                state[i] = 1
+            else:
+                state[i] = 0
+        else:
+            state[i] = 1
+        #later: send status based on state[i]
+        
+    elif l < 3:
         try:
             msg = int(inp)
             switch(msg)
@@ -90,7 +145,7 @@ def msgs(inp):
         print ( "Command:", cmds[0], "Number of Parameters:", len(cmds) )
 
         #suporting string commands with an arg separated by ','
-        if len(cmds) == 2:
+        if len(cmds) > 1:
             
             #error checking
             try:
@@ -111,7 +166,7 @@ def msgs(inp):
             
             #command with parameter used for dimming
             else:       
-                switch(command,speed = 3*arg/100+0.7 )
+                switch(command,speed = 4*arg/100+1 )
 
         #single string command without parameter
         else:
@@ -120,7 +175,11 @@ def msgs(inp):
             except KeyError:
                 return
         
+    return
+
 
 init_mqtt()
 while 1:
     time.sleep(10)
+
+# vim: noai:ts=4:sw=4