Browse Source

VTOL and fixed wing: Move parameters that belong to the navigator into its parameter definition space

sbg
Lorenz Meier 9 years ago
parent
commit
45cc79fbf7
  1. 14
      src/modules/fw_pos_control_l1/fw_pos_control_l1_params.c
  2. 30
      src/modules/navigator/mission_params.c
  3. 16
      src/modules/vtol_att_control/vtol_att_control_params.c

14
src/modules/fw_pos_control_l1/fw_pos_control_l1_params.c

@ -366,20 +366,6 @@ PARAM_DEFINE_FLOAT(FW_LND_AIRSPD_SC, 1.3f); @@ -366,20 +366,6 @@ PARAM_DEFINE_FLOAT(FW_LND_AIRSPD_SC, 1.3f);
*/
PARAM_DEFINE_FLOAT(FW_AIRSPD_MIN, 10.0f);
/**
* Trim Airspeed
*
* The TECS controller tries to fly at this airspeed.
*
* @unit m/s
* @min 0.0
* @max 40
* @decimal 1
* @increment 0.5
* @group FW TECS
*/
PARAM_DEFINE_FLOAT(FW_AIRSPD_TRIM, 15.0f);
/**
* Maximum Airspeed
*

30
src/modules/navigator/mission_params.c

@ -156,3 +156,33 @@ PARAM_DEFINE_FLOAT(MIS_YAW_TMT, -1.0f); @@ -156,3 +156,33 @@ PARAM_DEFINE_FLOAT(MIS_YAW_TMT, -1.0f);
* @group Mission
*/
PARAM_DEFINE_FLOAT(MIS_YAW_ERR, 12.0f);
/**
* Weather-vane mode landings for missions
*
* @boolean
* @group Mission
*/
PARAM_DEFINE_INT32(VT_WV_LND_EN, 0);
/**
* Weather-vane mode for loiter mode
*
* @boolean
* @group Mission
*/
PARAM_DEFINE_INT32(VT_WV_LTR_EN, 0);
/**
* Cruise Airspeed
*
* The fixed wing controller tries to fly at this airspeed.
*
* @unit m/s
* @min 0.0
* @max 40
* @decimal 1
* @increment 0.5
* @group FW TECS
*/
PARAM_DEFINE_FLOAT(FW_AIRSPD_TRIM, 15.0f);

16
src/modules/vtol_att_control/vtol_att_control_params.c

@ -256,14 +256,6 @@ PARAM_DEFINE_FLOAT(VT_ARSP_TRANS, 10.0f); @@ -256,14 +256,6 @@ PARAM_DEFINE_FLOAT(VT_ARSP_TRANS, 10.0f);
*/
PARAM_DEFINE_INT32(VT_OPT_RECOV_EN, 0);
/**
* Weather-vane mode landings for missions
*
* @boolean
* @group VTOL Attitude Control
*/
PARAM_DEFINE_INT32(VT_WV_LND_EN, 0);
/**
* Weather-vane yaw rate scale.
*
@ -278,14 +270,6 @@ PARAM_DEFINE_INT32(VT_WV_LND_EN, 0); @@ -278,14 +270,6 @@ PARAM_DEFINE_INT32(VT_WV_LND_EN, 0);
*/
PARAM_DEFINE_FLOAT(VT_WV_YAWR_SCL, 0.15f);
/**
* Weather-vane mode for loiter
*
* @boolean
* @group VTOL Attitude Control
*/
PARAM_DEFINE_INT32(VT_WV_LTR_EN, 0);
/**
* Front transition timeout
*

Loading…
Cancel
Save