placed assert macro where it belongs #49

TheGreenBox · May 17, 2014 · 89f5f03 · 89f5f03
1 parent 62279fa
commit 89f5f03
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/firmware/SatStepperBegin/state.h b/firmware/SatStepperBegin/state.h
@@ -10,15 +10,6 @@
 #ifndef _GLOBAL_STATE_H_
 #define _GLOBAL_STATE_H_
 
-#define __ASSERT_CONCAT(a, b) a##b
-#define STATIC_ASSERT(e) \
-    enum { __ASSERT_CONCAT(static_assert_, __LINE__) = 1/(!!(e)) }
-
-#define ASSERT(condition, event) \
-    if (condition) { \
-        event; \
-    }
-
 #include <stdint.h>
 #include "algo_types.h"
 #include "control_algo.h"

diff --git a/firmware/SatStepperBegin/utils/macros.h b/firmware/SatStepperBegin/utils/macros.h
@@ -7,8 +7,8 @@
  * ========================================================
  */
 
-#ifndef _MACROS_H_
-#define _MACROS_H_
+#ifndef _MACROS__H_
+#define _MACROS__H_
 
 #define CPU_CLOCK_SPEED 6.000L   // for 60 Mhz; 10.000L for a 100MHz CPU clock speed
 #define ADC_usDELAY     10000L
@@ -22,6 +22,15 @@ extern void DSP28x_usDelay(unsigned long Count);
 #define ACKNOWLEDGE_ONE_MORE_INTERRUPT_FROM_GROUP(GROUP_ID) \
     PieCtrlRegs.PIEACK.all = GROUP_ID
 
+#define __ASSERT_CONCAT(a, b) a##b
+#define STATIC_ASSERT(e) \
+    enum { __ASSERT_CONCAT(static_assert_, __LINE__) = 1/(!!(e)) }
+
+#define ASSERT(condition, event) \
+    if (condition) { \
+        event; \
+    }
+
 #define PI 3.14159265358979
 
-#endif //_MACROS_H_
+#endif //_MACROS__H_