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

mission_base: Force mission validity check on activation

Browse Source
This commit is contained in:
Konrad
2024-03-08 17:26:04 +01:00
committed by Silvan Fuhrer
parent 1aa26a5a91
commit 04099ed483
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/navigator/mission_base.cpp
+7 -5
View File
@@ -207,7 +207,7 @@ MissionBase::on_activation()
_mission_has_been_activated = true;
_system_disarmed_while_inactive = false;
check_mission_valid();
check_mission_valid(true);
update_mission();
@@ -687,11 +687,13 @@ MissionBase::checkMissionRestart()
}
void
MissionBase::check_mission_valid()
MissionBase::check_mission_valid(bool forced)
{
if ((_navigator->get_mission_result()->mission_id != _mission.mission_id)
|| (_navigator->get_mission_result()->geofence_id != _mission.geofence_id)
|| (_navigator->get_mission_result()->home_position_counter != _navigator->get_home_position()->update_count)) {
// Allow forcing it, since we currently not rechecking if parameters have changed.
if (forced ||
(_navigator->get_mission_result()->mission_id != _mission.mission_id) ||
(_navigator->get_mission_result()->geofence_id != _mission.geofence_id) ||
(_navigator->get_mission_result()->home_position_counter != _navigator->get_home_position()->update_count)) {
_navigator->get_mission_result()->mission_id = _mission.mission_id;
_navigator->get_mission_result()->geofence_id = _mission.geofence_id;