refactor bmp388: use driver base class

This commit is contained in:
Beat Küng
2020-03-17 23:31:17 -04:00
committed by Daniel Agar
parent aeadf54a74
commit 985bb2adc9
8 changed files with 88 additions and 225 deletions
+6 -9
View File
@@ -46,8 +46,6 @@
#define DIR_READ (1<<7) //for set
#define DIR_WRITE ~(1<<7) //for clear
#if defined(PX4_SPIDEV_BARO) || defined(PX4_SPIDEV_EXT_BARO)
#pragma pack(push,1)
struct spi_data_s {
uint8_t addr;
@@ -63,7 +61,7 @@ struct spi_calibration_s {
class BMP388_SPI: public device::SPI, public IBMP388
{
public:
BMP388_SPI(uint8_t bus, uint32_t device);
BMP388_SPI(uint8_t bus, uint32_t device, int bus_frequency, spi_mode_e spi_mode);
virtual ~BMP388_SPI() = default;
int init();
@@ -75,17 +73,18 @@ public:
uint32_t get_device_id() const override { return device::SPI::get_device_id(); }
uint8_t get_device_address() const override { return device::SPI::get_device_address(); }
private:
spi_calibration_s _cal;
};
IBMP388 *bmp388_spi_interface(uint8_t busnum, uint32_t device)
IBMP388 *bmp388_spi_interface(uint8_t busnum, uint32_t device, int bus_frequency, spi_mode_e spi_mode)
{
return new BMP388_SPI(busnum, device);
return new BMP388_SPI(busnum, device, bus_frequency, spi_mode);
}
BMP388_SPI::BMP388_SPI(uint8_t bus, uint32_t device) :
SPI("BMP388_SPI", nullptr, bus, device, SPIDEV_MODE3, 10 * 1000 * 1000)
BMP388_SPI::BMP388_SPI(uint8_t bus, uint32_t device, int bus_frequency, spi_mode_e spi_mode) :
SPI("BMP388_SPI", nullptr, bus, device, spi_mode, bus_frequency)
{
}
@@ -125,5 +124,3 @@ calibration_s *BMP388_SPI::get_calibration(uint8_t addr)
return nullptr;
}
}
#endif /* PX4_SPIDEV_BARO || PX4_SPIDEV_EXT_BARO */