Merge pull request #686 from sparkfun/TCPWiFiSourceControl

Add WiFi controls for TCP/UDP Server

Author: nseidle

Firmware/RTK_Everywhere/AP-Config/index.html

@@ -1709,6 +1709,18 @@
                     <p id="enableUdpServerError" class="inlineError"></p>
                 </div>
 
+                <div id="tcpUdpWiFiTypeDropdown" class="mt-3">
+                    <label for="tcpUdpOverWiFiStation">TCP/UDP Server Connection: </label>
+                    <select name="tcpUdpWiFiType" id="tcpUdpOverWiFiStation" class="form-dropdown">
+                        <option value="1">WiFi</option>
+                        <option value="0">AP</option>
+                    </select>
+                    <span class="tt" data-bs-placement="right"
+                        title="In WiFi mode, the device will attempt to connect to local WiFi to broadcast TCP/UDP packets. In AP mode, the device will become an Access Point that devices can connect to over WiFi.">
+                        <span class="icon-info-circle text-primary ms-2"></span>
+                    </span>
+                </div>
+
             </div>
         </div>
 
@@ -2181,7 +2193,7 @@
                 </div>
 
                 <div id="measurementScaleDropdown" class="mb-2 mt-3">
-                    <label for="measurementScale">Measurement Scale: </label>
+                    <label for="measurementScale">Units: </label>
                     <select name="measurementScale" id="measurementScale" class="form-dropdown">
                         <option value="0">Meters</option>
                         <option value="1">Feet/Inches</option>

Firmware/RTK_Everywhere/Network.ino

@@ -226,6 +226,9 @@ void menuTcpUdp()
         if (settings.mdnsEnable)
             systemPrintf("n) MDNS host name: %s\r\n", settings.mdnsHostName);
 
+        systemPrint("a) Broadcast TCP/UDP Server packets over local WiFi or act as Access Point: ");
+        systemPrintf("%s\r\n", settings.tcpUdpOverWiFiStation ? "WiFi" : "AP");
+
         //------------------------------
         // Finish the menu and get the input
         //------------------------------
@@ -320,6 +323,11 @@ void menuTcpUdp()
             getUserInputString((char *)&settings.mdnsHostName, sizeof(settings.mdnsHostName));
         }
 
+        else if (incoming == 'a')
+        {
+            settings.tcpUdpOverWiFiStation ^= 1;
+            wifiUpdateSettings();
+        }
         //------------------------------
         // Handle exit and invalid input
         //------------------------------

Firmware/RTK_Everywhere/TcpServer.ino

@@ -449,7 +449,7 @@ void tcpServerUpdate()
         {
             if (settings.debugTcpServer && (!inMainMenu))
                 systemPrintln("TCP server start");
-            if (settings.wifiConfigOverAP == false)
+            if (settings.tcpUdpOverWiFiStation == true)
                 networkConsumerAdd(NETCONSUMER_TCP_SERVER, NETWORK_ANY, __FILE__, __LINE__);
             else
                 networkSoftApConsumerAdd(NETCONSUMER_TCP_SERVER, __FILE__, __LINE__);

Firmware/RTK_Everywhere/UdpServer.ino

@@ -360,7 +360,7 @@ void udpServerUpdate()
         {
             if (settings.debugUdpServer && (!inMainMenu))
                 systemPrintln("UDP server starting the network");
-            if (settings.wifiConfigOverAP == false)
+            if (settings.tcpUdpOverWiFiStation == true)
                 networkConsumerAdd(NETCONSUMER_UDP_SERVER, NETWORK_ANY, __FILE__, __LINE__);
             else
                 networkSoftApConsumerAdd(NETCONSUMER_UDP_SERVER, __FILE__, __LINE__);

Firmware/RTK_Everywhere/form.h

@@ -1962,11 +1962,17 @@ void createSettingsString(char *newSettings)
     }
 
     // Drop downs on the AP config page expect a value, whereas bools get stringRecord as true/false
+    // These special bool settings get added twice to the string, once above, once here.
     if (settings.wifiConfigOverAP == true)
         stringRecord(newSettings, "wifiConfigOverAP", 1); // 1 = AP mode, 0 = WiFi
     else
         stringRecord(newSettings, "wifiConfigOverAP", 0); // 1 = AP mode, 0 = WiFi
 
+    if (settings.tcpUdpOverWiFiStation == true)
+        stringRecord(newSettings, "tcpUdpOverWiFiStation", 1); // 1 = WiFi mode, 0 = AP
+    else
+        stringRecord(newSettings, "tcpUdpOverWiFiStation", 0); // 1 = WiFi mode, 0 = AP
+
     // Single variables needed on Config page
     stringRecord(newSettings, "minCNO", gnss->getMinCno());
     stringRecord(newSettings, "enableRCFirmware", enableRCFirmware);

Firmware/RTK_Everywhere/menuCommands.ino

@@ -935,6 +935,7 @@ struct Settings
     bool debugTcpServer = false;
     bool enableTcpServer = false;
     uint16_t tcpServerPort = 2948; // TCP server port, 2948 is GPS Daemon: http://tcp-udp-ports.com/port-2948.htm
+    bool tcpUdpOverWiFiStation = true; // Controls if TCP/UDP settings should use Station or AP
 
     // Time Zone - Default to UTC
     int8_t timeZoneHours = 0;
@@ -1564,6 +1565,7 @@ const RTK_Settings_Entry rtkSettingsEntries[] =
     { 0, 0, 0, 1, 1, 1, 1, 1, 1, _bool,     0, & settings.debugTcpServer, "debugTcpServer",  },
     { 1, 1, 0, 1, 1, 1, 1, 1, 1, _bool,     0, & settings.enableTcpServer, "enableTcpServer",  },
     { 1, 1, 0, 1, 1, 1, 1, 1, 1, _uint16_t, 0, & settings.tcpServerPort, "tcpServerPort",  },
+    { 1, 1, 0, 1, 1, 1, 1, 1, 1, _bool,     0, & settings.tcpUdpOverWiFiStation, "tcpUdpOverWiFiStation",  },
 
     // Time Zone
     { 0, 1, 0, 1, 1, 1, 1, 1, 1, _int8_t,   0, & settings.timeZoneHours, "timeZoneHours",  },