diff options
| author | Julian Oes <julian@oes.ch> | 2013-12-25 11:23:58 +0100 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2013-12-25 11:23:58 +0100 |
| commit | b10fa3d0476ce6af977fe7e54bc361c44c27e9c4 (patch) | |
| tree | 7c230c829f4a43d1f12d8936c4a67d170abedc3a /src/modules/dataman | |
| parent | 5c33aeeb430a984d0802f1af73063afca793a98a (diff) | |
| download | px4-firmware-b10fa3d0476ce6af977fe7e54bc361c44c27e9c4.tar.gz px4-firmware-b10fa3d0476ce6af977fe7e54bc361c44c27e9c4.tar.bz2 px4-firmware-b10fa3d0476ce6af977fe7e54bc361c44c27e9c4.zip | |
Waypoints/Navigator: Use two different dataman storage places, keep old waypoints until all new ones are written
Diffstat (limited to 'src/modules/dataman')
| -rw-r--r-- | src/modules/dataman/dataman.c | 3 | ||||
| -rw-r--r-- | src/modules/dataman/dataman.h | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/modules/dataman/dataman.c b/src/modules/dataman/dataman.c index 14112fc0d..dc2d6c312 100644 --- a/src/modules/dataman/dataman.c +++ b/src/modules/dataman/dataman.c @@ -111,7 +111,8 @@ static unsigned g_func_counts[dm_number_of_funcs]; static const unsigned g_per_item_max_index[DM_KEY_NUM_KEYS] = { DM_KEY_SAFE_POINTS_MAX, DM_KEY_FENCE_POINTS_MAX, - DM_KEY_WAYPOINTS_OFFBOARD_MAX, + DM_KEY_WAYPOINTS_OFFBOARD_0_MAX, + DM_KEY_WAYPOINTS_OFFBOARD_1_MAX, DM_KEY_WAYPOINTS_ONBOARD_MAX }; diff --git a/src/modules/dataman/dataman.h b/src/modules/dataman/dataman.h index 2a781405a..a70638ccc 100644 --- a/src/modules/dataman/dataman.h +++ b/src/modules/dataman/dataman.h @@ -50,7 +50,8 @@ extern "C" { typedef enum { DM_KEY_SAFE_POINTS = 0, /* Safe points coordinates, safe point 0 is home point */ DM_KEY_FENCE_POINTS, /* Fence vertex coordinates */ - DM_KEY_WAYPOINTS_OFFBOARD, /* Mission way point coordinates sent over mavlink */ + DM_KEY_WAYPOINTS_OFFBOARD_0, /* Mission way point coordinates sent over mavlink */ + DM_KEY_WAYPOINTS_OFFBOARD_1, /* (alernate between 0 and 1) */ DM_KEY_WAYPOINTS_ONBOARD, /* Mission way point coordinates generated onboard */ DM_KEY_NUM_KEYS /* Total number of item types defined */ } dm_item_t; @@ -59,7 +60,8 @@ extern "C" { enum { DM_KEY_SAFE_POINTS_MAX = 8, DM_KEY_FENCE_POINTS_MAX = GEOFENCE_MAX_VERTICES, - DM_KEY_WAYPOINTS_OFFBOARD_MAX = NUM_MISSIONS_SUPPORTED, + DM_KEY_WAYPOINTS_OFFBOARD_0_MAX = NUM_MISSIONS_SUPPORTED, + DM_KEY_WAYPOINTS_OFFBOARD_1_MAX = NUM_MISSIONS_SUPPORTED, DM_KEY_WAYPOINTS_ONBOARD_MAX = NUM_MISSIONS_SUPPORTED }; |