fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-16 01:23:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rally Point: fix typo of save to safe in mission_safe_point_s

Browse Source 
Signed-off-by: Silvan Fuhrer <silvan@auterion.com>
This commit is contained in:
Silvan Fuhrer
2019-10-28 09:54:59 +01:00
committed by Beat Küng
parent 8f910f8435
commit 99dd229d71
5 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/dataman/dataman.cpp
+1 -1
View File
@@ -228,7 +228,7 @@ static const unsigned g_per_item_max_index[DM_KEY_NUM_KEYS] = {
/* Table of the len of each item type */
static constexpr size_t g_per_item_size[DM_KEY_NUM_KEYS] = {
sizeof(struct mission_save_point_s) + DM_SECTOR_HDR_SIZE,
sizeof(struct mission_safe_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,
src/modules/dataman/dataman.h
+1 -1
View File
@@ -103,7 +103,7 @@ 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 mission_fence_point_s) << 8) + (sizeof(struct mission_safe_point_s) << 4) + \
sizeof(struct dataman_compat_s))
/** Retrieve from the data manager store */
src/modules/mavlink/mavlink_mission.cpp
+14 -14
View File
@@ -336,15 +336,15 @@ MavlinkMissionManager::send_mission_item(uint8_t sysid, uint8_t compid, uint16_t
break;
case MAV_MISSION_TYPE_RALLY: { // Read a safe point / rally point
mission_save_point_s mission_save_point;
read_success = dm_read(DM_KEY_SAFE_POINTS, seq + 1, &mission_save_point, sizeof(mission_save_point_s)) ==
sizeof(mission_save_point_s);
mission_safe_point_s mission_safe_point;
read_success = dm_read(DM_KEY_SAFE_POINTS, seq + 1, &mission_safe_point, sizeof(mission_safe_point_s)) ==
sizeof(mission_safe_point_s);
mission_item.nav_cmd = MAV_CMD_NAV_RALLY_POINT;
mission_item.frame = mission_save_point.frame;
mission_item.lat = mission_save_point.lat;
mission_item.lon = mission_save_point.lon;
mission_item.altitude = mission_save_point.alt;
mission_item.frame = mission_safe_point.frame;
mission_item.lat = mission_safe_point.lat;
mission_item.lon = mission_safe_point.lon;
mission_item.altitude = mission_safe_point.alt;
}
break;
@@ -1113,13 +1113,13 @@ MavlinkMissionManager::handle_mission_item_both(const mavlink_message_t *msg)
break;
case MAV_MISSION_TYPE_RALLY: { // Write a safe point / rally point
mission_save_point_s mission_save_point;
mission_save_point.lat = mission_item.lat;
mission_save_point.lon = mission_item.lon;
mission_save_point.alt = mission_item.altitude;
mission_save_point.frame = mission_item.frame;
write_failed = dm_write(DM_KEY_SAFE_POINTS, wp.seq + 1, DM_PERSIST_POWER_ON_RESET, &mission_save_point,
sizeof(mission_save_point_s)) != sizeof(mission_save_point_s);
mission_safe_point_s mission_safe_point;
mission_safe_point.lat = mission_item.lat;
mission_safe_point.lon = mission_item.lon;
mission_safe_point.alt = mission_item.altitude;
mission_safe_point.frame = mission_item.frame;
write_failed = dm_write(DM_KEY_SAFE_POINTS, wp.seq + 1, DM_PERSIST_POWER_ON_RESET, &mission_safe_point,
sizeof(mission_safe_point_s)) != sizeof(mission_safe_point_s);
}
break;
src/modules/mavlink/mavlink_mission.h
+1 -1
View File
@@ -145,7 +145,7 @@ private:
DM_KEY_FENCE_POINTS_MAX - 1,
DM_KEY_SAFE_POINTS_MAX - 1
}; /**< Maximum number of mission items for each type
(fence & save points use the first item for the stats) */
(fence & safe points use the first item for the stats) */
/** get the maximum number of item count for the current _mission_type */
uint16_t current_max_item_count();
src/modules/navigator/navigation.h
+2 -2
View File
@@ -217,10 +217,10 @@ struct mission_fence_point_s {
};
/**
* Save Point (Rally Point).
* Safe Point (Rally Point).
* Corresponds to the DM_KEY_SAFE_POINTS dataman item
*/
struct mission_save_point_s {
struct mission_safe_point_s {
double lat;
double lon;
float alt;