Move log_ds to debugLBand prints

Author: nseidle

Firmware/RTK_Surveyor/menuPP.ino

@@ -347,13 +347,9 @@ bool pointperfectProvisionDevice()
                     break;
                 }
                 strncpy(tempHolderPtr, (const char *)((*jsonZtp)["certificate"]), MQTT_CERT_SIZE - 1);
-                // log_d("len of PrivateCert: %d", strlen(tempHolderPtr));
-                // log_d("privateCert: %s", tempHolderPtr);
                 recordFile("certificate", tempHolderPtr, strlen(tempHolderPtr));
 
                 strncpy(tempHolderPtr, (const char *)((*jsonZtp)["privateKey"]), MQTT_CERT_SIZE - 1);
-                // log_d("len of privateKey: %d", strlen(tempHolderPtr));
-                // log_d("privateKey: %s", tempHolderPtr);
                 recordFile("privateKey", tempHolderPtr, strlen(tempHolderPtr));
 
                 // Validate the keys
@@ -580,7 +576,8 @@ bool pointperfectUpdateKeys()
         mqttClient.setCallback(mqttCallback);
         mqttClient.setServer(settings.pointPerfectBrokerHost, 8883);
 
-        log_d("Connecting to MQTT broker: %s", settings.pointPerfectBrokerHost);
+        if (settings.debugLBand == true)
+            systemPrintf("Connecting to MQTT broker: %s\r\n", settings.pointPerfectBrokerHost);
 
         // Loop until we're connected or until the maximum retries are exceeded
         mqttMessageReceived = false;
@@ -605,7 +602,8 @@ bool pointperfectUpdateKeys()
             if (--maxTries)
             {
                 systemPrint(".");
-                log_d("failed, status code: %d try again in 1 second", mqttClient.state());
+                if (settings.debugLBand == true)
+                    systemPrintf("failed, status code: %d try again in 1 second\r\n", mqttClient.state());
                 delay(1000);
             }
         } while (maxTries);
@@ -614,7 +612,6 @@ bool pointperfectUpdateKeys()
         if (mqttClient.connected() == false)
         {
             systemPrintln("failed!");
-            log_d("MQTT failed to connect");
             break;
         }
 
@@ -629,12 +626,14 @@ bool pointperfectUpdateKeys()
                 break;
             if (mqttClient.connected() == false)
             {
-                log_d("Client disconnected");
+                if (settings.debugLBand == true)
+                    systemPrintln("Client disconnected");
                 break;
             }
             if (millis() - startTime > 8000)
             {
-                log_d("Channel failed to respond");
+                if (settings.debugLBand == true)
+                    systemPrintln("Channel failed to respond");
                 break;
             }
 
@@ -806,7 +805,8 @@ int daysFromEpoch(long long endEpoch)
     if (online.rtc == false)
     {
         // If we don't have RTC we can't calculate days to expire
-        log_d("No RTC available");
+        if (settings.debugLBand == true)
+            systemPrintln("No RTC available");
         return (0);
     }
 
@@ -1005,7 +1005,8 @@ void pointperfectApplyKeys()
     {
         if (online.gnss == false)
         {
-            log_d("ZED-F9P not available");
+            if (settings.debugLBand == true)
+                systemPrintln("ZED-F9P not available");
             return;
         }
 
@@ -1053,13 +1054,15 @@ void pointperfectApplyKeys()
                 systemPrintln("setDynamicSPARTNKeys failed");
             else
             {
-                log_d("PointPerfect keys applied");
+                if (settings.debugLBand == true)
+                    systemPrintln("PointPerfect keys applied");
                 online.lbandCorrections = true;
             }
         }
         else
         {
-            log_d("No PointPerfect keys available");
+            if (settings.debugLBand == true)
+                systemPrintln("No PointPerfect keys available");
         }
     }
 }
@@ -1096,15 +1099,17 @@ void beginLBand()
     // Skip if going into configure-via-ethernet mode
     if (configureViaEthernet)
     {
-        log_d("configureViaEthernet: skipping beginLBand");
+        if (settings.debugLBand == true)
+            systemPrintln("configureViaEthernet: skipping beginLBand");
         return;
     }
 
 #ifdef COMPILE_L_BAND
     if (i2cLBand.begin(Wire, 0x43) ==
         false) // Connect to the u-blox NEO-D9S using Wire port. The D9S default I2C address is 0x43 (not 0x42)
     {
-        log_d("L-Band not detected");
+        if (settings.debugLBand == true)
+            systemPrintln("L-Band not detected");
         return;
     }
 
