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

move flight termination and geofence flags from setpoint triplet to mission result

Browse Source
This commit is contained in:
Thomas Gubler
2014-08-24 17:45:15 +02:00
parent a432d0493c
commit 06317046f2
7 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/uORB/topics/mission_result.h
+5 -3
View File
@@ -55,9 +55,11 @@ struct mission_result_s
{
unsigned seq_reached; /**< Sequence of the mission item which has been reached */
unsigned seq_current; /**< Sequence of the current mission item */
bool reached; /**< true if mission has been reached */
bool finished; /**< true if mission has been completed */
bool stay_in_failsafe; /**< true if the commander should not switch out of the failsafe mode*/
bool reached; /**< true if mission has been reached */
bool finished; /**< true if mission has been completed */
bool stay_in_failsafe; /**< true if the commander should not switch out of the failsafe mode*/
bool geofence_violated; /**< true if the geofence is violated */
bool flight_termination; /**< true if the navigator demands a flight termination from the commander app */
};
/**
src/modules/uORB/topics/position_setpoint_triplet.h
-2
View File
@@ -97,8 +97,6 @@ struct position_setpoint_triplet_s
struct position_setpoint_s next;
unsigned nav_state; /**< report the navigation state */
bool geofence_violated; /**< true if the geofence is violated */
bool flight_termination; /**< true if the navigator demands a flight termination from the commander app */
};
/**