diff --git a/src/main/blackbox/blackbox.c b/src/main/blackbox/blackbox.c index 0ee1234768..a8db32f82d 100644 --- a/src/main/blackbox/blackbox.c +++ b/src/main/blackbox/blackbox.c @@ -26,6 +26,7 @@ #include "common/maths.h" #include "common/axis.h" #include "common/color.h" +#include "common/utils.h" #include "drivers/gpio.h" #include "drivers/sensor.h" @@ -86,11 +87,6 @@ typedef char assert_failed_ ## name [(condition) ? 1 : -1 ] // Some macros to make writing FLIGHT_LOG_FIELD_* constants shorter: -#define STR_HELPER(x) #x -#define STR(x) STR_HELPER(x) - -#define CONCAT_HELPER(x,y) x ## y -#define CONCAT(x,y) CONCAT_HELPER(x, y) #define PREDICT(x) CONCAT(FLIGHT_LOG_FIELD_PREDICTOR_, x) #define ENCODING(x) CONCAT(FLIGHT_LOG_FIELD_ENCODING_, x) diff --git a/src/main/common/utils.h b/src/main/common/utils.h index d9f22c01e9..90e12ac759 100644 --- a/src/main/common/utils.h +++ b/src/main/common/utils.h @@ -21,6 +21,12 @@ #define ARRAYLEN(x) (sizeof(x) / sizeof((x)[0])) +#define CONCAT_HELPER(x,y) x ## y +#define CONCAT(x,y) CONCAT_HELPER(x, y) + +#define STR_HELPER(x) #x +#define STR(x) STR_HELPER(x) + /* http://resnet.uoregon.edu/~gurney_j/jmpc/bitwise.html */