fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-22 07:13:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

mission: renaming dataman_id to mission_dataman_id

Browse Source
This commit is contained in:
Konrad
2024-01-30 11:25:37 -05:00
committed by Daniel Agar
parent cac858cb24
commit dfa56d474a
12 changed files with 71 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/navigator/mission.cpp
+3 -3
View File
@@ -192,11 +192,11 @@ void Mission::setActiveMissionItems()
getNextPositionItems(_mission.current_seq + 1, next_mission_items_index, num_found_items, max_num_next_items);
mission_item_s next_mission_items[max_num_next_items];
const dm_item_t dataman_id = static_cast<dm_item_t>(_mission.dataman_id);
const dm_item_t mission_dataman_id = static_cast<dm_item_t>(_mission.mission_dataman_id);
for (size_t i = 0U; i < num_found_items; i++) {
mission_item_s next_mission_item;
bool success = _dataman_cache.loadWait(dataman_id, next_mission_items_index[i],
bool success = _dataman_cache.loadWait(mission_dataman_id, next_mission_items_index[i],
reinterpret_cast<uint8_t *>(&next_mission_item), sizeof(next_mission_item), MAX_DATAMAN_LOAD_WAIT);
if (success) {
@@ -459,7 +459,7 @@ Mission::save_mission_state()
if (success) {
/* data read successfully, check dataman ID and items count */
if (mission_state.dataman_id == _mission.dataman_id && mission_state.count == _mission.count
if (mission_state.mission_dataman_id == _mission.mission_dataman_id && mission_state.count == _mission.count
&& mission_state.mission_id == _mission.mission_id) {
/* navigator may modify only sequence, write modified state only if it changed */
if (mission_state.current_seq != _mission.current_seq) {