fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-30 05:53:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

more consistent naming for LND params

Browse Source
This commit is contained in:
Daniel Agar
2016-03-03 10:13:40 +01:00
committed by Lorenz Meier
parent f34f5c4f5a
commit d1e096abc7
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
+4 -4
View File
@@ -607,13 +607,13 @@ FixedwingPositionControl::FixedwingPositionControl() :
_parameter_handles.land_slope_angle = param_find("FW_LND_ANG"); _parameter_handles.land_slope_angle = param_find("FW_LND_ANG");
_parameter_handles.land_H1_virt = param_find("FW_LND_HVIRT"); _parameter_handles.land_H1_virt = param_find("FW_LND_HVIRT");
_parameter_handles.land_flare_alt_relative = param_find("FW_LND_FLALT"); _parameter_handles.land_flare_alt_relative = param_find("FW_LND_FL_ALT");
_parameter_handles.land_flare_pitch_min_deg = param_find("FW_LND_FL_PMIN");
_parameter_handles.land_flare_pitch_max_deg = param_find("FW_LND_FL_PMAX");
_parameter_handles.land_thrust_lim_alt_relative = param_find("FW_LND_TLALT"); _parameter_handles.land_thrust_lim_alt_relative = param_find("FW_LND_TLALT");
_parameter_handles.land_heading_hold_horizontal_distance = param_find("FW_LND_HHDIST"); _parameter_handles.land_heading_hold_horizontal_distance = param_find("FW_LND_HHDIST");
_parameter_handles.land_flare_pitch_min_deg = param_find("FW_FLARE_PMIN");
_parameter_handles.land_flare_pitch_max_deg = param_find("FW_FLARE_PMAX");
_parameter_handles.land_use_terrain_estimate = param_find("FW_LND_USETER"); _parameter_handles.land_use_terrain_estimate = param_find("FW_LND_USETER");
_parameter_handles.land_airspeed_scale = param_find("FW_AIRSPD_SCALE"); _parameter_handles.land_airspeed_scale = param_find("FW_LND_AIRSPD_SC");
_parameter_handles.time_const = param_find("FW_T_TIME_CONST"); _parameter_handles.time_const = param_find("FW_T_TIME_CONST");
_parameter_handles.time_const_throt = param_find("FW_T_THRO_CONST"); _parameter_handles.time_const_throt = param_find("FW_T_THRO_CONST");
src/modules/fw_pos_control_l1/fw_pos_control_l1_params.c
+3 -3
View File
@@ -464,7 +464,7 @@ PARAM_DEFINE_INT32(FW_LND_USETER, 0);
* @group L1 Control * @group L1 Control
* *
*/ */
PARAM_DEFINE_FLOAT(FW_FLARE_PMIN, 2.5f); PARAM_DEFINE_FLOAT(FW_LND_FL_PMIN, 2.5f);
/** /**
* Flare, maximum pitch * Flare, maximum pitch
@@ -478,7 +478,7 @@ PARAM_DEFINE_FLOAT(FW_FLARE_PMIN, 2.5f);
* @group L1 Control * @group L1 Control
* *
*/ */
PARAM_DEFINE_FLOAT(FW_FLARE_PMAX, 15.0f); PARAM_DEFINE_FLOAT(FW_LND_FL_PMAX, 15.0f);
/** /**
* Landing airspeed scale factor * Landing airspeed scale factor
@@ -490,4 +490,4 @@ PARAM_DEFINE_FLOAT(FW_FLARE_PMAX, 15.0f);
* @max 1.5 * @max 1.5
* @group L1 Control * @group L1 Control
*/ */
PARAM_DEFINE_FLOAT(FW_AIRSPD_SCALE, 1.3f); PARAM_DEFINE_FLOAT(FW_LND_AIRSPD_SC, 1.3f);