Merge pull request #514 from brentru/fix-wifi-picow

Fix PicoW Infinite Reboot due to WiFi Failure

Author: brentru

src/Wippersnapper.cpp

@@ -2362,13 +2362,15 @@ void Wippersnapper::runNetFSM() {
       fsmNetwork = FSM_NET_ESTABLISH_NETWORK;
       break;
     case FSM_NET_ESTABLISH_NETWORK:
-      WS_DEBUG_PRINTLN("Connecting to WiFi...");
+      WS_DEBUG_PRINTLN("Establishing network connection...");
+      WS_PRINTER.flush();
 #ifdef USE_DISPLAY
       if (WS._ui_helper->getLoadingState())
         WS._ui_helper->set_label_status("Connecting to WiFi...");
 #endif
       // Perform a WiFi scan and check if SSID within
       // secrets.json is within the scanned SSIDs
+      WS_DEBUG_PRINT("Performing a WiFi scan for SSID...");
       if (!check_valid_ssid()) {
 #ifdef USE_DISPLAY
         WS._ui_helper->show_scr_error("ERROR",
@@ -2378,24 +2380,26 @@ void Wippersnapper::runNetFSM() {
         haltError("ERROR: Unable to find WiFi network, rebooting soon...",
                   WS_LED_STATUS_WIFI_CONNECTING);
       }
+      WS_DEBUG_PRINTLN("SSID found!");
       // Attempt to connect to wireless network
       maxAttempts = 5;
       while (maxAttempts > 0) {
         // blink before we connect
         statusLEDBlink(WS_LED_STATUS_WIFI_CONNECTING);
-        WS.feedWDT();
+        feedWDT();
         // attempt to connect
-        WS_DEBUG_PRINTLN("Attempting to connect to WiFi...");
+        WS_DEBUG_PRINT("Connecting to WiFi (attempt #");
+        WS_DEBUG_PRINT(5 - maxAttempts);
+        WS_DEBUG_PRINTLN(")");
+        WS_PRINTER.flush();
+        feedWDT();
         _connect();
-        WS.feedWDT();
-        // blink to simulate a delay to allow wifi connection to process
-        statusLEDBlink(WS_LED_STATUS_WIFI_CONNECTING);
+        feedWDT();
         // did we connect?
         if (networkStatus() == WS_NET_CONNECTED)
           break;
         maxAttempts--;
       }
-
       // Validate connection
       if (networkStatus() != WS_NET_CONNECTED) {
         WS_DEBUG_PRINTLN("ERROR: Unable to connect to WiFi!");
@@ -2412,7 +2416,6 @@ void Wippersnapper::runNetFSM() {
       fsmNetwork = FSM_NET_CHECK_NETWORK;
       break;
     case FSM_NET_ESTABLISH_MQTT:
-      WS_DEBUG_PRINTLN("Attempting to connect to IO...");
 #ifdef USE_DISPLAY
       if (WS._ui_helper->getLoadingState())
         WS._ui_helper->set_label_status("Connecting to IO...");
@@ -2421,16 +2424,25 @@ void Wippersnapper::runNetFSM() {
       // Attempt to connect
       maxAttempts = 5;
       while (maxAttempts > 0) {
+        WS_DEBUG_PRINT("Connecting to AIO MQTT (attempt #");
+        WS_DEBUG_PRINT(5 - maxAttempts);
+        WS_DEBUG_PRINTLN(")");
+        WS_PRINTER.flush();
+        WS_DEBUG_PRINT("WiFi Status: ");
+        WS_DEBUG_PRINTLN(networkStatus());
+        WS_PRINTER.flush();
+        feedWDT();
         statusLEDBlink(WS_LED_STATUS_MQTT_CONNECTING);
+        feedWDT();
         int8_t mqttRC = WS._mqtt->connect();
+        feedWDT();
         if (mqttRC == WS_MQTT_CONNECTED) {
           fsmNetwork = FSM_NET_CHECK_MQTT;
           break;
         }
         WS_DEBUG_PRINTLN(
             "Unable to connect to Adafruit IO MQTT, retrying in 3 seconds...");
         statusLEDBlink(WS_LED_STATUS_MQTT_CONNECTING);
-        delay(1800);
         maxAttempts--;
       }
       if (fsmNetwork != FSM_NET_CHECK_MQTT) {

src/Wippersnapper.h

@@ -71,7 +71,7 @@
 #endif
 
 #define WS_VERSION                                                             \
-  "1.0.0-alpha.74" ///< WipperSnapper app. version (semver-formatted)
+  "1.0.0-beta.74" ///< WipperSnapper app. version (semver-formatted)
 
 // Reserved Adafruit IO MQTT topics
 #define TOPIC_IO_THROTTLE "/throttle" ///< Adafruit IO Throttle MQTT Topic

src/network_interfaces/ws_networking_pico.h

@@ -8,7 +8,7 @@
  * please support Adafruit and open-source hardware by purchasing
  * products from Adafruit!
  *
- * Copyright (c) Brent Rubell 2022 for Adafruit Industries.
+ * Copyright (c) Brent Rubell 2023 for Adafruit Industries.
  *
  * MIT license, all text here must be included in any redistribution.
  *
@@ -261,10 +261,25 @@ class ws_networking_pico : public Wippersnapper {
       _status = WS_SSID_INVALID;
     } else {
       _disconnect();
-      delay(100);
+      delay(5000);
+      WS.feedWDT();
+      WiFi.mode(WIFI_STA);
+      WS.feedWDT();
+      WiFi.setTimeout(20000);
+      WS.feedWDT();
       WiFi.begin(_ssid, _pass);
+      // Wait setTimeout duration for a connection and check if connected every
+      // 5 seconds
+      for (int i = 0; i < 4; i++) {
+        WS.feedWDT();
+        delay(5000);
+        WS.feedWDT();
+        if (WiFi.status() == WL_CONNECTED) {
+          _status = WS_NET_CONNECTED;
+          return;
+        }
+      }
       _status = WS_NET_DISCONNECTED;
-      delay(5000);
     }
   }
 
@@ -274,8 +289,10 @@ class ws_networking_pico : public Wippersnapper {
   */
   /**************************************************************************/
   void _disconnect() {
+    WS.feedWDT();
     WiFi.disconnect();
-    delay(500);
+    delay(5000);
+    WS.feedWDT();
   }
 };