aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_Baro: use sensor_config_error on baro cal failure

Browse Source 
this allows the user to fix parameters
This commit is contained in:
Andrew Tridgell 2019-07-31 12:38:56 +10:00
parent 5645709e50
commit c9567783e6
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/AP_Baro/AP_Baro.cpp
View File

@ -207,8 +207,7 @@ void AP_Baro::calibrate(bool save)
do {
update();
if (AP_HAL::millis() - tstart > 500) {
AP_HAL::panic("PANIC: AP_Baro::read unsuccessful "
"for more than 500ms in AP_Baro::calibrate [2]\r\n");
AP_BoardConfig::sensor_config_error("Baro: unable to calibrate");
}
hal.scheduler->delay(10);
} while (!healthy());
@ -225,8 +224,7 @@ void AP_Baro::calibrate(bool save)
do {
update();
if (AP_HAL::millis() - tstart > 500) {
AP_HAL::panic("PANIC: AP_Baro::read unsuccessful "
"for more than 500ms in AP_Baro::calibrate [3]\r\n");
AP_BoardConfig::sensor_config_error("Baro: unable to calibrate");
}
} while (!healthy());
for (uint8_t i=0; i<_num_sensors; i++) {
@ -260,7 +258,7 @@ void AP_Baro::calibrate(bool save)
if (num_calibrated) {
return;
}
AP_HAL::panic("AP_Baro: all sensors uncalibrated");
AP_BoardConfig::sensor_config_error("AP_Baro: all sensors uncalibrated");
}
/*