Move semaphore prints to log_d level.

nseidle · nseidle · commit 8127a7e2ca2f · 2022-05-26T13:28:41.000-06:00
diff --git a/Binaries/RTK_Surveyor_Firmware_v2_0.bin b/Binaries/RTK_Surveyor_Firmware_v2_0.bin
diff --git a/Firmware/RTK_Surveyor/Buttons.ino b/Firmware/RTK_Surveyor/Buttons.ino
@@ -32,7 +32,7 @@ void powerDown(bool displayInfo)
     } //End sdCardSemaphore
     else
     {
-      Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
+      log_d("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
     }
 
     online.logging = false;
diff --git a/Firmware/RTK_Surveyor/NVM.ino b/Firmware/RTK_Surveyor/NVM.ino
@@ -88,7 +88,7 @@ void recordSystemSettingsToFileSD(char *fileName)
     }
     else
     {
-      Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
+      log_d("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
     }
   }
 }
@@ -292,7 +292,7 @@ bool loadSystemSettingsFromFileSD(char* fileName, Settings *settings)
     } //End Semaphore check
     else
     {
-      Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
+      log_d("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
     }
   } //End SD online
 
diff --git a/Firmware/RTK_Surveyor/RTK_Surveyor.ino b/Firmware/RTK_Surveyor/RTK_Surveyor.ino
@@ -571,7 +571,7 @@ void updateLogs()
     }
     else
     {
-      Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
+      log_d("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
     }
   }
   else if (online.logging == true && settings.enableLogging == true && (systemTime_minutes - startCurrentLogTime_minutes) >= settings.maxLogLength_minutes)
@@ -586,7 +586,7 @@ void updateLogs()
     }
     else
     {
-      Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
+      log_d("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
     }
   }
 
@@ -615,7 +615,7 @@ void updateLogs()
       } //End sdCardSemaphore
       else
       {
-        Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
+        log_d("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
       }
     }
 
@@ -640,7 +640,7 @@ void updateLogs()
       }
       else
       {
-        Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
+        log_d("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
       }
     }
 
@@ -658,7 +658,7 @@ void updateLogs()
       }
       else
       {
-        Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
+        log_d("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
       }
 
       if (fileSize > 0)
diff --git a/Firmware/RTK_Surveyor/System.ino b/Firmware/RTK_Surveyor/System.ino
@@ -577,7 +577,7 @@ bool createTestFile()
   }
   else
   {
-    Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
+    log_d("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
   }
 
   return (false);
diff --git a/Firmware/RTK_Surveyor/Tasks.ino b/Firmware/RTK_Surveyor/Tasks.ino
@@ -83,7 +83,7 @@ void F9PSerialReadTask(void *e)
           } //End sdCardSemaphore
           else
           {
-            Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
+            log_d("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
           }
         } //End maxLogTime
       } //End logging
diff --git a/Firmware/RTK_Surveyor/menuFirmware.ino b/Firmware/RTK_Surveyor/menuFirmware.ino
@@ -96,7 +96,7 @@ void scanForFirmware()
     }
     else
     {
-      Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
+      log_d("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
     }
   }
 }
diff --git a/Firmware/RTK_Surveyor/menuMain.ino b/Firmware/RTK_Surveyor/menuMain.ino
@@ -249,7 +249,7 @@ void factoryReset()
     } //End sdCardSemaphore
     else
     {
-      Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
+      log_d("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
     }
   }
 
diff --git a/Firmware/RTK_Surveyor/menuMessages.ino b/Firmware/RTK_Surveyor/menuMessages.ino
@@ -482,7 +482,7 @@ bool findLastLog(char *lastLogName)
     }
     else
     {
-      Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
+      log_d("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
     }
   }
 
diff --git a/Firmware/RTK_Surveyor/menuSystem.ino b/Firmware/RTK_Surveyor/menuSystem.ino
@@ -140,7 +140,7 @@ void menuSystem()
       }
       else
       {
-        Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
+        log_d("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
       }
     }
     // Support mode switching

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ void powerDown(bool displayInfo)`
`32`	`32`	`} //End sdCardSemaphore`
`33`	`33`	`else`
`34`	`34`	`{`
`35`		`- Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);`
	`35`	`+ log_d("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`online.logging = false;`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ void recordSystemSettingsToFileSD(char *fileName)`
