diff --git a/Multiprotocol/Multi_Protos.ino b/Multiprotocol/Multi_Protos.ino index ff85c1c..05de614 100644 --- a/Multiprotocol/Multi_Protos.ino +++ b/Multiprotocol/Multi_Protos.ino @@ -137,7 +137,7 @@ const char STR_SUBTYPE_POTENSIC[] = "\x03""A20"; const char STR_SUBTYPE_ZSX[] = "\x07""280JJRC"; const char STR_SUBTYPE_HEIGHT[] = "\x03""5ch""8ch"; const char STR_SUBTYPE_FX816[] = "\x03""P38"; -const char STR_SUBTYPE_XN297DUMP[] = "\x07""250Kbps""1Mbps\0 ""2Mbps\0 ""Auto\0 ""NRF\0 "; +const char STR_SUBTYPE_XN297DUMP[] = "\x07""250Kbps""1Mbps\0 ""2Mbps\0 ""Auto\0 ""NRF\0 ""CC2500\0"; const char STR_SUBTYPE_ESKY150[] = "\x03""4ch""7ch"; const char STR_SUBTYPE_ESKY150V2[] = "\x05""150V2"; const char STR_SUBTYPE_V911S[] = "\x05""V911S""E119\0"; @@ -441,7 +441,7 @@ const mm_protocol_definition multi_protocols[] = { {PROTO_XK, STR_XK, STR_SUBTYPE_XK, 2, OPTION_RFTUNE, 0, 0, SW_NRF, XK_init, XK_callback }, #endif #if defined(XN297DUMP_NRF24L01_INO) - {PROTO_XN297DUMP, STR_XN297DUMP, STR_SUBTYPE_XN297DUMP, 5, OPTION_RFCHAN, 0, 0, SW_NRF, XN297Dump_init, XN297Dump_callback }, + {PROTO_XN297DUMP, STR_XN297DUMP, STR_SUBTYPE_XN297DUMP, 6, OPTION_RFCHAN, 0, 0, SW_NRF, XN297Dump_init, XN297Dump_callback }, #endif #if defined(YD717_NRF24L01_INO) {PROTO_YD717, STR_YD717, STR_SUBTYPE_YD717, 5, OPTION_NONE, 0, 0, SW_NRF, YD717_init, YD717_callback }, diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index 3a57c6f..f7aa53d 100644 --- a/Multiprotocol/Multiprotocol.h +++ b/Multiprotocol/Multiprotocol.h @@ -113,8 +113,9 @@ enum PROTOCOLS PROTO_E129 = 83, // =>CYRF6936 PROTO_JOYSWAY = 84, // =>A7105 PROTO_E016H = 85, // =>NRF24L01 - PROTO_IKEAANSLUTA = 86, // =>CC2500 - PROTO_CONFIG = 87, // Module config + PROTO_CONFIG = 86, // Module config + PROTO_IKEAANSLUTA = 87, // =>CC2500 + PROTO_WILLIFM = 88, // 27/35ab/40/41/72 MHz module external project PROTO_NANORF = 126, // =>NRF24L01 PROTO_TEST = 127, // =>CC2500 diff --git a/Multiprotocol/XN297Dump_nrf24l01.ino b/Multiprotocol/XN297Dump_nrf24l01.ino index 6781d78..260fd03 100644 --- a/Multiprotocol/XN297Dump_nrf24l01.ino +++ b/Multiprotocol/XN297Dump_nrf24l01.ino @@ -591,15 +591,16 @@ static uint16_t XN297Dump_callback() break; } } - else + else if(sub_protocol == XN297DUMP_NRF) { if(phase==0) { - address_length=4; - memcpy(rx_tx_addr, (uint8_t *)"\x5A\xF6\xC1\x71", address_length); //"\xA3\x05\x22\xC1""\x5A\x20\x12\xAC" + address_length=5; + memcpy(rx_tx_addr, (uint8_t *)"\x61\x94\x17\x27\xED", address_length); //"\xA3\x05\x22\xC1""\x5A\x20\x12\xAC" + bitrate=XN297DUMP_250K; packet_length=32; - hopping_frequency_no=58; //bind ?, normal 60 + hopping_frequency_no=54; //bind ?, normal 60 NRF24L01_Initialize(); NRF24L01_SetTxRxMode(TXRX_OFF); @@ -639,7 +640,7 @@ static uint16_t XN297Dump_callback() //bool ok=true; uint8_t buffer[40]; memcpy(buffer,packet,packet_length); - if(memcmp(&packet_in[0],&packet[0],packet_length)) + //if(memcmp(&packet_in[0],&packet[0],packet_length)) { debug("P:"); for(uint8_t i=0;i