Pico W: Initial Wi-Fi support (#2980)

* Pico W: Initial WiFi support: connects, but freezes after a while

* Update arduino-pico core to fix hang with Wi-Fi

* Add `picow` to workflow since it's different from `pico` now

src/mesh/NodeDB.cpp

@@ -21,7 +21,7 @@
 #include <pb_encode.h>
 
 #ifdef ARCH_ESP32
-#include "mesh/http/WiFiAPClient.h"
+#include "mesh/wifi/WiFiAPClient.h"
 #include "modules/esp32/StoreForwardModule.h"
 #include <Preferences.h>
 #include <nvs_flash.h>

src/mesh/api/WiFiServerAPI.h

@@ -22,4 +22,4 @@ class WiFiServerPort : public APIServerPort<WiFiServerAPI, WiFiServer>
     explicit WiFiServerPort(int port);
 };
 
-void initApiServer(int port = 4403);
+void initApiServer(int port = 4403);

src/mesh/http/ContentHandler.cpp

@@ -5,7 +5,7 @@
 #include "main.h"
 #include "mesh/http/ContentHelper.h"
 #include "mesh/http/WebServer.h"
-#include "mesh/http/WiFiAPClient.h"
+#include "mesh/wifi/WiFiAPClient.h"
 #include "mqtt/JSON.h"
 #include "power.h"
 #include "sleep.h"

src/mesh/http/ContentHandler.h

@@ -1,5 +1,4 @@
 #pragma once
-
 void registerHandlers(HTTPServer *insecureServer, HTTPSServer *secureServer);
 
 // Declare some handler functions for the various URLs on the server
@@ -34,4 +33,4 @@ class HttpAPI : public PhoneAPI
   protected:
     /// Check the current underlying physical link to see if the client is currently connected
     virtual bool checkIsConnected() override { return true; } // FIXME, be smarter about this
-};
+};

src/mesh/http/ContentHelper.cpp

@@ -1,6 +1,6 @@
 #include "mesh/http/ContentHelper.h"
-//#include <Arduino.h>
-//#include "main.h"
+// #include <Arduino.h>
+// #include "main.h"
 
 void replaceAll(std::string &str, const std::string &from, const std::string &to)
 {

src/mesh/http/WebServer.cpp

@@ -2,7 +2,7 @@
 #include "NodeDB.h"
 #include "graphics/Screen.h"
 #include "main.h"
-#include "mesh/http/WiFiAPClient.h"
+#include "mesh/wifi/WiFiAPClient.h"
 #include "sleep.h"
 #include <HTTPBodyParser.hpp>
 #include <HTTPMultipartBodyParser.hpp>
@@ -210,4 +210,4 @@ void initWebServer()
     } else {
         LOG_ERROR("Web Servers Failed! ;-( \n");
     }
-}
+}

src/mesh/wifi/WiFiAPClient.cpp

@@ -1,17 +1,22 @@
-#include "mesh/http/WiFiAPClient.h"
+#include "mesh/wifi/WiFiAPClient.h"
 #include "NodeDB.h"
 #include "RTC.h"
 #include "concurrency/Periodic.h"
 #include "configuration.h"
 #include "main.h"
 #include "mesh/api/WiFiServerAPI.h"
-#include "mesh/http/WebServer.h"
 #include "mqtt/MQTT.h"
 #include "target_specific.h"
-#include <ESPmDNS.h>
 #include <WiFi.h>
 #include <WiFiUdp.h>
+#ifndef ARCH_RP2040
+#include "mesh/http/WebServer.h"
+#include <ESPmDNS.h>
 #include <esp_wifi.h>
+static void WiFiEvent(WiFiEvent_t event);
+#else
+#include <ESP8266mDNS.h>
+#endif
 
 #ifndef DISABLE_NTP
 #include <NTPClient.h>
@@ -19,8 +24,6 @@
 
 using namespace concurrency;
 
-static void WiFiEvent(WiFiEvent_t event);
-
 // NTP
 WiFiUDP ntpUDP;
 
@@ -44,78 +47,6 @@ Syslog syslog(syslogClient);
 
 Periodic *wifiReconnect;
 
