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

AP_Motors: Fix DDFP so tail motor doesn't start without Channel 8 high

This commit is contained in:
ChristopherOlson 2017-09-20 07:59:20 -05:00 committed by Andrew Tridgell
parent d28182435e
commit 7e086e8c4d
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libraries/AP_Motors/AP_MotorsHeli_Single.cpp
View File

@ -480,8 +480,19 @@ void AP_MotorsHeli_Single::move_yaw(float yaw_out)
limit.yaw = true; limit.yaw = true;
} }
rc_write(AP_MOTORS_MOT_4, calc_pwm_output_1to1(yaw_out, _yaw_servo)); if (_tail_type == AP_MOTORS_HELI_SINGLE_TAILTYPE_DIRECTDRIVE_FIXEDPITCH){
if (_main_rotor.get_desired_speed() > 0.0f && hal.util->get_soft_armed()) {
// constrain output so that motor never fully stops
yaw_out = constrain_float(yaw_out, -0.9f, 1.0f);
// output yaw servo to tail rsc
rc_write(AP_MOTORS_MOT_4, calc_pwm_output_1to1(yaw_out, _yaw_servo));
} else {
// output zero speed to tail rsc
rc_write(AP_MOTORS_MOT_4, calc_pwm_output_1to1(-1.0f, _yaw_servo));
}
} else {
rc_write(AP_MOTORS_MOT_4, calc_pwm_output_1to1(yaw_out, _yaw_servo));
}
if (_tail_type == AP_MOTORS_HELI_SINGLE_TAILTYPE_SERVO_EXTGYRO) { if (_tail_type == AP_MOTORS_HELI_SINGLE_TAILTYPE_SERVO_EXTGYRO) {
// output gain to exernal gyro // output gain to exernal gyro
if (_acro_tail && _ext_gyro_gain_acro > 0) { if (_acro_tail && _ext_gyro_gain_acro > 0) {
@ -489,10 +500,6 @@ void AP_MotorsHeli_Single::move_yaw(float yaw_out)
} else { } else {
write_aux(_ext_gyro_gain_std/1000.0f); write_aux(_ext_gyro_gain_std/1000.0f);
} }
} else if (_tail_type == AP_MOTORS_HELI_SINGLE_TAILTYPE_DIRECTDRIVE_FIXEDPITCH && _main_rotor.get_desired_speed() > 0.0f) {
// output yaw servo to tail rsc
// To-Do: fix this messy calculation
write_aux(yaw_out*0.5f+1.0f);
} }
} }