diff options
author | Jean Cyr <jcyr@dillobits.com> | 2013-07-07 19:04:30 -0400 |
---|---|---|
committer | Jean Cyr <jcyr@dillobits.com> | 2013-07-07 19:04:30 -0400 |
commit | dab652faf68931a2b1fa07609d63518237c9c8b7 (patch) | |
tree | 31f67d3ce9112c41676bcf53bbddb38b63612001 /src/modules | |
parent | 35711280df491c27ea42bd93d8102168a8514896 (diff) | |
download | px4-firmware-dab652faf68931a2b1fa07609d63518237c9c8b7.tar.gz px4-firmware-dab652faf68931a2b1fa07609d63518237c9c8b7.tar.bz2 px4-firmware-dab652faf68931a2b1fa07609d63518237c9c8b7.zip |
Prevent RELAY1 control via IOCTL if DSM bind feature is enabled
Diffstat (limited to 'src/modules')
-rw-r--r-- | src/modules/px4iofirmware/controls.c | 2 | ||||
-rw-r--r-- | src/modules/px4iofirmware/dsm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/px4iofirmware/controls.c b/src/modules/px4iofirmware/controls.c index 9561c9b1e..43d96fb06 100644 --- a/src/modules/px4iofirmware/controls.c +++ b/src/modules/px4iofirmware/controls.c @@ -145,7 +145,7 @@ controls_tick() { /* map raw inputs to mapped inputs */ /* XXX mapping should be atomic relative to protocol */ - for (unsigned i = 0; i < (r_raw_rc_count & 0x7fff); i++) { + for (unsigned i = 0; i < r_raw_rc_count; i++) { /* map the input channel */ uint16_t *conf = &r_page_rc_input_config[i * PX4IO_P_RC_CONFIG_STRIDE]; diff --git a/src/modules/px4iofirmware/dsm.c b/src/modules/px4iofirmware/dsm.c index 79e892503..ab6e3fec4 100644 --- a/src/modules/px4iofirmware/dsm.c +++ b/src/modules/px4iofirmware/dsm.c @@ -339,7 +339,7 @@ dsm_decode(hrt_abstime frame_time, uint16_t *values, uint16_t *num_values) for (unsigned i = 0; i < DSM_FRAME_CHANNELS; i++) { uint8_t *dp = &frame[2 + (2 * i)]; - uint16_t raw = ((uint16_t)dp[0] << 8) | dp[1]; + uint16_t raw = (dp[0] << 8) | dp[1]; unsigned channel, value; if (!dsm_decode_channel(raw, channel_shift, &channel, &value)) |