fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-21 12:13:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

move baro and magnetometer data out of sensor_combined

Browse Source
This commit is contained in:
Daniel Agar
2018-04-11 23:26:58 -04:00
parent 3e6ba1d541
commit 3b5b12e1d1
31 changed files with 289 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/barometer/ms5611/ms5611.cpp
+3 -3
View File
@@ -349,7 +349,7 @@ MS5611::init()
if (autodetect) {
if (_device_type == MS5611_DEVICE) {
if (brp.altitude > 5300.f) {
if (brp.pressure < 520.0f) {
/* This is likely not this device, try again */
_device_type = MS5607_DEVICE;
_measure_phase = 0;
@@ -358,8 +358,8 @@ MS5611::init()
}
} else if (_device_type == MS5607_DEVICE) {
if (brp.altitude > 5300.f) {
/* Both devices returned very high altitude;
if (brp.pressure < 520.0f) {
/* Both devices returned a very low pressure;
* have fun on Everest using MS5611 */
_device_type = MS5611_DEVICE;
}