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

Correct bug in auto flap handling

This commit is contained in:
Doug Weibel 2011-09-22 20:45:58 -06:00
parent 6921d94d20
commit 5767575a73
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ArduPlane/Attitude.pde
View File

@ -275,6 +275,7 @@ static void set_servos(void)
g.channel_throttle.radio_out = g.channel_throttle.radio_in;
g.channel_rudder.radio_out = g.channel_rudder.radio_in;
G_RC_AUX(k_aileron)->radio_out = g_rc_function[RC_Channel_aux::k_aileron]->radio_in;
G_RC_AUX(k_flap_auto)->radio_out = g_rc_function[RC_Channel_aux::k_flap_auto]->radio_in;
} else {
if (g.mix_mode == 0) {
@ -314,11 +315,11 @@ static void set_servos(void)
throttle_slew_limit();
}
if(control_mode <= FLY_BY_WIRE_B) {
if(control_mode < FLY_BY_WIRE_B) {
G_RC_AUX(k_flap_auto)->radio_out = g_rc_function[RC_Channel_aux::k_flap_auto]->radio_in;
} else if (control_mode >= FLY_BY_WIRE_C) {
} else if (control_mode >= FLY_BY_WIRE_B) {
if (g.airspeed_enabled == true) {
flapSpeedSource = g.airspeed_cruise;
flapSpeedSource = g.airspeed_cruise/100;
} else {
flapSpeedSource = g.throttle_cruise;
}
@ -329,6 +330,8 @@ static void set_servos(void)
} else {
G_RC_AUX(k_flap_auto)->servo_out = g.flap_2_percent;
}
g_rc_function[RC_Channel_aux::k_flap_auto]->calc_pwm();
}
#if HIL_MODE == HIL_MODE_DISABLED || HIL_SERVOS