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

Copter: reset ekf height if arming before home set

This commit is contained in:
Randy Mackay 2015-06-24 15:54:26 +09:00
parent 9f17fc17ab
commit 14cf9b1621
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ArduCopter/motors.cpp
View File

@ -153,8 +153,11 @@ bool Copter::init_arm_motors(bool arming_from_gcs)
initial_armed_bearing = ahrs.yaw_sensor; initial_armed_bearing = ahrs.yaw_sensor;
if (ap.home_state == HOME_UNSET) {
// Reset EKF altitude if home hasn't been set yet (we use EKF altitude as substitute for alt above home)
ahrs.get_NavEKF().resetHeightDatum();
} else if (ap.home_state == HOME_SET_NOT_LOCKED) {
// Reset home position if it has already been set before (but not locked) // Reset home position if it has already been set before (but not locked)
if (ap.home_state == HOME_SET_NOT_LOCKED) {
set_home_to_current_location(); set_home_to_current_location();
} }
calc_distance_and_bearing(); calc_distance_and_bearing();