Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_Baro: rename macros to avoid conflicts 

these macros were also defined in NuttX in clock.h
This commit is contained in:
Andrew Tridgell 2017-05-05 13:13:14 +10:00
parent a46799d34e
commit 375c7b0f5f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_Baro/AP_Baro_BMP280.cpp
View File

@ -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;
}

2
libraries/AP_Baro/AP_Baro_MS5611.cpp
View File

@ -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;
}