X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=common%2Fdebug.h;h=648f0e096c71e1a4c987361be59c47d49ec1c7c9;hb=16a583d7fd057c3ebcb859db44f097fd8073ec49;hp=230d3b3499b7c1ae3ccb8002d7a1f9f0901235c2;hpb=f4125707399d11a7d80587659c464b9bcddb8c56;p=tmk_firmware.git

diff --git a/common/debug.h b/common/debug.h
index 230d3b3..648f0e0 100644
--- a/common/debug.h
+++ b/common/debug.h
@@ -18,19 +18,50 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef DEBUG_H
 #define DEBUG_H 1
 
+#include <stdbool.h>
 #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)
+#define debug(s)                  do { if (debug_enable) print(s); } while (0)
+#define debugln(s)                do { if (debug_enable) println(s); } 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)
 
+    
 
-bool debug_enable;
-bool debug_matrix;
-bool debug_keyboard;
-bool debug_mouse;
+#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_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)
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern bool debug_enable;
+extern bool debug_matrix;
+extern bool debug_keyboard;
+extern bool debug_mouse;
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif