Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Baro: Fix GCS DPS310 HWID issue

Browse Source 
DPS280/DPS310 use the same driver(AP_Baro_DPS280.cpp/h), but it is necessary to distinguish between the two.
This commit is contained in:
daniel.li 2023-09-24 16:27:51 +08:00 committed by Peter Barker
parent 93da99bea2
commit ec601684e6
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libraries/AP_Baro/AP_Baro_DPS280.cpp
View File

@ -60,7 +60,7 @@ AP_Baro_Backend *AP_Baro_DPS280::probe(AP_Baro &baro,
if (sensor) { if (sensor) {
sensor->is_dps310 = _is_dps310; sensor->is_dps310 = _is_dps310;
} }
if (!sensor || !sensor->init()) { if (!sensor || !sensor->init(_is_dps310)) {
delete sensor; delete sensor;
return nullptr; return nullptr;
} }
@ -153,7 +153,7 @@ void AP_Baro_DPS280::set_config_registers(void)
} }
} }
bool AP_Baro_DPS280::init() bool AP_Baro_DPS280::init(bool _is_dps310)
{ {
if (!dev) { if (!dev) {
return false; return false;
@ -190,8 +190,11 @@ bool AP_Baro_DPS280::init()
set_config_registers(); set_config_registers();
instance = _frontend.register_sensor(); instance = _frontend.register_sensor();
if(_is_dps310) {
dev->set_device_type(DEVTYPE_BARO_DPS310);
} else {
dev->set_device_type(DEVTYPE_BARO_DPS280); dev->set_device_type(DEVTYPE_BARO_DPS280);
}
set_bus_id(instance, dev->get_bus_id()); set_bus_id(instance, dev->get_bus_id());
dev->get_semaphore()->give(); dev->get_semaphore()->give();

2
libraries/AP_Baro/AP_Baro_DPS280.h
View File

@ -29,7 +29,7 @@ public:
static AP_Baro_Backend *probe(AP_Baro &baro, AP_HAL::OwnPtr<AP_HAL::Device> dev, bool _is_dps310=false); static AP_Baro_Backend *probe(AP_Baro &baro, AP_HAL::OwnPtr<AP_HAL::Device> dev, bool _is_dps310=false);
protected: protected:
bool init(void); bool init(bool _is_dps310);
bool read_calibration(void); bool read_calibration(void);
void timer(void); void timer(void);
void calculate_PT(int32_t UT, int32_t UP, float &pressure, float &temperature); void calculate_PT(int32_t UT, int32_t UP, float &pressure, float &temperature);