Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-26 01:17:51 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

bmp280 move to cdev library

Browse Source
This commit is contained in:
Daniel Agar
2018-08-27 13:18:47 -04:00
committed by Beat Küng
parent df96cd2873
commit 1e7197976d
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/barometer/bmp280/bmp280.cpp
+6 -9
View File
@@ -61,7 +61,7 @@
#include <board_config.h>
#include "bmp280.h"
#include <drivers/device/device.h>
#include <lib/cdev/CDev.hpp>
#include <drivers/drv_baro.h>
#include <drivers/drv_hrt.h>
#include <drivers/device/ringbuffer.h>
@@ -86,7 +86,7 @@ enum BMP280_BUS {
* BMP280 internal constants and data structures.
*/
class BMP280 : public device::CDev
class BMP280 : public cdev::CDev
{
public:
BMP280(bmp280::IBMP280 *interface, const char *path);
@@ -148,7 +148,7 @@ private:
extern "C" __EXPORT int bmp280_main(int argc, char *argv[]);
BMP280::BMP280(bmp280::IBMP280 *interface, const char *path) :
CDev("BMP280", path),
CDev(path),
_interface(interface),
_running(false),
_report_ticks(0),
@@ -197,7 +197,7 @@ BMP280::init()
int ret = CDev::init();
if (ret != OK) {
DEVICE_DEBUG("CDev init failed");
PX4_ERR("CDev init failed");
return ret;
}
@@ -205,7 +205,7 @@ BMP280::init()
_reports = new ringbuffer::RingBuffer(2, sizeof(baro_report));
if (_reports == nullptr) {
DEVICE_DEBUG("can't get memory for reports");
PX4_ERR("can't get memory for reports");
ret = -ENOMEM;
return ret;
}
@@ -533,10 +533,7 @@ BMP280::collect()
report.pressure = _P / 100.0f; // to mbar
/* publish it */
if (!(_pub_blocked)) {
/* publish it */
orb_publish(ORB_ID(sensor_baro), _baro_topic, &report);
}
orb_publish(ORB_ID(sensor_baro), _baro_topic, &report);
_reports->force(&report);