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

FlightTask: use convetion for definition of the landing gear default value

Browse Source
This commit is contained in:
Simone Guscetti
2018-11-13 16:53:36 +01:00
committed by Dennis Mannhart
parent 9ee3d79a96
commit 2c06cb71c8
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/FlightTasks/FlightTasks.cpp
+1 -1
View File
@@ -53,7 +53,7 @@ const landing_gear_s FlightTasks::getGear()
return _current_task.task->getGear();
} else {
return FlightTask::landing_gear_default_keep;
return FlightTask::empty_landing_gear_default_keep;
}
}
src/lib/FlightTasks/tasks/FlightTask/FlightTask.cpp
+2 -2
View File
@@ -7,7 +7,7 @@ constexpr uint64_t FlightTask::_timeout;
const vehicle_local_position_setpoint_s FlightTask::empty_setpoint = {0, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN, {NAN, NAN, NAN}};
const vehicle_constraints_s FlightTask::empty_constraints = {0, NAN, NAN, NAN, NAN, NAN, NAN, NAN, {}};
const landing_gear_s FlightTask::landing_gear_default_keep = {0, landing_gear_s::GEAR_KEEP, {}};
const landing_gear_s FlightTask::empty_landing_gear_default_keep = {0, landing_gear_s::GEAR_KEEP, {}};
const vehicle_trajectory_waypoint_s FlightTask::empty_trajectory_waypoint = {0, 0, {0, 0, 0, 0, 0, 0, 0},
{ {0, {NAN, NAN, NAN}, {NAN, NAN, NAN}, {NAN, NAN, NAN}, NAN, NAN, false, {0, 0, 0}},
{0, {NAN, NAN, NAN}, {NAN, NAN, NAN}, {NAN, NAN, NAN}, NAN, NAN, false, {0, 0, 0}},
@@ -36,7 +36,7 @@ bool FlightTask::activate()
_setDefaultConstraints();
_time_stamp_activate = hrt_absolute_time();
_heading_reset_counter = _sub_attitude->get().quat_reset_counter;
_gear = landing_gear_default_keep;
_gear = empty_landing_gear_default_keep;
return true;
}
src/lib/FlightTasks/tasks/FlightTask/FlightTask.hpp
+1 -1
View File
@@ -143,7 +143,7 @@ public:
/**
* default landing gear state
*/
static const landing_gear_s landing_gear_default_keep;
static const landing_gear_s empty_landing_gear_default_keep;
/**
* Empty desired waypoints.