Core improvements

Debug.cpp

@@ -16,6 +16,8 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // Lesser General Public License for more details.
 //
+//#define DEBUG 1
+
 #include <inttypes.h>
 #include "Debug.h"
 

Debug.h

@@ -19,16 +19,6 @@
 #ifndef DEBUG_H
 #define DEBUG_H
 
-#ifdef DEBUG
-extern uint8_t _pn5180_debugIndent;
-extern uint8_t _pn5180_debugIndentN;
-extern bool _pn5180_debugNL;
-extern uint8_t _pn5180_debugSilent;
-
-// These macros are helper macros to make the see the debug macros like function calls so they do not alter any current code block structures when the macro contains if/else/break, etc.
-#define __DEBUG_BEGIN__   do{if(DEBUG){
-#define __DEBUG_END__     }}while(0)
-
 // DEBUG print with indention macros:
 //
 // USAGE:
@@ -83,6 +73,17 @@ extern uint8_t _pn5180_debugSilent;
 // |   IRQ-Status=0x00000004
 // ----------------------------------
 
+#if defined(DEBUG) || defined(DEBUG_ERROR)
+extern uint8_t _pn5180_debugIndent;
+extern uint8_t _pn5180_debugIndentN;
+extern bool _pn5180_debugNL;
+extern uint8_t _pn5180_debugSilent;
+
+#ifdef DEBUG
+// These macros are helper macros to make c compiler treat the debug macros like function calls so they do not alter any current code block structures when the macro contains if/else/break, etc.
+#define __DEBUG_BEGIN__   do{if(DEBUG){
+#define __DEBUG_END__     }}while(0)
+
 #define PN5180DEBUG_OFF          __DEBUG_BEGIN__ ++_pn5180_debugSilent; __DEBUG_END__
 #define PN5180DEBUG_ON           __DEBUG_BEGIN__ _pn5180_debugSilent-=((_pn5180_debugSilent>0)?1:0); __DEBUG_END__
 #define PN5180DEBUG_ENTER        __DEBUG_BEGIN__ ++_pn5180_debugIndent; __DEBUG_END__
@@ -92,7 +93,24 @@ extern uint8_t _pn5180_debugSilent;
 #define PN5180DEBUG_PRINTF(...)  __DEBUG_BEGIN__ if (!_pn5180_debugSilent) { if (_pn5180_debugNL) PN5180DEBUG_INDENT; Serial.printf(__VA_ARGS__); }; __DEBUG_END__
 #define PN5180DEBUG_PRINT(...)   __DEBUG_BEGIN__ if (!_pn5180_debugSilent) { if (_pn5180_debugNL) PN5180DEBUG_INDENT; Serial.print(__VA_ARGS__); }; __DEBUG_END__
 #define PN5180DEBUG(msg)         PN5180DEBUG_PRINT(msg)
-#else
+#endif /* DEBUG */
+
+#ifdef DEBUG_ERROR
+// These macros are helper macros to make c compiler treat the debug macros like function calls so they do not alter any current code block structures when the macro contains if/else/break, etc.
+#define __ERROR_BEGIN__   do{if(DEBUG_ERROR){
+#define __ERROR_END__     }}while(0)
+
+#define PN5180ERROR(...)		__ERROR_BEGIN__ if (!_pn5180_debugSilent) { if (!_pn5180_debugNL) Serial.print(F("\n"));; Serial.print(F("*** ERROR: ")); Serial.printf(__VA_ARGS__); Serial.print(F("\n"));}; __ERROR_END__
+#endif /* DEBUG_ERROR */
+
+extern char * formatHex(const uint8_t val);
+extern char * formatHex(const uint16_t val);
+extern char * formatHex(const uint32_t val);
+
+#else /* defined(DEBUG) || defined(DEBUG_ERROR) */
+#endif /* defined(DEBUG) || defined(DEBUG_ERROR) */
+
+#ifndef DEBUG
 #define PN5180DEBUG_OFF
 #define PN5180DEBUG_ON
 #define PN5180DEBUG_ENTER
@@ -104,10 +122,8 @@ extern uint8_t _pn5180_debugSilent;
 #define PN5180DEBUG(msg)
 #endif
 
-#ifdef DEBUG
-extern char * formatHex(const uint8_t val);
-extern char * formatHex(const uint16_t val);
-extern char * formatHex(const uint32_t val);
+#ifndef DEBUG_ERROR
+#define PN5180ERROR(...)
 #endif
 
 #endif /* DEBUG_H */