Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-08 17:03:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

uncrustify ArduPlane/Attitude.pde

Browse Source
This commit is contained in:
uncrustify 2012-08-21 19:19:50 -07:00 committed by Pat Hickey
parent 0f415bbc6a
commit d5767ef817
1 changed files with 286 additions and 286 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ArduPlane/Attitude.pde
View File

@ -242,13 +242,13 @@ static void calc_nav_roll()
* Roll servo slew limit * Roll servo slew limit
*****************************************/ *****************************************/
/* /*
float roll_slew_limit(float servo) * float roll_slew_limit(float servo)
{ * {
static float last; * static float last;
float temp = constrain(servo, last-ROLL_SLEW_LIMIT * delta_ms_fast_loop/1000.f, last + ROLL_SLEW_LIMIT * delta_ms_fast_loop/1000.f); * float temp = constrain(servo, last-ROLL_SLEW_LIMIT * delta_ms_fast_loop/1000.f, last + ROLL_SLEW_LIMIT * delta_ms_fast_loop/1000.f);
last = servo; * last = servo;
return temp; * return temp;
}*/ * }*/
/***************************************** /*****************************************
* Throttle slew limit * Throttle slew limit
@ -349,13 +349,13 @@ static void set_servos(void)
// We want to supress the throttle if we think we are on the ground and in an autopilot controlled throttle mode. // We want to supress the throttle if we think we are on the ground and in an autopilot controlled throttle mode.
/* Disable throttle if following conditions are met: /* Disable throttle if following conditions are met:
1 - We are in Circle mode (which we use for short term failsafe), or in FBW-B or higher * 1 - We are in Circle mode (which we use for short term failsafe), or in FBW-B or higher
AND * AND
2 - Our reported altitude is within 10 meters of the home altitude. * 2 - Our reported altitude is within 10 meters of the home altitude.
3 - Our reported speed is under 5 meters per second. * 3 - Our reported speed is under 5 meters per second.
4 - We are not performing a takeoff in Auto mode * 4 - We are not performing a takeoff in Auto mode
OR * OR
5 - Home location is not set * 5 - Home location is not set
*/ */
if ( if (
(control_mode == CIRCLE || control_mode >= FLY_BY_WIRE_B) && (control_mode == CIRCLE || control_mode >= FLY_BY_WIRE_B) &&
@ -373,7 +373,7 @@ static void set_servos(void)
if (control_mode >= FLY_BY_WIRE_B) { if (control_mode >= FLY_BY_WIRE_B) {
/* only do throttle slew limiting in modes where throttle /* only do throttle slew limiting in modes where throttle
control is automatic */ * control is automatic */
throttle_slew_limit(); throttle_slew_limit();
} }
} }