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

indent correct again

This commit is contained in:
Dr Gareth Owen 2013-05-20 20:33:59 +01:00 committed by Randy Mackay
parent d9fc37c01c
commit f646b79e5f
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ArduCopter/ArduCopter.pde
View File

@ -1376,7 +1376,7 @@ bool set_yaw_mode(uint8_t new_yaw_mode)
}
switch( new_yaw_mode ) {
case YAW_RESETTOARMEDYAW:
case YAW_RESETTOARMEDYAW:
nav_yaw = ahrs.yaw_sensor; // store current yaw so we can start rotating back to correct one
case YAW_HOLD:
case YAW_ACRO:
@ -1450,10 +1450,10 @@ void update_yaw_mode(void)
}
break;
case YAW_RESETTOARMEDYAW:
nav_yaw = get_yaw_slew(nav_yaw, initial_simple_bearing, AUTO_YAW_SLEW_RATE);
get_stabilize_yaw(nav_yaw);
break;
case YAW_RESETTOARMEDYAW:
nav_yaw = get_yaw_slew(nav_yaw, initial_simple_bearing, AUTO_YAW_SLEW_RATE);
get_stabilize_yaw(nav_yaw);
break;
case YAW_LOOK_AT_NEXT_WP:
// point towards next waypoint (no pilot input accepted)

12
ArduCopter/control_modes.pde
View File

@ -91,12 +91,12 @@ static void do_aux_switch_function(int8_t ch_function, bool ch_flag)
}
switch(tmp_function) {
case AUX_SWITCH_RESETTOARMEDYAW:
if(ch_flag)
set_yaw_mode(YAW_RESETTOARMEDYAW);
else
set_yaw_mode(YAW_HOLD);
break;
case AUX_SWITCH_RESETTOARMEDYAW:
if(ch_flag)
set_yaw_mode(YAW_RESETTOARMEDYAW);
else
set_yaw_mode(YAW_HOLD);
break;
case AUX_SWITCH_FLIP:
// flip if switch is on, positive throttle and we're actually flying