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

XN297Dump fix enhanced unscramble mode

Browse Source
This commit is contained in:
Pascal Langer 2019-08-24 22:39:27 +02:00
parent 1f0b21e351
commit 4e906757b9
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Multiprotocol/Multiprotocol.h
View File

@ -19,7 +19,7 @@
#define VERSION_MAJOR 1 #define VERSION_MAJOR 1
#define VERSION_MINOR 2 #define VERSION_MINOR 2
#define VERSION_REVISION 1 #define VERSION_REVISION 1
#define VERSION_PATCH_LEVEL 73 #define VERSION_PATCH_LEVEL 74
//****************** //******************
// Protocols // Protocols

11
Multiprotocol/XN297Dump_nrf24l01.ino
View File

@ -124,23 +124,24 @@ static boolean __attribute__((unused)) XN297Dump_process_packet(void)
crc_enh = crc16_update(crc, packet[i+1] & 0xC0, 2); crc_enh = crc16_update(crc, packet[i+1] & 0xC0, 2);
crcxored=(packet[i+1]<<10)|(packet[i+2]<<2)|(packet[i+3]>>6) ; crcxored=(packet[i+1]<<10)|(packet[i+2]<<2)|(packet[i+3]>>6) ;
if((crc_enh ^ pgm_read_word(&xn297_crc_xorout_scrambled_enhanced[i - 3])) == crcxored) if((crc_enh ^ pgm_read_word(&xn297_crc_xorout_scrambled_enhanced[i - 3])) == crcxored)
{ { // Found a valid CRC for the enhanced payload mode
packet_length=i; packet_length=i;
scramble=true;
i++; i++;
packet_sc[i]=packet[i]^xn297_scramble[i]; packet_sc[i]=packet[i]^xn297_scramble[i];
memcpy(packet_un,packet_sc,packet_length+2); // unscramble packet memcpy(packet_un,packet_sc,packet_length+2); // unscramble packet
scramble=true;
break; break;
} }
if((crc_enh ^ pgm_read_word(&xn297_crc_xorout_enhanced[i - 3])) == crcxored) if((crc_enh ^ pgm_read_word(&xn297_crc_xorout_enhanced[i - 3])) == crcxored)
{ { // Found a valid CRC for the enhanced payload mode
scramble=false;
packet_length=i; packet_length=i;
scramble=false;
memcpy(packet_un,packet,packet_length+2); // packet is unscrambled
break; break;
} }
} }
if(packet_length!=0) if(packet_length!=0)
{ { // Found a valid CRC for the enhanced payload mode
debug("Enhanced "); debug("Enhanced ");
//check selected address length //check selected address length
if((packet_un[address_length]>>1)!=packet_length-address_length) if((packet_un[address_length]>>1)!=packet_length-address_length)