aboutsummaryrefslogtreecommitdiff
path: root/src/modules/px4iofirmware/dsm.c
diff options
context:
space:
mode:
authorJean Cyr <jcyr@dillobits.com>2013-07-07 19:04:30 -0400
committerJean Cyr <jcyr@dillobits.com>2013-07-07 19:04:30 -0400
commitdab652faf68931a2b1fa07609d63518237c9c8b7 (patch)
tree31f67d3ce9112c41676bcf53bbddb38b63612001 /src/modules/px4iofirmware/dsm.c
parent35711280df491c27ea42bd93d8102168a8514896 (diff)
downloadpx4-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/px4iofirmware/dsm.c')
-rw-r--r--src/modules/px4iofirmware/dsm.c2
1 files changed, 1 insertions, 1 deletions
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))