diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-05-05 08:04:28 -0700 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-05-05 08:04:28 -0700 |
| commit | d1909ca94bbf930d5cb4f22fa6bc00d07cd26b0e (patch) | |
| tree | f390ddd282da029968c96d63041fe34990201bf6 /src/modules/px4iofirmware/registers.c | |
| parent | 896d8a3acd0ea91858c7a23b2dbce174f7da7fba (diff) | |
| parent | 91c55503a860ffc02a2687c141e2cfc68a43b3cc (diff) | |
| download | px4-firmware-d1909ca94bbf930d5cb4f22fa6bc00d07cd26b0e.tar.gz px4-firmware-d1909ca94bbf930d5cb4f22fa6bc00d07cd26b0e.tar.bz2 px4-firmware-d1909ca94bbf930d5cb4f22fa6bc00d07cd26b0e.zip | |
Merge pull request #878 from PX4/sbus_out
S.BUS output
Diffstat (limited to 'src/modules/px4iofirmware/registers.c')
| -rw-r--r-- | src/modules/px4iofirmware/registers.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/modules/px4iofirmware/registers.c b/src/modules/px4iofirmware/registers.c index 9e5d7e7e2..fd7c6081f 100644 --- a/src/modules/px4iofirmware/registers.c +++ b/src/modules/px4iofirmware/registers.c @@ -463,9 +463,18 @@ registers_set_one(uint8_t page, uint8_t offset, uint16_t value) #ifdef ENABLE_SBUS_OUT ENABLE_SBUS_OUT(value & (PX4IO_P_SETUP_FEATURES_SBUS1_OUT | PX4IO_P_SETUP_FEATURES_SBUS2_OUT)); - /* disable the conflicting options */ - if (value & (PX4IO_P_SETUP_FEATURES_SBUS1_OUT | PX4IO_P_SETUP_FEATURES_SBUS2_OUT)) { - value &= ~(PX4IO_P_SETUP_FEATURES_PWM_RSSI | PX4IO_P_SETUP_FEATURES_ADC_RSSI); + /* disable the conflicting options with SBUS 1 */ + if (value & (PX4IO_P_SETUP_FEATURES_SBUS1_OUT)) { + value &= ~(PX4IO_P_SETUP_FEATURES_PWM_RSSI | + PX4IO_P_SETUP_FEATURES_ADC_RSSI | + PX4IO_P_SETUP_FEATURES_SBUS2_OUT); + } + + /* disable the conflicting options with SBUS 2 */ + if (value & (PX4IO_P_SETUP_FEATURES_SBUS2_OUT)) { + value &= ~(PX4IO_P_SETUP_FEATURES_PWM_RSSI | + PX4IO_P_SETUP_FEATURES_ADC_RSSI | + PX4IO_P_SETUP_FEATURES_SBUS1_OUT); } #endif |