Merge pull request #664 from LeeLeahy2/tcp-server

Update TCP server to better work as an NTRIP or base caster

Author: nseidle

Firmware/RTK_Everywhere/AP-Config/index.html

@@ -1637,6 +1637,17 @@
                             <span class="icon-info-circle text-primary ms-2"></span>
                         </span>
                     </div>
+                    <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>
+                        <span class="tt" data-bs-placement="right"
+                            title="In WiFi mode, the device will attempt to connect to local WiFi to broadcast TCP 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 class="form-group row">
                     <p id="enableTcpServerError" class="inlineError"></p>
@@ -1677,18 +1688,6 @@
                 <div class="form-group row">
                     <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>
 

Firmware/RTK_Everywhere/Developer.ino

@@ -171,6 +171,8 @@ bool webServerStart(int httpPort = 80)
 bool parseIncomingSettings() {return false;}
 void sendStringToWebsocket(const char* stringToSend) {}
 void stopWebServer() {}
+bool webServerSettingsCheckAndFree()    {return false;}
+void webServerSettingsClone()   {}
 void webServerStop() {}
 void webServerUpdate()  {}
 void webServerVerifyTables() {}

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/RTK_Everywhere.ino

@@ -343,11 +343,6 @@ const TickType_t ringBuffer_longWait_ms = 300 / portTICK_PERIOD_MS;
 SemaphoreHandle_t ringBufferSemaphore = NULL;
 const char *ringBufferSemaphoreHolder = "None";
 
-// tcpServer semaphore - prevent tcpServerClientSendData (handleGnssDataTask) and tcpServerUpdate
-// from gatecrashing each other. See #695 for why this is needed.
-SemaphoreHandle_t tcpServerSemaphore = NULL;
-const char *tcpServerSemaphoreHolder = "None";
-
 // Display used/free space in menu and config page
 uint64_t sdCardSize;
 uint64_t sdFreeSpace;
@@ -444,6 +439,7 @@ bool otaRequestFirmwareUpdate = false;
 
 bool enableRCFirmware;     // Goes true from AP config page
 bool currentlyParsingData; // Goes true when we hit 750ms timeout with new data
+bool tcpServerInCasterMode;// True when TCP server is running in caster mode
 
 // Give up connecting after this number of attempts
 // Connection attempts are throttled to increase the time between attempts

Firmware/RTK_Everywhere/Tasks.ino

@@ -754,7 +754,7 @@ void processUart1Message(SEMP_PARSE_STATE *parse, uint16_t type)
     // If BaseCasterOverride is enabled, remove everything but RTCM from the circular buffer
     // to avoid saturating the downstream radio link that is consuming over a TCP (NTRIP Caster) connection
     // Remove NMEA, etc after passing to the GNSS receiver library so that we still have SIV and other stats available
-    if (settings.baseCasterOverride == true)
+    if (tcpServerInCasterMode)
     {
         if (type != RTK_RTCM_PARSER_INDEX)
         {