Rewrite to make it readable
This commit is contained in:
T
parent
7329f47354
commit
e8395ae404
447
power_mqtt1.py
447
power_mqtt1.py
@ -1,312 +1,229 @@
|
|||||||
#!/usr/bin/env python3
|
#!/usr/bin/env python3
|
||||||
|
|
||||||
import _thread
|
import threading
|
||||||
import time
|
import time
|
||||||
from datetime import datetime
|
from dataclasses import dataclass
|
||||||
|
|
||||||
import paho.mqtt.client as mqt
|
import paho.mqtt.client as mqtt
|
||||||
import smbus
|
import smbus
|
||||||
|
|
||||||
bus = smbus.SMBus(1)
|
|
||||||
mqtc = mqt.Client()
|
|
||||||
|
|
||||||
access = {}
|
class BusWLock:
|
||||||
# [ code : [last_access, penalty] ]
|
def __init__(self, bus: smbus.SMBus):
|
||||||
|
self.bus = bus
|
||||||
bus_use = True
|
self.lock = threading.Lock()
|
||||||
|
|
||||||
|
|
||||||
def allowed(code):
|
@dataclass
|
||||||
print(access)
|
class Relay:
|
||||||
if code in access:
|
name: str
|
||||||
if millis_since(access[code][0]) > 3000 + access[code][1]:
|
i2c_read_addr: int
|
||||||
access[code] = [datetime.now(), 0]
|
i2c_read_bit: int
|
||||||
return True
|
i2c_write_addr: int
|
||||||
|
i2c_write_bit: int
|
||||||
|
|
||||||
|
bus: BusWLock = None
|
||||||
|
state: int = 0
|
||||||
|
has_brightness: bool = False
|
||||||
|
on_state_change = lambda s, _: _
|
||||||
|
on_button_event = lambda s, _s, _ev: None
|
||||||
|
|
||||||
|
STATE_MIN = 0
|
||||||
|
STATE_MAX = 255
|
||||||
|
|
||||||
|
def set_state(self, state):
|
||||||
|
if state == self.state:
|
||||||
|
return
|
||||||
|
if self.STATE_MIN < state < self.STATE_MAX:
|
||||||
|
self._trigger(4 * state / 100 + 1)
|
||||||
else:
|
else:
|
||||||
access[code] = [datetime.now(), access[code][1] + 3000]
|
self._trigger()
|
||||||
return False
|
self.state = state
|
||||||
else:
|
print("set", self.name, self.state)
|
||||||
access[code] = [datetime.now(), 0]
|
self.on_state_change(self)
|
||||||
return True
|
|
||||||
|
def update_state(self, state):
|
||||||
|
if self.state == state:
|
||||||
|
return
|
||||||
|
self.state = state
|
||||||
|
print("update", self.name, self.state)
|
||||||
|
self.on_state_change(self)
|
||||||
|
|
||||||
|
def _trigger(self, duration=0.5):
|
||||||
|
data_mask = 0xff ^ (1 << self.i2c_write_bit)
|
||||||
|
with self.bus.lock:
|
||||||
|
print("write", time.monotonic(), self.name, hex(self.i2c_write_addr), self.i2c_write_bit, hex(data_mask))
|
||||||
|
self.bus.bus.write_byte(self.i2c_write_addr, data_mask)
|
||||||
|
time.sleep(duration)
|
||||||
|
self.bus.bus.write_byte(self.i2c_write_addr, 255)
|
||||||
|
print("write", time.monotonic(), self.name, hex(self.i2c_write_addr), self.i2c_write_bit, hex(data_mask))
|
||||||
|
|
||||||
|
def process_event(self, active):
|
||||||
|
new_state = self.STATE_MAX if active else self.STATE_MIN
|
||||||
|
if self.state != new_state:
|
||||||
|
self.on_button_event(self, 1)
|
||||||
|
self.on_button_event(self, 0)
|
||||||
|
self.update_state(new_state)
|
||||||
|
|
||||||
|
|
||||||
def millis_since(start_time):
|
@dataclass
|
||||||
dt = datetime.now() - start_time
|
class ButtonInput(Relay):
|
||||||
ms = (dt.days * 24 * 60 * 60 + dt.seconds) * 1000 + dt.microseconds / 1000.0
|
pressed_since: int | None = None
|
||||||
return ms
|
|
||||||
|
|
||||||
|
def button_pressed(self, ms: int):
|
||||||
|
...
|
||||||
|
|
||||||
def on_connect(mosq, obj, foo, bar):
|
def process_event(self, active: bool):
|
||||||
print("Connected")
|
if active:
|
||||||
|
if self.pressed_since is None:
|
||||||
|
self.pressed_since = time.monotonic_ns()
|
||||||
def on_message(mosq, obj, msg):
|
self.on_button_event(self, 1)
|
||||||
# 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")
|
|
||||||
|
|
||||||
|
|
||||||
# Funktion Setze Bit in Variable / Function Set Bit in byte
|
|
||||||
def set_bit(value, bit):
|
|
||||||
return value | (1 << bit)
|
|
||||||
|
|
||||||
|
|
||||||
# Funktion rücksetzte Bit in Variable / Function reset Bit in byte
|
|
||||||
def clear_bit(value, bit):
|
|
||||||
return value & ~(1 << bit)
|
|
||||||
|
|
||||||
|
|
||||||
def eval_time_diff(switch, start, end):
|
|
||||||
print("Switch: " + str(switch) + " was pressed for " + str(end - start) + "MS")
|
|
||||||
d = end - start
|
|
||||||
if d < 600 and switch == 7:
|
|
||||||
zentral_aus()
|
|
||||||
print("Zentral Aus gedrueckt")
|
|
||||||
return
|
|
||||||
if d < 600: # Single Switch
|
|
||||||
state[switch] ^= 1
|
|
||||||
send_state()
|
|
||||||
|
|
||||||
|
|
||||||
def i2c_status_thread_new():
|
|
||||||
global bus_use, state
|
|
||||||
state_timer = [0, 0, 0, 0, 0, 0, 0, 0]
|
|
||||||
while True:
|
|
||||||
while bus_use:
|
|
||||||
for pos, i2c_input in enumerate(inputs):
|
|
||||||
byte = bus.read_byte(i2c_input)
|
|
||||||
for c, i in i2c_inputs[pos].items():
|
|
||||||
ns = 1 if byte | c == c else 0 # get new state
|
|
||||||
|
|
||||||
# if i == 7:
|
|
||||||
# zentral_aus()
|
|
||||||
# print( "zentral-aus" )
|
|
||||||
# continue
|
|
||||||
|
|
||||||
if state[i] != ns and not i in [1, 2, 3, 6]: # Turned on
|
|
||||||
mqtc.publish("foobar/oben/" + names[i][0] + "/" + services[names[i][1]] + "/status", states[ns], qos=0, retain=False)
|
|
||||||
state[i] = ns
|
|
||||||
|
|
||||||
if i in (1, 2, 3, 6, 7):
|
|
||||||
if ns == 0 and state_timer[i] > 0:
|
|
||||||
eval_time_diff(i, state_timer[i], int(time.time() * 1000))
|
|
||||||
state_timer[i] = 0
|
|
||||||
|
|
||||||
if ns == 1 and state_timer[i] == 0:
|
|
||||||
state_timer[i] = int(time.time() * 1000)
|
|
||||||
time.sleep(0.1) # abtastrate für die schalter
|
|
||||||
|
|
||||||
time.sleep(1)
|
|
||||||
|
|
||||||
|
|
||||||
# Buttonbefehle
|
|
||||||
def switch(i, speed=0.5):
|
|
||||||
global bus_use
|
|
||||||
# if allowed(i):
|
|
||||||
bus_use = False
|
|
||||||
print("Switched: " + str(i) + " Speed: " + str(speed))
|
|
||||||
o = 0
|
|
||||||
if 7 < i < 16:
|
|
||||||
o = set_bit(o, i - 8)
|
|
||||||
bus.write_byte(0x3f, 255 - o)
|
|
||||||
time.sleep(speed)
|
|
||||||
o = clear_bit(o, i - 8)
|
|
||||||
bus.write_byte(0x3f, 255 - o)
|
|
||||||
elif i < 8:
|
|
||||||
o = set_bit(o, i)
|
|
||||||
bus.write_byte(0x21, 255 - o)
|
|
||||||
time.sleep(speed)
|
|
||||||
o = clear_bit(o, i)
|
|
||||||
bus.write_byte(0x21, 255 - o)
|
|
||||||
bus_use = True
|
|
||||||
|
|
||||||
|
|
||||||
def strobo_switch(switch_list, speed=0.5):
|
|
||||||
global bus_use
|
|
||||||
bus_use = False
|
|
||||||
for i in switch_list:
|
|
||||||
o = 0
|
|
||||||
if i > 7:
|
|
||||||
o = set_bit(o, i - 8)
|
|
||||||
bus.write_byte(0x3f, 255 - o)
|
|
||||||
time.sleep(speed)
|
|
||||||
o = clear_bit(o, i - 8)
|
|
||||||
bus.write_byte(0x3f, 255 - o)
|
|
||||||
else:
|
else:
|
||||||
o = set_bit(o, i)
|
if self.pressed_since is not None:
|
||||||
bus.write_byte(0x21, 255 - o)
|
self.button_pressed((time.monotonic_ns() - self.pressed_since) // 1000000) # ms
|
||||||
time.sleep(speed)
|
self.on_button_event(self, 0)
|
||||||
o = clear_bit(o, i)
|
self.pressed_since = None
|
||||||
bus.write_byte(0x21, 255 - o)
|
|
||||||
bus_use = True
|
|
||||||
|
|
||||||
|
|
||||||
services = ["strom", "licht"]
|
@dataclass
|
||||||
state = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
|
class DimmerRelay(ButtonInput):
|
||||||
inputs = (0x23, 0x3a)
|
def set_state(self, state):
|
||||||
states = {0: "off", 1: "on"}
|
super().set_state(self.STATE_MAX if state > self.STATE_MIN else self.STATE_MIN)
|
||||||
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}
|
|
||||||
i2c_inputs = [{0xFE: 4, 0xFD: 5, 0xFB: 8, 0xF7: 0, 0xEF: 2, 0xDF: 1, 0xBF: 3, 0x7F: 6}, {0xFE: 7}]
|
|
||||||
|
|
||||||
names = {7: ["zentral", 0], 4: ["baellebad", 0],
|
def __post_init__(self):
|
||||||
5: ["lounge", 0], 6: ["cantina", 0], 0: ["flur", 1],
|
self.has_brightness = True
|
||||||
1: ["baellebad", 1], 2: ["lounge-front", 1],
|
|
||||||
3: ["lounge-back", 1], 8: ["cantina", 1]}
|
def button_pressed(self, ms: int):
|
||||||
power = {"zentral": 7, "baellebad": 4, "lounge": 5, "cantina": 6}
|
print(self.name, "pressed for", ms)
|
||||||
light = {"flur": 0, "baellebad": 1, "lounge-front": 2,
|
if ms < 600:
|
||||||
"lounge-back": 3, "cantina": 8}
|
self.update_state(self.STATE_MIN if self.state else self.STATE_MAX)
|
||||||
|
else:
|
||||||
|
pass # TODO
|
||||||
|
|
||||||
|
|
||||||
# foobar/oben/lounge /licht/action
|
@dataclass
|
||||||
# cantina /strom/status
|
class ZentralAus(ButtonInput):
|
||||||
# flur
|
relays: list[Relay] = None
|
||||||
# baellebad
|
|
||||||
# zentral
|
|
||||||
|
|
||||||
def zentral_aus():
|
def __post_init__(self):
|
||||||
for i in range(len(state)):
|
self.state: None = None
|
||||||
state[i] = 0
|
|
||||||
send_state()
|
def set_state(self, state):
|
||||||
# for k,v in names.items():
|
if state == self.STATE_MAX:
|
||||||
# mqtc.publish("foobar/oben/" + v[0] + "/" + services[v[1]] + "/status", "off" )
|
for relay in self.relays:
|
||||||
|
relay.set_state(relay.STATE_MIN)
|
||||||
|
|
||||||
|
def update_state(self, state):
|
||||||
|
return False
|
||||||
|
|
||||||
|
def button_pressed(self, ms: int):
|
||||||
|
self.set_state(self.STATE_MAX)
|
||||||
|
|
||||||
|
|
||||||
def switch_state(i, state_, speed=0.5):
|
class PowerCTL:
|
||||||
if state[i] != state_: # changed
|
PREFIX = "foobar/oben"
|
||||||
switch(i, speed=0.5)
|
|
||||||
state[i] = state_
|
|
||||||
return state[i]
|
|
||||||
|
|
||||||
|
def __init__(self):
|
||||||
|
self.bus = BusWLock(smbus.SMBus(1))
|
||||||
|
self.relays: dict[str, Relay] = {} # topic: relay
|
||||||
|
|
||||||
def switch_toggle(i, speed=0.5):
|
self.mqtc = mqtt.Client()
|
||||||
switch(i, speed=speed)
|
self.mqtc.connect("mqtt.chaospott.de", 1883, 60)
|
||||||
# power can only be switched on, and centrally shutdown
|
|
||||||
# if i in [ 4,5,6]:
|
|
||||||
# state[i] = 1
|
|
||||||
# not anymore
|
|
||||||
if i == 7:
|
|
||||||
state[i] = 0
|
|
||||||
elif i < 16:
|
|
||||||
state[i] = 0 if state[i] == 1 else 1
|
|
||||||
mqtc.publish("foobar/oben/" + names[i][0] + "/" + services[names[i][1]] + "/status", states[state[i]])
|
|
||||||
|
|
||||||
|
self.mqtc.on_message = self.on_message
|
||||||
|
self.mqtc.on_connect = self.on_connect
|
||||||
|
self.mqtc.on_subscribe = self.on_subscribe
|
||||||
|
|
||||||
def decode_topic(topic, state):
|
def add_relays(self, *relays: Relay):
|
||||||
clist = topic.split('/')
|
for relay in relays:
|
||||||
if clist[3] == "strom" and clist[2] == "zentral":
|
relay.bus = self.bus
|
||||||
zentral_aus()
|
relay.on_state_change = self.mqtt_send_state
|
||||||
|
relay.on_button_event = self.mqtt_send_event
|
||||||
|
topic = f"{self.PREFIX}/{relay.name}/action"
|
||||||
|
self.relays[topic] = relay
|
||||||
|
print("subscribe", topic)
|
||||||
|
self.mqtc.subscribe(topic, 0)
|
||||||
|
|
||||||
if clist[3] == "licht" and clist[2] in light:
|
def mqtt_send_state(self, relay: Relay):
|
||||||
ns = switch_state(light[clist[2]], state)
|
if relay.state is not None:
|
||||||
mqtc.publish(topic.replace("action", "status"), states[ns], qos=0, retain=False)
|
self.mqtc.publish(f"{self.PREFIX}/{relay.name}/status", {True: "on", False: "off"}[relay.state > relay.STATE_MIN], qos=0, retain=False)
|
||||||
|
if relay.has_brightness:
|
||||||
|
self.mqtc.publish(f"{self.PREFIX}/{relay.name}/brightness", relay.state, qos=0, retain=False)
|
||||||
|
|
||||||
if clist[3] == "strom" and clist[2] in power:
|
def mqtt_send_event(self, relay: ButtonInput, ev):
|
||||||
ns = switch_state(power[clist[2]], state)
|
self.mqtc.publish(f"{self.PREFIX}/{relay.name}/input", ev, qos=0, retain=False)
|
||||||
mqtc.publish(topic.replace("action", "status"), states[ns], qos=0, retain=False)
|
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def on_connect(_mosq, _obj, _foo, _bar):
|
||||||
|
print("Connected")
|
||||||
|
|
||||||
def msgs(inp, topic):
|
@staticmethod
|
||||||
c = inp.decode("utf-8")
|
def on_subscribe(_mosq, _obj, _mid, _granted_qos):
|
||||||
l = len(c)
|
print("Subscribed OK")
|
||||||
# supporting number commands
|
|
||||||
if c == "on" or c == "off":
|
def on_message(self, _mosq, _obj, msg):
|
||||||
if c.find("on") >= 0:
|
relay = self.relays.get(msg.topic)
|
||||||
decode_topic(topic, 1)
|
if relay is None:
|
||||||
elif c.find("off") >= 0:
|
|
||||||
decode_topic(topic, 0)
|
|
||||||
return
|
|
||||||
elif l < 3:
|
|
||||||
try:
|
|
||||||
msg = int(inp)
|
|
||||||
switch_toggle(msg)
|
|
||||||
except ValueError:
|
|
||||||
return
|
return
|
||||||
|
|
||||||
# supporting string commands with dimming parameters
|
payload = msg.payload.decode("utf-8")
|
||||||
else:
|
if payload == "on":
|
||||||
cmds = c.split(",")
|
state = relay.STATE_MAX
|
||||||
if len(cmds) > 1:
|
elif payload == "off":
|
||||||
command = 9001
|
state = relay.STATE_MIN
|
||||||
# error checking
|
else:
|
||||||
if cmds[0] in commands:
|
|
||||||
command = commands[cmds[0]]
|
|
||||||
else:
|
|
||||||
return
|
|
||||||
try:
|
try:
|
||||||
arg = int(cmds[1])
|
state = int(payload)
|
||||||
except ValueError:
|
except ValueError:
|
||||||
return
|
return
|
||||||
|
|
||||||
# strobo
|
relay.set_state(state)
|
||||||
if (command == 100 or command == 99) and arg < 100:
|
|
||||||
for i in range(arg):
|
|
||||||
switch((100 - command) * 8, speed=0.05)
|
|
||||||
time.sleep(0.06)
|
|
||||||
elif command == 101 and arg < 100:
|
|
||||||
for i in range(arg):
|
|
||||||
strobo_switch([0, 8], speed=0.05)
|
|
||||||
time.sleep(0.01)
|
|
||||||
# command with parameter used for dimming
|
|
||||||
else:
|
|
||||||
if arg < 100:
|
|
||||||
switch(command, speed=4 * arg / 100 + 1)
|
|
||||||
if state[command] == 0:
|
|
||||||
state[command] = 1
|
|
||||||
mqtc.publish("foobar/oben/" + names[command][0] + "/" + services[names[command][1]] + "/status", states[state[command]])
|
|
||||||
|
|
||||||
# single string command without parameter
|
def i2c_status_thread_new(self):
|
||||||
else:
|
while True:
|
||||||
print("One Command")
|
bus_cache = {}
|
||||||
if commands[c] == 7:
|
for relay in self.relays.values():
|
||||||
zentral_aus()
|
if relay.i2c_read_addr not in bus_cache:
|
||||||
if c in commands:
|
with self.bus.lock:
|
||||||
switch_toggle(commands[c])
|
bus_cache[relay.i2c_read_addr] = self.bus.bus.read_byte(relay.i2c_read_addr)
|
||||||
return
|
i2c_data = bus_cache[relay.i2c_read_addr]
|
||||||
|
|
||||||
|
active = False if i2c_data & (1 << relay.i2c_read_bit) else True
|
||||||
|
relay.process_event(active)
|
||||||
|
|
||||||
|
time.sleep(0.1) # abtastrate für die schalter
|
||||||
|
|
||||||
|
def send_state(self):
|
||||||
|
for relay in self.relays.values():
|
||||||
|
self.mqtt_send_state(relay)
|
||||||
|
|
||||||
|
|
||||||
def send_state():
|
def main():
|
||||||
for i in range(len(state)):
|
powerctl = PowerCTL()
|
||||||
try:
|
|
||||||
mqtc.publish("foobar/oben/" + names[i][0] + "/" + services[names[i][1]] + "/status", states[state[i]])
|
|
||||||
except KeyError:
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
relays = [
|
||||||
|
Relay("flur/licht", 0x23, 3, 0x21, 0),
|
||||||
|
Relay("cantina/licht", 0x23, 2, 0x3f, 0),
|
||||||
|
DimmerRelay("baellebad/licht", 0x23, 5, 0x21, 1),
|
||||||
|
DimmerRelay("lounge-front/licht", 0x23, 4, 0x21, 2),
|
||||||
|
DimmerRelay("lounge-back/licht", 0x23, 6, 0x21, 3),
|
||||||
|
|
||||||
def init_mqtt():
|
Relay("baellebad/strom", 0x23, 0, 0x21, 4),
|
||||||
mqtc.connect("mqtt.chaospott.de", 1883, 60)
|
Relay("lounge/strom", 0x23, 1, 0x21, 5),
|
||||||
mqtc.subscribe("foobar/oben/licht", 0)
|
Relay("cantina/strom", 0x23, 7, 0x21, 6),
|
||||||
mqtc.subscribe("foobar/oben/lounge-back/licht/action", 0)
|
]
|
||||||
mqtc.subscribe("foobar/oben/lounge-front/licht/action", 0)
|
powerctl.add_relays(
|
||||||
mqtc.subscribe("foobar/oben/lounge/strom/action", 0)
|
*relays,
|
||||||
mqtc.subscribe("foobar/oben/baellebad/licht/action", 0)
|
ZentralAus("zentralaus", 0x3a, 0, 0x21, 7, relays=relays),
|
||||||
mqtc.subscribe("foobar/oben/baellebad/strom/action", 0)
|
)
|
||||||
mqtc.subscribe("foobar/oben/cantina/licht/action", 0)
|
|
||||||
mqtc.subscribe("foobar/oben/cantina/strom/action", 0)
|
|
||||||
mqtc.subscribe("foobar/oben/flur/licht/action", 0)
|
|
||||||
mqtc.subscribe("foobar/oben/strom/zentral/licht/action", 0)
|
|
||||||
mqtc.on_message = on_message
|
|
||||||
mqtc.on_connect = on_connect
|
|
||||||
mqtc.on_subscribe = on_subscribe
|
|
||||||
|
|
||||||
_thread.start_new_thread(i2c_status_thread_new, ())
|
threading.Thread(target=powerctl.i2c_status_thread_new, daemon=True).start()
|
||||||
mqtc.loop_start()
|
powerctl.mqtc.loop_start()
|
||||||
|
time.sleep(10)
|
||||||
while True:
|
while True:
|
||||||
# try:
|
powerctl.send_state()
|
||||||
# print("Err")
|
|
||||||
# mqtc.loop_forever()
|
|
||||||
# except:
|
|
||||||
# pass
|
|
||||||
time.sleep(60)
|
time.sleep(60)
|
||||||
send_state()
|
|
||||||
|
|
||||||
|
|
||||||
init_mqtt()
|
if __name__ == '__main__':
|
||||||
|
main()
|
||||||
# vim: noai:ts=4:sw=4
|
|
||||||
|
|||||||
29
test.py
Normal file
29
test.py
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
import random
|
||||||
|
import time
|
||||||
|
from unittest.mock import patch
|
||||||
|
|
||||||
|
import paho.mqtt.client as mqtt
|
||||||
|
|
||||||
|
import power_mqtt1
|
||||||
|
|
||||||
|
|
||||||
|
class SMBus:
|
||||||
|
def __init__(self, _bus):
|
||||||
|
pass
|
||||||
|
|
||||||
|
def read_byte(self, _i2c_addr):
|
||||||
|
time.sleep(5)
|
||||||
|
return random.randbytes(1)[0]
|
||||||
|
|
||||||
|
def write_byte(self, i2c_addr, data):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
class MqttClient(mqtt.Client):
|
||||||
|
def connect(self, host, *args, **kwargs):
|
||||||
|
return super().connect("127.0.0.1", *args, **kwargs)
|
||||||
|
|
||||||
|
|
||||||
|
with patch('smbus.SMBus', new=SMBus) as SMBus_mock, \
|
||||||
|
patch("paho.mqtt.client.Client", new=MqttClient) as connect_mock:
|
||||||
|
power_mqtt1.main()
|
||||||
Loading…
x
Reference in New Issue
Block a user