gomaomao/DIY-Multiprotocol-TX-Module
1
0
Fork 0
mirror of https://github.com/pascallanger/DIY-Multiprotocol-TX-Module.git synced 2025-07-13 02:07:53 +00:00
Code Issues Projects Releases Wiki Activity

Fix RSSI reading

Browse Source
This commit is contained in:
Goebish 2019-09-17 22:14:55 +02:00
parent 9ae0b1c385
commit 0d8df1f6f9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Multiprotocol/FrSkyX_Rx_cc2500.ino
View File

@ -13,8 +13,8 @@
along with Multiprotocol. If not, see <http://www.gnu.org/licenses/>. along with Multiprotocol. If not, see <http://www.gnu.org/licenses/>.
*/ */
#define FRSKYX_FCC_LENGTH 30 #define FRSKYX_FCC_LENGTH 30+2
#define FRSKYX_LBT_LENGTH 33 #define FRSKYX_LBT_LENGTH 33+2
enum { enum {
FRSKYX_RX_BIND, FRSKYX_RX_BIND,
@ -122,7 +122,7 @@ static void __attribute__((unused)) frskyx_rx_calibrate()
uint8_t __attribute__((unused)) frskyx_rx_check_crc() uint8_t __attribute__((unused)) frskyx_rx_check_crc()
{ {
uint8_t limit = packet_length - 2; uint8_t limit = packet_length - 4;
uint16_t lcrc = frskyX_crc_x(&packet[3], limit - 3); // computed crc uint16_t lcrc = frskyX_crc_x(&packet[3], limit - 3); // computed crc
uint16_t rcrc = (packet[limit] << 8) | (packet[limit + 1] & 0xff); // received crc uint16_t rcrc = (packet[limit] << 8) | (packet[limit + 1] & 0xff); // received crc
return lcrc == rcrc; return lcrc == rcrc;
@ -257,7 +257,7 @@ uint16_t FrSkyX_Rx_callback()
if (len >= packet_length) { if (len >= packet_length) {
CC2500_ReadData(packet, packet_length); CC2500_ReadData(packet, packet_length);
if (packet[1] == frskyx_rx_txid[0] && packet[2] == frskyx_rx_txid[1] && packet[6] == frskyx_rx_txid[2] && frskyx_rx_check_crc()) { if (packet[1] == frskyx_rx_txid[0] && packet[2] == frskyx_rx_txid[1] && packet[6] == frskyx_rx_txid[2] && frskyx_rx_check_crc()) {
frskyx_rx_rssi = CC2500_ReadReg(CC2500_READ_BURST | CC2500_34_RSSI); frskyx_rx_rssi = packet[packet_length-2];
if(frskyx_rx_rssi >= 128) if(frskyx_rx_rssi >= 128)
frskyx_rx_rssi -= 128; frskyx_rx_rssi -= 128;
else else