diff --git a/Multiprotocol/Multi_Names.ino b/Multiprotocol/Multi_Names.ino index 83bebf9..98b3573 100644 --- a/Multiprotocol/Multi_Names.ino +++ b/Multiprotocol/Multi_Names.ino @@ -119,6 +119,7 @@ enum OPTION_TELEM, OPTION_SRVFREQ, OPTION_MAXTHR, + OPTION_RFCHAN }; #define NO_SUBTYPE nullptr @@ -294,7 +295,7 @@ const mm_protocol_definition multi_protocols[] = { {PROTO_HOTT, STR_HOTT, 0, NO_SUBTYPE, OPTION_RFTUNE }, #endif #if defined(XN297DUMP_NRF24L01_INO) - {PROTO_XN297DUMP, STR_XN297DUMP, 3, STR_SUBTYPE_XN297DUMP, OPTION_NONE }, + {PROTO_XN297DUMP, STR_XN297DUMP, 3, STR_SUBTYPE_XN297DUMP, OPTION_RFCHAN }, #endif {0x00, nullptr, 0, nullptr, 0 } }; diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index cd61eed..02964db 100644 --- a/Multiprotocol/Multiprotocol.h +++ b/Multiprotocol/Multiprotocol.h @@ -19,7 +19,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 3 #define VERSION_REVISION 0 -#define VERSION_PATCH_LEVEL 41 +#define VERSION_PATCH_LEVEL 42 //****************** // Protocols @@ -913,6 +913,7 @@ Serial: 100000 Baud 8e2 _ xxxx xxxx p -- OPTION_TELEM 5 OPTION_SRVFREQ 6 OPTION_MAXTHR 7 + OPTION_RFCHAN 8 [19&0x0F] Number of sub protocols [20..27] Sub protocol name [8], not null terminated if sub prototcol len == 8 diff --git a/Multiprotocol/XN297Dump_nrf24l01.ino b/Multiprotocol/XN297Dump_nrf24l01.ino index 2ff6033..7c07918 100644 --- a/Multiprotocol/XN297Dump_nrf24l01.ino +++ b/Multiprotocol/XN297Dump_nrf24l01.ino @@ -176,6 +176,10 @@ static void __attribute__((unused)) XN297Dump_overflow() static uint16_t XN297Dump_callback() { static uint32_t time=0; + + //!!!Blocking mode protocol!!! + TX_MAIN_PAUSE_off; + tx_resume(); while(1) { if(option==0xFF && bind_counter>XN297DUMP_PERIOD_SCAN)