Browse Source

Add manual seed to dataman hash to allow later incrementing the seed number for incompatible changes

sbg
Lorenz Meier 8 years ago committed by Lorenz Meier
parent
commit
ff0d7613b1
  1. 2
      src/modules/dataman/dataman.h
  2. 1
      src/modules/navigator/mission_block.cpp

2
src/modules/dataman/dataman.h

@ -109,7 +109,7 @@ struct dataman_compat_s { @@ -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

1
src/modules/navigator/mission_block.cpp

@ -499,7 +499,6 @@ MissionBlock::mission_item_to_position_setpoint(const struct mission_item_s *ite @@ -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;

Loading…
Cancel
Save