Merge branch 'rewrite-async' into 'master'

Rewrite code using resilient async library

See merge request Teckids/hacknfun/kalle-firmware!3

main.py

-from umqtt.simple import MQTTClient
+import asyncio
 import json
 import time
-import sys
-import network
 
-import wled
-import config
+from mqtt_as import MQTTClient
+from mqtt_as import config as mqtt_config
 
+import config
+import wled
 
-# Connect wifi
-print("Wifi connecting...")
 wled.set_color(0, 0, 0, 255, 0)
-nic = network.WLAN(network.STA_IF)
-nic.active(True)
-try:
-    nic.connect(config.wifi_ssid, config.wifi_pw)
-except OSError:
-    time.sleep(1)
-    print("Wifi broken")
-    wled.set_color(0, 255, 0, 0, 0)
-    sys.exit()
 
-for i in range(10):
-    if nic.isconnected():
-        break
+async def wifi_change(state):
+    if state:
+        # Wifi is connected
+        wled.set_color(0, 255, 0, 0, 0)
+        print("Wifi connected")
     else:
-        time.sleep(1)
-print("Done connecting!")
+        # Wifi is not connected
+        wled.set_color(0, 0, 0, 255, 0)
+        print("Wifi disconnected")
 
-# Connect MQTT
-mqtt = MQTTClient(
-    config.mqtt_client_id,
-    config.mqtt_server,
-    config.mqtt_port,
-    config.mqtt_user,
-    config.mqtt_password,
-)
+async def conn_ok(mqtt):
+    # MQTT connected
+    wled.set_color(0, 0, 255, 0, 0)
+    print("MQTT connected")
 
-try:
-    print("Lets connect MQTT")
-    mqtt.connect(clean_session=False)
-    print("Connected!")
-except OSError as e:
-    print(f"Not connected, error: {e}")
-    wled.set_color(0, 255, 0, 0, 0)
-    sys.exit()
-
-wled.set_color(0, 0, 255, 0, 0)
-time.sleep(3)
-wled.set_color(0, 0, 0, 0, 0)
+    await asyncio.sleep(3)
 
+    await mqtt.subscribe(f"kalle/effects")
+    for i in range(8):
+        await mqtt.subscribe(f"kalle/led/{i}/color")
 
-# Create function to react to json messages
-def react(topic, message):
-    msg = json.loads(message)
+def react(topic, msg, retained):
+    msg = json.loads(msg)
     print(msg)
     if "kalle/led" in topic.decode("UTF-8") and len(msg) < 3:
         print(len(msg))
@@ -83,15 +62,25 @@ def react(topic, message):
                 print(f"Party for 10s (time {time.time()})")
                 wled.party(10)
 
+async def main(mqtt):
+    await mqtt.connect()
 
-mqtt.set_callback(react)
-mqtt.subscribe(f"kalle/effects")
-for i in range(8):
-    mqtt.subscribe(f"kalle/led/{i}/color")
+    while True:
+        # TODO implement publishing logic here
+        await asyncio.sleep(5)
 
-print("Waiting for messages")
-while True:
-    try:
-        mqtt.wait_msg()
-    except Exception as e:
-        print(f"Error: {e}")
+mqtt_config["ssid"] = config.wifi_ssid
+mqtt_config["wifi_pw"] = config.wifi_pw
+mqtt_config["client_id"] = config.mqtt_client_id
+mqtt_config["server"] = config.mqtt_server
+mqtt_config["user"] = config.mqtt_user
+mqtt_config["password"] = config.mqtt_password
+mqtt_config["subs_cb"] = react
+mqtt_config["connect_coro"] = conn_ok
+mqtt_config["wifi_coro"] = wifi_change
+
+mqtt = MQTTClient(mqtt_config)
+try:
+    asyncio.run(main(mqtt))
+finally:
+    mqtt.close()