Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Sub: Check for BARO_TYPE_WATER before assigning depth sensor

This commit is contained in:
Jacob Walser 2017-02-20 16:06:09 -05:00 committed by Andrew Tridgell
parent 84c3c0d234
commit ec0b073fbc
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ArduSub/system.cpp
View File

@ -234,17 +234,23 @@ void Sub::init_ardupilot()
init_barometer(false); init_barometer(false);
barometer.update(); barometer.update();
if (barometer.healthy(1)) { // We have an external MS58XX pressure sensor connected for (uint8_t i = 0; i < barometer.num_instances(); i++) {
barometer.set_primary_baro(1); // Set the primary baro to external MS58XX !!Changes and saves parameter value!! if (barometer.get_type(i) == AP_Baro::BARO_TYPE_WATER && barometer.healthy(i)) {
barometer.set_primary_baro(i);
ap.depth_sensor_present = true; ap.depth_sensor_present = true;
EKF2.set_baro_alt_noise(0.1f); // Depth readings are very accurate and up-to-date break;
EKF3.set_baro_alt_noise(0.1f); }
} else { //We only have onboard baro }
if (!ap.depth_sensor_present) {
// We only have onboard baro
// No external underwater depth sensor detected // No external underwater depth sensor detected
barometer.set_primary_baro(0); // Set the primary baro to default board baro !!Changes and saves parameter value!! barometer.set_primary_baro(0);
ap.depth_sensor_present = false;
EKF2.set_baro_alt_noise(10.0f); // Readings won't correspond with rest of INS EKF2.set_baro_alt_noise(10.0f); // Readings won't correspond with rest of INS
EKF3.set_baro_alt_noise(10.0f); EKF3.set_baro_alt_noise(10.0f);
} else {
EKF2.set_baro_alt_noise(0.1f);
EKF3.set_baro_alt_noise(0.1f);
} }
leak_detector.init(); leak_detector.init();