Skip to content

Commit c02fc13

Browse files
committed
Output semaphore take failures via serial
1 parent 6bf9290 commit c02fc13

File tree

9 files changed

+50
-3
lines changed

9 files changed

+50
-3
lines changed

Firmware/RTK_Surveyor/Buttons.ino

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ void powerDown(bool displayInfo)
3838
ubxFile.close();
3939
//xSemaphoreGive(sdCardSemaphore); //Do not release semaphore
4040
} //End sdCardSemaphore
41+
else
42+
{
43+
Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
44+
}
4145

4246
online.logging = false;
4347
}

Firmware/RTK_Surveyor/NVM.ino

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@ void recordSystemSettingsToFileSD(char *fileName)
8686

8787
xSemaphoreGive(sdCardSemaphore);
8888
}
89+
else
90+
{
91+
Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
92+
}
8993
}
9094
}
9195

@@ -286,6 +290,10 @@ bool loadSystemSettingsFromFileSD(char* fileName, Settings *settings)
286290
}
287291

288292
} //End Semaphore check
293+
else
294+
{
295+
Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
296+
}
289297
} //End SD online
290298

291299
log_d("Config file read failed: SD offline");

Firmware/RTK_Surveyor/RTK_Surveyor.ino

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -570,6 +570,10 @@ void updateLogs()
570570
online.logging = false;
571571
xSemaphoreGive(sdCardSemaphore); //Release semaphore
572572
}
573+
else
574+
{
575+
Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
576+
}
573577
}
574578
else if (online.logging == true && settings.enableLogging == true && (systemTime_minutes - startCurrentLogTime_minutes) >= settings.maxLogLength_minutes)
575579
{
@@ -581,6 +585,10 @@ void updateLogs()
581585
online.logging = false;
582586
xSemaphoreGive(sdCardSemaphore); //Release semaphore
583587
}
588+
else
589+
{
590+
Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
591+
}
584592
}
585593

586594
if (online.logging == true)
@@ -608,7 +616,7 @@ void updateLogs()
608616
} //End sdCardSemaphore
609617
else
610618
{
611-
log_d("Semaphore failed to yield");
619+
Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
612620
}
613621
}
614622

@@ -631,6 +639,10 @@ void updateLogs()
631639
xSemaphoreGive(sdCardSemaphore);
632640
newEventToRecord = false;
633641
}
642+
else
643+
{
644+
Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
645+
}
634646
}
635647

636648
//Report file sizes to show recording is working
@@ -645,6 +657,10 @@ void updateLogs()
645657

646658
xSemaphoreGive(sdCardSemaphore);
647659
}
660+
else
661+
{
662+
Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
663+
}
648664

649665
if (fileSize > 0)
650666
{

Firmware/RTK_Surveyor/System.ino

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -576,6 +576,10 @@ bool createTestFile()
576576
}
577577
xSemaphoreGive(sdCardSemaphore);
578578
}
579+
else
580+
{
581+
Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
582+
}
579583

580584
return (false);
581585
}

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-
log_d("Semaphore failed to yield");
86+
Serial.printf("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: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,10 @@ void scanForFirmware()
9494

9595
xSemaphoreGive(sdCardSemaphore);
9696
}
97-
97+
else
98+
{
99+
Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
100+
}
98101
}
99102
}
100103

Firmware/RTK_Surveyor/menuMain.ino

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,10 @@ void factoryReset()
225225
sd.remove(settingsFileName);
226226
xSemaphoreGive(sdCardSemaphore);
227227
} //End sdCardSemaphore
228+
else
229+
{
230+
Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
231+
}
228232
}
229233

230234
if (online.gnss == true)

Firmware/RTK_Surveyor/menuMessages.ino

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,10 @@ bool findLastLog(char *lastLogName)
480480

481481
xSemaphoreGive(sdCardSemaphore);
482482
}
483+
else
484+
{
485+
Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
486+
}
483487
}
484488

485489
return (foundAFile);

Firmware/RTK_Surveyor/menuSystem.ino

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,10 @@ void menuSystem()
133133

134134
xSemaphoreGive(sdCardSemaphore);
135135
}
136+
else
137+
{
138+
Serial.printf("sdCardSemaphore failed to yield, %s line %d\r\n", __FILE__, __LINE__);
139+
}
136140
}
137141
else if (incoming == 'x')
138142
break;

0 commit comments

Comments
 (0)