Skip to content

Commit c990e43

Browse files
committed
AP_Baro: ICP101XX: probe takes Device, not I2CDevice
allows reuse of probe method in AP_Baro
1 parent 710e4bb commit c990e43

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

libraries/AP_Baro/AP_Baro_ICP101XX.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@ extern const AP_HAL::HAL &hal;
4949
/*
5050
constructor
5151
*/
52-
AP_Baro_ICP101XX::AP_Baro_ICP101XX(AP_Baro &baro, AP_HAL::I2CDevice &_dev)
52+
AP_Baro_ICP101XX::AP_Baro_ICP101XX(AP_Baro &baro, AP_HAL::Device &_dev)
5353
: AP_Baro_Backend(baro)
5454
, dev(&_dev)
5555
{
5656
}
5757

58-
AP_Baro_Backend *AP_Baro_ICP101XX::probe(AP_Baro &baro, AP_HAL::I2CDevice &dev)
58+
AP_Baro_Backend *AP_Baro_ICP101XX::probe(AP_Baro &baro, AP_HAL::Device &dev)
5959
{
6060
AP_Baro_ICP101XX *sensor = NEW_NOTHROW AP_Baro_ICP101XX(baro, dev);
6161
if (!sensor || !sensor->init()) {

libraries/AP_Baro/AP_Baro_ICP101XX.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ class AP_Baro_ICP101XX : public AP_Baro_Backend
1313
public:
1414
void update() override;
1515

16-
static AP_Baro_Backend *probe(AP_Baro &baro, AP_HAL::I2CDevice &dev);
16+
static AP_Baro_Backend *probe(AP_Baro &baro, AP_HAL::Device &dev);
1717

1818
private:
19-
AP_Baro_ICP101XX(AP_Baro &baro, AP_HAL::I2CDevice &dev);
19+
AP_Baro_ICP101XX(AP_Baro &baro, AP_HAL::Device &dev);
2020

2121
bool init();
2222
bool send_cmd16(uint16_t cmd);
@@ -38,7 +38,7 @@ class AP_Baro_ICP101XX : public AP_Baro_Backend
3838

3939
uint8_t instance;
4040

41-
AP_HAL::I2CDevice *dev;
41+
AP_HAL::Device *dev;
4242

4343
// time last read command was sent
4444
uint32_t last_measure_us;

0 commit comments

Comments
 (0)