aboutsummaryrefslogtreecommitdiff
path: root/src/modules/uORB
diff options
context:
space:
mode:
authorJulian Oes <julian@oes.ch>2013-11-22 14:03:09 +0100
committerJulian Oes <julian@oes.ch>2013-11-22 14:03:09 +0100
commit7892a72f90be76fc948a0fbefb2357d29bbdffcc (patch)
tree5ea49b11025dbd1bc5a2a59bb9d83d3113cdb964 /src/modules/uORB
parent42aefe838c2471c53c326347f0230c301689d96d (diff)
downloadpx4-firmware-7892a72f90be76fc948a0fbefb2357d29bbdffcc.tar.gz
px4-firmware-7892a72f90be76fc948a0fbefb2357d29bbdffcc.tar.bz2
px4-firmware-7892a72f90be76fc948a0fbefb2357d29bbdffcc.zip
Navigator, waypoints: save index in mission item and use this in navigator
Diffstat (limited to 'src/modules/uORB')
-rw-r--r--src/modules/uORB/topics/mission.h1
-rw-r--r--src/modules/uORB/topics/mission_item_triplet.h4
2 files changed, 5 insertions, 0 deletions
diff --git a/src/modules/uORB/topics/mission.h b/src/modules/uORB/topics/mission.h
index f97de94bc..a39a1e4d7 100644
--- a/src/modules/uORB/topics/mission.h
+++ b/src/modules/uORB/topics/mission.h
@@ -80,6 +80,7 @@ struct mission_item_s
float radius; /**< radius in which the mission is accepted as reached in meters */
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 */
};
struct mission_s
diff --git a/src/modules/uORB/topics/mission_item_triplet.h b/src/modules/uORB/topics/mission_item_triplet.h
index 48553b0ac..b35eae607 100644
--- a/src/modules/uORB/topics/mission_item_triplet.h
+++ b/src/modules/uORB/topics/mission_item_triplet.h
@@ -67,6 +67,10 @@ struct mission_item_triplet_s
struct mission_item_s previous;
struct mission_item_s current;
struct mission_item_s next;
+
+ int previous_index;
+ int current_index;
+ int next_index;
};
/**