Skip to content

Commit 6404acd

Browse files
nseidlenseidle
committed
Squashed commit of the following:
commit d2396a1 Author: Nathan Seidle <[email protected]> Date: Thu May 26 13:29:15 2022 -0600 Docs update commit 8127a7e Author: Nathan Seidle <[email protected]> Date: Thu May 26 13:28:41 2022 -0600 Move semaphore prints to log_d level. commit 15455bd Merge: 428f063 d9bd587 Author: Nathan Seidle <[email protected]> Date: Thu May 26 11:53:10 2022 -0600 Merge pull request #143 from sparkfun/release_candidate v2.0 Release
1 parent d9bd587 commit 6404acd

15 files changed

+14
-74
lines changed

‎Binaries/RTK_Surveyor_Firmware_v2_0.bin

-128 Bytes
Binary file not shown.

‎Firmware/RTK_Surveyor/Buttons.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ void powerDown(bool displayInfo)
3232
} //End sdCardSemaphore
3333
else
3434
{
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__);
3636
}
3737

3838
online.logging = false;

‎Firmware/RTK_Surveyor/NVM.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ void recordSystemSettingsToFileSD(char *fileName)
8888
}
8989
else
9090
{
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__);
9292
}
9393
}
9494
}
@@ -292,7 +292,7 @@ bool loadSystemSettingsFromFileSD(char* fileName, Settings *settings)
292292
} //End Semaphore check
293293
else
294294
{
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__);
296296
}
297297
} //End SD online
298298

‎Firmware/RTK_Surveyor/RTK_Surveyor.ino

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -571,7 +571,7 @@ void updateLogs()
571571
}
572572
else
573573
{
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__);
575575
}
576576
}
577577
else if (online.logging == true && settings.enableLogging == true && (systemTime_minutes - startCurrentLogTime_minutes) >= settings.maxLogLength_minutes)
@@ -586,7 +586,7 @@ void updateLogs()
586586
}
587587
else
588588
{
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__);
590590
}
591591
}
592592

@@ -615,7 +615,7 @@ void updateLogs()
615615
} //End sdCardSemaphore
616616
else
617617
{
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__);
619619
}
620620
}
621621

@@ -640,7 +640,7 @@ void updateLogs()
640640
}
641641
else
642642
{
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__);
644644
}
645645
}
646646

@@ -658,7 +658,7 @@ void updateLogs()
658658
}
659659
else
660660
{
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__);
662662
}
663663

664664
if (fileSize > 0)

‎Firmware/RTK_Surveyor/System.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ bool createTestFile()
577577
}
578578
else
579579
{
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__);
581581
}
582582

583583
return (false);

‎Firmware/RTK_Surveyor/Tasks.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ void F9PSerialReadTask(void *e)
8383
} //End sdCardSemaphore
8484
else
8585
{
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__);
8787
}
8888
} //End maxLogTime
8989
} //End logging

‎Firmware/RTK_Surveyor/menuFirmware.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ void scanForFirmware()
9696
}
9797
else
9898
{
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__);
100100
}
101101
}
102102
}

‎Firmware/RTK_Surveyor/menuMain.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ void factoryReset()
249249
} //End sdCardSemaphore
250250
else
251251
{
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__);
253253
}
254254
}
255255

‎Firmware/RTK_Surveyor/menuMessages.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ bool findLastLog(char *lastLogName)
482482
}
483483
else
484484
{
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__);
486486
}
487487
}
488488

‎Firmware/RTK_Surveyor/menuSystem.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ void menuSystem()
140140
}
141141
else
142142
{
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__);
144144
}
145145
}
146146
// Support mode switching

‎docs/update_GUI.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎docs/update_intro.md

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎docs/update_sd.md

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎docs/update_serial.md

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎docs/update_wifi.md

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)