feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/spelling_and_crlf_fix_in_panic' into 'master'

Browse Source 
Fix a spelling mistake in panic message, add carriage return to stack canary message

Probably the most trivial mr ever, but the spelling error was reported as a bug and the missing \r bugged me ever since I saw it.

See merge request !113
This commit is contained in:
Angus Gratton
2016-09-26 15:53:05 +08:00
parent 1dc7fda812 14de3a3815
commit 25f6d06e01
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/freertos/panic.c
View File

@@ -81,7 +81,7 @@ int xPortGetCoreID();
void __attribute__((weak)) vApplicationStackOverflowHook( TaskHandle_t xTask, signed char *pcTaskName ) { void __attribute__((weak)) vApplicationStackOverflowHook( TaskHandle_t xTask, signed char *pcTaskName ) {
panicPutStr("***ERROR*** A stack overflow in task"); panicPutStr("***ERROR*** A stack overflow in task");
panicPutStr((char*)pcTaskName); panicPutStr((char*)pcTaskName);
panicPutStr("has been detected.\n"); panicPutStr("has been detected.\r\n");
} }
static const char *edesc[]={ static const char *edesc[]={
@@ -160,7 +160,7 @@ void xt_unhandled_exception(XtExcFrame *frame) {
panicPutStr("Guru Meditation Error of type "); panicPutStr("Guru Meditation Error of type ");
x=regs[20]; x=regs[20];
if (x<40) panicPutStr(edesc[x]); else panicPutStr("Unknown"); if (x<40) panicPutStr(edesc[x]); else panicPutStr("Unknown");
panicPutStr(" occured on core "); panicPutStr(" occurred on core ");
panicPutDec(xPortGetCoreID()); panicPutDec(xPortGetCoreID());
if (inOCDMode()) { if (inOCDMode()) {
panicPutStr(" at pc="); panicPutStr(" at pc=");