mirror/Grbl_Esp32
1
0
Fork 0
mirror of https://github.com/bdring/Grbl_Esp32.git synced 2025-09-02 02:42:36 +02:00
Code Issues Releases Wiki Activity

Fixed Assert for ESP32 environment

Browse Source
This commit is contained in:
Mitch Bradley
2021-06-03 08:23:11 -10:00
parent 620de14b10
commit a999a178e8
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Grbl_Esp32/src/StackTrace/AssertionFailed.cpp
View File

@@ -35,16 +35,15 @@ AssertionFailed AssertionFailed::create(const char* condition, const char* msg,
va_list arg; va_list arg;
va_start(arg, msg); va_start(arg, msg);
size_t len = vsnprintf(tmp, 255, msg, arg); size_t len = vsnprintf(tmp, 255, msg, arg);
va_end(arg);
tmp[254] = 0; tmp[254] = 0;
msg = tmp;
st += tmp; st += tmp;
st += " at: "; st += " at: ";
st += esp_backtrace_print(10); st += esp_backtrace_print(10);
return AssertionFailed(st); return AssertionFailed(st, tmp);
} }
#else #else

2
Grbl_Esp32/src/StackTrace/AssertionFailed.h
View File

@@ -26,7 +26,7 @@ public:
String stackTrace; String stackTrace;
String msg; String msg;
AssertionFailed(String st) : stackTrace(st) {} AssertionFailed(String st, String message) : stackTrace(st), msg(message) {}
static AssertionFailed create(const char* condition) { return create(condition, "Assertion failed"); } static AssertionFailed create(const char* condition) { return create(condition, "Assertion failed"); }
static AssertionFailed create(const char* condition, const char* msg, ...); static AssertionFailed create(const char* condition, const char* msg, ...);