From b9cddfb75b05c177a3449b5e7442aedbb9d54e66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Fri, 14 Jul 2017 13:16:05 +0200 Subject: [PATCH] dataman: account for new geofence & rally point structs --- src/modules/dataman/dataman.cpp | 4 ++-- src/modules/dataman/dataman.h | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/modules/dataman/dataman.cpp b/src/modules/dataman/dataman.cpp index c455ad7b2b..0013f351cd 100644 --- a/src/modules/dataman/dataman.cpp +++ b/src/modules/dataman/dataman.cpp @@ -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, diff --git a/src/modules/dataman/dataman.h b/src/modules/dataman/dataman.h index d9d524fbf4..eb9d203341 100644 --- a/src/modules/dataman/dataman.h +++ b/src/modules/dataman/dataman.h @@ -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