Update online.ethernetStatus state checking

Author: PaulZC

Firmware/RTK_Surveyor/Display.ino

@@ -3193,7 +3193,7 @@ const uint8_t * getMacAddress()
     return wifiMACAddress;
 #endif
 #ifdef COMPILE_ETHERNET
-  else if (online.ethernetStatus >= ETH_BEGUN_NO_LINK)
+  else if ((online.ethernetStatus >= ETH_STARTED_CHECK_CABLE) && (online.ethernetStatus <= ETH_CONNECTED))
     return ethernetMACAddress;
 #endif
 #endif

Firmware/RTK_Surveyor/NtripClient.ino

@@ -367,12 +367,7 @@ void ntripClientUpdate()
 #ifdef COMPILE_ETHERNET
         if (HAS_ETHERNET)
         {
-          if (online.ethernetStatus < ETH_BEGUN_NO_LINK)
-          {
-            systemPrintln("Error: Please connect Ethernet before starting NTRIP Client");
-            ntripClientStop(true); //Do not allocate new wifiClient
-          }
-          else
+          if ((online.ethernetStatus >= ETH_STARTED_CHECK_CABLE) && (online.ethernetStatus <= ETH_CONNECTED))
           {
             //Pause until connection timeout has passed
             if (millis() - ntripClientLastConnectionAttempt > ntripClientConnectionAttemptTimeout)
@@ -382,6 +377,11 @@ void ntripClientUpdate()
               ntripClientSetState(NTRIP_CLIENT_WIFI_ETHERNET_STARTED);
             }
           }
+          else
+          {
+            systemPrintln("Error: Please connect Ethernet before starting NTRIP Client");
+            ntripClientStop(true); //Do not allocate new wifiClient
+          }
         }
         else
 #endif
@@ -412,7 +412,7 @@ void ntripClientUpdate()
       {
         if (online.ethernetStatus == ETH_CONNECTED)
           ntripClientSetState(NTRIP_CLIENT_WIFI_ETHERNET_CONNECTED);
-        else if (online.ethernetStatus >= ETH_BEGUN_NO_LINK)
+        else
           ntripClientSetState(NTRIP_CLIENT_OFF);
       }
       else

Firmware/RTK_Surveyor/NtripServer.ino

@@ -369,12 +369,7 @@ void ntripServerUpdate()
 #ifdef COMPILE_ETHERNET
       if (HAS_ETHERNET)
       {
-        if (online.ethernetStatus < ETH_BEGUN_NO_LINK)
-        {
-          systemPrintln("Error: Please connect Ethernet before starting NTRIP Server");
-          ntripServerStop(true); //Do not allocate new wifiClient
-        }
-        else
+        if ((online.ethernetStatus >= ETH_STARTED_CHECK_CABLE) && (online.ethernetStatus <= ETH_CONNECTED))
         {
           //Pause until connection timeout has passed
           if (millis() - ntripServerLastConnectionAttempt > ntripServerConnectionAttemptTimeout)
@@ -384,6 +379,11 @@ void ntripServerUpdate()
             ntripServerSetState(NTRIP_SERVER_WIFI_ETHERNET_STARTED);
           }
         }
+        else
+        {
+          systemPrintln("Error: Please connect Ethernet before starting NTRIP Server");
+          ntripServerStop(true); //Do not allocate new wifiClient
+        }
       }
       else
 #endif
@@ -414,7 +414,7 @@ void ntripServerUpdate()
       {
         if (online.ethernetStatus == ETH_CONNECTED)
           ntripServerSetState(NTRIP_SERVER_WIFI_ETHERNET_CONNECTED);
-        else if (online.ethernetStatus >= ETH_BEGUN_NO_LINK)
+        else
           ntripServerSetState(NTRIP_SERVER_OFF);
       }
       else

Firmware/RTK_Surveyor/menuEthernet.ino

@@ -17,10 +17,6 @@ void beginEthernet()
 
   switch (online.ethernetStatus)
   {
-    default:
-      log_d("Unknown status");
-      break;
-
     case (ETH_NOT_STARTED):
       Ethernet.init(pin_Ethernet_CS);
 
@@ -90,6 +86,9 @@ void beginEthernet()
     case (ETH_CAN_NOT_BEGIN):
       break;
 
+    default:
+      log_d("Unknown status");
+      break;
   }
 #endif ///COMPILE_ETHERNET
 }