Merge pull request #526 from LeeLeahy2/net-rtcm

 Changed from wifi*RTCM to net*RTCM

Author: nseidle

Firmware/RTK_Surveyor/Display.ino

@@ -1002,7 +1002,7 @@ uint32_t setWiFiIcon_TwoRadios()
         {
             firstRadioSpotTimer = millis();
 
-            if (wifiIncomingRTCM == true || wifiOutgoingRTCM == true)
+            if (netIncomingRTCM == true || netOutgoingRTCM == true)
                 firstRadioSpotBlink ^= 1; // Share the spot
             else
                 firstRadioSpotBlink = false;
@@ -1028,15 +1028,15 @@ uint32_t setWiFiIcon_TwoRadios()
         else
         {
             // Share the spot. Determine if we need to indicate Up, or Down
-            if (wifiIncomingRTCM == true)
+            if (netIncomingRTCM == true)
             {
                 icons |= ICON_DOWN_ARROW_LEFT;
-                wifiIncomingRTCM = false; // Reset, set during NTRIP Client
+                netIncomingRTCM = false; // Reset, set during NTRIP Client
             }
-            else if (wifiOutgoingRTCM == true)
+            else if (netOutgoingRTCM == true)
             {
                 icons |= ICON_UP_ARROW_LEFT;
-                wifiOutgoingRTCM = false; // Reset, set during NTRIP Server
+                netOutgoingRTCM = false; // Reset, set during NTRIP Server
             }
             else
             {
@@ -1089,7 +1089,7 @@ uint32_t setWiFiIcon_ThreeRadios()
         {
             thirdRadioSpotTimer = millis();
 
-            if (wifiIncomingRTCM == true || wifiOutgoingRTCM == true)
+            if (netIncomingRTCM == true || netOutgoingRTCM == true)
                 thirdRadioSpotBlink ^= 1; // Share the spot
             else
                 thirdRadioSpotBlink = false;
@@ -1115,15 +1115,15 @@ uint32_t setWiFiIcon_ThreeRadios()
         else
         {
             // Share the spot. Determine if we need to indicate Up, or Down
-            if (wifiIncomingRTCM == true)
+            if (netIncomingRTCM == true)
             {
                 icons |= ICON_DOWN_ARROW_RIGHT;
-                wifiIncomingRTCM = false; // Reset, set during NTRIP Client
+                netIncomingRTCM = false; // Reset, set during NTRIP Client
             }
-            else if (wifiOutgoingRTCM == true)
+            else if (netOutgoingRTCM == true)
             {
                 icons |= ICON_UP_ARROW_RIGHT;
-                wifiOutgoingRTCM = false; // Reset, set during NTRIP Server
+                netOutgoingRTCM = false; // Reset, set during NTRIP Server
             }
             else
             {

Firmware/RTK_Surveyor/NtripClient.ino

@@ -320,7 +320,7 @@ void ntripClientStop(bool wifiClientAllocated)
     // Determine the next NTRIP client state
     ntripClientSetState((ntripClient && (wifiClientAllocated == false)) ? NTRIP_CLIENT_ON : NTRIP_CLIENT_OFF);
     online.ntripClient = false;
-    wifiIncomingRTCM = false;
+    netIncomingRTCM = false;
 }
 
 // Determine if NTRIP Client is needed
@@ -623,7 +623,7 @@ void ntripClientUpdate()
 
                 // Push RTCM to GNSS module over I2C / SPI
                 theGNSS.pushRawData(rtcmData, rtcmCount);
-                wifiIncomingRTCM = true;
+                netIncomingRTCM = true;
 
                 if (!inMainMenu && settings.enablePrintNtripClientState)
                     systemPrintf("NTRIP Client received %d RTCM bytes, pushed to ZED\r\n", rtcmCount);

Firmware/RTK_Surveyor/NtripServer.ino

@@ -266,7 +266,7 @@ void ntripServerProcessRTCM(uint8_t incoming)
             ntripServer->write(incoming); // Send this byte to socket
             ntripServerBytesSent++;
             ntripServerTimer = millis();
-            wifiOutgoingRTCM = true;
+            netOutgoingRTCM = true;
         }
     }
 

Firmware/RTK_Surveyor/RTK_Surveyor.ino

@@ -660,8 +660,8 @@ unsigned long thirdRadioSpotTimer = 0;
 
 bool bluetoothIncomingRTCM = false;
 bool bluetoothOutgoingRTCM = false;
-bool wifiIncomingRTCM = false;
-bool wifiOutgoingRTCM = false;
+bool netIncomingRTCM = false;
+bool netOutgoingRTCM = false;
 bool espnowIncomingRTCM = false;
 bool espnowOutgoingRTCM = false;