diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2013-12-08 21:34:31 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2013-12-08 21:34:49 +0100 |
| commit | 86aa2f85cb923b7a45d3a0139ae0cf108d0cb002 (patch) | |
| tree | 2da612fc584db2e4c973fd1029dc724ea0c067e5 /src | |
| parent | 8acea79918e20eabb73f6c6bacc5ebd7f30ae577 (diff) | |
| download | px4-firmware-86aa2f85cb923b7a45d3a0139ae0cf108d0cb002.tar.gz px4-firmware-86aa2f85cb923b7a45d3a0139ae0cf108d0cb002.tar.bz2 px4-firmware-86aa2f85cb923b7a45d3a0139ae0cf108d0cb002.zip | |
px4iofirmware: in manual mode: ignore control indices which are not controlled by the rmeote control
Diffstat (limited to 'src')
| -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 9bb93ce9f..87844ca70 100644 --- a/src/modules/px4iofirmware/mixer.cpp +++ b/src/modules/px4iofirmware/mixer.cpp @@ -248,7 +248,7 @@ mixer_callback(uintptr_t handle, return -1; case MIX_OVERRIDE: - if (r_page_rc_input[PX4IO_P_RC_VALID] & (1 << control_index)) { + if ((r_page_rc_input[PX4IO_P_RC_VALID] & (1 << control_index)) && CONTROL_PAGE_INDEX(control_group, control_index) < PX4IO_RC_INPUT_CHANNELS) { control = REG_TO_FLOAT(r_page_rc_input[PX4IO_P_RC_BASE + control_index]); break; } |