Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-01 02:55:07 +08:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

FlightTask Auto: Save deploy gear information

Browse Source
This commit is contained in:
Simone Guscetti
2018-11-05 14:47:18 +01:00
committed by Dennis Mannhart
parent aaddb845c4
commit 66f85ff9ae
3 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
msg/position_setpoint.msg
+2
View File
@@ -39,6 +39,8 @@ bool yaw_valid # true if yaw setpoint valid
float32 yawspeed # yawspeed (only for multirotors, in rad/s) float32 yawspeed # yawspeed (only for multirotors, in rad/s)
bool yawspeed_valid # true if yawspeed setpoint valid bool yawspeed_valid # true if yawspeed setpoint valid
bool deploy_gear # deploy landing gear
float32 loiter_radius # loiter radius (only for fixed wing), in m float32 loiter_radius # loiter radius (only for fixed wing), in m
int8 loiter_direction # loiter direction: 1 = CW, -1 = CCW int8 loiter_direction # loiter direction: 1 = CW, -1 = CCW
float32 pitch_min # minimal pitch angle for fixed wing takeoff waypoints float32 pitch_min # minimal pitch angle for fixed wing takeoff waypoints
src/lib/FlightTasks/tasks/Auto/FlightTaskAuto.cpp
+1
View File
@@ -224,6 +224,7 @@ bool FlightTaskAuto::_evaluateTriplets()
if (triplet_update || (_current_state != previous_state)) { if (triplet_update || (_current_state != previous_state)) {
_updateInternalWaypoints(); _updateInternalWaypoints();
_updateAvoidanceWaypoints(); _updateAvoidanceWaypoints();
_deploy_gear = _sub_triplet_setpoint->get().current.deploy_gear;
} }
if (MPC_OBS_AVOID.get() && _sub_vehicle_status->get().is_rotary_wing) { if (MPC_OBS_AVOID.get() && _sub_vehicle_status->get().is_rotary_wing) {
src/lib/FlightTasks/tasks/Auto/FlightTaskAuto.hpp
+1
View File
@@ -103,6 +103,7 @@ protected:
State _current_state{State::none}; State _current_state{State::none};
float _target_acceptance_radius = 0.0f; /**< Acceptances radius of the target */ float _target_acceptance_radius = 0.0f; /**< Acceptances radius of the target */
bool _deploy_gear = false;
DEFINE_PARAMETERS_CUSTOM_PARENT(FlightTask, DEFINE_PARAMETERS_CUSTOM_PARENT(FlightTask,
(ParamFloat<px4::params::MPC_XY_CRUISE>) MPC_XY_CRUISE, (ParamFloat<px4::params::MPC_XY_CRUISE>) MPC_XY_CRUISE,