Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-24 00:35:39 +03:00
Code Issues Wiki Activity

Spektrum RX fix

Browse source
This commit is contained in:
Martin Budden 2016-11-09 21:38:04 +00:00
parent 054b399bbf
commit 4cd3329f9a
1 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/main/rx/spektrum.c
View file

@ -108,20 +108,16 @@ static uint32_t spekChannelData[SPEKTRUM_MAX_SUPPORTED_CHANNEL_COUNT];
uint8_t spektrumFrameStatus(void)
{
uint8_t b;
uint16_t fade;
uint32_t current_secs;
if (!rcFrameComplete) {
return RX_FRAME_PENDING;
}
rcFrameComplete = false;
// Fetch the fade count
fade = (spekFrame[0] << 8) + spekFrame[1];
current_secs = micros() / 1000 / (1000 / SPEKTRUM_FADE_REPORTS_PER_SEC);
const uint16_t fade = (spekFrame[0] << 8) + spekFrame[1];
const uint32_t current_secs = micros() / 1000 / (1000 / SPEKTRUM_FADE_REPORTS_PER_SEC);
if (spek_fade_last_sec == 0) {
// This is the first frame status received.
spek_fade_last_sec_count = fade;
@ -140,12 +136,11 @@ uint8_t spektrumFrameStatus(void)
spek_fade_last_sec_count = fade;
spek_fade_last_sec = current_secs;
}
for (b = 3; b < SPEK_FRAME_SIZE; b += 2) {
uint8_t spekChannel = 0x0F & (spekFrame[b - 1] >> spek_chan_shift);
for (int b = 3; b < SPEK_FRAME_SIZE; b += 2) {
const uint8_t spekChannel = 0x0F & (spekFrame[b - 1] >> spek_chan_shift);
if (spekChannel < rxRuntimeConfigPtr->channelCount && spekChannel < SPEKTRUM_MAX_SUPPORTED_CHANNEL_COUNT) {
if(rssi_channel != 0 && spekChannel != rssi_channel) {
if(rssi_channel == 0 || spekChannel != rssi_channel) {
spekChannelData[spekChannel] = ((uint32_t)(spekFrame[b - 1] & spek_chan_mask) << 8) + spekFrame[b];
}
}