diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-02-18 16:13:19 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-02-18 16:13:19 +0400 |
| commit | 3508a42f6a308ad4dc53d6c3efc3b2f8013cc086 (patch) | |
| tree | 8a3aa4f5de44ade5704b30e7ea4ecfe6668b76b9 | |
| parent | 7fa82a27a7bb3be6793375d666474b93f0f5c5d0 (diff) | |
| parent | 4cfaf928e12ac8927b3980506f31c05a1ab899ce (diff) | |
| download | px4-firmware-3508a42f6a308ad4dc53d6c3efc3b2f8013cc086.tar.gz px4-firmware-3508a42f6a308ad4dc53d6c3efc3b2f8013cc086.tar.bz2 px4-firmware-3508a42f6a308ad4dc53d6c3efc3b2f8013cc086.zip | |
Merge branch 'master' into beta
| -rw-r--r-- | src/modules/px4iofirmware/mixer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/px4iofirmware/mixer.cpp b/src/modules/px4iofirmware/mixer.cpp index f39fcf7ec..6a4429461 100644 --- a/src/modules/px4iofirmware/mixer.cpp +++ b/src/modules/px4iofirmware/mixer.cpp @@ -179,7 +179,7 @@ mixer_tick(void) ((r_setup_arming & PX4IO_P_SETUP_ARMING_FMU_ARMED) /* and there is valid input via or mixer */ && (r_status_flags & PX4IO_P_STATUS_FLAGS_MIXER_OK) ) /* or direct PWM is set */ || (r_status_flags & PX4IO_P_STATUS_FLAGS_RAW_PWM) - /* or failsafe was set manually */ || (r_setup_arming & PX4IO_P_SETUP_ARMING_FAILSAFE_CUSTOM) + /* or failsafe was set manually */ || ((r_setup_arming & PX4IO_P_SETUP_ARMING_FAILSAFE_CUSTOM) && !(r_status_flags & PX4IO_P_STATUS_FLAGS_FMU_OK)) ) ); |