From 375c7b0f5f3da92a4f4a4e3ed15b570c9ff96e47 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 5 May 2017 13:13:14 +1000 Subject: [PATCH] AP_Baro: rename macros to avoid conflicts these macros were also defined in NuttX in clock.h --- libraries/AP_Baro/AP_Baro_BMP280.cpp | 2 +- libraries/AP_Baro/AP_Baro_MS5611.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/AP_Baro/AP_Baro_BMP280.cpp b/libraries/AP_Baro/AP_Baro_BMP280.cpp index e4fd0f4b01..c02379e3ab 100644 --- a/libraries/AP_Baro/AP_Baro_BMP280.cpp +++ b/libraries/AP_Baro/AP_Baro_BMP280.cpp @@ -115,7 +115,7 @@ bool AP_Baro_BMP280::_init() _dev->get_semaphore()->give(); // request 50Hz update - _dev->register_periodic_callback(20 * USEC_PER_MSEC, FUNCTOR_BIND_MEMBER(&AP_Baro_BMP280::_timer, void)); + _dev->register_periodic_callback(20 * AP_USEC_PER_MSEC, FUNCTOR_BIND_MEMBER(&AP_Baro_BMP280::_timer, void)); return true; } diff --git a/libraries/AP_Baro/AP_Baro_MS5611.cpp b/libraries/AP_Baro/AP_Baro_MS5611.cpp index 66ab261776..7c0de82547 100644 --- a/libraries/AP_Baro/AP_Baro_MS5611.cpp +++ b/libraries/AP_Baro/AP_Baro_MS5611.cpp @@ -144,7 +144,7 @@ bool AP_Baro_MS56XX::_init() _dev->get_semaphore()->give(); /* Request 100Hz update */ - _dev->register_periodic_callback(10 * USEC_PER_MSEC, + _dev->register_periodic_callback(10 * AP_USEC_PER_MSEC, FUNCTOR_BIND_MEMBER(&AP_Baro_MS56XX::_timer, void)); return true; }