Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-29 03:36:07 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

fix bmp280 driver init faild.

Browse Source
This commit is contained in:
misswhile
2019-04-25 14:40:51 +08:00
committed by Beat Küng
parent c95394f57f
commit 37fe090225
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/barometer/bmp280/bmp280.h
+3 -3
View File
@@ -154,6 +154,6 @@ public:
/* interface factories */ /* interface factories */
extern bmp280::IBMP280 *bmp280_spi_interface(uint8_t busnum, uint8_t device, bool external); extern bmp280::IBMP280 *bmp280_spi_interface(uint8_t busnum, uint32_t device, bool external);
extern bmp280::IBMP280 *bmp280_i2c_interface(uint8_t busnum, uint8_t device, bool external); extern bmp280::IBMP280 *bmp280_i2c_interface(uint8_t busnum, uint32_t device, bool external);
typedef bmp280::IBMP280 *(*BMP280_constructor)(uint8_t, uint8_t, bool); typedef bmp280::IBMP280 *(*BMP280_constructor)(uint8_t, uint32_t, bool);
src/drivers/barometer/bmp280/bmp280_i2c.cpp
+3 -3
View File
@@ -49,7 +49,7 @@
class BMP280_I2C: public device::I2C, public bmp280::IBMP280 class BMP280_I2C: public device::I2C, public bmp280::IBMP280
{ {
public: public:
BMP280_I2C(uint8_t bus, uint8_t device, bool external); BMP280_I2C(uint8_t bus, uint32_t device, bool external);
virtual ~BMP280_I2C() = default; virtual ~BMP280_I2C() = default;
bool is_external(); bool is_external();
@@ -66,12 +66,12 @@ private:
bool _external; bool _external;
}; };
bmp280::IBMP280 *bmp280_i2c_interface(uint8_t busnum, uint8_t device, bool external) bmp280::IBMP280 *bmp280_i2c_interface(uint8_t busnum, uint32_t device, bool external)
{ {
return new BMP280_I2C(busnum, device, external); return new BMP280_I2C(busnum, device, external);
} }
BMP280_I2C::BMP280_I2C(uint8_t bus, uint8_t device, bool external) : BMP280_I2C::BMP280_I2C(uint8_t bus, uint32_t device, bool external) :
I2C("BMP280_I2C", nullptr, bus, device, 100 * 1000) I2C("BMP280_I2C", nullptr, bus, device, 100 * 1000)
{ {
_external = external; _external = external;
src/drivers/barometer/bmp280/bmp280_spi.cpp
+1 -1
View File
@@ -82,7 +82,7 @@ private:
bool _external; bool _external;
}; };
bmp280::IBMP280 *bmp280_spi_interface(uint8_t busnum, uint8_t device, bool external) bmp280::IBMP280 *bmp280_spi_interface(uint8_t busnum, uint32_t device, bool external)
{ {
return new BMP280_SPI(busnum, device, external); return new BMP280_SPI(busnum, device, external);
} }