aboutsummaryrefslogtreecommitdiff
path: root/src/modules/uORB
diff options
context:
space:
mode:
authorAnton Babushkin <anton.babushkin@me.com>2014-06-14 23:57:29 +0200
committerAnton Babushkin <anton.babushkin@me.com>2014-06-14 23:57:29 +0200
commit5be741607c0d8d477ff30c7639edbd3bce427e7b (patch)
treee232f15d126c75481e6c9ca6d8eebf49d546ce27 /src/modules/uORB
parentffd9ac7e081aebb3d6329a0f6c09812d1c0c4523 (diff)
downloadpx4-firmware-5be741607c0d8d477ff30c7639edbd3bce427e7b.tar.gz
px4-firmware-5be741607c0d8d477ff30c7639edbd3bce427e7b.tar.bz2
px4-firmware-5be741607c0d8d477ff30c7639edbd3bce427e7b.zip
mavlink: mission manager moved to separate class and reworked
Diffstat (limited to 'src/modules/uORB')
-rw-r--r--src/modules/uORB/topics/mission.h6
-rw-r--r--src/modules/uORB/topics/mission_result.h8
2 files changed, 9 insertions, 5 deletions
diff --git a/src/modules/uORB/topics/mission.h b/src/modules/uORB/topics/mission.h
index 4bcaaaa5a..499b2e1e5 100644
--- a/src/modules/uORB/topics/mission.h
+++ b/src/modules/uORB/topics/mission.h
@@ -97,11 +97,15 @@ struct mission_item_s {
unsigned do_jump_current_count; /**< count how many times the jump has been done */
};
+/**
+ * This topic used to notify navigator about mission changes, mission itself and new mission state
+ * must be stored in dataman before publication.
+ */
struct mission_s
{
int dataman_id; /**< default 0, there are two offboard storage places in the dataman: 0 or 1 */
unsigned count; /**< count of the missions stored in the dataman */
- int current_index; /**< default -1, start at the one changed latest */
+ int current_seq; /**< default -1, start at the one changed latest */
};
/**
diff --git a/src/modules/uORB/topics/mission_result.h b/src/modules/uORB/topics/mission_result.h
index ad654a9ff..beb797e62 100644
--- a/src/modules/uORB/topics/mission_result.h
+++ b/src/modules/uORB/topics/mission_result.h
@@ -53,10 +53,10 @@
struct mission_result_s
{
- bool mission_reached; /**< true if mission has been reached */
- unsigned mission_index_reached; /**< index of the mission which has been reached */
- unsigned index_current_mission; /**< index of the current mission */
- bool mission_finished; /**< true if mission has been completed */
+ 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 */
};
/**