From e528eb5dc4b11447d9b2bb935758b7d190a54681 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Thu, 24 Mar 2022 09:40:13 -0400 Subject: [PATCH] commander: fix status flags usage (condition_global_position_valid->global_position_valid) - broken due to the merge timing of https://github.com/PX4/PX4-Autopilot/pull/19378 and https://github.com/PX4/PX4-Autopilot/pull/19351 --- src/modules/commander/state_machine_helper.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/commander/state_machine_helper.cpp b/src/modules/commander/state_machine_helper.cpp index 109f8d24a1..6ed5d53761 100644 --- a/src/modules/commander/state_machine_helper.cpp +++ b/src/modules/commander/state_machine_helper.cpp @@ -1004,7 +1004,7 @@ void set_quadchute_nav_state(vehicle_status_s &status, actuator_armed_s &armed, default: case quadchute_actions_t::AUTO_RTL: - if (status_flags.condition_global_position_valid && status_flags.condition_home_position_valid) { + if (status_flags.global_position_valid && status_flags.home_position_valid) { status.nav_state = vehicle_status_s::NAVIGATION_STATE_AUTO_RTL; } @@ -1012,7 +1012,7 @@ void set_quadchute_nav_state(vehicle_status_s &status, actuator_armed_s &armed, // FALLTHROUGH case quadchute_actions_t::AUTO_LAND: - if (status_flags.condition_global_position_valid) { + if (status_flags.global_position_valid) { status.nav_state = vehicle_status_s::NAVIGATION_STATE_AUTO_LAND; } @@ -1020,7 +1020,7 @@ void set_quadchute_nav_state(vehicle_status_s &status, actuator_armed_s &armed, // FALLTHROUGH case quadchute_actions_t::AUTO_LOITER: - if (status_flags.condition_global_position_valid) { + if (status_flags.global_position_valid) { status.nav_state = vehicle_status_s::NAVIGATION_STATE_AUTO_LOITER; }