settings: Better definition for NETCONSUMER_OTA_CLIENT

Author: LeeLeahy2

Firmware/RTK_Everywhere/NtripServer.ino

@@ -557,7 +557,7 @@ void ntripServerStart(int serverIndex)
     systemPrintf("NTRIP Server %d start\r\n", serverIndex);
     ntripServerStop(serverIndex, false);
     if (ntripServerEnabled(serverIndex, nullptr))
-        networkConsumerAdd(NETCONSUMER_NTRIP_SERVER_0 + serverIndex, NETWORK_ANY, __FILE__, __LINE__);
+        networkConsumerAdd(NETCONSUMER_NTRIP_SERVER + serverIndex, NETWORK_ANY, __FILE__, __LINE__);
 }
 
 //----------------------------------------
@@ -588,7 +588,7 @@ void ntripServerStop(int serverIndex, bool shutdown)
 
     // Determine the next NTRIP server state
     online.ntripServer[serverIndex] = false;
-    networkConsumerOffline(NETCONSUMER_NTRIP_SERVER_0 + serverIndex);
+    networkConsumerOffline(NETCONSUMER_NTRIP_SERVER + serverIndex);
     if (shutdown)
     {
         if (settings.debugNtripServerState)
@@ -599,7 +599,7 @@ void ntripServerStop(int serverIndex, bool shutdown)
             systemPrintf("NTRIP Server %d caster port not configured!\r\n", serverIndex);
         if (settings.debugNtripServerState && (!settings.ntripServer_MountPoint[serverIndex][0]))
             systemPrintf("NTRIP Server %d mount point not configured!\r\n", serverIndex);
-        networkConsumerRemove(NETCONSUMER_NTRIP_SERVER_0 + serverIndex, NETWORK_ANY, __FILE__, __LINE__);
+        networkConsumerRemove(NETCONSUMER_NTRIP_SERVER + serverIndex, NETWORK_ANY, __FILE__, __LINE__);
         ntripServerSetState(ntripServer, NTRIP_SERVER_OFF);
         ntripServer->connectionAttempts = 0;
         ntripServer->connectionAttemptTimeout = 0;
@@ -635,7 +635,7 @@ void ntripServerUpdate(int serverIndex)
 
     // Shutdown the NTRIP server when the mode or setting changes
     DMW_ds(ntripServerSetState, ntripServer);
-    connected = networkConsumerIsConnected(NETCONSUMER_NTRIP_SERVER_0 + serverIndex);
+    connected = networkConsumerIsConnected(NETCONSUMER_NTRIP_SERVER + serverIndex);
     enabled = ntripServerEnabled(serverIndex, &line);
     if (!enabled && (ntripServer->state > NTRIP_SERVER_OFF))
         ntripServerShutdown(serverIndex);
@@ -676,14 +676,14 @@ void ntripServerUpdate(int serverIndex)
                 reportHeapNow(settings.debugNtripServerState);
 
                 // Reset the timeout when the network changes
-                if (networkChanged(NETCONSUMER_NTRIP_SERVER_0 + serverIndex))
+                if (networkChanged(NETCONSUMER_NTRIP_SERVER + serverIndex))
                 {
                     ntripServer->connectionAttempts = 0;
                     ntripServer->connectionAttemptTimeout = 0;
                 }
 
                 // The network is available for the NTRIP server
-                networkUserAdd(NETCONSUMER_NTRIP_SERVER_0 + serverIndex, __FILE__, __LINE__);
+                networkUserAdd(NETCONSUMER_NTRIP_SERVER + serverIndex, __FILE__, __LINE__);
                 ntripServerSetState(ntripServer, NTRIP_SERVER_NETWORK_CONNECTED);
             }
         }
@@ -887,8 +887,6 @@ void ntripServerUpdate()
 //----------------------------------------
 void ntripServerValidateTables()
 {
-    if (NETCONSUMER_OTA_CLIENT != (NETCONSUMER_NTRIP_SERVER_0 + NTRIP_SERVER_MAX))
-        reportFatalError("Adjust NETCONSUMER_NTRIP_SERVER_* entries to match NTRIP_SERVER_MAX");
     if (ntripServerStateNameEntries != NTRIP_SERVER_STATE_MAX)
         reportFatalError("Fix ntripServerStateNameEntries to match NTRIPServerState");
 }

Firmware/RTK_Everywhere/settings.h

@@ -581,11 +581,8 @@ enum
     NETCONSUMER_NTP_SERVER,
     NETCONSUMER_NTRIP_CLIENT,
     NETCONSUMER_NTRIP_SERVER,
-    NETCONSUMER_NTRIP_SERVER_0 = NETCONSUMER_NTRIP_SERVER,
-    NETCONSUMER_NTRIP_SERVER_1,
-    NETCONSUMER_NTRIP_SERVER_2,
-    NETCONSUMER_NTRIP_SERVER_3,
-    NETCONSUMER_OTA_CLIENT,
+    NETCONSUMER_NTRIP_SERVER_MAX = NETCONSUMER_NTRIP_SERVER + NTRIP_SERVER_MAX,
+    NETCONSUMER_OTA_CLIENT = NETCONSUMER_NTRIP_SERVER_MAX,
     NETCONSUMER_PPL_KEY_UPDATE,
     NETCONSUMER_PPL_MQTT_CLIENT,
     NETCONSUMER_TCP_CLIENT,