TcpServer: Determine operating mode in tcpServerEnabled

Author: LeeLeahy2

Firmware/RTK_Everywhere/RTK_Everywhere.ino

@@ -439,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)
         {

Firmware/RTK_Everywhere/TcpServer.ino

@@ -171,6 +171,7 @@ int32_t tcpServerClientSendData(int index, uint8_t *data, uint16_t length)
 //----------------------------------------
 bool tcpServerEnabled(const char ** line)
 {
+    bool casterMode;
     bool enabled;
     const char * name;
     uint16_t port;
@@ -192,13 +193,17 @@ bool tcpServerEnabled(const char ** line)
         {
             // TCP server running in Rover mode
             name = "TCP Server";
+            casterMode = false;
             port = settings.tcpServerPort;
         }
 
         // Determine if the base caster should be running
         else if (EQ_RTK_MODE(baseCasterMode)
             && (settings.enableNtripCaster || settings.baseCasterOverride))
         {
+            // TCP server running in caster mode
+            casterMode = true;
+
             // Select the base caster WiFi mode and port number
             if (settings.baseCasterOverride)
             {
@@ -224,11 +229,13 @@ bool tcpServerEnabled(const char ** line)
         {
             // Update the TCP server configuration
             tcpServerName = name;
+            tcpServerInCasterMode = casterMode;
             tcpServerPort = port;
         }
 
         // Shutdown and restart the TCP server when configuration changes
         else if ((name != tcpServerName)
+            || (casterMode != tcpServerInCasterMode)
             || (port != tcpServerPort))
         {
             *line = ", Wrong state to switch configuration!";
@@ -603,7 +610,7 @@ void tcpServerUpdate()
 
                 // If we are acting as an NTRIP Caster, intercept the initial communication from the client
                 //  and respond accordingly
-                if (settings.enableNtripCaster || settings.baseCasterOverride)
+                if (tcpServerInCasterMode)
                 {
                     // Read response from client
                     char response[512];
@@ -646,7 +653,7 @@ void tcpServerUpdate()
                         if (settings.debugTcpServer)
                             systemPrintf("Unknown response: %s\r\n", response);
                     }
-                } // settings.enableNtripCaster == true || settings.baseCasterOverride == true
+                } // tcpServerInCasterMode
 
                 // Make client online after any NTRIP injections so ring buffer can start outputting data to it
                 tcpServerClientConnected = tcpServerClientConnected | (1 << index);