fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-02 05:21:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

commander: fix status flags usage (condition_global_position_valid->global_position_valid)

Browse Source 
- broken due to the merge timing of https://github.com/PX4/PX4-Autopilot/pull/19378 and https://github.com/PX4/PX4-Autopilot/pull/19351
This commit is contained in:
Daniel Agar
2022-03-24 09:40:15 -04:00
parent 106044be38
commit e528eb5dc4
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/commander/state_machine_helper.cpp
+3 -3
View File
@@ -1004,7 +1004,7 @@ void set_quadchute_nav_state(vehicle_status_s &status, actuator_armed_s &armed,
default: default:
case quadchute_actions_t::AUTO_RTL: 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; 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 // FALLTHROUGH
case quadchute_actions_t::AUTO_LAND: 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; 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 // FALLTHROUGH
case quadchute_actions_t::AUTO_LOITER: 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; status.nav_state = vehicle_status_s::NAVIGATION_STATE_AUTO_LOITER;
} }