From 08404f9223c8c2983502e19c742debbadbb200be Mon Sep 17 00:00:00 2001 From: Pascal Langer Date: Thu, 26 Aug 2021 23:43:42 +0200 Subject: [PATCH] F949G: another try... --- Multiprotocol/MT99xx_ccnrf.ino | 19 ++++++++++--------- Multiprotocol/Multiprotocol.h | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Multiprotocol/MT99xx_ccnrf.ino b/Multiprotocol/MT99xx_ccnrf.ino index 8adff3f..a4d1d9c 100644 --- a/Multiprotocol/MT99xx_ccnrf.ino +++ b/Multiprotocol/MT99xx_ccnrf.ino @@ -105,6 +105,15 @@ 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 + else + if(sub_protocol==FY805) + XN297_RFChannel(0x4B); // FY805 always transmits on the same channel + else // MT99 & H7 & YZ & A180 & DRAGON & F949G + XN297_Hopping(hopping_frequency_no); + if(IS_BIND_IN_PROGRESS) { //Bind packet @@ -263,15 +272,7 @@ static void __attribute__((unused)) MT99XX_send_packet() } } - //RF freq - 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 - XN297_Hopping(hopping_frequency_no); - + //Hopp hopping_frequency_no++; if(sub_protocol == YZ || sub_protocol == A180 || sub_protocol == DRAGON || sub_protocol == F949G) hopping_frequency_no++; // skip every other channel diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index 419b303..d03923b 100644 --- a/Multiprotocol/Multiprotocol.h +++ b/Multiprotocol/Multiprotocol.h @@ -19,7 +19,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 3 #define VERSION_REVISION 2 -#define VERSION_PATCH_LEVEL 92 +#define VERSION_PATCH_LEVEL 93 #define MODE_SERIAL 0