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

FlightTaskManualPosition: remove update method and old member variable setpoints

Browse Source
This commit is contained in:
Dennis Mannhart
2018-04-05 07:30:12 +02:00
committed by Beat Küng
parent a7f4859698
commit d6fe2159ae
2 changed files with 21 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/FlightTasks/tasks/FlightTaskManualPosition.hpp
+3 -8
View File
@@ -51,17 +51,12 @@ public:
bool activate() override;
bool update() override;
protected:
matrix::Vector2f _vel_sp_xy{}; /**< Scaled velocity setpoint from stick. NAN during position lock */
matrix::Vector2f _pos_sp_xy{}; /**< Position setpoint during lock. Otherwise NAN */
control::BlockParamFloat _vel_xy_manual_max; /**< Maximum speed allowed horizontally */
control::BlockParamFloat _acc_xy_max;/**< Maximum acceleration horizontally. Only used to compute lock time */
control::BlockParamFloat _vel_xy_manual_max; /**< maximum speed allowed horizontally */
control::BlockParamFloat _acc_xy_max;/**< maximum acceleration horizontally. Only used to compute lock time */
control::BlockParamFloat _vel_hold_thr_xy; /**< velocity threshold to switch back into horizontal position hold */
void _updateXYlock(); /**< Applies positon lock based on stick and velocity */
void _updateXYlock(); /**< applies positon lock based on stick and velocity */
void _updateSetpoints() override;
void _scaleSticks() override;
};