Browse Source

dataman: account for new geofence & rally point structs

sbg
Beat Küng 8 years ago committed by Lorenz Meier
parent
commit
b9cddfb75b
  1. 4
      src/modules/dataman/dataman.cpp
  2. 5
      src/modules/dataman/dataman.h

4
src/modules/dataman/dataman.cpp

@ -228,8 +228,8 @@ static const unsigned g_per_item_max_index[DM_KEY_NUM_KEYS] = { @@ -228,8 +228,8 @@ static const unsigned g_per_item_max_index[DM_KEY_NUM_KEYS] = {
/* Table of the len of each item type */
static const unsigned g_per_item_size[DM_KEY_NUM_KEYS] = {
sizeof(struct home_position_s) + DM_SECTOR_HDR_SIZE,
sizeof(struct fence_vertex_s) + DM_SECTOR_HDR_SIZE,
sizeof(struct mission_save_point_s) + DM_SECTOR_HDR_SIZE,
sizeof(struct mission_fence_point_s) + DM_SECTOR_HDR_SIZE,
sizeof(struct mission_item_s) + DM_SECTOR_HDR_SIZE,
sizeof(struct mission_item_s) + DM_SECTOR_HDR_SIZE,
sizeof(struct mission_item_s) + DM_SECTOR_HDR_SIZE,

5
src/modules/dataman/dataman.h

@ -106,7 +106,10 @@ struct dataman_compat_s { @@ -106,7 +106,10 @@ struct dataman_compat_s {
/* increment this define whenever a binary incompatible change is performed */
#define DM_COMPAT_VERSION 1ULL
#define DM_COMPAT_KEY ((DM_COMPAT_VERSION << 32) + (sizeof(struct mission_item_s) << 24) + (sizeof(struct mission_s) << 16) + (sizeof(struct fence_vertex_s) << 8) + sizeof(struct dataman_compat_s))
#define DM_COMPAT_KEY ((DM_COMPAT_VERSION << 32) + (sizeof(struct mission_item_s) << 24) + \
(sizeof(struct mission_s) << 16) + (sizeof(struct mission_stats_entry_s) << 12) + \
(sizeof(struct mission_fence_point_s) << 8) + (sizeof(struct mission_save_point_s) << 4) + \
sizeof(struct dataman_compat_s))
/** Retrieve from the data manager store */
__EXPORT ssize_t

Loading…
Cancel
Save