From 3bf4ffa764d74842969df70fbf0ad4fceb247055 Mon Sep 17 00:00:00 2001 From: pascallanger Date: Wed, 12 Aug 2026 11:10:59 +0200 Subject: [PATCH] MT99X/PA18:new try --- Multiprotocol/MT99xx_ccnrf.ino | 17 +++++++++++------ Multiprotocol/Multiprotocol.h | 2 +- Multiprotocol/Validate.h | 3 --- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Multiprotocol/MT99xx_ccnrf.ino b/Multiprotocol/MT99xx_ccnrf.ino index 9bba6f66..c2dbbb6d 100644 --- a/Multiprotocol/MT99xx_ccnrf.ino +++ b/Multiprotocol/MT99xx_ccnrf.ino @@ -129,13 +129,18 @@ static void __attribute__((unused)) MT99XX_send_packet() static uint8_t seq_num=0; //Set RF freq - if(sub_protocol == LS) - XN297_RFChannel(0x2D); // LS always transmits on the same channel + if(IS_BIND_IN_PROGRESS && sub_protocol == PA18+8) + XN297_RFChannel(0x02); else - if(sub_protocol==FY805) - XN297_RFChannel(0x4B); // FY805 always transmits on the same channel - else // MT99 & H7 & YZ & A180 & DRAGON & F949G & PA18 - XN297_Hopping(hopping_frequency_no); + { + if(sub_protocol == LS) + XN297_RFChannel(0x2D); // LS always transmits on the same channel + else + if(sub_protocol==FY805) + XN297_RFChannel(0x4B); // FY805 always transmits on the same channel + else // MT99 & H7 & YZ & A180 & DRAGON & F949G & PA18 + XN297_Hopping(hopping_frequency_no); + } if(IS_BIND_IN_PROGRESS) { diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index 450e2965..3a6c043f 100644 --- a/Multiprotocol/Multiprotocol.h +++ b/Multiprotocol/Multiprotocol.h @@ -19,7 +19,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 3 #define VERSION_REVISION 4 -#define VERSION_PATCH_LEVEL 63 +#define VERSION_PATCH_LEVEL 64 #define MODE_SERIAL 0 diff --git a/Multiprotocol/Validate.h b/Multiprotocol/Validate.h index d9d67756..e0a8b827 100644 --- a/Multiprotocol/Validate.h +++ b/Multiprotocol/Validate.h @@ -387,12 +387,9 @@ #ifdef MULTI_AIR #undef JOYSWAY_A7105_INO - //#undef KYOSHO_A7105_INO - //#undef PELIKAN_A7105_INO #undef LOSI_CYRF6936_INO //Need DSM to be enabled #undef TRAXXAS_CYRF6936_INO #undef EAZYRC_NRF24L01_INO - //#undef KYOSHO2_NRF24L01_INO #undef KYOSHO3_CYRF6936_INO #undef MOULDKG_NRF24L01_INO #undef SHENQI_NRF24L01_INO