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

Copter: stabilize uses 0 to 1 throttle and sets motor spool state

This commit is contained in:
Leonard Hall 2015-12-19 18:24:42 +09:00 committed by Randy Mackay
parent 76a8de8a53
commit f56ff4d564
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ArduCopter/control_stabilize.cpp
View File

@ -10,7 +10,7 @@
bool Copter::stabilize_init(bool ignore_checks) bool Copter::stabilize_init(bool ignore_checks)
{ {
// if landed and the mode we're switching from does not have manual throttle and the throttle stick is too high // if landed and the mode we're switching from does not have manual throttle and the throttle stick is too high
if (motors.armed() && ap.land_complete && !mode_has_manual_throttle(control_mode) && (g.rc_3.control_in > get_non_takeoff_throttle())) { if (motors.armed() && ap.land_complete && !mode_has_manual_throttle(control_mode) && (get_pilot_desired_throttle(channel_throttle->control_in) > get_non_takeoff_throttle())) {
return false; return false;
} }
// set target altitude to zero for reporting // set target altitude to zero for reporting
@ -25,10 +25,11 @@ void Copter::stabilize_run()
{ {
float target_roll, target_pitch; float target_roll, target_pitch;
float target_yaw_rate; float target_yaw_rate;
int16_t pilot_throttle_scaled; float pilot_throttle_scaled;
// if not armed or throttle at zero, set throttle to zero and exit immediately // if not armed set throttle to zero and exit immediately
if(!motors.armed() || ap.throttle_zero) { if (!motors.armed() || ap.throttle_zero || !motors.get_interlock()) {
motors.set_desired_spool_state(AP_MotorsMulticopter::DESIRED_SPIN_WHEN_ARMED);
attitude_control.set_throttle_out_unstabilized(0,true,g.throttle_filt); attitude_control.set_throttle_out_unstabilized(0,true,g.throttle_filt);
// slow start if landed // slow start if landed
if (ap.land_complete) { if (ap.land_complete) {
@ -37,6 +38,8 @@ void Copter::stabilize_run()
return; return;
} }
motors.set_desired_spool_state(AP_MotorsMulticopter::DESIRED_THROTTLE_UNLIMITED);
// apply SIMPLE mode transform to pilot inputs // apply SIMPLE mode transform to pilot inputs
update_simple_mode(); update_simple_mode();