fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-04-28 06:44:08 +08:00
Code Issues 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/drivers/barometer/bmp280/bmp280.h
View File

@ -154,6 +154,6 @@ public:
/* interface factories */
extern bmp280::IBMP280 *bmp280_spi_interface(uint8_t busnum, uint8_t device, bool external);
extern bmp280::IBMP280 *bmp280_i2c_interface(uint8_t busnum, uint8_t device, bool external);
typedef bmp280::IBMP280 *(*BMP280_constructor)(uint8_t, uint8_t, bool);
extern bmp280::IBMP280 *bmp280_spi_interface(uint8_t busnum, uint32_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, uint32_t, bool);

6
src/drivers/barometer/bmp280/bmp280_i2c.cpp
View File

@ -49,7 +49,7 @@
class BMP280_I2C: public device::I2C, public bmp280::IBMP280
{
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;
bool is_external();
@ -66,12 +66,12 @@ private:
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);
}
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)
{
_external = external;

2
src/drivers/barometer/bmp280/bmp280_spi.cpp
View File

@ -82,7 +82,7 @@ private:
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);
}