rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

separate TELEMETRY and RSSI

This commit is contained in:
chibaron 2018-10-04 00:42:52 +09:00
parent f04f2f7cbb
commit 7f26db0b07
3 changed files with 26 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/rx/cc2500_frsky_d.c
View File

@ -220,10 +220,10 @@ rx_spi_received_e frSkyDHandlePacket(uint8_t * const packet, uint8_t * const pro
(packet[2] == rxFrSkySpiConfig()->bindTxId[1])) {
cc2500LedOn();
nextChannel(1);
cc2500setRssiDbm(packet[18]);
#if defined(USE_RX_FRSKY_SPI_TELEMETRY)
if ((packet[3] % 4) == 2) {
telemetryTimeUs = micros();
cc2500setRssiDbm(packet[18]);
buildTelemetryFrame(packet);
*protocolState = STATE_TELEMETRY;
} else
@ -254,9 +254,7 @@ rx_spi_received_e frSkyDHandlePacket(uint8_t * const packet, uint8_t * const pro
if (missingPackets > MAX_MISSING_PKT) {
timeoutUs = 50;
#if defined(USE_RX_FRSKY_SPI_TELEMETRY)
setRssiDirect(0, RSSI_SOURCE_RX_PROTOCOL);
#endif
}
missingPackets++;
@ -269,9 +267,7 @@ rx_spi_received_e frSkyDHandlePacket(uint8_t * const packet, uint8_t * const pro
}
ledIsOn = !ledIsOn;
#if defined(USE_RX_FRSKY_SPI_TELEMETRY)
setRssi(0, RSSI_SOURCE_RX_PROTOCOL);
#endif
nextChannel(13);
}

4
src/main/rx/cc2500_frsky_x.c
View File

@ -376,9 +376,7 @@ rx_spi_received_e frSkyXHandlePacket(uint8_t * const packet, uint8_t * const pro
telemetryReceived = true; // now telemetry can be sent
skipChannels = false;
}
#ifdef USE_RX_FRSKY_SPI_TELEMETRY
cc2500setRssiDbm(packet[ccLen - 2]);
#endif
telemetrySequenceMarker_t *inFrameMarker = (telemetrySequenceMarker_t *)&packet[21];
@ -451,9 +449,7 @@ rx_spi_received_e frSkyXHandlePacket(uint8_t * const packet, uint8_t * const pro
}
ledIsOn = !ledIsOn;
#if defined(USE_RX_FRSKY_SPI_TELEMETRY)
setRssiDirect(0, RSSI_SOURCE_RX_PROTOCOL);
#endif
nextChannel(1);
cc2500Strobe(CC2500_SRX);
*protocolState = STATE_UPDATE;