From c3a5c263d3d163684075d626101ea57dae6418b8 Mon Sep 17 00:00:00 2001 From: Pascal Langer Date: Fri, 17 May 2019 19:56:52 +0200 Subject: [PATCH] XN297Dump fix CRC... --- Multiprotocol/Multiprotocol.h | 2 +- Multiprotocol/XN297Dump_nrf24l01.ino | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index 1969753..6f7ecc4 100644 --- a/Multiprotocol/Multiprotocol.h +++ b/Multiprotocol/Multiprotocol.h @@ -19,7 +19,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 2 #define VERSION_REVISION 1 -#define VERSION_PATCH_LEVEL 48 +#define VERSION_PATCH_LEVEL 49 //****************** // Protocols diff --git a/Multiprotocol/XN297Dump_nrf24l01.ino b/Multiprotocol/XN297Dump_nrf24l01.ino index 0f60ea8..db5377a 100644 --- a/Multiprotocol/XN297Dump_nrf24l01.ino +++ b/Multiprotocol/XN297Dump_nrf24l01.ino @@ -18,7 +18,7 @@ #include "iface_nrf24l01.h" // Parameters which can be modified -#define XN297DUMP_PERIOD_DUMP 2000 // Multiplied by 50, default 2000=100ms +#define XN297DUMP_PERIOD_DUMP 3000 // Multiplied by 50, default 3000=150ms #define XN297DUMP_MAX_RF_CHANNEL 84 // Default 84 // Do not touch from there @@ -72,7 +72,7 @@ static boolean __attribute__((unused)) XN297Dump_process_packet(void) uint8_t packet_ori[XN297DUMP_MAX_PACKET_LEN]; memcpy(packet_ori,packet,XN297DUMP_MAX_PACKET_LEN); address_length=5; - + while(address_length >= 3) { // init crc @@ -99,9 +99,9 @@ static boolean __attribute__((unused)) XN297Dump_process_packet(void) packet[i] = bit_reverse(packet[i]); // check crc if (RX_num) - crcxored = crc ^ pgm_read_word(&xn297_crc_xorout[i - 3]); + crcxored = crc ^ pgm_read_word(&xn297_crc_xorout[i+1 - 3]); else - crcxored = crc ^ pgm_read_word(&xn297_crc_xorout_scrambled[i - 3]); + crcxored = crc ^ pgm_read_word(&xn297_crc_xorout_scrambled[i+1 - 3]); if( (crcxored >> 8) == packet[i + 1] && (crcxored & 0xff) == packet[i + 2]) { packet_length=i+1;