From ff0d7613b1ef849d54f622979184bc197a975257 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Fri, 21 Oct 2016 13:55:38 +0200 Subject: [PATCH] Add manual seed to dataman hash to allow later incrementing the seed number for incompatible changes --- src/modules/dataman/dataman.h | 2 +- src/modules/navigator/mission_block.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/modules/dataman/dataman.h b/src/modules/dataman/dataman.h index d5f9e90543..3967c38ce1 100644 --- a/src/modules/dataman/dataman.h +++ b/src/modules/dataman/dataman.h @@ -109,7 +109,7 @@ struct dataman_compat_s { uint32_t key; }; -#define DM_COMPAT_KEY ((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 (1 + (sizeof(struct mission_item_s) << 24) + (sizeof(struct mission_s) << 16) + (sizeof(struct fence_vertex_s) << 8) + sizeof(struct dataman_compat_s)) /** Maximum size in bytes of a single item instance is * defined by adding the structure type to the union below diff --git a/src/modules/navigator/mission_block.cpp b/src/modules/navigator/mission_block.cpp index 6e78ce1e00..59cebc2c93 100644 --- a/src/modules/navigator/mission_block.cpp +++ b/src/modules/navigator/mission_block.cpp @@ -499,7 +499,6 @@ MissionBlock::mission_item_to_position_setpoint(const struct mission_item_s *ite case NAV_CMD_TAKEOFF: // set pitch and ensure that the hold time is zero sp->pitch_min = item->pitch_min; - sp->time_inside = 0.0f; case NAV_CMD_VTOL_TAKEOFF: sp->type = position_setpoint_s::SETPOINT_TYPE_TAKEOFF; break;