@@ -1129,12 +1134,14 @@ void beginLBand()
     {
         if ((longitude > -125 && longitude < -67) && (latitude > -90 && latitude < 90))
         {
-            log_d("Setting L-Band to US");
+            if (settings.debugLBand == true)
+                systemPrintln("Setting L-Band to US");
             settings.LBandFreq = 1556290000; // We are in US band
         }
         else if ((longitude > -25 && longitude < 70) && (latitude > -90 && latitude < 90))
         {
-            log_d("Setting L-Band to EU");
+            if (settings.debugLBand == true)
+                systemPrintln("Setting L-Band to EU");
             settings.LBandFreq = 1545260000; // We are in EU band
         }
         else
@@ -1145,7 +1152,10 @@ void beginLBand()
         recordSystemSettings();
     }
     else
-        log_d("No fix available for L-Band frequency determination");
+    {
+        if (settings.debugLBand == true)
+            systemPrintln("No fix available for L-Band frequency determination");
+    }
 
     bool response = true;
     response &= i2cLBand.newCfgValset();
@@ -1170,7 +1180,8 @@ void beginLBand()
 
     i2cLBand.softwareResetGNSSOnly(); // Do a restart
 
-    log_d("L-Band online");
+    if (settings.debugLBand == true)
+        systemPrintln("L-Band online");
 
     online.lband = true;
 #endif // COMPILE_L_BAND
@@ -1187,9 +1198,11 @@ void menuPointPerfect()
         systemPrintln();
         systemPrintln("Menu: PointPerfect Corrections");
 
-        log_d("Time to first L-Band fix: %ds Restarts: %d", lbandTimeToFix / 1000, lbandRestarts);
+        if (settings.debugLBand == true)
+            systemPrintf("Time to first L-Band fix: %ds Restarts: %d\r\n", lbandTimeToFix / 1000, lbandRestarts);
 
-        log_d("settings.pointPerfectLBandTopic: %s", settings.pointPerfectLBandTopic);
+        if (settings.debugLBand == true)
+            systemPrintf("settings.pointPerfectLBandTopic: %s\r\n", settings.pointPerfectLBandTopic);
 
         systemPrint("Days until keys expire: ");
         if (strlen(settings.pointPerfectCurrentKey) > 0)
@@ -1339,7 +1352,8 @@ void updateLBand()
     // Skip if in configure-via-ethernet mode
     if (configureViaEthernet)
     {
-        // log_d("configureViaEthernet: skipping updateLBand");
+        if (settings.debugLBand == true)
+            systemPrintln("configureViaEthernet: skipping updateLBand");
         return;
     }
 
@@ -1377,14 +1391,16 @@ void updateLBand()
                     // Hotstart ZED to try to get RTK lock
                     theGNSS.softwareResetGNSSOnly();
 
-                    log_d("Restarting ZED. Number of L-Band restarts: %d", lbandRestarts);
+                    if (settings.debugLBand == true)
+                        systemPrintf("Restarting ZED. Number of L-Band restarts: %d\r\n", lbandRestarts);
                 }
             }
         }
         else if (carrSoln == 2 && lbandTimeToFix == 0)
         {
             lbandTimeToFix = millis();
-            log_d("Time to first L-Band fix: %ds", lbandTimeToFix / 1000);
+            if (settings.debugLBand == true)
+                systemPrintf("Time to first L-Band fix: %ds\r\n", lbandTimeToFix / 1000);
         }
 
         if ((millis() - rtcmLastPacketReceived) / 1000 > settings.rtcmTimeoutBeforeUsingLBand_s)
@@ -1394,7 +1410,8 @@ void updateLBand()
             // re-enable L-Band communcation
             if (lBandCommunicationEnabled == false)
             {
-                log_d("Enabling L-Band communication due to RTCM timeout");
+                if (settings.debugLBand == true)
+                    systemPrintln("Enabling L-Band communication due to RTCM timeout");
                 lBandCommunicationEnabled = zedEnableLBandCommunication();
             }
         }
@@ -1403,7 +1420,8 @@ void updateLBand()
             // If we *have* recently received RTCM then disable corrections from then NEO-D9S L-Band receiver
             if (lBandCommunicationEnabled == true)
             {
-                log_d("Disabling L-Band communication due to RTCM reception");
+                if (settings.debugLBand == true)
+                    systemPrintln("Disabling L-Band communication due to RTCM reception");
                 lBandCommunicationEnabled = !zedDisableLBandCommunication(); // zedDisableLBandCommunication() returns
                                                                              // true if we successfully disabled
             }