Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 14:38:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Baro: fix for change to timer API

Browse Source
This commit is contained in:
Andrew Tridgell 2017-01-14 12:53:48 +11:00
parent 4e06be38ac
commit 8aa100d164
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/AP_Baro/AP_Baro_BMP280.cpp
View File

@ -115,7 +115,7 @@ bool AP_Baro_BMP280::_init()
_dev->get_semaphore()->give(); _dev->get_semaphore()->give();
// request 50Hz update // request 50Hz update
_dev->register_periodic_callback(20 * USEC_PER_MSEC, FUNCTOR_BIND_MEMBER(&AP_Baro_BMP280::_timer, bool)); _dev->register_periodic_callback(20 * USEC_PER_MSEC, FUNCTOR_BIND_MEMBER(&AP_Baro_BMP280::_timer, void));
return true; return true;
} }
@ -123,7 +123,7 @@ bool AP_Baro_BMP280::_init()
// acumulate a new sensor reading // acumulate a new sensor reading
bool AP_Baro_BMP280::_timer(void) void AP_Baro_BMP280::_timer(void)
{ {
uint8_t buf[6]; uint8_t buf[6];
@ -131,8 +131,6 @@ bool AP_Baro_BMP280::_timer(void)
_update_temperature((buf[3] << 12) | (buf[4] << 4) | (buf[5] >> 4)); _update_temperature((buf[3] << 12) | (buf[4] << 4) | (buf[5] >> 4));
_update_pressure((buf[0] << 12) | (buf[1] << 4) | (buf[2] >> 4)); _update_pressure((buf[0] << 12) | (buf[1] << 4) | (buf[2] >> 4));
return true;
} }
// transfer data to the frontend // transfer data to the frontend

2
libraries/AP_Baro/AP_Baro_BMP280.h
View File

@ -20,7 +20,7 @@ private:
virtual ~AP_Baro_BMP280(void) {}; virtual ~AP_Baro_BMP280(void) {};
bool _init(void); bool _init(void);
bool _timer(void); void _timer(void);
void _update_temperature(int32_t); void _update_temperature(int32_t);
void _update_pressure(int32_t); void _update_pressure(int32_t);