diff --git a/src/drivers/barometer/bmp388/bmp388.h b/src/drivers/barometer/bmp388/bmp388.h index caf959f94a..f092e2260c 100644 --- a/src/drivers/barometer/bmp388/bmp388.h +++ b/src/drivers/barometer/bmp388/bmp388.h @@ -297,9 +297,6 @@ public: // write reg value virtual int set_reg(uint8_t value, uint8_t addr) = 0; - // bulk read of data into buffer, return same pointer - virtual data_s *get_data(uint8_t addr) = 0; - // bulk read of calibration data into buffer, return same pointer virtual calibration_s *get_calibration(uint8_t addr) = 0; diff --git a/src/drivers/barometer/bmp388/bmp388_i2c.cpp b/src/drivers/barometer/bmp388/bmp388_i2c.cpp index 7fdc7a3656..9d46d717bc 100644 --- a/src/drivers/barometer/bmp388/bmp388_i2c.cpp +++ b/src/drivers/barometer/bmp388/bmp388_i2c.cpp @@ -54,14 +54,12 @@ public: uint8_t get_reg(uint8_t addr); int get_reg_buf(uint8_t addr, uint8_t *buf, uint8_t len); int set_reg(uint8_t value, uint8_t addr); - data_s *get_data(uint8_t addr); calibration_s *get_calibration(uint8_t addr); uint32_t get_device_id() const override { return device::I2C::get_device_id(); } private: struct calibration_s _cal; - struct data_s _data; }; IBMP388 *bmp388_i2c_interface(uint8_t busnum, uint32_t device) @@ -99,18 +97,6 @@ int BMP388_I2C::set_reg(uint8_t value, uint8_t addr) return transfer(cmd, sizeof(cmd), nullptr, 0); } -data_s *BMP388_I2C::get_data(uint8_t addr) -{ - const uint8_t cmd = (uint8_t)(addr); - - if (transfer(&cmd, sizeof(cmd), (uint8_t *)&_data, sizeof(struct data_s)) == OK) { - return (&_data); - - } else { - return nullptr; - } -} - calibration_s *BMP388_I2C::get_calibration(uint8_t addr) { const uint8_t cmd = (uint8_t)(addr); diff --git a/src/drivers/barometer/bmp388/bmp388_spi.cpp b/src/drivers/barometer/bmp388/bmp388_spi.cpp index 82154e847c..0209112aac 100644 --- a/src/drivers/barometer/bmp388/bmp388_spi.cpp +++ b/src/drivers/barometer/bmp388/bmp388_spi.cpp @@ -71,14 +71,12 @@ public: uint8_t get_reg(uint8_t addr); int get_reg_buf(uint8_t addr, uint8_t *buf, uint8_t len); int set_reg(uint8_t value, uint8_t addr); - data_s *get_data(uint8_t addr); calibration_s *get_calibration(uint8_t addr); uint32_t get_device_id() const override { return device::SPI::get_device_id(); } private: spi_calibration_s _cal; - spi_data_s _data; }; IBMP388 *bmp388_spi_interface(uint8_t busnum, uint32_t device) @@ -116,18 +114,6 @@ int BMP388_SPI::set_reg(uint8_t value, uint8_t addr) return transfer(&cmd[0], nullptr, 2); } -data_s *BMP388_SPI::get_data(uint8_t addr) -{ - _data.addr = (uint8_t)(addr | DIR_READ); //set MSB bit - - if (transfer((uint8_t *)&_data, (uint8_t *)&_data, sizeof(struct spi_data_s)) == OK) { - return &(_data.data); - - } else { - return nullptr; - } -} - calibration_s *BMP388_SPI::get_calibration(uint8_t addr) { _cal.addr = addr | DIR_READ;