diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-24 17:45:15 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-24 17:45:15 +0200 |
| commit | 06317046f2da215db328be660f900d265cdf9102 (patch) | |
| tree | fa4c78a02537d80ea338cddbefa7c8a3d94d8fa3 /src/modules/uORB | |
| parent | a432d0493c0761da075c7734c0f54f44d6121e78 (diff) | |
| download | px4-firmware-06317046f2da215db328be660f900d265cdf9102.tar.gz px4-firmware-06317046f2da215db328be660f900d265cdf9102.tar.bz2 px4-firmware-06317046f2da215db328be660f900d265cdf9102.zip | |
move flight termination and geofence flags from setpoint triplet to mission result
Diffstat (limited to 'src/modules/uORB')
| -rw-r--r-- | src/modules/uORB/topics/mission_result.h | 8 | ||||
| -rw-r--r-- | src/modules/uORB/topics/position_setpoint_triplet.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/modules/uORB/topics/mission_result.h b/src/modules/uORB/topics/mission_result.h index 65ddfb4ad..c7d25d1f0 100644 --- a/src/modules/uORB/topics/mission_result.h +++ b/src/modules/uORB/topics/mission_result.h @@ -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 */ }; /** diff --git a/src/modules/uORB/topics/position_setpoint_triplet.h b/src/modules/uORB/topics/position_setpoint_triplet.h index e2b1525a2..ec2131abd 100644 --- a/src/modules/uORB/topics/position_setpoint_triplet.h +++ b/src/modules/uORB/topics/position_setpoint_triplet.h @@ -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 */ }; /** |