From 495706314f23e57e7b0af6577c2fdedac00e942f Mon Sep 17 00:00:00 2001 From: pascallanger Date: Wed, 29 Nov 2023 15:40:08 +0100 Subject: [PATCH] Pelikan: 1 more High ID / frequency table --- Multiprotocol/Pelikan_a7105.ino | 13 +++++++++---- Protocols_Details.md | 4 ++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Multiprotocol/Pelikan_a7105.ino b/Multiprotocol/Pelikan_a7105.ino index d6ae4a3..5006cdd 100644 --- a/Multiprotocol/Pelikan_a7105.ino +++ b/Multiprotocol/Pelikan_a7105.ino @@ -292,7 +292,8 @@ const uint8_t PROGMEM pelikan_lite_hopp[][PELIKAN_NUM_RF_CHAN] = { #ifdef PELIKAN_SCX24_FORCE_HOP const uint8_t PROGMEM pelikan_scx24_hopp[][PELIKAN_NUM_RF_CHAN] = { { 0x1E,0x32,0x46,0x5A,0x44,0x58,0x2E,0x42,0x56,0x2C,0x40,0x54,0x2A,0x3E,0x52,0x28,0x3C,0x50,0x26,0x3A,0x4E,0x24,0x38,0x4C,0x22,0x36,0x4A,0x20,0x1A }, - { 0x2C,0x44,0x1E,0x52,0x56,0x22,0x3A,0x3E,0x34,0x4C,0x26,0x5A,0x50,0x2A,0x42,0x38,0x2E,0x46,0x20,0x54,0x4A,0x24,0x3C,0x32,0x28,0x40,0x58,0x1B,0x4E } + { 0x2C,0x44,0x1E,0x52,0x56,0x22,0x3A,0x3E,0x34,0x4C,0x26,0x5A,0x50,0x2A,0x42,0x38,0x2E,0x46,0x20,0x54,0x4A,0x24,0x3C,0x32,0x28,0x40,0x58,0x1B,0x4E }, + { 0x3C,0x4C,0x1E,0x4A,0x5A,0x2C,0x58,0x2A,0x3A,0x56,0x28,0x38,0x26,0x36,0x46,0x34,0x44,0x54,0x42,0x52,0x24,0x50,0x22,0x32,0x4E,0x20,0x40,0x3E,0x17 } }; #endif @@ -345,18 +346,22 @@ void PELIKAN_init() { #if defined(PELIKAN_SCX24_FORCE_HOP) // Hop frequency table - uint8_t num=rx_tx_addr[3] & 0x01; - if(num) + uint8_t num=rx_tx_addr[3] % 0x03; + if(num==1) {//1 rx_tx_addr[0]=0x10; // hopping freq TX2 rx_tx_addr[1]=0x63; // hopping freq TX2 } + else if(num==2) + {//2 + rx_tx_addr[0]=0x81; // hopping freq Ben + rx_tx_addr[1]=0x63; // hopping freq Ben + } else {//0 rx_tx_addr[0]=0x12; // hopping freq TX1 rx_tx_addr[1]=0x46; // hopping freq TX1 } - for(uint8_t i=0;i