put back checks, sprinkle feedwdt where it needs to go

Author: brentru

src/Wippersnapper.cpp

@@ -2362,36 +2362,39 @@ 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
-/*       if (!check_valid_ssid()) {
+       WS_DEBUG_PRINT("Performing a WiFi scan for SSID...");
+       if (!check_valid_ssid()) {
 #ifdef USE_DISPLAY
         WS._ui_helper->show_scr_error("ERROR",
                                       "Unable to find WiFi network listed in "
                                       "the secrets file. Rebooting soon...");
 #endif
         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();
+        statusLEDBlink(WS_LED_STATUS_WIFI_CONNECTING);
+        feedWDT();
         // attempt to connect
         WS_DEBUG_PRINT("Connecting to WiFi (attempt #");
         WS_DEBUG_PRINT(5-maxAttempts);
         WS_DEBUG_PRINTLN(")");
         WS_PRINTER.flush();
+        feedWDT();
         _connect();
-        WS.feedWDT();
+        feedWDT();
         // did we connect?
         if (networkStatus() == WS_NET_CONNECTED)
           break;
@@ -2428,7 +2431,8 @@ void Wippersnapper::runNetFSM() {
         WS_DEBUG_PRINT("WiFi Status: ");
         WS_DEBUG_PRINTLN(networkStatus());
         WS_PRINTER.flush();
-        // statusLEDBlink(WS_LED_STATUS_MQTT_CONNECTING);
+        feedWDT();
+        statusLEDBlink(WS_LED_STATUS_MQTT_CONNECTING);
         feedWDT();
         int8_t mqttRC = WS._mqtt->connect();
         feedWDT();
@@ -2438,7 +2442,7 @@ void Wippersnapper::runNetFSM() {
         }
         WS_DEBUG_PRINTLN(
             "Unable to connect to Adafruit IO MQTT, retrying in 3 seconds...");
-        //statusLEDBlink(WS_LED_STATUS_MQTT_CONNECTING);
+        statusLEDBlink(WS_LED_STATUS_MQTT_CONNECTING);
         maxAttempts--;
       }
       if (fsmNetwork != FSM_NET_CHECK_MQTT) {

src/Wippersnapper.h

@@ -105,10 +105,6 @@
   {} ///< Prints line from debug output.
 #endif
 
-#ifdef ARDUINO_ARCH_RP2040
-#define delay(ms) delayMicroseconds(ms * 1000); // Use non-blocking delay() call for RP2040 architectures
-#endif
-
 /** Defines the Adafruit IO connection status */
 typedef enum {
   WS_IDLE = 0,               // Waiting for connection establishement

src/network_interfaces/ws_networking_pico.h

@@ -97,7 +97,7 @@ class ws_networking_pico : public Wippersnapper {
     // connected
     WiFi.mode(WIFI_STA);
     WiFi.disconnect();
-    delayMicroseconds(100000);
+    delay(100);
 
     // Perform a network scan
     int n = WiFi.scanNetworks();
@@ -261,21 +261,22 @@ class ws_networking_pico : public Wippersnapper {
       _status = WS_SSID_INVALID;
     } else {
       _disconnect();
-      WS.feedWDT();
-      delayMicroseconds(5000000);
+      delay(5000);
       WS.feedWDT();
       WiFi.mode(WIFI_STA);
       WS.feedWDT();
       WiFi.setTimeout(20000);
       WS.feedWDT();
       WiFi.begin(_ssid, _pass);
+      // Here, we're going to wait 20 seconds total, matching the value within
+      // setTimeout().
+      // However, due to the global WDT of 6 sec., we need to feed the WDT
+      // after every 5 seconds.
       for (int i = 0; i < 4; i++) {
-        // WS_DEBUG_PRINTLN("Delaying 5 seconds...");
-        delayMicroseconds(5000000);
+        delay(5000);
         WS.feedWDT();
       }
       _status = WS_NET_DISCONNECTED;
-      
     }
   }
 
@@ -285,8 +286,10 @@ class ws_networking_pico : public Wippersnapper {
   */
   /**************************************************************************/
   void _disconnect() {
+    WS.feedWDT();
     WiFi.disconnect();
-    delayMicroseconds(500000);
+    delay(5000);
+    WS.feedWDT();
   }
 };