fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-22 23:13:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

bmi055: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 bd185ceb22
commit 045771ffcb
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/bmi055/bmi055.hpp
+3 -3
View File
@@ -309,7 +309,7 @@ protected:
public: public:
BMI055(const char *name, const char *devname, int bus, enum spi_dev_e device, enum spi_mode_e mode, uint32_t frequency, BMI055(const char *name, const char *devname, int bus, uint32_t device, enum spi_mode_e mode, uint32_t frequency,
enum Rotation rotation); enum Rotation rotation);
virtual ~BMI055(); virtual ~BMI055();
@@ -321,7 +321,7 @@ public:
class BMI055_accel : public BMI055 class BMI055_accel : public BMI055
{ {
public: public:
BMI055_accel(int bus, const char *path_accel, spi_dev_e device, enum Rotation rotation); BMI055_accel(int bus, const char *path_accel, uint32_t device, enum Rotation rotation);
virtual ~BMI055_accel(); virtual ~BMI055_accel();
virtual int init(); virtual int init();
@@ -484,7 +484,7 @@ private:
class BMI055_gyro : public BMI055 class BMI055_gyro : public BMI055
{ {
public: public:
BMI055_gyro(int bus, const char *path_gyro, spi_dev_e device, enum Rotation rotation); BMI055_gyro(int bus, const char *path_gyro, uint32_t device, enum Rotation rotation);
virtual ~BMI055_gyro(); virtual ~BMI055_gyro();
virtual int init(); virtual int init();
src/drivers/bmi055/bmi055_accel.cpp
+1 -1
View File
@@ -14,7 +14,7 @@ const uint8_t BMI055_accel::_checked_registers[BMI055_ACCEL_NUM_CHECKED_REGISTER
BMI055_accel::BMI055_accel(int bus, const char *path_accel, spi_dev_e device, enum Rotation rotation) : BMI055_accel::BMI055_accel(int bus, const char *path_accel, uint32_t device, enum Rotation rotation) :
BMI055("BMI055_ACCEL", path_accel, bus, device, SPIDEV_MODE3, BMI055_BUS_SPEED, rotation), BMI055("BMI055_ACCEL", path_accel, bus, device, SPIDEV_MODE3, BMI055_BUS_SPEED, rotation),
_accel_reports(nullptr), _accel_reports(nullptr),
_accel_scale{}, _accel_scale{},
src/drivers/bmi055/bmi055_gyro.cpp
+1 -1
View File
@@ -17,7 +17,7 @@ const uint8_t BMI055_gyro::_checked_registers[BMI055_GYRO_NUM_CHECKED_REGISTERS]
}; };
BMI055_gyro::BMI055_gyro(int bus, const char *path_gyro, spi_dev_e device, enum Rotation rotation) : BMI055_gyro::BMI055_gyro(int bus, const char *path_gyro, uint32_t device, enum Rotation rotation) :
BMI055("BMI055_GYRO", path_gyro, bus, device, SPIDEV_MODE3, BMI055_BUS_SPEED, rotation), BMI055("BMI055_GYRO", path_gyro, bus, device, SPIDEV_MODE3, BMI055_BUS_SPEED, rotation),
_gyro_reports(nullptr), _gyro_reports(nullptr),
_gyro_scale{}, _gyro_scale{},
src/drivers/bmi055/bmi055_main.cpp
+5 -5
View File
@@ -62,13 +62,13 @@ start(bool external_bus, enum Rotation rotation, enum sensor_type sensor)
/* create the driver */ /* create the driver */
if (external_bus) { if (external_bus) {
#if defined(PX4_SPI_BUS_EXT) && defined(PX4_SPIDEV_EXT_BMI) #if defined(PX4_SPI_BUS_EXT) && defined(PX4_SPIDEV_EXT_BMI)
*g_dev_acc_ptr = new BMI055_accel(PX4_SPI_BUS_EXT, path_accel, (spi_dev_e)PX4_SPIDEV_EXT_BMI, rotation); *g_dev_acc_ptr = new BMI055_accel(PX4_SPI_BUS_EXT, path_accel, PX4_SPIDEV_EXT_BMI, rotation);
#else #else
errx(0, "External SPI not available"); errx(0, "External SPI not available");
#endif #endif
} else { } else {
*g_dev_acc_ptr = new BMI055_accel(PX4_SPI_BUS_SENSORS, path_accel, (spi_dev_e)PX4_SPIDEV_BMI055_ACC, rotation); *g_dev_acc_ptr = new BMI055_accel(PX4_SPI_BUS_SENSORS, path_accel, PX4_SPIDEV_BMI055_ACC, rotation);
} }
if (*g_dev_acc_ptr == nullptr) { if (*g_dev_acc_ptr == nullptr) {
@@ -102,13 +102,13 @@ start(bool external_bus, enum Rotation rotation, enum sensor_type sensor)
/* create the driver */ /* create the driver */
if (external_bus) { if (external_bus) {
#if defined(PX4_SPI_BUS_EXT) && defined(PX4_SPIDEV_EXT_BMI) #if defined(PX4_SPI_BUS_EXT) && defined(PX4_SPIDEV_EXT_BMI)
*g_dev_ptr = new BMI055_gyro(PX4_SPI_BUS_EXT, path_gyro, (spi_dev_e)PX4_SPIDEV_EXT_BMI, rotation); *g_dev_ptr = new BMI055_gyro(PX4_SPI_BUS_EXT, path_gyro, PX4_SPIDEV_EXT_BMI, rotation);
#else #else
errx(0, "External SPI not available"); errx(0, "External SPI not available");
#endif #endif
} else { } else {
*g_dev_gyr_ptr = new BMI055_gyro(PX4_SPI_BUS_SENSORS, path_gyro, (spi_dev_e)PX4_SPIDEV_BMI055_GYR, rotation); *g_dev_gyr_ptr = new BMI055_gyro(PX4_SPI_BUS_SENSORS, path_gyro, PX4_SPIDEV_BMI055_GYR, rotation);
} }
if (*g_dev_gyr_ptr == nullptr) { if (*g_dev_gyr_ptr == nullptr) {
@@ -452,7 +452,7 @@ usage()
}//namespace ends }//namespace ends
BMI055::BMI055(const char *name, const char *devname, int bus, enum spi_dev_e device, enum spi_mode_e mode, BMI055::BMI055(const char *name, const char *devname, int bus, uint32_t device, enum spi_mode_e mode,
uint32_t frequency, enum Rotation rotation): uint32_t frequency, enum Rotation rotation):
SPI(name, devname, bus, device, mode, frequency), SPI(name, devname, bus, device, mode, frequency),
_whoami(0), _whoami(0),