diff options
author | Thomas Gubler <thomasgubler@gmail.com> | 2013-12-23 11:47:17 +0100 |
---|---|---|
committer | Thomas Gubler <thomasgubler@gmail.com> | 2013-12-23 11:47:17 +0100 |
commit | 1450903fa9f5856a97648bcc745d287a33525994 (patch) | |
tree | 35de4c25ca888af2b55d2193e590adc7446407b5 /src/modules/uORB/topics/mission.h | |
parent | 411428b8e448f773d104704449b08261197a4b27 (diff) | |
parent | b5fb5f9dbb2d26cea1ab50f005cedff52e992eca (diff) | |
download | px4-firmware-1450903fa9f5856a97648bcc745d287a33525994.tar.gz px4-firmware-1450903fa9f5856a97648bcc745d287a33525994.tar.bz2 px4-firmware-1450903fa9f5856a97648bcc745d287a33525994.zip |
Merge remote-tracking branch 'private_julian/fw_autoland_att_tecs_navigator' into fw_autoland_att_tecs_navigator_termination_controlgroups
Conflicts:
src/modules/navigator/navigator_main.cpp
Diffstat (limited to 'src/modules/uORB/topics/mission.h')
-rw-r--r-- | src/modules/uORB/topics/mission.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/modules/uORB/topics/mission.h b/src/modules/uORB/topics/mission.h index 2427a1d57..370242007 100644 --- a/src/modules/uORB/topics/mission.h +++ b/src/modules/uORB/topics/mission.h @@ -46,6 +46,8 @@ #include <stdbool.h> #include "../uORB.h" +#define NUM_MISSIONS_SUPPORTED 256 + /* compatible to mavlink MAV_CMD */ enum NAV_CMD { NAV_CMD_WAYPOINT=16, @@ -59,6 +61,11 @@ enum NAV_CMD { NAV_CMD_PATHPLANNING=81 }; +enum ORIGIN { + ORIGIN_MAVLINK = 0, + ORIGIN_ONBOARD +}; + /** * @addtogroup topics * @{ @@ -84,12 +91,12 @@ struct mission_item_s float time_inside; /**< time that the MAV should stay inside the radius before advancing in seconds */ bool autocontinue; /**< true if next waypoint should follow after this one */ int index; /**< index matching the mavlink waypoint */ + enum ORIGIN origin; /**< where the waypoint has been generated */ }; struct mission_s { - struct mission_item_s *items; - unsigned count; + unsigned count; /**< count of the missions stored in the datamanager */ int current_index; /**< default -1, start at the one changed latest */ }; |