diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-21 11:17:29 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-21 11:17:29 +0200 |
| commit | 5fbee2394522d8b0c7a78d2751783845d011b56d (patch) | |
| tree | 78f0b0b3148c915876b318847b4015472c89e264 /src/modules/px4iofirmware/mixer.cpp | |
| parent | 2a58929ffde494ba7db0bd09178545d5d650b420 (diff) | |
| download | px4-firmware-5fbee2394522d8b0c7a78d2751783845d011b56d.tar.gz px4-firmware-5fbee2394522d8b0c7a78d2751783845d011b56d.tar.bz2 px4-firmware-5fbee2394522d8b0c7a78d2751783845d011b56d.zip | |
Added flag to disable RC evaluation onboard of IO (raw values still forwarded)
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 d8c0e58ba..3ddad9ef7 100644 --- a/src/modules/px4iofirmware/mixer.cpp +++ b/src/modules/px4iofirmware/mixer.cpp @@ -132,7 +132,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; |