From 45f27ceb9cf7c11635cf8bd7b1a0ec6952da7d11 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 5 May 2017 20:09:29 +1000 Subject: [PATCH] AP_Compass: rename macros to avoid conflicts these macros were also defined in NuttX in clock.h --- libraries/AP_Compass/AP_Compass_IST8310.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/AP_Compass/AP_Compass_IST8310.cpp b/libraries/AP_Compass/AP_Compass_IST8310.cpp index 779c953109..1ece7cfc1c 100644 --- a/libraries/AP_Compass/AP_Compass_IST8310.cpp +++ b/libraries/AP_Compass/AP_Compass_IST8310.cpp @@ -56,7 +56,7 @@ #define PDCNTL_REG 0x42 #define PDCNTL_VAL_PULSE_DURATION_NORMAL 0xC0 -#define SAMPLING_PERIOD_USEC (10 * USEC_PER_MSEC) +#define SAMPLING_PERIOD_USEC (10 * AP_USEC_PER_MSEC) /* * FSR: