TcpServer: Rename settings.tcpUdpOverWiFiStation to tcpOverWiFiStation

Author: LeeLeahy2

Firmware/RTK_Everywhere/AP-Config/index.html

@@ -1678,9 +1678,9 @@
                     <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">
+                <div id="tcpWiFiTypeDropdown" class="mt-3">
+                    <label for="tcpOverWiFiStation">TCP Server Connection: </label>
+                    <select name="tcpWiFiType" id="tcpOverWiFiStation" class="form-dropdown">
                         <option value="1">WiFi</option>
                         <option value="0">AP</option>
                     </select>

Firmware/RTK_Everywhere/Network.ino

@@ -226,8 +226,8 @@ 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");
+        systemPrint("t) Broadcast TCP/UDP Server packets over local WiFi or act as Access Point: ");
+        systemPrintf("%s\r\n", settings.tcpOverWiFiStation ? "WiFi" : "AP");
 
         systemPrint("u) Broadcast UDP Server packets over local WiFi or act as Access Point: ");
         systemPrintf("%s\r\n", settings.udpOverWiFiStation ? "WiFi" : "AP");
@@ -326,9 +326,9 @@ void menuTcpUdp()
             getUserInputString((char *)&settings.mdnsHostName, sizeof(settings.mdnsHostName));
         }
 
-        else if (incoming == 'a')
+        else if (incoming == 't')
         {
-            settings.tcpUdpOverWiFiStation ^= 1;
+            settings.tcpOverWiFiStation ^= 1;
             wifiUpdateSettings();
         }
 

Firmware/RTK_Everywhere/TcpServer.ino

@@ -698,7 +698,7 @@ void tcpServerUpdate()
         {
             if (settings.debugTcpServer && (!inMainMenu))
                 systemPrintf("%s start/r/n", tcpServerName);
-            if (settings.tcpUdpOverWiFiStation == true)
+            if (settings.tcpOverWiFiStation == true)
                 networkConsumerAdd(NETCONSUMER_TCP_SERVER, NETWORK_ANY, __FILE__, __LINE__);
             else
                 networkSoftApConsumerAdd(NETCONSUMER_TCP_SERVER, __FILE__, __LINE__);

Firmware/RTK_Everywhere/menuCommands.ino

@@ -1968,10 +1968,10 @@ void createSettingsString(char *newSettings)
     else
         stringRecord(newSettings, "wifiConfigOverAP", 0); // 1 = AP mode, 0 = WiFi
 
-    if (settings.tcpUdpOverWiFiStation == true)
-        stringRecord(newSettings, "tcpUdpOverWiFiStation", 1); // 1 = WiFi mode, 0 = AP
+    if (settings.tcpOverWiFiStation == true)
+        stringRecord(newSettings, "tcpOverWiFiStation", 1); // 1 = WiFi mode, 0 = AP
     else
-        stringRecord(newSettings, "tcpUdpOverWiFiStation", 0); // 1 = WiFi mode, 0 = AP
+        stringRecord(newSettings, "tcpOverWiFiStation", 0); // 1 = WiFi mode, 0 = AP
 
     if (settings.udpOverWiFiStation == true)
         stringRecord(newSettings, "udpOverWiFiStation", 1); // 1 = WiFi mode, 0 = AP

Firmware/RTK_Everywhere/settings.h

@@ -938,7 +938,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
+    bool tcpOverWiFiStation = true; // Should TCP server use Station (true) or AP (false)
     bool udpOverWiFiStation = true; // Should UDP server use Station (true) or AP (false)
 
     // Time Zone - Default to UTC
@@ -1586,7 +1586,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",  },
+    { 1, 1, 0, 1, 1, 1, 1, 1, 1, _bool,     0, & settings.tcpOverWiFiStation, "tcpOverWiFiStation",  },
 
     // Time Zone
     { 0, 1, 0, 1, 1, 1, 1, 1, 1, _int8_t,   0, & settings.timeZoneHours, "timeZoneHours",  },