From 0b2c47a932763daa06c395fe81391d59e95141f0 Mon Sep 17 00:00:00 2001
From: Michael Graff <mgraff@cardinalhq.io>
Date: Fri, 4 Sep 2026 20:10:20 -0500
Subject: [PATCH] Add WiFi companion support for Pico W

SerialWifiInterface has no ESP32-specific code, so move it to
helpers/wifi and reuse it on RP2040. Guard the ESP32-only WiFi
event/auto-reconnect calls and poll link state on RP2040 instead.
---
 examples/companion_radio/main.cpp             | 24 ++++++++++-----
 platformio.ini                                |  1 +
 .../{esp32 => wifi}/SerialWifiInterface.cpp   |  0
 .../{esp32 => wifi}/SerialWifiInterface.h     |  0
 variants/rpi_picow/platformio.ini             | 30 ++++++++++---------
 5 files changed, 34 insertions(+), 21 deletions(-)
 rename src/helpers/{esp32 => wifi}/SerialWifiInterface.cpp (100%)
 rename src/helpers/{esp32 => wifi}/SerialWifiInterface.h (100%)

diff --git a/examples/companion_radio/main.cpp b/examples/companion_radio/main.cpp
index 89f0e6cb9..7c8c12b9f 100644
--- a/examples/companion_radio/main.cpp
+++ b/examples/companion_radio/main.cpp
@@ -36,9 +36,8 @@ MultiSerialInterface interface_manager;
   #ifndef TCP_PORT
     #define TCP_PORT 5000
   #endif
-  #ifdef ESP32
-    // include esp32 wifi interface
-    #include <helpers/esp32/SerialWifiInterface.h>
+  #if defined(ESP32) || defined(RP2040_PLATFORM)
+    #include <helpers/wifi/SerialWifiInterface.h>
     SerialWifiInterface wifi_interface;
   #else
     #error "SerialWifiInterface is not defined for this platform"
@@ -108,7 +107,7 @@ void halt() {
 }
 
 /* WIFI RECONNECT TRACKERS */
-#if defined(ESP32) && defined(WIFI_SSID)
+#ifdef WIFI_SSID
   bool wifi_needs_reconnect = false;
   unsigned long last_wifi_reconnect_attempt = 0;
 #endif
@@ -192,6 +191,7 @@ void setup() {
 
 // add wifi interface
 #ifdef WIFI_SSID
+#if defined(ESP32)
   board.setInhibitSleep(true);   // prevent sleep when WiFi is active
   WiFi.setAutoReconnect(true);
 
@@ -204,6 +204,7 @@ void setup() {
           wifi_needs_reconnect = false;
       }
   });
+#endif
 
   WiFi.begin(WIFI_SSID, WIFI_PWD);
   wifi_interface.begin(TCP_PORT);
@@ -262,12 +263,21 @@ void loop() {
 #endif
   }
 
-#if defined(ESP32) && defined(WIFI_SSID)
+#ifdef WIFI_SSID
+  // RP2040 has no WiFi event callbacks, so poll the link state instead
+  #if defined(RP2040_PLATFORM)
+    wifi_needs_reconnect = (WiFi.status() != WL_CONNECTED);
+  #endif
+
   // Safely attempt to reconnect every 10 seconds if flagged
   if (wifi_needs_reconnect && (millis() - last_wifi_reconnect_attempt > 10000)) {
     WIFI_DEBUG_PRINTLN("Attempting manual WiFi reconnect...");
-    WiFi.disconnect();
-    WiFi.reconnect();
+    #if defined(RP2040_PLATFORM)
+      WiFi.begin(WIFI_SSID, WIFI_PWD);   // no reconnect() on this platform
+    #else
+      WiFi.disconnect();
+      WiFi.reconnect();
+    #endif
     last_wifi_reconnect_attempt = millis();
   }
 #endif
diff --git a/platformio.ini b/platformio.ini
index 2219c9786..622b01e27 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -64,6 +64,7 @@ build_flags = ${arduino_base.build_flags}
   -D ESP32_PLATFORM
 ;  -D ESP32_CPU_FREQ=80          ; change it to your need
 build_src_filter = ${arduino_base.build_src_filter}
+  +<helpers/wifi/*.cpp>
 
 [esp32_ota]
 lib_deps =
diff --git a/src/helpers/esp32/SerialWifiInterface.cpp b/src/helpers/wifi/SerialWifiInterface.cpp
similarity index 100%
rename from src/helpers/esp32/SerialWifiInterface.cpp
rename to src/helpers/wifi/SerialWifiInterface.cpp
diff --git a/src/helpers/esp32/SerialWifiInterface.h b/src/helpers/wifi/SerialWifiInterface.h
similarity index 100%
rename from src/helpers/esp32/SerialWifiInterface.h
rename to src/helpers/wifi/SerialWifiInterface.h
diff --git a/variants/rpi_picow/platformio.ini b/variants/rpi_picow/platformio.ini
index 0fe8c4369..32944a9a4 100644
--- a/variants/rpi_picow/platformio.ini
+++ b/variants/rpi_picow/platformio.ini
@@ -81,20 +81,22 @@ lib_ignore = BLE
 ; lib_deps = ${rpi_picow.lib_deps}
 ;   densaugeo/base64 @ ~1.4.0
 
-; [env:PicoW_companion_radio_wifi]
-; extends = rpi_picow
-; build_flags = ${rpi_picow.build_flags}
-;   -D MAX_CONTACTS=100
-;   -D MAX_GROUP_CHANNELS=8
-;   -D WIFI_DEBUG_LOGGING=1
-;   -D WIFI_SSID='"myssid"'
-;   -D WIFI_PWD='"mypwd"'
-; ;  -D MESH_PACKET_LOGGING=1
-; ;  -D MESH_DEBUG=1
-; build_src_filter = ${rpi_picow.build_src_filter}
-;   +<../examples/companion_radio/*.cpp>
-; lib_deps = ${rpi_picow.lib_deps}
-;   densaugeo/base64 @ ~1.4.0
+[env:PicoW_companion_radio_wifi]
+extends = rpi_picow
+build_flags = ${rpi_picow.build_flags}
+  -D MAX_CONTACTS=100
+  -D MAX_GROUP_CHANNELS=8
+  -D WIFI_DEBUG_LOGGING=1
+  -D WIFI_SSID='"myssid"'
+  -D WIFI_PWD='"mypwd"'
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+build_src_filter = ${rpi_picow.build_src_filter}
+  +<helpers/wifi/*.cpp>
+  +<../examples/companion_radio/*.cpp>
+lib_deps = ${rpi_picow.lib_deps}
+  densaugeo/base64 @ ~1.4.0
+lib_ignore = BLE
 
 [env:PicoW_terminal_chat]
 extends = rpi_picow