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

Sub: Fix merge error affecting pressure sensor.

Browse Source
This commit is contained in:
Rustom Jehangir 2016-01-20 20:23:10 -08:00
parent ca140e81bc
commit 10ed6ec791
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ArduSub/system.cpp
View File

@ -242,22 +242,17 @@ void Sub::init_ardupilot()
#endif
if(barometer.num_instances() > 1) {
//We have an external MS58XX pressure sensor connected
for(int i = 1; i < barometer.num_instances(); i++) {
//We have an external MS58XX pressure sensor connected
for(int i = 1; i < barometer.num_instances(); i++) {
barometer.set_type(i, BARO_TYPE_WATER); //Altitude (depth) is calculated differently underwater
barometer.set_precision_multiplier(i, 10); //The MS58XX values reported need to be multiplied by 10 to match units everywhere else
}
barometer.set_primary_baro(1); //Set the primary baro to external MS58XX
}
barometer.set_primary_baro(1); //Set the primary baro to external MS58XX
}
// read Baro pressure at ground
//-----------------------------
init_barometer(true);
if(barometer.num_instances() > 1) {
//We have an external MS58XX pressure sensor connected
barometer.set_type(1, BARO_TYPE_WATER); //Altitude (depth) is calculated differently underwater
barometer.set_precision_multiplier(1, 10); //The MS58XX values reported need to be multiplied by 10 to match units everywhere else
}
}
// read Baro pressure at ground
//-----------------------------
init_barometer(true);
// initialise sonar
#if CONFIG_SONAR == ENABLED