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

NavEKF: incorporate use_gyro and use_accel

This commit is contained in:
Randy Mackay 2015-08-01 17:36:18 +09:00
parent e5615ec349
commit 0b981d38e8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/AP_NavEKF/AP_NavEKF.cpp
View File

@ -4130,7 +4130,7 @@ void NavEKF::readIMUData()
// the imu sample time is used as a common time reference throughout the filter // the imu sample time is used as a common time reference throughout the filter
imuSampleTime_ms = hal.scheduler->millis(); imuSampleTime_ms = hal.scheduler->millis();
if (ins.get_accel_health(0) && ins.get_accel_health(1)) { if (ins.use_accel(0) && ins.use_accel(1)) {
// dual accel mode // dual accel mode
// read IMU1 delta velocity data // read IMU1 delta velocity data
readDeltaVelocity(0, dVelIMU1, dtDelVel1); readDeltaVelocity(0, dVelIMU1, dtDelVel1);
@ -4157,7 +4157,7 @@ void NavEKF::readIMUData()
dVelIMU2 = dVelIMU1; dVelIMU2 = dVelIMU1;
} }
if (ins.get_gyro_health(0) && ins.get_gyro_health(1)) { if (ins.use_gyro(0) && ins.use_gyro(1)) {
// dual gyro mode - average first two gyros // dual gyro mode - average first two gyros
Vector3f dAng; Vector3f dAng;
dAngIMU.zero(); dAngIMU.zero();