diff --git a/src/modules/flight_mode_manager/tasks/Auto/FlightTaskAuto.hpp b/src/modules/flight_mode_manager/tasks/Auto/FlightTaskAuto.hpp index 92763c0475..1485e65ec1 100644 --- a/src/modules/flight_mode_manager/tasks/Auto/FlightTaskAuto.hpp +++ b/src/modules/flight_mode_manager/tasks/Auto/FlightTaskAuto.hpp @@ -142,7 +142,23 @@ protected: (ParamInt) _param_com_obs_avoid, // obstacle avoidance active (ParamFloat) _param_mpc_yawrauto_max, (ParamFloat) _param_mis_yaw_err, // yaw-error threshold - (ParamBool) _param_wv_en // enable/disable weather vane (VTOL) + (ParamBool) _param_wv_en, // enable/disable weather vane (VTOL) + (ParamFloat) _param_mpc_acc_hor, // acceleration in flight + (ParamFloat) _param_mpc_acc_up_max, + (ParamFloat) _param_mpc_acc_down_max, + (ParamFloat) _param_mpc_jerk_auto, + (ParamFloat) _param_mpc_xy_traj_p, + (ParamFloat) _param_mpc_xy_err_max, + (ParamFloat) _param_mpc_land_speed, + (ParamInt) _param_mpc_land_rc_help, + (ParamFloat) + _param_mpc_land_alt1, // altitude at which speed limit downwards reaches maximum speed + (ParamFloat) + _param_mpc_land_alt2, // altitude at which speed limit downwards reached minimum speed + (ParamFloat) _param_mpc_tko_speed, + (ParamFloat) + _param_mpc_tko_ramp_t, // time constant for smooth takeoff ramp + (ParamFloat) _param_mpc_man_y_max ); private: diff --git a/src/modules/flight_mode_manager/tasks/AutoLineSmoothVel/FlightTaskAutoLineSmoothVel.hpp b/src/modules/flight_mode_manager/tasks/AutoLineSmoothVel/FlightTaskAutoLineSmoothVel.hpp index 7c2b36bdd6..459d9ad9ec 100644 --- a/src/modules/flight_mode_manager/tasks/AutoLineSmoothVel/FlightTaskAutoLineSmoothVel.hpp +++ b/src/modules/flight_mode_manager/tasks/AutoLineSmoothVel/FlightTaskAutoLineSmoothVel.hpp @@ -83,24 +83,4 @@ protected: bool _highEnoughForLandingGear(); /**< Checks if gears can be lowered. */ void updateParams() override; /**< See ModuleParam class */ - - DEFINE_PARAMETERS_CUSTOM_PARENT(FlightTaskAuto, - (ParamFloat) _param_mis_yaw_err, // yaw-error threshold - (ParamFloat) _param_mpc_acc_hor, // acceleration in flight - (ParamFloat) _param_mpc_acc_up_max, - (ParamFloat) _param_mpc_acc_down_max, - (ParamFloat) _param_mpc_jerk_auto, - (ParamFloat) _param_mpc_xy_traj_p, - (ParamFloat) _param_mpc_xy_err_max, - (ParamFloat) _param_mpc_land_speed, - (ParamInt) _param_mpc_land_rc_help, - (ParamFloat) - _param_mpc_land_alt1, // altitude at which speed limit downwards reaches maximum speed - (ParamFloat) - _param_mpc_land_alt2, // altitude at which speed limit downwards reached minimum speed - (ParamFloat) _param_mpc_tko_speed, - (ParamFloat) - _param_mpc_tko_ramp_t, // time constant for smooth takeoff ramp - (ParamFloat) _param_mpc_man_y_max - ); };