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

fw att+pos ctrl: use enum for flaps configs

Browse Source
This commit is contained in:
Thomas Stastny
2018-07-08 23:15:01 +02:00
committed by Lorenz Meier
parent 0c3399433d
commit 8a7919bcb6
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/fw_pos_control_l1/FixedwingPositionControl.cpp
+3 -3
View File
@@ -704,7 +704,7 @@ FixedwingPositionControl::control_position(const Vector2f &curr_pos, const Vecto
bool setpoint = true;
_att_sp.fw_control_yaw = false; // by default we don't want yaw to be contoller directly with rudder
_att_sp.apply_flaps = 0; // by default we don't use flaps
_att_sp.apply_flaps = vehicle_attitude_setpoint_s::FLAPS_OFF; // by default we don't use flaps
calculate_gndspeed_undershoot(curr_pos, ground_speed, pos_sp_prev, pos_sp_curr);
@@ -1139,7 +1139,7 @@ FixedwingPositionControl::control_takeoff(const Vector2f &curr_pos, const Vector
// apply flaps for takeoff according to the corresponding scale factor set
// via FW_FLAPS_TO_SCL
_att_sp.apply_flaps = 2;
_att_sp.apply_flaps = vehicle_attitude_setpoint_s::FLAPS_TAKEOFF;
// continuously reset launch detection and runway takeoff until armed
if (!_control_mode.flag_armed) {
@@ -1309,7 +1309,7 @@ FixedwingPositionControl::control_landing(const Vector2f &curr_pos, const Vector
// apply full flaps for landings. this flag will also trigger the use of flaperons
// if they have been enabled using the corresponding parameter
_att_sp.apply_flaps = 1;
_att_sp.apply_flaps = vehicle_attitude_setpoint_s::FLAPS_LAND;
// save time at which we started landing and reset abort_landing
if (_time_started_landing == 0) {