Rename old networkMarkO* routines to networkInterfaceInternetConnection*

Author: LeeLeahy2

Firmware/RTK_Everywhere/Cellular.ino

@@ -87,7 +87,7 @@ void cellularEvent(arduino_event_id_t event)
     if (networkInterfaceHasInternet(NETWORK_CELLULAR) && (event != ARDUINO_EVENT_ETH_GOT_IP) &&
         (event != ARDUINO_EVENT_ETH_GOT_IP6) && (event != ARDUINO_EVENT_PPP_CONNECTED))
     {
-        networkMarkOffline(NETWORK_CELLULAR);
+        networkInterfaceInternetConnectionLost(NETWORK_CELLULAR);
     }
 
     // Cellular State Machine
@@ -108,7 +108,7 @@ void cellularEvent(arduino_event_id_t event)
 
     case ARDUINO_EVENT_PPP_CONNECTED:
         systemPrintln("Cellular Connected");
-        networkMarkHasInternet(NETWORK_CELLULAR);
+        networkInterfaceInternetConnectionAvailable(NETWORK_CELLULAR);
         break;
 
     case ARDUINO_EVENT_PPP_DISCONNECTED:

Firmware/RTK_Everywhere/Ethernet.ino

@@ -174,7 +174,7 @@ void ethernetEvent(arduino_event_id_t event, arduino_event_info_t info)
         if (settings.enablePrintEthernetDiag && (!inMainMenu))
             systemPrintf("ETH Got IP: '%s'\r\n", ETH.localIP().toString().c_str());
 
-        networkMarkHasInternet((NetIndex_t)NETWORK_ETHERNET);
+        networkInterfaceInternetConnectionAvailable((NetIndex_t)NETWORK_ETHERNET);
 
         if (settings.ethernetDHCP)
             paintEthernetConnected();
@@ -202,7 +202,7 @@ void ethernetEvent(arduino_event_id_t event, arduino_event_info_t info)
     // Take the network offline if necessary
     if (networkInterfaceHasInternet(NETWORK_ETHERNET) && (event != ARDUINO_EVENT_ETH_GOT_IP))
     {
-        networkMarkOffline((NetIndex_t)NETWORK_ETHERNET);
+        networkInterfaceInternetConnectionLost((NetIndex_t)NETWORK_ETHERNET);
     }
 }
 

Firmware/RTK_Everywhere/Network.ino

@@ -631,7 +631,7 @@ bool networkIsPresent(NetIndex_t index)
 //----------------------------------------
 // Mark network offline
 //----------------------------------------
-void networkMarkOffline(NetIndex_t index)
+void networkInterfaceInternetConnectionLost(NetIndex_t index)
 {
     NetMask_t bitMask;
     NetPriority_t previousPriority;
@@ -700,7 +700,7 @@ void networkMarkOffline(NetIndex_t index)
 //----------------------------------------
 // Mark network online
 //----------------------------------------
-void networkMarkHasInternet(NetIndex_t index)
+void networkInterfaceInternetConnectionAvailable(NetIndex_t index)
 {
     NetMask_t bitMask;
     NetIndex_t previousIndex;
@@ -1855,4 +1855,4 @@ uint8_t networkConsumersOnline()
     return (consumerCountOnline);
 }
 
-#endif // COMPILE_NETWORK
+#endif // COMPILE_NETWORK

Firmware/RTK_Everywhere/WiFi_old.ino

@@ -424,7 +424,7 @@ void wifiEvent(arduino_event_id_t event, arduino_event_info_t info)
             systemPrint("WiFi STA Got IPv4: ");
             systemPrintln(ipAddress);
         }
-        networkMarkHasInternet(NETWORK_WIFI);
+        networkInterfaceInternetConnectionAvailable(NETWORK_WIFI);
         break;
 
     case ARDUINO_EVENT_WIFI_STA_GOT_IP6:
@@ -434,7 +434,7 @@ void wifiEvent(arduino_event_id_t event, arduino_event_info_t info)
             systemPrint("WiFi STA Got IPv6: ");
             systemPrintln(ipAddress);
         }
-        networkMarkHasInternet(NETWORK_WIFI);
+        networkInterfaceInternetConnectionAvailable(NETWORK_WIFI);
         break;
 
     case ARDUINO_EVENT_WIFI_STA_LOST_IP:
@@ -717,7 +717,7 @@ void wifiStop()
     }
 
     // Take the network offline
-    networkMarkOffline(NETWORK_WIFI);
+    networkInterfaceInternetConnectionLost(NETWORK_WIFI);
 
     if (wifiMulti != nullptr)
         wifiMulti = nullptr;