From 08ea8818fb02c9941bca644b5220d5ac291144d6 Mon Sep 17 00:00:00 2001 From: Pascal Langer Date: Wed, 24 Feb 2021 10:26:58 +0100 Subject: [PATCH] E010R5: 5th ID --- Multiprotocol/E010R5_cyrf6936.ino | 30 +++++++++++++++++++----------- Multiprotocol/Multiprotocol.h | 2 +- Protocols_Details.md | 2 +- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/Multiprotocol/E010R5_cyrf6936.ino b/Multiprotocol/E010R5_cyrf6936.ino index 986c3ca..7142d0c 100644 --- a/Multiprotocol/E010R5_cyrf6936.ino +++ b/Multiprotocol/E010R5_cyrf6936.ino @@ -19,7 +19,6 @@ #define E010R5_FORCE_ID -#define E010R5_BIND_CH 0x2D //45 #define E010R5_PAYLOAD_SIZE 14 @@ -96,40 +95,49 @@ void E010R5_init() RF2500_Init(E010R5_PAYLOAD_SIZE, false); // 14 bytes, not scrambled RF2500_SetTXAddr((uint8_t*)"\x0E\x54\x96\xEE"); // Same address for bind and normal packets + rx_tx_addr[0]=0x00; + hopping_frequency[0]=0x35; //53 #ifdef E010R5_FORCE_ID - switch(rx_tx_addr[3]&0x03) + switch(rx_tx_addr[3]%5) { case 0: //TX1 - hopping_frequency[0]=0x35; //53 - hopping_frequency[1]=0x30; //48 + //hopping_frequency[0]=0x35; //53 + hopping_frequency[1]=0x30; //48 rx_tx_addr[1]=0x45; rx_tx_addr[2]=0x46; break; case 1: //TX2 - hopping_frequency[0]=0x35; //53 - hopping_frequency[1]=0x3C; //60 + //hopping_frequency[0]=0x35; //53 + hopping_frequency[1]=0x3C; //60 rx_tx_addr[1]=0x1B; rx_tx_addr[2]=0x9E; break; case 2: //TX4 - hopping_frequency[0]=0x30; //48 - hopping_frequency[1]=0x38; //56 + hopping_frequency[0]=0x30; //48 + hopping_frequency[1]=0x38; //56 rx_tx_addr[1]=0x2E; rx_tx_addr[2]=0xAE; break; + case 3: + //TX5 + //hopping_frequency[0]=0x35; //53 + hopping_frequency[1]=0x41; //65 + rx_tx_addr[0]=0x0D; + rx_tx_addr[1]=0xB9; + rx_tx_addr[2]=0xFC; + break; default: //TX3 - hopping_frequency[0]=0x30; //48 - hopping_frequency[1]=0x38; //56 + hopping_frequency[0]=0x30; //48 + hopping_frequency[1]=0x38; //56 rx_tx_addr[1]=0x17; rx_tx_addr[2]=0x0D; break; } #endif - rx_tx_addr[0]=0x00; // This is the same as the E010 v1... hopping_frequency[2]=hopping_frequency[0]+0x10; hopping_frequency[3]=hopping_frequency[1]+0x10; diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index 2d424ea..7fa5127 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 49 +#define VERSION_PATCH_LEVEL 50 //****************** // Protocols diff --git a/Protocols_Details.md b/Protocols_Details.md index b56b344..5d3132c 100644 --- a/Protocols_Details.md +++ b/Protocols_Details.md @@ -513,7 +513,7 @@ Models: E010 R5 red boards, JJRC H36, H36F and H36S Autobind protocol. -**Only 4 IDs are available**. More IDs can be added if you send me your "unused" original TX. +**Only 5 IDs are available**. Use RX num to cycle through them. More IDs can be added if you send me your "unused" original TX. CH1|CH2|CH3|CH4|CH5|CH6|CH7|CH8|CH9|CH10 ---|---|---|---|---|---|---|---|---|---