diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2012-09-12 17:39:02 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2012-09-12 17:39:02 +0200 |
| commit | 3536ad801017a0ef552a391bc3ac1d6cd2cb13cf (patch) | |
| tree | 43727f15869f1abe454a2c3dfe9a9fe0f3a3f2ad /apps/sensors | |
| parent | 59bd9ae92b7744a5b687c7aa38f4f7b5292574cf (diff) | |
| parent | 59b1402379124711a7a28e70dfe58352f9ae48ea (diff) | |
| download | px4-firmware-3536ad801017a0ef552a391bc3ac1d6cd2cb13cf.tar.gz px4-firmware-3536ad801017a0ef552a391bc3ac1d6cd2cb13cf.tar.bz2 px4-firmware-3536ad801017a0ef552a391bc3ac1d6cd2cb13cf.zip | |
Merge branch 'rc_cleanup' of github.com:PX4/Firmware into gps
Diffstat (limited to 'apps/sensors')
| -rw-r--r-- | apps/sensors/sensors.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/apps/sensors/sensors.cpp b/apps/sensors/sensors.cpp index 8a9e4d1ab..01c35301c 100644 --- a/apps/sensors/sensors.cpp +++ b/apps/sensors/sensors.cpp @@ -950,11 +950,15 @@ Sensors::ppm_poll() if (ppm_decoded_channels < 4) return; + unsigned channel_limit = ppm_decoded_channels; + if (channel_limit > _rc_max_chan_count) + channel_limit = _rc_max_chan_count; + /* we are accepting this decode */ _ppm_last_valid = ppm_last_valid_decode; /* Read out values from HRT */ - for (unsigned int i = 0; (i < ppm_decoded_channels && i < 8); i++) { + for (unsigned int i = 0; channel_limit; i++) { _rc.chan[i].raw = ppm_buffer[i]; /* Set the range to +-, then scale up */ _rc.chan[i].scale = (ppm_buffer[i] - _rc.chan[i].mid) * _rc.chan[i].scaling_factor * 10000; |