Add printing of NTRIP Server during error reporting

Author: nseidle

Firmware/RTK_Everywhere/NtripServer.ino

@@ -663,8 +663,8 @@ void ntripServerUpdate(int serverIndex)
                 // Assume service not available
                 if (ntripServerConnectLimitReached(serverIndex)) // Update ntripServer->connectionAttemptTimeout
                     systemPrintf(
-                        "NTRIP Server %d failed to connect! Do you have your caster address and port correct?\r\n",
-                        serverIndex);
+                        "NTRIP Server %d - %s failed to connect! Do you have your caster address and port correct?\r\n",
+                        serverIndex, settings.ntripServer_CasterHost[serverIndex]);
             }
             else
             {
@@ -690,8 +690,8 @@ void ntripServerUpdate(int serverIndex)
             if (millis() - ntripServer->timer > 10000)
             {
                 if (ntripServerConnectLimitReached(serverIndex))
-                    systemPrintf("Caster %d failed to respond. Do you have your caster address and port correct?\r\n",
-                                 serverIndex);
+                    systemPrintf("Caster %d - %s failed to respond. Do you have your caster address and port correct?\r\n",
+                                 serverIndex, settings.ntripServer_CasterHost[serverIndex]);
             }
         }
         else
@@ -701,26 +701,26 @@ void ntripServerUpdate(int serverIndex)
             ntripServerResponse(serverIndex, response, sizeof(response));
 
             if (settings.debugNtripServerState)
-                systemPrintf("Server %d Response: %s\r\n", serverIndex, response);
+                systemPrintf("Server %d - %s Response: %s\r\n", serverIndex, settings.ntripServer_CasterHost[serverIndex], response);
             else
-                log_d("Server %d Response: %s", serverIndex, response);
+                log_d("Server %d - %s Response: %s", serverIndex, settings.ntripServer_CasterHost[serverIndex], response);
 
             // Look for various responses
             if (strstr(response, "200") != nullptr) //'200' found
             {
                 // We got a response, now check it for possible errors
                 if (strcasestr(response, "banned") != nullptr)
                 {
-                    systemPrintf("NTRIP Server %d connected to caster but caster responded with banned error: %s\r\n",
-                                 serverIndex, response);
+                    systemPrintf("NTRIP Server %d connected to %s but caster responded with banned error: %s\r\n",
+                                 serverIndex, settings.ntripServer_CasterHost[serverIndex], response);
 
                     // Stop NTRIP Server operations
                     ntripServerShutdown(serverIndex);
                 }
                 else if (strcasestr(response, "sandbox") != nullptr)
                 {
-                    systemPrintf("NTRIP Server %d connected to caster but caster responded with sandbox error: %s\r\n",
-                                 serverIndex, response);
+                    systemPrintf("NTRIP Server %d connected to %s but caster responded with sandbox error: %s\r\n",
+                                 serverIndex, settings.ntripServer_CasterHost[serverIndex], response);
 
                     // Stop NTRIP Server operations
                     ntripServerShutdown(serverIndex);
@@ -754,8 +754,8 @@ void ntripServerUpdate(int serverIndex)
             // Other errors returned by the caster
             else
             {
-                systemPrintf("NTRIP Server %d connected but caster responded with problem: %s\r\n", serverIndex,
-                             response);
+                systemPrintf("NTRIP Server %d connected but %s responded with problem: %s\r\n", serverIndex,
+                             settings.ntripServer_CasterHost[serverIndex], response);
 
                 // Check for connection limit
                 if (ntripServerConnectLimitReached(serverIndex))
@@ -770,20 +770,20 @@ void ntripServerUpdate(int serverIndex)
     case NTRIP_SERVER_CASTING:
         // Determine if the network has failed
         if (networkIsShuttingDown(NETWORK_USER_NTRIP_SERVER + serverIndex))
-            // Failed to connect to to the network, attempt to restart the network
+            // Failed to connect to the network, attempt to restart the network
             ntripServerRestart(serverIndex);
 
         // Check for a broken connection
         else if (!ntripServer->networkClient->connected())
         {
             // Broken connection, retry the NTRIP connection
-            systemPrintf("Connection to NTRIP Caster %d was lost\r\n", serverIndex);
+            systemPrintf("Connection to NTRIP Caster %d - %s was lost\r\n", serverIndex, settings.ntripServer_CasterHost[serverIndex]);
             ntripServerRestart(serverIndex);
         }
         else if ((millis() - ntripServer->timer) > (10 * 1000))
         {
             // GNSS stopped sending RTCM correction data
-            systemPrintf("NTRIP Server %d breaking connection to caster due to lack of RTCM data!\r\n", serverIndex);
+            systemPrintf("NTRIP Server %d breaking connection to %s due to lack of RTCM data!\r\n", serverIndex, settings.ntripServer_CasterHost[serverIndex]);
             ntripServerRestart(serverIndex);
         }
         else
@@ -801,7 +801,7 @@ void ntripServerUpdate(int serverIndex)
                 ntripServer->connectionAttempts = 0;
                 ntripServer->connectionAttemptTimeout = 0;
                 if (settings.debugNtripServerState)
-                    systemPrintf("NTRIP Server %d resetting connection attempt counter and timeout\r\n", serverIndex);
+                    systemPrintf("NTRIP Server %d - %s resetting connection attempt counter and timeout\r\n", serverIndex, settings.ntripServer_CasterHost[serverIndex]);
             }
         }
         break;