Merge branch 'master' of ch1p.io:homekit

2 files changed, 6 insertions, 2 deletions

diff --git a/src/ipcam_server.py b/src/ipcam_server.py
index 8d91ce1..2c4915d 100755
--- a/src/ipcam_server.py
+++ b/src/ipcam_server.py
@@ -572,5 +572,8 @@ if __name__ == '__main__':
     except KeyError:
         pass
 
+    asyncio.ensure_future(fix_job())
+    asyncio.ensure_future(cleanup_job())
+
     server = IPCamWebServer(config.get_addr('server.listen'))
     server.run()
diff --git a/tools/mcuota.py b/tools/mcuota.py
index 21cd25a..46968a8 100755
--- a/tools/mcuota.py
+++ b/tools/mcuota.py
@@ -10,7 +10,8 @@ sys.path.extend([
 from time import sleep
 from argparse import ArgumentParser
 from src.home.config import config
-from src.home.mqtt import MqttRelay, MQTTESPDevice
+from src.home.mqtt import MqttRelay
+from src.home.mqtt.esp import MqttEspDevice
 
 
 def guess_filename(product: str, build_target: str):
@@ -34,7 +35,7 @@ def relayctl_publish_ota(filename: str,
         global stop
         stop = True
 
-    mqtt_relay = MqttRelay(devices=MQTTESPDevice(id=device_id, secret=home_secret))
+    mqtt_relay = MqttRelay(devices=MqttEspDevice(id=device_id, secret=home_secret))
     mqtt_relay.configure_tls()
     mqtt_relay.connect_and_loop(loop_forever=False)
     mqtt_relay.push_ota(device_id, filename, published, qos)