From cc83177542e144da0171960e88844818543e3e61 Mon Sep 17 00:00:00 2001 From: Pascal Langer Date: Tue, 28 Nov 2017 17:24:24 +0100 Subject: [PATCH] Protocol DM002: add 1 more TX ID/RF set Total of 3 known TX IDs & RFs sets. --- Multiprotocol/DM002_nrf24l01.ino | 23 ++++++++++++++--------- Multiprotocol/Multiprotocol.h | 2 +- Protocols_Details.md | 2 +- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/Multiprotocol/DM002_nrf24l01.ino b/Multiprotocol/DM002_nrf24l01.ino index bfa2a88..5bf414c 100644 --- a/Multiprotocol/DM002_nrf24l01.ino +++ b/Multiprotocol/DM002_nrf24l01.ino @@ -132,16 +132,21 @@ uint16_t DM002_callback() static void __attribute__((unused)) DM002_initialize_txid() { - // Only 2 IDs/RFs are available, RX_NUM is used to switch between them - if(rx_tx_addr[3]&1) + // Only 3 IDs/RFs are available, RX_NUM is used to switch between them + switch(rx_tx_addr[3]%3) { - memcpy(hopping_frequency,(uint8_t *)"\x34\x39\x43\x48",4); - memcpy(rx_tx_addr,(uint8_t *)"\x47\x93\x00\x00\xD5",5); - } - else - { - memcpy(hopping_frequency,(uint8_t *)"\x35\x39\x3B\x3D",4); - memcpy(rx_tx_addr,(uint8_t *)"\xAC\xA1\x00\x00\xD5",5); + case 0: + memcpy(hopping_frequency,(uint8_t *)"\x34\x39\x43\x48",4); + memcpy(rx_tx_addr,(uint8_t *)"\x47\x93\x00\x00\xD5",5); + break; + case 1: + memcpy(hopping_frequency,(uint8_t *)"\x35\x39\x3B\x3D",4); + memcpy(rx_tx_addr,(uint8_t *)"\xAC\xA1\x00\x00\xD5",5); + break; + case 2: + memcpy(hopping_frequency,(uint8_t *)"\x32\x37\x41\x46",4); + memcpy(rx_tx_addr,(uint8_t *)"\x92\x45\x01\x00\xD5",5); + break; } } diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index e018945..2216e07 100644 --- a/Multiprotocol/Multiprotocol.h +++ b/Multiprotocol/Multiprotocol.h @@ -19,7 +19,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 1 #define VERSION_REVISION 6 -#define VERSION_PATCH_LEVEL 32 +#define VERSION_PATCH_LEVEL 33 //****************** // Protocols //****************** diff --git a/Protocols_Details.md b/Protocols_Details.md index a7bda68..9922d46 100644 --- a/Protocols_Details.md +++ b/Protocols_Details.md @@ -491,7 +491,7 @@ FLIP|MODE|PICTURE|VIDEO|HEADLESS|RTH ## DM002 - *33* Autobind protocol -**Only 2 TX IDs available, change RX_Num value 0-1 to cycle through them** +**Only 3 TX IDs available, change RX_Num value 0-1-2 to cycle through them** CH1|CH2|CH3|CH4|CH5|CH6|CH7|CH8|CH9|CH10|CH11 ---|---|---|---|---|---|---|---|---|----|----