Finally Working and mostly efficient
This commit is contained in:
parent
021a39b53c
commit
2db0e62604
114
power_mqtt1.py
114
power_mqtt1.py
@ -49,29 +49,40 @@ def set_bit(value, bit):
|
||||
def clear_bit(value, bit):
|
||||
return value & ~(1<<bit)
|
||||
|
||||
def i2c_status_thread():
|
||||
global state
|
||||
#ports = (0xFE,0xFD,0xFB,0xF7,0xEF,0xDF,0xBF,0x7F)
|
||||
# bael loun cant flur
|
||||
# leba e ina
|
||||
# d
|
||||
names = { "flur", "baellebad", "lounge-front", "lounge-back", "baellebad-ein", "lounge-ein", "cantina-ein", "zentral-aus", "cantina"}
|
||||
ports = (0xF7,0xFF,0xFF,0xFE,0xFD,0xFF,0xFF,0xFF,0xFB)
|
||||
inputs = (0x23,0x21)
|
||||
def i2c_status_thread_new():
|
||||
services = ["strom", "licht"]
|
||||
while True:
|
||||
byte = bus.read_byte(inputs[0])
|
||||
update = map( lambda x: 1 if (byte | x == x) else 0 , ports)
|
||||
byte = bus.read_byte(inputs[1])
|
||||
update[:8] = map( lambda x: 1 if (byte | x == x) else 0 , ports[:8])
|
||||
for i,j,n in state,update,names:
|
||||
if i != j:
|
||||
if n in power:
|
||||
mqtc.publish("foobar/oben/" + n + "/strom/status", states[j], qos=0, retain=False)
|
||||
else:
|
||||
mqtc.publish("foobar/oben/" + n + "/licht/status", states[j], qos=0, retain=False)
|
||||
|
||||
for c,i in i2c_input[0].items():
|
||||
on = byte | c == c
|
||||
if on and state[i] == 0 or not on and state[i] == 1: #Turned on
|
||||
mqtc.publish("foobar/oben/" + names[i][0] + "/" + services[names[i][1]] + "/status", states[1 if on else 0], qos=0, retain=False)
|
||||
state[i] = 1 if on else 0
|
||||
time.sleep(5)
|
||||
|
||||
#def i2c_status_thread():
|
||||
# global state
|
||||
#ports = (0xFE,0xFD,0xFB,0xF7,0xEF,0xDF,0xBF,0x7F)
|
||||
# bael loun cant flur
|
||||
# leba e ina-
|
||||
# d lich
|
||||
#ports = (0xF7,0,0,0xFE,0xFD,0xFB,0,0,0,0,0,0,0,0,0,0)
|
||||
# while True:
|
||||
# byte_ = bus.read_byte(inputs[0])
|
||||
# print(byte_)
|
||||
# update = list(map( lambda x: 1 if (byte_ | x == x) else 0, ports))
|
||||
# byte_ = bus.read_byte(inputs[1])
|
||||
# print(byte_)
|
||||
# update[8:] = list(map( lambda x: 1 if (byte_ | x == x) else 0, ports[8:]))
|
||||
# for i,j,n in zip(state,update,names):#
|
||||
# if i != j:
|
||||
# if n in power:
|
||||
# mqtc.publish("foobar/oben/" + n + "/strom/status", states[j], qos=0, retain=False)
|
||||
# else:
|
||||
# mqtc.publish("foobar/oben/" + n + "/licht/status", states[j], qos=0, retain=False)
|
||||
# state = update
|
||||
# time.sleep(5)
|
||||
|
||||
#Buttonbefehle
|
||||
def switch(i,speed=0.5):
|
||||
if allowed(i):
|
||||
@ -89,38 +100,41 @@ def switch(i,speed=0.5):
|
||||
o = clear_bit(o,i)
|
||||
bus.write_byte(0x3f,255-o)
|
||||
|
||||
state = [0,0,0,0,0,0,0,0,0,0]
|
||||
state = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
|
||||
inputs = (0x23,0x21)
|
||||
states = {0: "OFF", 1: "ON"}
|
||||
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}
|
||||
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, "flur-strobo": 100, "cantina-strobo": 99}
|
||||
i2c_input = [{ 0xFE : 4, 0xFD : 5, 0xFB : 8, 0xF7 : 0 }, {}]
|
||||
names = { 7: [ "zentral",0] , 4: ["baellebad",0], 5: ["lounge",0], 6: ["cantina",0], 0: ["flur",1], 1: ["baellebad",1], 2:["lounge-front",1], 3: ["lounge-back",1], 8: ["cantina",1]}
|
||||
power = { "zentral" : 7 , "baellebad" : 4, "lounge" : 5, "cantina" : 6 }
|
||||
light = { "flur" : 0, "baellebad" : 1, "lounge-front" : 2, "lounge-back" : 3, "cantina" : 8 }
|
||||
|
||||
|
||||
|
||||
# foobar/oben/lounge /licht/action
|
||||
# cantina /strom/status
|
||||
# flur
|
||||
# baellebad
|
||||
# zentral
|
||||
|
||||
def switch_state(i, state):
|
||||
def switch_state(i, state, speed=0.5):
|
||||
if state[i] != state: # changed
|
||||
switch(i)
|
||||
switch(i,speed=0.5)
|
||||
state[i] = state
|
||||
return True
|
||||
return False
|
||||
|
||||
def switch_toggle(i,speed=0.5):
|
||||
switch(i, speed=0.5)
|
||||
state[i] = 0 if state[i] == 1 else 1
|
||||
|
||||
def decode_topic(topic, state):
|
||||
#lazy
|
||||
print("dummy")
|
||||
list = topic.split('/')
|
||||
if list[3] == "licht":
|
||||
if list[2] in light:
|
||||
if switch_state(light[list[2]], state):
|
||||
clist = topic.split('/')
|
||||
if clist[3] == "licht":
|
||||
if clist[2] in light:
|
||||
if switch_state(light[clist[2]], state):
|
||||
mqtc.publish(topic.replace("action", "status"), states[state], qos=0, retain=False)
|
||||
elif list[3] == "strom":
|
||||
if list[2] in power:
|
||||
if switch_state(power[list[2]], state):
|
||||
elif clist[3] == "strom":
|
||||
if clist[2] in power:
|
||||
if switch_state(power[clist[2]], state):
|
||||
mqtc.publish(topic.replace("action", "status"), states[state], qos=0, retain=False)
|
||||
|
||||
def msgs(inp, topic):
|
||||
@ -136,29 +150,22 @@ def msgs(inp, topic):
|
||||
elif l < 3:
|
||||
try:
|
||||
msg = int(inp)
|
||||
switch(msg)
|
||||
switch_toggle(msg)
|
||||
except ValueError:
|
||||
print ( "No valid value")
|
||||
return
|
||||
|
||||
#supporting string commmands
|
||||
#supporting string commmands with dimming parameters
|
||||
else:
|
||||
|
||||
cmds = c.split(",")
|
||||
print ( "Command:", cmds[0], "Number of Parameters:", len(cmds) )
|
||||
|
||||
#suporting string commands with an arg separated by ','
|
||||
if len(cmds) > 1:
|
||||
|
||||
command = 9001
|
||||
#error checking
|
||||
try:
|
||||
command = commands[cmds[0]]
|
||||
except KeyError:
|
||||
return
|
||||
try:
|
||||
arg = int (cmds[1])
|
||||
except ValueError:
|
||||
return
|
||||
if cmds[0] in commands:
|
||||
command = cmds[0]
|
||||
try:
|
||||
arg = int (cmds[1])
|
||||
except ValueError:
|
||||
return
|
||||
|
||||
#strobo
|
||||
if ( command == 100 or command == 99 ):
|
||||
@ -169,12 +176,13 @@ def msgs(inp, topic):
|
||||
|
||||
#command with parameter used for dimming
|
||||
else:
|
||||
switch(command,speed = 4*arg/100+1 )
|
||||
switch_toggle(command,speed = 4*arg/100+1 )
|
||||
|
||||
#single string command without parameter
|
||||
else:
|
||||
try:
|
||||
switch(commands[c])
|
||||
if c in commands:
|
||||
switch_toggle(commands[c])
|
||||
except KeyError:
|
||||
return
|
||||
|
||||
@ -197,7 +205,7 @@ def init_mqtt():
|
||||
mqtc.on_connect = on_connect
|
||||
mqtc.on_subscribe = on_subscribe
|
||||
|
||||
_thread.start_new_thread(i2c_status_thread, ())
|
||||
_thread.start_new_thread(i2c_status_thread_new, ())
|
||||
|
||||
mqtc.loop_forever()
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user