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

AP_Baro: rename sensor_config_error to config_error

Browse Source
This commit is contained in:
Mark Whitehorn 2019-11-06 12:44:04 -07:00 committed by Peter Barker
parent 285901f57c
commit a1868b8b67
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/AP_Baro/AP_Baro.cpp
View File

@ -216,7 +216,7 @@ void AP_Baro::calibrate(bool save)
do { do {
update(); update();
if (AP_HAL::millis() - tstart > 500) { if (AP_HAL::millis() - tstart > 500) {
AP_BoardConfig::sensor_config_error("Baro: unable to calibrate"); AP_BoardConfig::config_error("Baro: unable to calibrate");
} }
hal.scheduler->delay(10); hal.scheduler->delay(10);
} while (!healthy()); } while (!healthy());
@ -233,7 +233,7 @@ void AP_Baro::calibrate(bool save)
do { do {
update(); update();
if (AP_HAL::millis() - tstart > 500) { if (AP_HAL::millis() - tstart > 500) {
AP_BoardConfig::sensor_config_error("Baro: unable to calibrate"); AP_BoardConfig::config_error("Baro: unable to calibrate");
} }
} while (!healthy()); } while (!healthy());
for (uint8_t i=0; i<_num_sensors; i++) { for (uint8_t i=0; i<_num_sensors; i++) {
@ -267,7 +267,7 @@ void AP_Baro::calibrate(bool save)
if (num_calibrated) { if (num_calibrated) {
return; return;
} }
AP_BoardConfig::sensor_config_error("AP_Baro: all sensors uncalibrated"); AP_BoardConfig::config_error("AP_Baro: all sensors uncalibrated");
} }
/* /*
@ -603,7 +603,7 @@ void AP_Baro::init(void)
#if !defined(HAL_BARO_ALLOW_INIT_NO_BARO) // most boards requires external baro #if !defined(HAL_BARO_ALLOW_INIT_NO_BARO) // most boards requires external baro
if (_num_drivers == 0 || _num_sensors == 0 || drivers[0] == nullptr) { if (_num_drivers == 0 || _num_sensors == 0 || drivers[0] == nullptr) {
AP_BoardConfig::sensor_config_error("Baro: unable to initialise driver"); AP_BoardConfig::config_error("Baro: unable to initialise driver");
} }
#endif #endif
} }