From 59b1402379124711a7a28e70dfe58352f9ae48ea Mon Sep 17 00:00:00 2001 From: px4dev Date: Wed, 12 Sep 2012 08:37:05 -0700 Subject: Compute the channel bound once before the loop runs. --- apps/sensors/sensors.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'apps/sensors') diff --git a/apps/sensors/sensors.cpp b/apps/sensors/sensors.cpp index fae19b12a..19bceb842 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; -- cgit v1.2.3