Browse Source

Do not enter RC override if FMU is lost and termination failsafe mode requested

sbg
Lorenz Meier 11 years ago
parent
commit
91d50301c6
  1. 4
      src/modules/px4iofirmware/mixer.cpp

4
src/modules/px4iofirmware/mixer.cpp

@ -139,7 +139,9 @@ mixer_tick(void) @@ -139,7 +139,9 @@ mixer_tick(void)
(r_status_flags & PX4IO_P_STATUS_FLAGS_RC_OK) &&
(r_status_flags & PX4IO_P_STATUS_FLAGS_MIXER_OK) &&
!(r_setup_arming & PX4IO_P_SETUP_ARMING_RC_HANDLING_DISABLED) &&
!(r_status_flags & PX4IO_P_STATUS_FLAGS_FMU_OK)) {
!(r_status_flags & PX4IO_P_STATUS_FLAGS_FMU_OK) &&
/* do not enter manual override if we asked for termination failsafe and FMU is lost */
!(r_setup_arming & PX4IO_P_SETUP_ARMING_TERMINATION_FAILSAFE)) {
/* if allowed, mix from RC inputs directly */
source = MIX_OVERRIDE;

Loading…
Cancel
Save