dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Working around creating an error condition with more than 8 raw RC channels

This commit is contained in:
Lorenz Meier 2013-12-27 21:19:04 +01:00
parent cddbb0d23f
commit a9ea39054d
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/drivers/px4io/px4io.cpp
View File

@ -1095,8 +1095,10 @@ PX4IO::io_set_rc_config()
* assign RC_MAP_ROLL/PITCH/YAW/THROTTLE to the canonical * assign RC_MAP_ROLL/PITCH/YAW/THROTTLE to the canonical
* controls. * controls.
*/ */
/* fill the mapping with an error condition triggering value */
for (unsigned i = 0; i < _max_rc_input; i++) for (unsigned i = 0; i < _max_rc_input; i++)
input_map[i] = -1; input_map[i] = UINT16_MAX;
/* /*
* NOTE: The indices for mapped channels are 1-based * NOTE: The indices for mapped channels are 1-based
@ -1128,12 +1130,6 @@ PX4IO::io_set_rc_config()
if ((ichan >= 0) && (ichan < (int)_max_rc_input)) if ((ichan >= 0) && (ichan < (int)_max_rc_input))
input_map[ichan - 1] = 4; input_map[ichan - 1] = 4;
ichan = 5;
for (unsigned i = 0; i < _max_rc_input; i++)
if (input_map[i] == -1)
input_map[i] = ichan++;
/* /*
* Iterate all possible RC inputs. * Iterate all possible RC inputs.
*/ */

2
src/modules/px4iofirmware/registers.c
View File

@ -602,7 +602,7 @@ registers_set_one(uint8_t page, uint8_t offset, uint16_t value)
if (conf[PX4IO_P_RC_CONFIG_DEADZONE] > 500) { if (conf[PX4IO_P_RC_CONFIG_DEADZONE] > 500) {
count++; count++;
} }
if (conf[PX4IO_P_RC_CONFIG_ASSIGNMENT] >= PX4IO_RC_MAPPED_CONTROL_CHANNELS) { if ((int)(conf[PX4IO_P_RC_CONFIG_ASSIGNMENT]) < 0 || conf[PX4IO_P_RC_CONFIG_ASSIGNMENT] >= PX4IO_RC_MAPPED_CONTROL_CHANNELS) {
count++; count++;
} }