fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-21 07:03:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

mpu9250: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 487315af19
commit fcbb99200f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/mpu9250/mpu9250_spi.cpp
+6 -6
View File
@@ -92,7 +92,7 @@ device::Device *MPU9250_SPI_interface(int bus, bool external_bus);
class MPU9250_SPI : public device::SPI class MPU9250_SPI : public device::SPI
{ {
public: public:
MPU9250_SPI(int bus, spi_dev_e device); MPU9250_SPI(int bus, uint32_t device);
virtual ~MPU9250_SPI(); virtual ~MPU9250_SPI();
virtual int init(); virtual int init();
@@ -113,21 +113,21 @@ private:
device::Device * device::Device *
MPU9250_SPI_interface(int bus, bool external_bus) MPU9250_SPI_interface(int bus, bool external_bus)
{ {
spi_dev_e cs = SPIDEV_NONE; uint32_t cs = SPIDEV_NONE(0);
device::Device *interface = nullptr; device::Device *interface = nullptr;
if (external_bus) { if (external_bus) {
#if defined(PX4_SPI_BUS_EXT) && defined(PX4_SPIDEV_EXT_MPU) #if defined(PX4_SPI_BUS_EXT) && defined(PX4_SPIDEV_EXT_MPU)
cs = (spi_dev_e) PX4_SPIDEV_EXT_MPU; cs = PX4_SPIDEV_EXT_MPU;
#else #else
errx(0, "External SPI not available"); errx(0, "External SPI not available");
#endif #endif
} else { } else {
cs = (spi_dev_e) PX4_SPIDEV_MPU; cs = PX4_SPIDEV_MPU;
} }
if (cs != SPIDEV_NONE) { if (cs != SPIDEV_NONE(0)) {
interface = new MPU9250_SPI(bus, cs); interface = new MPU9250_SPI(bus, cs);
} }
@@ -135,7 +135,7 @@ MPU9250_SPI_interface(int bus, bool external_bus)
return interface; return interface;
} }
MPU9250_SPI::MPU9250_SPI(int bus, spi_dev_e device) : MPU9250_SPI::MPU9250_SPI(int bus, uint32_t device) :
SPI("MPU9250", nullptr, bus, device, SPIDEV_MODE3, MPU9250_LOW_SPI_BUS_SPEED) SPI("MPU9250", nullptr, bus, device, SPIDEV_MODE3, MPU9250_LOW_SPI_BUS_SPEED)
{ {
_device_id.devid_s.devtype = DRV_ACC_DEVTYPE_MPU9250; _device_id.devid_s.devtype = DRV_ACC_DEVTYPE_MPU9250;