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

Copter: allow override of auto throttle mode

Browse Source
This commit is contained in:
Randy Mackay 2013-08-28 11:45:07 +09:00
parent 45aeb1a921
commit 6052017b13
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ArduCopter/commands_logic.pde
View File

@ -237,7 +237,7 @@ static void do_takeoff()
set_yaw_mode(YAW_HOLD);
// set throttle mode to AUTO although we should already be in this mode
set_throttle_mode(THROTTLE_AUTO);
set_throttle_mode(AUTO_THR);
// set our nav mode to loiter
set_nav_mode(NAV_WP);
@ -260,7 +260,7 @@ static void do_nav_wp()
set_roll_pitch_mode(AUTO_RP);
// set throttle mode
set_throttle_mode(THROTTLE_AUTO);
set_throttle_mode(AUTO_THR);
// set nav mode
set_nav_mode(NAV_WP);
@ -303,7 +303,7 @@ static void do_land(const struct Location *cmd)
set_yaw_mode(get_wp_yaw_mode(false));
// set throttle mode
set_throttle_mode(THROTTLE_AUTO);
set_throttle_mode(AUTO_THR);
// set nav mode
set_nav_mode(NAV_WP);
@ -354,7 +354,7 @@ static void do_loiter_unlimited()
set_roll_pitch_mode(AUTO_RP);
// set throttle mode to AUTO which, if not already active, will default to hold at our current altitude
set_throttle_mode(THROTTLE_AUTO);
set_throttle_mode(AUTO_THR);
// hold yaw
set_yaw_mode(YAW_HOLD);
@ -387,7 +387,7 @@ static void do_circle()
set_roll_pitch_mode(AUTO_RP);
// set throttle mode to AUTO which, if not already active, will default to hold at our current altitude
set_throttle_mode(THROTTLE_AUTO);
set_throttle_mode(AUTO_THR);
// set nav mode to CIRCLE
set_nav_mode(NAV_CIRCLE);
@ -422,7 +422,7 @@ static void do_loiter_time()
set_roll_pitch_mode(AUTO_RP);
// set throttle mode to AUTO which, if not already active, will default to hold at our current altitude
set_throttle_mode(THROTTLE_AUTO);
set_throttle_mode(AUTO_THR);
// hold yaw
set_yaw_mode(YAW_HOLD);