From 9b4cbd6883d7d3bcb0f34ea9c2e2fd3510ba0c4b Mon Sep 17 00:00:00 2001
From: Pierrick C <arofarn@arofarn.info>
Date: Fri, 27 Mar 2020 22:53:00 +0100
Subject: [PATCH] Add refresh param in config file Put functions def in
 separate file "main_lib"

---
 code/config_template.py |   2 ++
 code/lib/main_lib.mpy   | Bin 0 -> 655 bytes
 code/lib/main_lib.py    |  40 +++++++++++++++++++++++++++++++++++
 code/main.py            |  45 +++++++---------------------------------
 4 files changed, 49 insertions(+), 38 deletions(-)
 create mode 100644 code/lib/main_lib.mpy
 create mode 100644 code/lib/main_lib.py

diff --git a/code/config_template.py b/code/config_template.py
index 0ef83e8..ad44e4a 100644
--- a/code/config_template.py
+++ b/code/config_template.py
@@ -12,4 +12,6 @@ MQTT_PASSWD = "passwd"
 WIFI_SSID = "my_wifi_ssid"
 WIFI_PSK = "my_wifi_wpa_key"
 
+REFRESH_RATE = 5
+
 ALTITUDE = 150
diff --git a/code/lib/main_lib.mpy b/code/lib/main_lib.mpy
new file mode 100644
index 0000000000000000000000000000000000000000..6e63a718dbcdf8efacfb2b1bd72fec91e9369373
GIT binary patch
literal 655
zcmX|9-EI;=7@cJ;T@lE-tQ#XWY$d4+F$EFUgm_`0F*Qn41XH<Mm)WTu%l?!Z+L*QJ
zYUqtmLuq*de;&eD@WN+sc9%FeXC~)-=R5hn>8vCQ>epxD8dz0q6FbHT4>!F}?=?;H
zE^_EO2)cQJVjC$OyJc+?9%5(ta1cFp$4872<xaQXZ;vo?Xqn63o!G~eZjRmIgwQo!
z;RZFJDEs&Tw_V3Ukk&XQ>A0tR!M8Hsdy-I;4%6>Vh9gW4yAbfxcOM_E+zwJ|MSHkW
z+R#eHnpQ6D04XC2`>(flB|ew#^|y?dFLdtvTuz&i;uG{n=LU0GAkcJl@Z-vOwF7=$
z2XE!Hg`jI89sF9%es4Dd3HZfCJ=A7loM&;VCkCyXfs~g8Y>k+dkqRbD8d*Bn{(BzQ
z@vJU9Ek0;1&gU|xgSHSk-UuBb4+KK6mGsCF$?nDjQV-mTW37{WVRUuriCsq}69^Hq
z5aZS&&T(lhu7tP$-K}-8kPq&wpvcLfKa)kvq$pg94th@k<Un#vA*uM)X0>jeRs6@z
zYAwWCgoa;_u<19Js7Lta^PdY&DXs<&)B;k$OwM}o28v16MPySu!4S=I5{&k0U`tF<
z*Te8qpMtrV9wW*=%$1ltcFDCqO$?-lERqpIo?(*(+eMcpOUK2xvNj^b{D3l<R3ssH
PC?d4t$4yw)$ocFaOCHAy

literal 0
HcmV?d00001

diff --git a/code/lib/main_lib.py b/code/lib/main_lib.py
new file mode 100644
index 0000000..06fb8c1
--- /dev/null
+++ b/code/lib/main_lib.py
@@ -0,0 +1,40 @@
+"""Divers fonctions utiles
+"""
+
+import time
+import machine
+import network
+from umqtt.robust import MQTTClient
+
+
+def WifiConnect(ssid, psk):
+    """Connect to the wifi with given credentials"""
+    wlan = network.WLAN(network.STA_IF)
+    wlan.active(True)
+    nets = wlan.scan()
+    for net in nets:
+        net_ssid = net[0].decode()
+        if net_ssid == ssid:
+            print('Network found!')
+            wlan.connect(net_ssid, psk)
+            while not wlan.isconnected():
+                machine.idle()  # save power while waiting
+            print('WLAN connection succeeded!')
+            break
+    if not wlan.isconnected():
+        print("WLAN not found/not connected")
+
+    return wlan
+
+def now(rtc):
+    """Return a string representing date/time now"""
+    return "{0:04d}/{1:02d}/{2:02d}_{4:02d}:{5:02d}:{6:02d}".format(*rtc.datetime())
+
+
+def MqttPublish(client, topic, message, retain=False, qos=0, sleep=10):
+    """MQTT publish helper"""
+    client.publish("test/{device}/{topic}".format(device=client.client_id, topic=topic),
+                   message,
+                   retain=retain,
+                   qos=qos)
+    time.sleep_ms(sleep)
diff --git a/code/main.py b/code/main.py
index 14431b4..7d16828 100644
--- a/code/main.py
+++ b/code/main.py
@@ -1,32 +1,17 @@
 """Station météo connectée vers MQTT via wifi
 """
 
-import time
-import machine
-import network
+
 import esp
 import bme280_i2c
 import adafruit_max31865
 from ntptime import settime
-from umqtt.robust import MQTTClient
+from main_lib import *
 import config
 
 
-# connect to WLAN
-wlan = network.WLAN(network.STA_IF)
-wlan.active(True)
-nets = wlan.scan()
-for net in nets:
-    net_ssid = net[0].decode()
-    if net_ssid == config.WIFI_SSID:
-        print('Network found!')
-        wlan.connect(net_ssid, config.WIFI_PSK)
-        while not wlan.isconnected():
-            machine.idle()  # save power while waiting
-        print('WLAN connection succeeded!')
-        break
-if not wlan.isconnected():
-    print("WLAN not found/not connected")
+# Connect to WLAN
+wlan = WifiConnect(config.WIFI_SSID, config.WIFI_PSK)
 
 # Create a micropython I2C object with the appropriate device pins
 i2c = machine.I2C(scl=machine.Pin(5), sda=machine.Pin(4))
@@ -59,21 +44,6 @@ max31865=adafruit_max31865.MAX31865(spi, max31865_cs)
 rtc=machine.RTC()
 settime()
 
-
-def now():
-    """Return a string representing date/time now"""
-    return "{0:04d}/{1:02d}/{2:02d}_{4:02d}:{5:02d}:{6:02d}".format(*rtc.datetime())
-
-
-def MqttPublish(client, topic, message, retain=False, qos=0, sleep=10):
-    """MQTT publish helper"""
-    client.publish("test/{device}/{topic}".format(device=config.CLIENT_ID, topic=topic),
-                   message,
-                   retain=retain,
-                   qos=qos)
-    time.sleep_ms(sleep)
-
-
 client = MQTTClient(client_id=config.CLIENT_ID,
                     server=config.MQTT_HOST,
                     user=config.MQTT_USERNAME,
@@ -81,7 +51,7 @@ client = MQTTClient(client_id=config.CLIENT_ID,
                     port=config.MQTT_PORT)
 client.connect()
 
-MqttPublish(client, "last_boot", now())
+MqttPublish(client, "last_boot", now(rtc))
 MqttPublish(client, "location", config.LOCATION, retain=True, qos=1)
 MqttPublish(client, "humidity/unit", "%", retain=True)
 MqttPublish(client, "humidity/desc", "Capteur Bosch BME280", retain=True, qos=0)
@@ -95,7 +65,6 @@ MqttPublish(client, "temperature2/unit", "degC", retain=True, qos=0)
 MqttPublish(client, "temperature2/desc", "Sonde PT100/MAX31865", retain=True, qos=0)
 MqttPublish(client, "wifi/ssid", config.WIFI_SSID, retain=True, qos=0)
 MqttPublish(client, "wifi/ip", wlan.ifconfig()[0], retain=True, qos=0)
-MqttPublish(client, "wifi/channel", "{:d}".format(net[2]), retain=True, qos=0)
 MqttPublish(client, "sys/esp8266_device_id", "{:d}".format(esp.flash_id()), retain=True, qos=0)
 
 time.sleep_ms(1000)
@@ -116,7 +85,7 @@ topics = {"time" : ["time/last_values", "{}", 1, 1],
 
 while 1:
     bme_data = bme.get_measurement()
-    bme_data['time'] = now()
+    bme_data['time'] = now(rtc)
     bme_data['pressure2'] = bme_data['pressure']/SMLP_coef
     bme_data['temperature2'] = max31865.temperature
     bme_data['wifi_rssi'] = wlan.status('rssi')
@@ -129,4 +98,4 @@ while 1:
                     qos=param[3],
                     sleep=20)
 
-    time.sleep_ms(1000)
+    time.sleep(config.REFRESH_RATE)