WiFi: Get new ESP-NOW channel via menuRadio

Author: LeeLeahy2

Firmware/RTK_Everywhere/Developer.ino

@@ -213,6 +213,7 @@ void wifiDisplayNetworkData()                   {}
 void wifiDisplaySoftApStatus()                  {}
 bool wifiEspNowOff(const char * fileName, uint32_t lineNumber) {return true;}
 bool wifiEspNowOn(const char * fileName, uint32_t lineNumber) {return false;}
+void wifiEspNowSetChannel(WIFI_CHANNEL_t channel) {}
 uint32_t wifiGetStartTimeout() {return 0;}
 #define WIFI_IS_RUNNING() 0
 int wifiNetworkCount() {return 0;}

Firmware/RTK_Everywhere/WiFi.ino

@@ -546,6 +546,13 @@ void wifiDisplayState()
     }
 }
 
+//*********************************************************************
+// Set the ESP-NOW channel
+void wifiEspNowSetChannel(WIFI_CHANNEL_t channel)
+{
+    wifi.espNowSetChannel(channel);
+}
+
 //*********************************************************************
 // Stop ESP-NOW
 // Inputs:

Firmware/RTK_Everywhere/menuMain.ino

@@ -693,15 +693,24 @@ void menuRadio()
         }
         else if (settings.enableEspNow == true && incoming == 4)
         {
-            if (WIFI_IS_RUNNING() == false)
+            if (getNewSetting("Enter the WiFi channel to use for ESP-NOW communication", 1, 14,
+                              &settings.wifiChannel) == INPUT_RESPONSE_VALID)
             {
-                if (getNewSetting("Enter the WiFi channel to use for ESP-NOW communication", 1, 14,
-                                  &settings.wifiChannel) == INPUT_RESPONSE_VALID)
-                    espNowSetChannel(settings.wifiChannel);
-            }
-            else
-            {
-                systemPrintln("ESP-NOW channel can't be modified while WiFi is active.");
+                wifiEspNowSetChannel(settings.wifiChannel);
+                if (settings.wifiChannel)
+                {
+                    if (settings.wifiChannel == wifiChannel)
+                        systemPrintf("WiFi is already on channel %d.", settings.wifiChannel);
+                    else
+                    {
+                        if (wifiSoftApRunning || wifiStationRunning)
+                            systemPrintf("Restart WiFi to use channel %d.", settings.wifiChannel);
+                        else if (wifiEspNowRunning)
+                            systemPrintf("Restart ESP-NOW to use channel %d.", settings.wifiChannel);
+                        else
+                            systemPrintf("Please start ESP-NOW to use channel %d.", settings.wifiChannel);
+                    }
+                }
             }
         }
         else if (settings.enableEspNow == true && incoming == 5 && settings.debugEspNow == true)