diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-12-27 21:19:04 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-12-27 21:19:04 +0100 |
| commit | a9ea39054dbd6eb62fb3185465848a485c32a046 (patch) | |
| tree | e3fd89fe2cdaa6ecefb4751446c35ec1fb250e8d /src | |
| parent | cddbb0d23fc21d4b1c0d9b734dd98447fc814ad9 (diff) | |
| download | px4-firmware-a9ea39054dbd6eb62fb3185465848a485c32a046.tar.gz px4-firmware-a9ea39054dbd6eb62fb3185465848a485c32a046.tar.bz2 px4-firmware-a9ea39054dbd6eb62fb3185465848a485c32a046.zip | |
Working around creating an error condition with more than 8 raw RC channels
Diffstat (limited to 'src')
| -rw-r--r-- | src/drivers/px4io/px4io.cpp | 10 | ||||
| -rw-r--r-- | src/modules/px4iofirmware/registers.c | 2 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/drivers/px4io/px4io.cpp b/src/drivers/px4io/px4io.cpp index 9812ea497..22d707233 100644 --- a/src/drivers/px4io/px4io.cpp +++ b/src/drivers/px4io/px4io.cpp @@ -1095,8 +1095,10 @@ PX4IO::io_set_rc_config() * assign RC_MAP_ROLL/PITCH/YAW/THROTTLE to the canonical * controls. */ + + /* fill the mapping with an error condition triggering value */ 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 @@ -1128,12 +1130,6 @@ PX4IO::io_set_rc_config() if ((ichan >= 0) && (ichan < (int)_max_rc_input)) 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. */ diff --git a/src/modules/px4iofirmware/registers.c b/src/modules/px4iofirmware/registers.c index 7ef1aa309..b0922f4d6 100644 --- a/src/modules/px4iofirmware/registers.c +++ b/src/modules/px4iofirmware/registers.c @@ -602,7 +602,7 @@ registers_set_one(uint8_t page, uint8_t offset, uint16_t value) if (conf[PX4IO_P_RC_CONFIG_DEADZONE] > 500) { 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++; } |