Switch to using ntripServerArray

Author: LeeLeahy2

Firmware/RTK_Surveyor/Base.ino

@@ -349,7 +349,8 @@ void DevUBLOXGNSS::processRTCM(uint8_t incoming)
         rtcmLastReceived = millis();
         rtcmBytesSent++;
 
-        ntripServerProcessRTCM(incoming);
+        for (int serverIndex = 0; serverIndex < NTRIP_SERVER_MAX; serverIndex++)
+            ntripServerProcessRTCM(serverIndex, incoming);
 
         espnowProcessRTCM(incoming);
     }
@@ -391,7 +392,8 @@ void processRTCMBuffer()
             rtcmLastReceived = millis();
             rtcmBytesSent++;
 
-            ntripServerProcessRTCM(incoming);
+            for (int serverIndex = 0; serverIndex < NTRIP_SERVER_MAX; serverIndex++)
+                ntripServerProcessRTCM(serverIndex, incoming);
 
             espnowProcessRTCM(incoming);
         }

Firmware/RTK_Surveyor/Developer.ino

@@ -59,10 +59,10 @@ void ntripClientValidateTables() {}
 // NTRIP server
 //----------------------------------------
 
-bool ntripServerIsCasting() {return false;}
-void ntripServerPrintStatus() {systemPrint("NTRIP Server not compiled");}
-void ntripServerProcessRTCM(uint8_t incoming) {}
-void ntripServerStop(bool clientAllocated) {online.ntripServer = false;}
+bool ntripServerIsCasting(int serverIndex) {return false;}
+void ntripServerPrintStatus(int serverIndex) {systemPrintf("**NTRIP Server %d not compiled**\r\n", serverIndex);}
+void ntripServerProcessRTCM(int serverIndex, uint8_t incoming) {}
+void ntripServerStop(int serverIndex, bool clientAllocated) {online.ntripServer = false;}
 void ntripServerUpdate() {}
 void ntripServerValidateTables() {}
 

Firmware/RTK_Surveyor/Form.ino

@@ -60,7 +60,8 @@ bool startWebServer(bool startWiFi = true, int httpPort = 80)
     do
     {
         ntripClientStop(true); // Do not allocate new wifiClient
-        ntripServerStop(true); // Do not allocate new wifiClient
+        for (int serverIndex = 0; serverIndex < NTRIP_SERVER_MAX; serverIndex++)
+            ntripServerStop(serverIndex, true); // Do not allocate new wifiClient
 
         if (startWiFi)
             if (wifiStartAP() == false) // Exits calling wifiConnect()

Firmware/RTK_Surveyor/Network.ino

@@ -183,11 +183,11 @@ const char * const networkUser[] =
 {
     "NTP Server",
     "NTRIP Client",
-    "NTRIP Server",
     "OTA Firmware Update",
     "PVT Client",
     "PVT Server",
     "PVT UDP Server",
+    "NTRIP Server 0",
 };
 const int networkUserEntries = sizeof(networkUser) / sizeof(networkUser[0]);
 
@@ -838,6 +838,7 @@ void networkStop(uint8_t networkType)
 {
     NETWORK_DATA * network;
     bool restart;
+    int serverIndex;
     bool shutdown;
     int user;
 
@@ -877,6 +878,17 @@ void networkStop(uint8_t networkType)
                 // Stop the network client
                 switch(user)
                 {
+                default:
+                    if ((user >= NETWORK_USER_NTRIP_SERVER)
+                        && (user < (NETWORK_USER_NTRIP_SERVER + NTRIP_SERVER_MAX)))
+                    {
+                        serverIndex = user - NETWORK_USER_NTRIP_SERVER;
+                        if (settings.debugNetworkLayer)
+                            systemPrintln("Network layer stopping NTRIP server");
+                        ntripServerRestart(serverIndex);
+                    }
+                    break;
+
                 case NETWORK_USER_NTP_SERVER:
                     if (settings.debugNetworkLayer)
                         systemPrintln("Network layer stopping NTP server");
@@ -889,12 +901,6 @@ void networkStop(uint8_t networkType)
                     ntripClientRestart();
                     break;
 
-                case NETWORK_USER_NTRIP_SERVER:
-                    if (settings.debugNetworkLayer)
-                        systemPrintln("Network layer stopping NTRIP server");
-                    ntripServerRestart();
-                    break;
-
                 case NETWORK_USER_OTA_FIRMWARE_UPDATE:
                     if (settings.debugNetworkLayer)
                         systemPrintln("Network layer stopping OTA firmware update");