From 71247d0154636bfd76ef433c96140a1a9cc4c66a Mon Sep 17 00:00:00 2001
From: Jimmy <git@jimmy.nz>
Date: Sat, 29 May 2021 14:59:03 +1200
Subject: [PATCH] Use mqtt robust, use config file

---
 uP/main.py | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/uP/main.py b/uP/main.py
index b8ee007..90799b6 100644
--- a/uP/main.py
+++ b/uP/main.py
@@ -2,26 +2,37 @@ from machine import Pin
 from time import sleep
 import machine
 import dht
-from umqtt.simple import MQTTClient
+from umqtt.robust import MQTTClient
 import json
 import gc
 
+with open("config.json", 'r') as f:
+    config = json.load(f)
+    
+print(config)
+
 led = Pin(2, Pin.OUT)
-d = dht.DHT11(Pin(16))
+d = dht.DHT11(Pin(12))
 adc = machine.ADC(0)
-server="10.1.1.162"
-c = MQTTClient("umqtt_client", server)
+
+c = MQTTClient("umqtt_client", config["mqtt"]["server"],ssl=True, user=config["mqtt"]["user"], password=config["mqtt"]["password"])
 gc.enable()
 
 while True:
     led(0)
     d.measure()
-    data = {'temp': d.temperature(), 'humid': d.humidity(),'light': adc.read(), 'id': 1}
+    data = {'temp': d.temperature(), 'humid': d.humidity(),'light': adc.read(), 'id': config["id"]}
     print(data)
     led(1)
-    c.connect()
-    c.publish(b"sensors", json.dumps(data))
-    c.disconnect()
+    try:
+        c.connect()
+        c.publish(b"sensors", json.dumps(data))
+    finally:
+        c.disconnect()
     gc.collect()
-    sleep(2)
+    
+    
+
+
+