fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-02 07:41:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

bmp280:spi_dev_e is now uint32_t in NuttX

Browse Source 
Using new type of uint32_t for spi device
This commit is contained in:
David Sidrane
2017-09-29 10:13:51 -04:00
committed by Daniel Agar
parent a5ea55cc5c
commit 81bd05d49c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/bmp280/bmp280.cpp
+1 -1
View File
@@ -619,7 +619,7 @@ struct bmp280_bus_option {
const char *devpath; const char *devpath;
BMP280_constructor interface_constructor; BMP280_constructor interface_constructor;
uint8_t busnum; uint8_t busnum;
uint8_t device; uint32_t device;
bool external; bool external;
BMP280 *dev; BMP280 *dev;
} bus_options[] = { } bus_options[] = {
src/drivers/bmp280/bmp280_spi.cpp
+3 -3
View File
@@ -65,7 +65,7 @@ struct spi_calibration_s {
class BMP280_SPI: public device::SPI, public bmp280::IBMP280 class BMP280_SPI: public device::SPI, public bmp280::IBMP280
{ {
public: public:
BMP280_SPI(uint8_t bus, spi_dev_e device, bool external); BMP280_SPI(uint8_t bus, uint32_t device, bool external);
virtual ~BMP280_SPI() = default; virtual ~BMP280_SPI() = default;
bool is_external(); bool is_external();
@@ -84,10 +84,10 @@ private:
bmp280::IBMP280 *bmp280_spi_interface(uint8_t busnum, uint8_t device, bool external) bmp280::IBMP280 *bmp280_spi_interface(uint8_t busnum, uint8_t device, bool external)
{ {
return new BMP280_SPI(busnum, (spi_dev_e)device, external); return new BMP280_SPI(busnum, device, external);
} }
BMP280_SPI::BMP280_SPI(uint8_t bus, spi_dev_e device, bool external) : BMP280_SPI::BMP280_SPI(uint8_t bus, uint32_t device, bool external) :
SPI("BMP280_SPI", nullptr, bus, device, SPIDEV_MODE3, 10 * 1000 * 1000) SPI("BMP280_SPI", nullptr, bus, device, SPIDEV_MODE3, 10 * 1000 * 1000)
{ {
_external = external; _external = external;