Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 14:38:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Copter: remove unused takeoff_trigger_dz parameter

Browse Source
This commit is contained in:
Peter Barker 2018-12-31 15:18:14 +11:00 committed by Peter Barker
parent 92970cf4ed
commit e5b25824eb
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ArduCopter/Parameters.cpp
View File

@ -68,14 +68,6 @@ const AP_Param::Info Copter::var_info[] = {
// @Increment: 10 // @Increment: 10
GSCALAR(pilot_takeoff_alt, "PILOT_TKOFF_ALT", PILOT_TKOFF_ALT_DEFAULT), GSCALAR(pilot_takeoff_alt, "PILOT_TKOFF_ALT", PILOT_TKOFF_ALT_DEFAULT),
// @Param: PILOT_TKOFF_DZ
// @DisplayName: Takeoff trigger deadzone
// @Description: Offset from mid stick at which takeoff is triggered
// @User: Standard
// @Range: 0 500
// @Increment: 10
GSCALAR(takeoff_trigger_dz, "PILOT_TKOFF_DZ", THR_DZ_DEFAULT),
// @Param: PILOT_THR_BHV // @Param: PILOT_THR_BHV
// @DisplayName: Throttle stick behavior // @DisplayName: Throttle stick behavior
// @Description: Bitmask containing various throttle stick options. TX with sprung throttle can set PILOT_THR_BHV to "1" so motor feedback when landed starts from mid-stick instead of bottom of stick. // @Description: Bitmask containing various throttle stick options. TX with sprung throttle can set PILOT_THR_BHV to "1" so motor feedback when landed starts from mid-stick instead of bottom of stick.

3
ArduCopter/Parameters.h
View File

@ -207,7 +207,7 @@ public:
k_param_ch10_option_old, k_param_ch10_option_old,
k_param_ch11_option_old, k_param_ch11_option_old,
k_param_ch12_option_old, k_param_ch12_option_old,
k_param_takeoff_trigger_dz, k_param_takeoff_trigger_dz_old,
k_param_gcs3, k_param_gcs3,
k_param_gcs_pid_mask, // 126 k_param_gcs_pid_mask, // 126
@ -376,7 +376,6 @@ public:
AP_Float throttle_filt; AP_Float throttle_filt;
AP_Int16 throttle_behavior; AP_Int16 throttle_behavior;
AP_Int16 takeoff_trigger_dz;
AP_Float pilot_takeoff_alt; AP_Float pilot_takeoff_alt;
AP_Int16 rtl_altitude; AP_Int16 rtl_altitude;

1
ArduCopter/mode.cpp
View File

@ -381,6 +381,7 @@ bool Copter::Mode::_TakeOff::triggered(const float target_climb_rate) const
// can't takeoff unless we want to go up... // can't takeoff unless we want to go up...
return false; return false;
} }
if (copter.motors->get_spool_mode() != AP_Motors::THROTTLE_UNLIMITED) { if (copter.motors->get_spool_mode() != AP_Motors::THROTTLE_UNLIMITED) {
// hold aircraft on the ground until rotor speed runup has finished // hold aircraft on the ground until rotor speed runup has finished
return false; return false;