`88`	`88`	`}`
`89`	`89`	`else`
`90`	`90`	`{`
`91`		`- Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);`
	`91`	`+ log_d("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);`
`92`	`92`	`}`
`93`	`93`	`}`
`94`	`94`	`}`
`@@ -292,7 +292,7 @@ bool loadSystemSettingsFromFileSD(char* fileName, Settings *settings)`
`292`	`292`	`} //End Semaphore check`
`293`	`293`	`else`
`294`	`294`	`{`
`295`		`- Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);`
	`295`	`+ log_d("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);`
`296`	`296`	`}`
`297`	`297`	`} //End SD online`
`298`	`298`
Original file line number	Diff line number	Diff line change
`@@ -571,7 +571,7 @@ void updateLogs()`
`571`	`571`	`}`
`572`	`572`	`else`
`573`	`573`	`{`
`574`		`- Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);`
	`574`	`+ log_d("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);`
`575`	`575`	`}`
`576`	`576`	`}`
`577`	`577`	`else if (online.logging == true && settings.enableLogging == true && (systemTime_minutes - startCurrentLogTime_minutes) >= settings.maxLogLength_minutes)`
`@@ -586,7 +586,7 @@ void updateLogs()`
`586`	`586`	`}`
`587`	`587`	`else`
`588`	`588`	`{`
`589`		`- Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);`
	`589`	`+ log_d("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);`
`590`	`590`	`}`
`591`	`591`	`}`
`592`	`592`
`@@ -615,7 +615,7 @@ void updateLogs()`
`615`	`615`	`} //End sdCardSemaphore`
`616`	`616`	`else`
`617`	`617`	`{`
`618`		`- Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);`
	`618`	`+ log_d("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);`
`619`	`619`	`}`
`620`	`620`	`}`
`621`	`621`
`@@ -640,7 +640,7 @@ void updateLogs()`
`640`	`640`	`}`
`641`	`641`	`else`
`642`	`642`	`{`
`643`		`- Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);`
	`643`	`+ log_d("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);`
`644`	`644`	`}`
`645`	`645`	`}`
`646`	`646`
`@@ -658,7 +658,7 @@ void updateLogs()`
`658`	`658`	`}`
`659`	`659`	`else`
`660`	`660`	`{`
`661`		`- Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);`
	`661`	`+ log_d("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);`
`662`	`662`	`}`
`663`	`663`
`664`	`664`	`if (fileSize > 0)`
Original file line number	Diff line number	Diff line change
`@@ -577,7 +577,7 @@ bool createTestFile()`
`577`	`577`	`}`
`578`	`578`	`else`
`579`	`579`	`{`
`580`		`- Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);`
	`580`	`+ log_d("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);`
`581`	`581`	`}`
`582`	`582`
`583`	`583`	`return (false);`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ void F9PSerialReadTask(void *e)`
`83`	`83`	`} //End sdCardSemaphore`
`84`	`84`	`else`
`85`	`85`	`{`
`86`		`- Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);`
	`86`	`+ log_d("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);`
`87`	`87`	`}`
`88`	`88`	`} //End maxLogTime`
`89`	`89`	`} //End logging`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ void scanForFirmware()`
`96`	`96`	`}`
`97`	`97`	`else`
`98`	`98`	`{`
`99`		`- Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);`
	`99`	`+ log_d("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ void factoryReset()`
`249`	`249`	`} //End sdCardSemaphore`
`250`	`250`	`else`
`251`	`251`	`{`
`252`		`- Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);`
	`252`	`+ log_d("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);`
`253`	`253`	`}`
`254`	`254`	`}`
`255`	`255`
Original file line number	Diff line number	Diff line change
`@@ -482,7 +482,7 @@ bool findLastLog(char *lastLogName)`
`482`	`482`	`}`
`483`	`483`	`else`
`484`	`484`	`{`
`485`		`- Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);`
	`485`	`+ log_d("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);`
`486`	`486`	`}`
`487`	`487`	`}`
`488`	`488`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ void menuSystem()`
`140`	`140`	`}`
`141`	`141`	`else`
`142`	`142`	`{`
`143`		`- Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);`
	`143`	`+ log_d("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);`
`144`	`144`	`}`
`145`	`145`	`}`
`146`	`146`	`// Support mode switching`