NtripServer: Use macro to compute NETCONSUMER_NTRIP_SERVER + serverIndex

Author: LeeLeahy2

Firmware/RTK_Everywhere/NtripServer.ino

@@ -169,6 +169,12 @@ const int ntripServerStateNameEntries = sizeof(ntripServerStateName) / sizeof(nt
 
 const RtkMode_t ntripServerMode = RTK_MODE_BASE_FIXED;
 
+//----------------------------------------
+// Macros
+//----------------------------------------
+
+#define NETWORK_CONSUMER(x)     (NETCONSUMER_NTRIP_SERVER + x)
+
 //----------------------------------------
 // Locals
 //----------------------------------------
@@ -557,7 +563,7 @@ void ntripServerStart(int serverIndex)
     systemPrintf("NTRIP Server %d start\r\n", serverIndex);
     ntripServerStop(serverIndex, false);
     if (ntripServerEnabled(serverIndex, nullptr))
-        networkConsumerAdd(NETCONSUMER_NTRIP_SERVER + serverIndex, NETWORK_ANY, __FILE__, __LINE__);
+        networkConsumerAdd(NETWORK_CONSUMER(serverIndex), NETWORK_ANY, __FILE__, __LINE__);
 }
 
 //----------------------------------------
@@ -588,7 +594,7 @@ void ntripServerStop(int serverIndex, bool shutdown)
 
     // Determine the next NTRIP server state
     online.ntripServer[serverIndex] = false;
-    networkConsumerOffline(NETCONSUMER_NTRIP_SERVER + serverIndex);
+    networkConsumerOffline(NETWORK_CONSUMER(serverIndex));
     if (shutdown)
     {
         if (settings.debugNtripServerState)
@@ -599,7 +605,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 + serverIndex, NETWORK_ANY, __FILE__, __LINE__);
+        networkConsumerRemove(NETWORK_CONSUMER(serverIndex), NETWORK_ANY, __FILE__, __LINE__);
         ntripServerSetState(ntripServer, NTRIP_SERVER_OFF);
         ntripServer->connectionAttempts = 0;
         ntripServer->connectionAttemptTimeout = 0;
@@ -635,7 +641,7 @@ void ntripServerUpdate(int serverIndex)
 
     // Shutdown the NTRIP server when the mode or setting changes
     DMW_ds(ntripServerSetState, ntripServer);
-    connected = networkConsumerIsConnected(NETCONSUMER_NTRIP_SERVER + serverIndex);
+    connected = networkConsumerIsConnected(NETWORK_CONSUMER(serverIndex));
     enabled = ntripServerEnabled(serverIndex, &line);
     if (!enabled && (ntripServer->state > NTRIP_SERVER_OFF))
         ntripServerShutdown(serverIndex);
@@ -676,14 +682,14 @@ void ntripServerUpdate(int serverIndex)
                 reportHeapNow(settings.debugNtripServerState);
 
                 // Reset the timeout when the network changes
-                if (networkChanged(NETCONSUMER_NTRIP_SERVER + serverIndex))
+                if (networkChanged(NETWORK_CONSUMER(serverIndex)))
                 {
                     ntripServer->connectionAttempts = 0;
                     ntripServer->connectionAttemptTimeout = 0;
                 }
 
                 // The network is available for the NTRIP server
-                networkUserAdd(NETCONSUMER_NTRIP_SERVER + serverIndex, __FILE__, __LINE__);
+                networkUserAdd(NETWORK_CONSUMER(serverIndex), __FILE__, __LINE__);
                 ntripServerSetState(ntripServer, NTRIP_SERVER_NETWORK_CONNECTED);
             }
         }