Merge pull request #65 from adamgreen/fixWarningsInThreadDebug

facchinm · web-flow · commit 999846e0276f · 2020-10-05T09:30:20.000+02:00
Fix ThreadDebug warnings when building for nRF52*
diff --git a/libraries/ThreadDebug/src/ThreadDebug.cpp b/libraries/ThreadDebug/src/ThreadDebug.cpp
@@ -71,10 +71,12 @@ static const char* g_threadNamesToIgnore[] = {
 #define EXC_RETURN_THREADMODE_MAINSTACK     0x9
 
 // Macro to make is easier to calculate array size.
+#undef ARRAY_SIZE
 #define ARRAY_SIZE(X) (sizeof(X)/sizeof(X[0]))
 
 // Assert routine that will dump error text to USB GDB connection before entering infinite loop. If user is logging MRI
 // remote communications then they will see the error text in the log before debug stub becomes unresponseive.
+#undef ASSERT
 #define ASSERT(X) \
     if (!(X)) { \
         Serial.print("Assertion Failed: "); \
