Skip to content

Commit

Permalink
commander: fix status flags usage (condition_global_position_valid->g…
Browse files Browse the repository at this point in the history
…lobal_position_valid)

 - broken due to the merge timing of #19378 and #19351
  • Loading branch information
dagar committed Mar 24, 2022
1 parent 106044b commit e528eb5
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/modules/commander/state_machine_helper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1004,23 +1004,23 @@ 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;
}

break;

// 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;
}

break;

// 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;
}

Expand Down

0 comments on commit e528eb5

Please sign in to comment.