fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-05-21 05:57:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Prevent RELAY1 control via IOCTL if DSM bind feature is enabled

Browse Source
This commit is contained in:
Jean Cyr
2013-07-07 19:04:30 -04:00
parent 35711280df
commit dab652faf6
3 changed files with 47 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/px4iofirmware/controls.c
+1 -1
View File
@@ -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];
src/modules/px4iofirmware/dsm.c
+1 -1
View File
@@ -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))