From f5dcd13357283817877e32375c866a4285a14509 Mon Sep 17 00:00:00 2001 From: TheJoKlLa Date: Mon, 8 Aug 2022 14:13:17 +0000 Subject: [PATCH] Update main.py --- main.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/main.py b/main.py index 25b838d..8a429d2 100644 --- a/main.py +++ b/main.py @@ -19,23 +19,25 @@ def on_message(client, topic, payload, qos, properties): print(topic) print(payload) - if topic.endswith("/relay/0") and int(payload) == 1: + if topic.endswith("/relay/0") and payload.decode("UTF-8") == "on": if LAST_TIME == None: LAST_TIME = datetime.datetime.now() print("UPDATE TIME") - if topic.endswith("/relay/0") and int(payload) == 0: + if topic.endswith("/relay/0") and payload.decode("UTF-8") == "off": LAST_TIME = None print("RESET TIME") - if topic.endswith("/relay/0/energy") and LAST_TIME != None: - if int(payload) > POWER_THRESHOLD: + if topic.endswith("/relay/0/power") and LAST_TIME != None: + if float(payload.decode("UTF-8")) > POWER_THRESHOLD: LAST_TIME = None print("RESET POWER") elif (datetime.datetime.now() - LAST_TIME).total_seconds() > TIME_THRESHOLD: - client.publish(f"shellies/{SHELLY_ID}/relay/0", "off") + #client.publish(f"shellies/{SHELLY_ID}/relay/0", "off") print('{ "state": { "1.3.6.1.4.1.48398.612.2.4": { "state": "Free" } } }') LAST_TIME = None print("RESET STATE") + else: + print("WAITING TIME") def ask_exit(*args): STOP.set() @@ -62,4 +64,4 @@ if __name__ == '__main__': loop.add_signal_handler(signal.SIGINT, ask_exit) loop.add_signal_handler(signal.SIGTERM, ask_exit) - loop.run_until_complete(main(host)) \ No newline at end of file + loop.run_until_complete(main(host))