-static int32_t reconnectWiFi()
-{
-    const char *wifiName = config.network.wifi_ssid;
-    const char *wifiPsw = config.network.wifi_psk;
-
-    if (config.network.wifi_enabled && needReconnect) {
-
-        if (!*wifiPsw) // Treat empty password as no password
-            wifiPsw = NULL;
-
-        needReconnect = false;
-
-        // Make sure we clear old connection credentials
-        WiFi.disconnect(false, true);
-        LOG_INFO("Reconnecting to WiFi access point %s\n", wifiName);
-
-        delay(5000);
-
-        if (!WiFi.isConnected()) {
-            WiFi.begin(wifiName, wifiPsw);
-        }
-    }
-
-#ifndef DISABLE_NTP
-    if (WiFi.isConnected() && (((millis() - lastrun_ntp) > 43200000) || (lastrun_ntp == 0))) { // every 12 hours
-        LOG_DEBUG("Updating NTP time from %s\n", config.network.ntp_server);
-        if (timeClient.update()) {
-            LOG_DEBUG("NTP Request Success - Setting RTCQualityNTP if needed\n");
-
-            struct timeval tv;
-            tv.tv_sec = timeClient.getEpochTime();
-            tv.tv_usec = 0;
-
-            perhapsSetRTC(RTCQualityNTP, &tv);
-            lastrun_ntp = millis();
-
-        } else {
-            LOG_DEBUG("NTP Update failed\n");
-        }
-    }
-#endif
-
-    if (config.network.wifi_enabled && !WiFi.isConnected()) {
-        return 1000; // check once per second
-    } else {
-        return 300000; // every 5 minutes
-    }
-}
-
-bool isWifiAvailable()
-{
-
-    if (config.network.wifi_enabled && (config.network.wifi_ssid[0])) {
-        return true;
-    } else {
-        return false;
-    }
-}
-
-// Disable WiFi
-void deinitWifi()
-{
-    LOG_INFO("WiFi deinit\n");
-
-    if (isWifiAvailable()) {
-        WiFi.disconnect(true);
-        WiFi.mode(WIFI_MODE_NULL);
-        LOG_INFO("WiFi Turned Off\n");
-        // WiFi.printDiag(Serial);
-    }
-}
-
 static void onNetworkConnected()
 {
     if (!APStartupComplete) {
@@ -158,7 +89,9 @@ static void onNetworkConnected()
             syslog.enable();
         }
 
+#ifndef ARCH_RP2040
         initWebServer();
+#endif
         initApiServer();
 
         APStartupComplete = true;
@@ -169,6 +102,89 @@ static void onNetworkConnected()
         mqtt->reconnect();
 }
 
