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

Plane: fixed some warnings

Browse Source
This commit is contained in:
Andrew Tridgell 2013-01-16 14:19:25 +11:00
parent 4fa7bb1486
commit 9058949558
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ArduPlane/Attitude.pde
View File

@ -289,7 +289,7 @@ static void calc_nav_yaw(float speed_scaler, float ch4_inf)
g.channel_rudder.servo_out += g.pidServoRudder.get_pid(error, speed_scaler); g.channel_rudder.servo_out += g.pidServoRudder.get_pid(error, speed_scaler);
#else // APM_CONTROL == ENABLED #else // APM_CONTROL == ENABLED
// use the new APM_Control library // use the new APM_Control library
g.channel_rudder.servo_out = g.yawController.get_servo_out(speed_scaler, ch4_inf < 0.25) + g.channel_roll.servo_out * g.kff_rudder_mix; g.channel_rudder.servo_out = g.yawController.get_servo_out(speed_scaler, ch4_inf < 0.25f) + g.channel_roll.servo_out * g.kff_rudder_mix;
#endif #endif
} }

4
ArduPlane/radio.pde
View File

@ -163,10 +163,8 @@ static void control_failsafe(uint16_t pwm)
} }
if (failsafeCounter == 1) { if (failsafeCounter == 1) {
gcs_send_text_fmt(PSTR("MSG FS OFF %u"), (unsigned)pwm); gcs_send_text_fmt(PSTR("MSG FS OFF %u"), (unsigned)pwm);
}else if(failsafeCounter == 0) { } else if(failsafeCounter == 0) {
ch3_failsafe = false; ch3_failsafe = false;
}else if (failsafeCounter <0) {
failsafeCounter = -1;
} }
} }
} }