diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-21 15:19:19 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-21 15:19:19 +0200 |
| commit | 309ea8146055528c22395fca06b7a70b660c22b3 (patch) | |
| tree | 13478630a0543077da64db78ad59a972af1a5520 /src/modules/px4iofirmware/mixer.cpp | |
| parent | 5a8dc9c504f70b4ce1b45f91b3bdd9b7126ef0d3 (diff) | |
| parent | db1229dca338890c4aef26e17ebc622e5ba61b59 (diff) | |
| download | px4-firmware-309ea8146055528c22395fca06b7a70b660c22b3.tar.gz px4-firmware-309ea8146055528c22395fca06b7a70b660c22b3.tar.bz2 px4-firmware-309ea8146055528c22395fca06b7a70b660c22b3.zip | |
Merged fmuv2_bringup
Diffstat (limited to 'src/modules/px4iofirmware/mixer.cpp')
| -rw-r--r-- | src/modules/px4iofirmware/mixer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/modules/px4iofirmware/mixer.cpp b/src/modules/px4iofirmware/mixer.cpp index 38727c68c..deed25836 100644 --- a/src/modules/px4iofirmware/mixer.cpp +++ b/src/modules/px4iofirmware/mixer.cpp @@ -148,7 +148,8 @@ mixer_tick(void) if ( (r_status_flags & PX4IO_P_STATUS_FLAGS_OVERRIDE) && (r_status_flags & PX4IO_P_STATUS_FLAGS_RC_OK) && - (r_status_flags & PX4IO_P_STATUS_FLAGS_MIXER_OK)) { + (r_status_flags & PX4IO_P_STATUS_FLAGS_MIXER_OK) && + !(r_setup_arming & PX4IO_P_SETUP_ARMING_RC_HANDLING_DISABLED)) { /* if allowed, mix from RC inputs directly */ source = MIX_OVERRIDE; |