fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-06 03:01:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

VTOL status: Do not force a commander status change

Browse Source 
Before the VTOL status would automatically force a commander state update all the time. This saves effort and makes sure the system only updates when it should.
This commit is contained in:
Lorenz Meier
2017-12-31 16:37:02 +01:00
parent 90b4afebb5
commit 2167457e2e
1 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/commander/commander.cpp
+25 -7
View File
@@ -2018,15 +2018,33 @@ Commander::run()
/* Make sure that this is only adjusted if vehicle really is of type vtol */ /* Make sure that this is only adjusted if vehicle really is of type vtol */
if (is_vtol(&status)) { if (is_vtol(&status)) {
status.is_rotary_wing = vtol_status.vtol_in_rw_mode;
status.in_transition_mode = vtol_status.vtol_in_trans_mode;
status.in_transition_to_fw = vtol_status.in_transition_to_fw;
status_flags.vtol_transition_failure = vtol_status.vtol_transition_failsafe;
armed.soft_stop = !status.is_rotary_wing; // Check if there has been any change while updating the flags
if (status.is_rotary_wing != vtol_status.vtol_in_rw_mode) {
status.is_rotary_wing = vtol_status.vtol_in_rw_mode;
status_changed = true;
}
if (status.in_transition_mode != vtol_status.vtol_in_trans_mode) {
status.in_transition_mode = vtol_status.vtol_in_trans_mode;
status_changed = true;
}
if (status.in_transition_to_fw != vtol_status.in_transition_to_fw) {
status.in_transition_to_fw = vtol_status.in_transition_to_fw;
status_changed = true;
}
if (status_flags.vtol_transition_failure != vtol_status.vtol_transition_failsafe) {
status_flags.vtol_transition_failure = vtol_status.vtol_transition_failsafe;
status_changed = true;
}
if (armed.soft_stop != !status.is_rotary_wing) {
armed.soft_stop = !status.is_rotary_wing;
status_changed = true;
}
} }
status_changed = true;
} }
// Check if quality checking of position accuracy and consistency is to be performed // Check if quality checking of position accuracy and consistency is to be performed