Merge branch 'fix_asserts'

leaflabs · Oct 7, 2010 · 26bf02d · 26bf02d
2 parents 4ed8406 + 06ff573
commit 26bf02d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/libmaple/libmaple.h b/libmaple/libmaple.h
@@ -34,7 +34,13 @@
 #include "libmaple_types.h"
 
 // General configuration
-#define MAPLE_DEBUG 1
+#define DEBUG_NONE      0
+#define DEBUG_FAULT     1
+#define DEBUG_ALL       2
+
+#ifndef DEBUG_LEVEL
+#define DEBUG_LEVEL DEBUG_ALL
+#endif
 
 // MCU-specific configuration
 #ifdef MCU_STM32F103RB

diff --git a/libmaple/util.h b/libmaple/util.h
@@ -77,10 +77,6 @@ void throb(void);
 /* Asserts for sanity checks, redefine DEBUG_LEVEL in libmaple.h to
  * compile out these checks */
 
-#define DEBUG_NONE      0
-#define DEBUG_FAULT     1
-#define DEBUG_ALL       2
-
 #if DEBUG_LEVEL >= DEBUG_ALL
 #define ASSERT(exp)                              \
     if (exp) {                                   \