Merge branch 'main' of https://github.com/tomas-fryza/esp-micropython

examples/06-mqtt-thingspeak/mqtt_publish.py

@@ -24,75 +24,39 @@
 import wifi_module
 import config
 from umqtt.robust import MQTTClient
+import mqtt_credentials as mc
 import sys
 
 PUBLISH_TIME_SEC = 60  # 300
 
 # MQTT parameters
 BROKER_ADDRESS = "mqtt3.thingspeak.com"
-MQTT_USERNAME = "your_mqtt_username"
-MQTT_CLIENT_ID = "your_client_id"
-MQTT_PASSWORD = "your_mqtt_password"
-CHANNEL_ID = "your_thingspeak_channel_id"
+# MQTT_USERNAME = "your_mqtt_username"
+# MQTT_CLIENT_ID = "your_client_id"
+# MQTT_PASSWORD = "your_mqtt_password"
+# CHANNEL_ID = "your_thingspeak_channel_id"
 
-# Function to initialize the logging system
-def init_log_system():
-    # Record the start time of the application
-    global start_time
-    start_time = time.ticks_ms()
 
 # Function to print log messages with elapsed time and log level
 def print_log(level, message):
     # Get the current time in milliseconds since the application start
     elapsed_time = time.ticks_ms() - start_time
-    
+
     # Format the log message
     if level == "E":
         level = "\x1b[31m" + level
         message = message + "\x1b[0m"
     log_message = f"{level} ({elapsed_time}) {message}"
-    
+
     # Print the formatted log message to the serial monitor
     print(log_message)
 
-# Initialize the log system
-init_log_system()
-
-# Setup I2C for BME280 sensor
-i2c = I2C(0, scl=Pin(22), sda=Pin(21), freq=100_000)
-bme = bme280.BME280(i2c)
-T, RH, P, _ = bme.read_values()
-
-# Wi-Fi Station interface
-wifi = network.WLAN(network.STA_IF)
-status = wifi_module.connect(wifi, config.SSID, config.PSWD)
-if status == False:
-    print_log("E", "wifi: Failed to connect to Wi-Fi")
-    wifi_module.disconnect(wifi)
-    sys.exit()
-
-# Setup MQTT client
-# Note: Connection uses unsecure TCP (port 1883)
-client = MQTTClient(
-    server=BROKER_ADDRESS,
-    client_id=MQTT_CLIENT_ID, 
-    user=MQTT_USERNAME, 
-    password=MQTT_PASSWORD, 
-    ssl=False)
-# MQTT topic
-topic = "channels/{}/publish".format(CHANNEL_ID)
-
-# Initialize previous sensor data
-prev_T = T + 10  # Make sure the first readings are published
-prev_RH = RH
-prev_P = P
 
 # Publish sensor data if changed
 def publish_data(T, RH, P):
     global prev_T, prev_RH, prev_P
 
     # Check if the data has changed (ignore small fluctuations)
-    # if (T != prev_T) or (RH != prev_RH) or (P != prev_P):
     if abs(T-prev_T) > 0.1 or abs(RH-prev_RH) > 1 or abs(P-prev_P) > 1:
         # Prepare payload
         payload = "field1={:.1f}&field2={:.1f}&field3={:.1f}".format(T, RH, P)
@@ -112,6 +76,35 @@ def publish_data(T, RH, P):
     else:
         print_log("I", "mqtt: No/small changes, skipping publish")
 
+
+# Initialize start time for log system
+start_time = time.ticks_ms()
+
+# Setup I2C for BME280 sensor
+i2c = I2C(0, scl=Pin(22), sda=Pin(21), freq=100_000)
+bme = bme280.BME280(i2c)
+T, RH, P, _ = bme.read_values()
+
+# Wi-Fi Station interface
+wifi = network.WLAN(network.STA_IF)
+if not wifi_module.connect(wifi, config.SSID, config.PSWD):
+    sys.exit()
+
+# Setup MQTT client and topic
+# Note: Connection uses unsecure TCP (port 1883)
+client = MQTTClient(
+    server=BROKER_ADDRESS,
+    client_id=mc.MQTT_CLIENT_ID, 
+    user=mc.MQTT_USERNAME, 
+    password=mc.MQTT_PASSWORD, 
+    ssl=False)
+topic = "channels/{}/publish".format(mc.CHANNEL_ID)
+
+# Initialize previous sensor data
+prev_T = T + 10  # Make sure the first readings are published
+prev_RH = RH
+prev_P = P
+
 print_log("I", "main: Start publishing data to MQTT broker")
 print_log("I", "main: Press `Ctrl+C` to stop")
 
@@ -133,8 +126,4 @@ def publish_data(T, RH, P):
     print_log("I", "main: Program stopped. Exiting...")
 
     # Optional cleanup code
-    try:
-        client.disconnect()
-    except Exception as e:
-        print_log("E", "mqtt: Failed to disconnect from MQTT server {}{}".format(type(e).__name__, e))
     wifi_module.disconnect(wifi)

modules/wifi_module.py

@@ -35,13 +35,14 @@
 - **2023-06-17** : Created `connect` and `disconnect` methods.
 """
 
+import time
 import gc  # Garbage Collector interface (Memory management)
 gc.collect()
 
 print_info = False
 
 
-def connect(wifi, ssid, password, timeout=10):
+def connect(wifi, ssid, password):
     """
     Connect to a specified Wi-Fi network using the provided
     SSID and password. If the connection attempt exceeds the
@@ -50,32 +51,29 @@ def connect(wifi, ssid, password, timeout=10):
     :param wifi: The Wi-Fi interface object to use for the connection.
     :param str ssid: The SSID of the Wi-Fi network to connect to.
     :param str password: The password for the Wi-Fi network.
-    :param int timeout: The maximum time in seconds to wait
-                        for the connection attempt.
     :returns: `True` if connected successfully, `False` if
               the connection attempt timed out.
     """
-    import time
 
     if not wifi.isconnected():
         wifi.active(True)
+        print(f"wifi: Connecting to {ssid}...", end="")
         wifi.connect(ssid, password)
-        print(f"wifi: Connecting to {ssid} (timeout {timeout} sec)...", end="")
 
-        start_time = time.time()
-
-        while not wifi.isconnected():
-            # Check if the timeout has been reached
-            if time.time() - start_time > timeout:
-                print("\r\n\x1b[31mwifi: Connection attempt timed out\x1b[0m")
-                return False
-
-            time.sleep(0.25)
-            if print_info:
-                print_status(wifi)
+        for _ in range(40):
+            if wifi.isconnected():
+                print(" Done")
+                return True
             else:
-                print(".", end="")
-        print(" Done")
+                if print_info:
+                    print_status(wifi)
+                else:
+                    print(".", end="")
+                time.sleep_ms(250)
+
+        print("\r\n\x1b[31mwifi: Connection failed\x1b[0m")
+        wifi.disconnect()
+        return False
     else:
         print("wifi: Already connected")
         if print_info: