Merge branch 'rhaberkorn-serial-mouse'

[tmk_firmware.git] / common / debug.h

diff --git a/common/debug.h b/common/debug.h
index 648f0e096c71e1a4c987361be59c47d49ec1c7c9..8aaa5ed915e2b62a9ada6ff3b9e6b628cc21122c 100644 (file)
--- a/common/debug.h
+++ b/common/debug.h
@@ -18,12 +18,20 @@ 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"
+#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) println(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 { \
@@ -31,11 +39,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
         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)
@@ -45,23 +51,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #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
-}
+#else
+#include "nodebug.h"
 #endif
 
 #endif