Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-11 10:28:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Copter: remove mode from guided_set_dest

Browse Source 
This duplicate check stopped us from reusing guided
guided_set_destination as part of Auto's nav_guided command
This commit is contained in:
Randy Mackay 2014-05-23 14:26:41 +09:00
parent f4c9d58051
commit af4490a3d5
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ArduCopter/control_guided.pde
View File

@ -37,12 +37,10 @@ static bool guided_init(bool ignore_checks)
// guided_set_destination - sets guided mode's target destination // guided_set_destination - sets guided mode's target destination
static void guided_set_destination(const Vector3f& destination) static void guided_set_destination(const Vector3f& destination)
{ {
if (control_mode == GUIDED) { wp_nav.set_wp_destination(destination);
wp_nav.set_wp_destination(destination); if (!guided_pilot_yaw_override_yaw) {
if (!guided_pilot_yaw_override_yaw) { // get default yaw mode
// get default yaw mode set_auto_yaw_mode(get_default_auto_yaw_mode(false));
set_auto_yaw_mode(get_default_auto_yaw_mode(false));
}
} }
} }