Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-17 13:25:30 +03:00
Code Issues Wiki Activity

SRXL2 failsafe fix for newer receivers (#9189)

Browse source 
SRXL2 failsafe fix for newer receivers
This commit is contained in:
Michael Keller 2019-12-04 15:49:38 +13:00
parent 534ea7577b
commit 68cdde94fc
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/main/rx/srxl2.c
View file

@ -168,18 +168,17 @@ bool srxl2ProcessHandshake(const Srxl2Header* header)
} }
void srxl2ProcessChannelData(const Srxl2ChannelDataHeader* channelData, rxRuntimeConfig_t *rxRuntimeConfig) { void srxl2ProcessChannelData(const Srxl2ChannelDataHeader* channelData, rxRuntimeConfig_t *rxRuntimeConfig) {
globalResult = RX_FRAME_COMPLETE;
if (channelData->rssi >= 0) { if (channelData->rssi >= 0) {
const int rssiPercent = channelData->rssi; const int rssiPercent = channelData->rssi;
setRssi(scaleRange(rssiPercent, 0, 100, 0, RSSI_MAX_VALUE), RSSI_SOURCE_RX_PROTOCOL); setRssi(scaleRange(rssiPercent, 0, 100, 0, RSSI_MAX_VALUE), RSSI_SOURCE_RX_PROTOCOL);
} else {
// If dBm value provided, cant properly convert to % without knowing the receivers sensitivity range. Fix at 50% for now.
setRssi(RSSI_MAX_VALUE / 2, RSSI_SOURCE_RX_PROTOCOL);
} }
if (channelData->rssi == 0) { //If receiver is in a connected state, and a packet is missed, the channel mask will be 0.
globalResult = RX_FRAME_FAILSAFE; if (!channelData->channelMask.u32) {
} else { globalResult |= RX_FRAME_FAILSAFE;
globalResult = RX_FRAME_COMPLETE; return;
} }
const uint16_t *frameChannels = (const uint16_t *) (channelData + 1); const uint16_t *frameChannels = (const uint16_t *) (channelData + 1);
@ -209,7 +208,7 @@ bool srxl2ProcessControlData(const Srxl2Header* header, rxRuntimeConfig_t *rxRun
break; break;
case FailsafeChannelData: { case FailsafeChannelData: {
srxl2ProcessChannelData((const Srxl2ChannelDataHeader *) (controlData + 1), rxRuntimeConfig); globalResult |= RX_FRAME_FAILSAFE;
setRssiDirect(0, RSSI_SOURCE_RX_PROTOCOL); setRssiDirect(0, RSSI_SOURCE_RX_PROTOCOL);
// DEBUG_PRINTF("fs channel data\r\n"); // DEBUG_PRINTF("fs channel data\r\n");
} break; } break;