dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

dataman: account for new geofence & rally point structs

This commit is contained in:
Beat Küng 2017-07-14 13:16:05 +02:00 committed by Lorenz Meier
parent b8fb8c610e
commit b9cddfb75b
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/dataman/dataman.cpp
View File

@ -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
View File

@ -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