X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=common%2Fdebug.h;h=8aaa5ed915e2b62a9ada6ff3b9e6b628cc21122c;hb=0bfba7acc4e05e66c8ab448286fc51bc94d03a57;hp=230d3b3499b7c1ae3ccb8002d7a1f9f0901235c2;hpb=62d1ebb91c7b381ce3d88aad9ee0b03bea9fce26;p=tmk_firmware.git

diff --git a/common/debug.h b/common/debug.h
index 230d3b3..8aaa5ed 100644
--- a/common/debug.h
+++ b/common/debug.h
@@ -19,18 +19,44 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEBUG_H 1
 
 #include "print.h"
-
-
-#define debug(s)             if(debug_enable) print(s)
-#define debug_hex(c)         if(debug_enable) phex(c)
-#define debug_hex16(i)       if(debug_enable) phex16(i)
-#define debug_bin(c)         if(debug_enable) pbin(c)
-#define debug_bin_reverse(c) if(debug_enable) pbin_reverse(c)
-
-
-bool debug_enable;
-bool debug_matrix;
-bool debug_keyboard;
-bool debug_mouse;
+#include "debug_config.h"
+
+
+#ifndef NO_DEBUG
+
+#define dprint(s)           do { if (debug_enable) print(s); } while (0)
+#define dprintln()          do { if (debug_enable) print_crlf(); } while (0)
+#define dprintf(fmt, ...)   do { if (debug_enable) __xprintf(PSTR(fmt), ##__VA_ARGS__); } while (0)
+#define dmsg(s)             dprintf("%s at %s: %S\n", __FILE__, __LINE__, PSTR(s))
+
+/* DO NOT USE these anymore */
+#define debug(s)                  do { if (debug_enable) print(s); } while (0)
+#define debugln(s)                do { if (debug_enable) print_crlf(); } while (0)
+#define debug_S(s)                do { if (debug_enable) print_S(s); } while (0)
+#define debug_P(s)                do { if (debug_enable) print_P(s); } while (0)
+#define debug_msg(s)              do { \
+    if (debug_enable) { \
+        print(__FILE__); print(" at "); print_dec(__LINE__); print(" in "); print(": "); print(s); \
+    } \
+} while (0)
+#define debug_dec(data)           do { if (debug_enable) print_dec(data); } while (0)
+#define debug_decs(data)          do { if (debug_enable) print_decs(data); } while (0)
+#define debug_hex4(data)          do { if (debug_enable) print_hex4(data); } while (0)
+#define debug_hex8(data)          do { if (debug_enable) print_hex8(data); } while (0)
+#define debug_hex16(data)         do { if (debug_enable) print_hex16(data); } while (0)
+#define debug_hex32(data)         do { if (debug_enable) print_hex32(data); } while (0)
+#define debug_bin8(data)          do { if (debug_enable) print_bin8(data); } while (0)
+#define debug_bin16(data)         do { if (debug_enable) print_bin16(data); } while (0)
+#define debug_bin32(data)         do { if (debug_enable) print_bin32(data); } while (0)
+#define debug_bin_reverse8(data)  do { if (debug_enable) print_bin_reverse8(data); } while (0)
+#define debug_bin_reverse16(data) do { if (debug_enable) print_bin_reverse16(data); } while (0)
+#define debug_bin_reverse32(data) do { if (debug_enable) print_bin_reverse32(data); } while (0)
+#define debug_hex(data)           debug_hex8(data)
+#define debug_bin(data)           debug_bin8(data)
+#define debug_bin_reverse(data)   debug_bin8(data)
+
+#else
+#include "nodebug.h"
+#endif
 
 #endif