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

Plane: make CIRCLE mode hold altitude

Browse Source 
this will prevent us losing a lot of altitude during the initial
failsafe phase
This commit is contained in:
Andrew Tridgell 2013-02-11 13:52:25 +11:00
parent 693627d76a
commit 9f70c6c70d
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ArduPlane/ArduPlane.pde
View File

@ -1194,14 +1194,12 @@ static void update_current_flight_mode(void)
case CIRCLE: case CIRCLE:
// we have no GPS installed and have lost radio contact // we have no GPS installed and have lost radio contact
// or we just want to fly around in a gentle circle w/o GPS // or we just want to fly around in a gentle circle w/o GPS,
// ---------------------------------------------------- // holding altitude at the altitude we set when we
// switched into the mode
nav_roll_cd = g.roll_limit_cd / 3; nav_roll_cd = g.roll_limit_cd / 3;
nav_pitch_cd = 0; calc_nav_pitch();
calc_throttle();
if (failsafe != FAILSAFE_NONE) {
g.channel_throttle.servo_out = g.throttle_cruise;
}
break; break;
case MANUAL: case MANUAL:

6
ArduPlane/system.pde
View File

@ -337,13 +337,17 @@ static void set_mode(enum FlightMode mode)
{ {
case INITIALISING: case INITIALISING:
case MANUAL: case MANUAL:
case CIRCLE:
case STABILIZE: case STABILIZE:
case TRAINING: case TRAINING:
case FLY_BY_WIRE_A: case FLY_BY_WIRE_A:
case FLY_BY_WIRE_B: case FLY_BY_WIRE_B:
break; break;
case CIRCLE:
// the altitude to circle at is taken from the current altitude
next_WP.alt = current_loc.alt;
break;
case AUTO: case AUTO:
update_auto(); update_auto();
break; break;