+static int32_t reconnectWiFi()
+{
+    const char *wifiName = config.network.wifi_ssid;
+    const char *wifiPsw = config.network.wifi_psk;
+
+    if (config.network.wifi_enabled && needReconnect) {
+
+        if (!*wifiPsw) // Treat empty password as no password
+            wifiPsw = NULL;
+
+        needReconnect = false;
+
+        // Make sure we clear old connection credentials
+#ifdef ARCH_ESP32
+        WiFi.disconnect(false, true);
+#else
+        WiFi.disconnect(false);
+#endif
+        LOG_INFO("Reconnecting to WiFi access point %s\n", wifiName);
+
+        delay(5000);
+
+        if (!WiFi.isConnected()) {
+            WiFi.begin(wifiName, wifiPsw);
+        }
+    }
+
+#ifndef DISABLE_NTP
+    if (WiFi.isConnected() && (((millis() - lastrun_ntp) > 43200000) || (lastrun_ntp == 0))) { // every 12 hours
+        LOG_DEBUG("Updating NTP time from %s\n", config.network.ntp_server);
+        if (timeClient.update()) {
+            LOG_DEBUG("NTP Request Success - Setting RTCQualityNTP if needed\n");
+
+            struct timeval tv;
+            tv.tv_sec = timeClient.getEpochTime();
+            tv.tv_usec = 0;
+
+            perhapsSetRTC(RTCQualityNTP, &tv);
+            lastrun_ntp = millis();
+
+        } else {
+            LOG_DEBUG("NTP Update failed\n");
+        }
+    }
+#endif
+
+    if (config.network.wifi_enabled && !WiFi.isConnected()) {
+        return 1000; // check once per second
+    } else {
+#ifdef ARCH_RP2040
+        onNetworkConnected(); // will only do anything once
+#endif
+        return 300000; // every 5 minutes
+    }
+}
+
+bool isWifiAvailable()
+{
+
+    if (config.network.wifi_enabled && (config.network.wifi_ssid[0])) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
+// Disable WiFi
+void deinitWifi()
+{
+    LOG_INFO("WiFi deinit\n");
+
+    if (isWifiAvailable()) {
+#ifdef ARCH_ESP32
+        WiFi.disconnect(true, false);
+#else
+        WiFi.disconnect(true);
+#endif
+        WiFi.mode(WIFI_OFF);
+        LOG_INFO("WiFi Turned Off\n");
+        // WiFi.printDiag(Serial);
+    }
+}
+
 // Startup WiFi
 bool initWifi()
 {
@@ -177,10 +193,10 @@ bool initWifi()
         const char *wifiName = config.network.wifi_ssid;
         const char *wifiPsw = config.network.wifi_psk;
 
-        createSSLCert();
-
+#ifndef ARCH_RP2040
+        createSSLCert();                        // For WebServer
         esp_wifi_set_storage(WIFI_STORAGE_RAM); // Disable flash storage for WiFi credentials
-
+#endif
         if (!*wifiPsw) // Treat empty password as no password
             wifiPsw = NULL;
 
@@ -189,17 +205,17 @@ bool initWifi()
             getMacAddr(dmac);
             snprintf(ourHost, sizeof(ourHost), "Meshtastic-%02x%02x", dmac[4], dmac[5]);
 
-            WiFi.mode(WIFI_MODE_STA);
+            WiFi.mode(WIFI_STA);
             WiFi.setHostname(ourHost);
-            WiFi.onEvent(WiFiEvent);
-            WiFi.setAutoReconnect(true);
-            WiFi.setSleep(false);
             if (config.network.address_mode == meshtastic_Config_NetworkConfig_AddressMode_STATIC &&
                 config.network.ipv4_config.ip != 0) {
                 WiFi.config(config.network.ipv4_config.ip, config.network.ipv4_config.gateway, config.network.ipv4_config.subnet,
-                            config.network.ipv4_config.dns,
-                            config.network.ipv4_config.dns); // Wifi wants two DNS servers... set both to the same value
+                            config.network.ipv4_config.dns);
             }
+#ifndef ARCH_RP2040
+            WiFi.onEvent(WiFiEvent);
+            WiFi.setAutoReconnect(true);
+            WiFi.setSleep(false);
 
             // This is needed to improve performance.
             esp_wifi_set_ps(WIFI_PS_NONE); // Disable radio power saving
@@ -218,7 +234,7 @@ bool initWifi()
                     wifiDisconnectReason = info.wifi_sta_disconnected.reason;
                 },
                 WiFiEvent_t::ARDUINO_EVENT_WIFI_STA_DISCONNECTED);
-
+#endif
             LOG_DEBUG("JOINING WIFI soon: ssid=%s\n", wifiName);
             wifiReconnect = new Periodic("WifiConnect", reconnectWiFi);
         }
@@ -229,6 +245,7 @@ bool initWifi()
     }
 }
 
+#ifndef ARCH_RP2040
 // Called by the Espressif SDK to
 static void WiFiEvent(WiFiEvent_t event)
 {
@@ -369,8 +386,9 @@ static void WiFiEvent(WiFiEvent_t event)
         break;
     }
 }
+#endif
 
 uint8_t getWifiDisconnectReason()
 {
     return wifiDisconnectReason;
-}
+}

src/mesh/wifi/WiFiAPClient.h

@@ -5,7 +5,7 @@
 #include <Arduino.h>
 #include <functional>
 
-#ifdef ARCH_ESP32
+#if defined(HAS_WIFI) && !defined(ARCH_PORTDUINO)
 #include <WiFi.h>
 #endif
 
@@ -19,4 +19,4 @@ void deinitWifi();
 
 bool isWifiAvailable();
 
-uint8_t getWifiDisconnectReason();
+uint8_t getWifiDisconnectReason();