fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-05 15:00:34 +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
2023-12-05 13:28:23 +01: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/rtl.cpp
+2 -2
View File
@@ -146,7 +146,7 @@ void RTL::updateDatamanCache()
if (_mission_id != _mission_sub.get().mission_id) {
_mission_id = _mission_sub.get().mission_id;
const dm_item_t dm_item = static_cast<dm_item_t>(_mission_sub.get().dataman_id);
const dm_item_t dm_item = static_cast<dm_item_t>(_mission_sub.get().mission_dataman_id);
_dataman_cache_landItem.invalidate();
if (_mission_sub.get().land_index > 0) {
@@ -365,7 +365,7 @@ void RTL::findRtlDestination(DestinationType &destination_type, DestinationPosit
if (((_param_rtl_type.get() == 1) || (_param_rtl_type.get() == 3) || (fabsf(FLT_MAX - min_dist) < FLT_EPSILON))
&& hasMissionLandStart()) {
mission_item_s land_mission_item;
const dm_item_t dm_item = static_cast<dm_item_t>(_mission_sub.get().dataman_id);
const dm_item_t dm_item = static_cast<dm_item_t>(_mission_sub.get().mission_dataman_id);
bool success = _dataman_cache_landItem.loadWait(dm_item, _mission_sub.get().land_index,
reinterpret_cast<uint8_t *>(&land_mission_item), sizeof(mission_item_s), 500_ms);