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

lsm303d: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 7e24ec12d9
commit 1e4113ee37
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/lsm303d/lsm303d.cpp
+4 -4
View File
@@ -230,7 +230,7 @@ class LSM303D_mag;
class LSM303D : public device::SPI class LSM303D : public device::SPI
{ {
public: public:
LSM303D(int bus, const char *path, spi_dev_e device, enum Rotation rotation); LSM303D(int bus, const char *path, uint32_t device, enum Rotation rotation);
virtual ~LSM303D(); virtual ~LSM303D();
virtual int init(); virtual int init();
@@ -544,7 +544,7 @@ private:
}; };
LSM303D::LSM303D(int bus, const char *path, spi_dev_e device, enum Rotation rotation) : LSM303D::LSM303D(int bus, const char *path, uint32_t device, enum Rotation rotation) :
SPI("LSM303D", path, bus, device, SPIDEV_MODE3, SPI("LSM303D", path, bus, device, SPIDEV_MODE3,
11 * 1000 * 1000 /* will be rounded to 10.4 MHz, within safety margins for LSM303D */), 11 * 1000 * 1000 /* will be rounded to 10.4 MHz, within safety margins for LSM303D */),
_mag(new LSM303D_mag(this)), _mag(new LSM303D_mag(this)),
@@ -1913,13 +1913,13 @@ start(bool external_bus, enum Rotation rotation, unsigned range)
/* create the driver */ /* create the driver */
if (external_bus) { if (external_bus) {
#if defined(PX4_SPI_BUS_EXT) && defined(PX4_SPIDEV_EXT_ACCEL_MAG) #if defined(PX4_SPI_BUS_EXT) && defined(PX4_SPIDEV_EXT_ACCEL_MAG)
g_dev = new LSM303D(PX4_SPI_BUS_EXT, LSM303D_DEVICE_PATH_ACCEL, (spi_dev_e)PX4_SPIDEV_EXT_ACCEL_MAG, rotation); g_dev = new LSM303D(PX4_SPI_BUS_EXT, LSM303D_DEVICE_PATH_ACCEL, PX4_SPIDEV_EXT_ACCEL_MAG, rotation);
#else #else
errx(0, "External SPI not available"); errx(0, "External SPI not available");
#endif #endif
} else { } else {
g_dev = new LSM303D(PX4_SPI_BUS_SENSORS, LSM303D_DEVICE_PATH_ACCEL, (spi_dev_e)PX4_SPIDEV_ACCEL_MAG, rotation); g_dev = new LSM303D(PX4_SPI_BUS_SENSORS, LSM303D_DEVICE_PATH_ACCEL, PX4_SPIDEV_ACCEL_MAG, rotation);
} }
if (g_dev == nullptr) { if (g_dev == nullptr) {