FW move altitude first order hold (FOH) and loiter to position special cases from navigator to position controller

Co-authored-by: RomanBapst <bapstroman@gmail.com>
This commit is contained in:
Daniel Agar
2020-10-06 16:57:12 -04:00
committed by GitHub
co-authored by RomanBapst
parent 9838e340e0
commit c01fabaf11
7 changed files with 125 additions and 218 deletions
-16
View File
@@ -76,11 +76,6 @@ public:
void on_activation() override;
void on_active() override;
enum mission_altitude_mode {
MISSION_ALTMODE_ZOH = 0,
MISSION_ALTMODE_FOH = 1
};
bool set_current_mission_index(uint16_t index);
bool land_start();
@@ -155,11 +150,6 @@ private:
*/
void heading_sp_update();
/**
* Updates the altitude sp to follow a foh
*/
void altitude_sp_foh_update();
/**
* Update the cruising speed setpoint.
*/
@@ -243,7 +233,6 @@ private:
DEFINE_PARAMETERS(
(ParamFloat<px4::params::MIS_DIST_1WP>) _param_mis_dist_1wp,
(ParamFloat<px4::params::MIS_DIST_WPS>) _param_mis_dist_wps,
(ParamInt<px4::params::MIS_ALTMODE>) _param_mis_altmode,
(ParamInt<px4::params::MIS_MNT_YAW_CTL>) _param_mis_mnt_yaw_ctl
)
@@ -272,11 +261,6 @@ private:
bool _mission_waypoints_changed{false};
bool _mission_changed{false}; /** < true if the mission changed since the mission mode was active */
float _min_current_sp_distance_xy{FLT_MAX}; /**< minimum distance which was achieved to the current waypoint */
float _distance_current_previous{0.0f}; /**< distance from previous to current sp in pos_sp_triplet,
only use if current and previous are valid */
enum work_item_type {
WORK_ITEM_TYPE_DEFAULT, /**< default mission item */
WORK_ITEM_TYPE_TAKEOFF, /**< takeoff before moving to waypoint */