gomaomao/DIY-Multiprotocol-TX-Module
1
0
Fork 0
mirror of https://github.com/pascallanger/DIY-Multiprotocol-TX-Module.git synced 2025-03-15 12:59:09 +00:00
Code Issues Projects Releases Wiki Activity

FX small changes

Browse Source
This commit is contained in:
pascallanger 2025-03-13 19:13:14 +01:00
parent 77efe467ad
commit 432e2e08a4
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Multiprotocol/FX_nrf24l01.ino
View File

@ -52,7 +52,7 @@ static void __attribute__((unused)) FX_send_packet()
{ {
XN297_Hopping(hopping_frequency_no++); XN297_Hopping(hopping_frequency_no++);
if(sub_protocol >= FX9630) if(sub_protocol >= FX9630)
{ // FX9630 & FX_Q560 { // FX9630 & FX_Q560 & FX_QF012
XN297_SetTXAddr(rx_tx_addr, 4); XN297_SetTXAddr(rx_tx_addr, 4);
if (hopping_frequency_no >= FX9630_NUM_CHANNELS) if (hopping_frequency_no >= FX9630_NUM_CHANNELS)
{ {
@ -60,13 +60,13 @@ static void __attribute__((unused)) FX_send_packet()
if(sub_protocol == FX9630) if(sub_protocol == FX9630)
{ {
trim_ch++; trim_ch++;
if(trim_ch > 3) trim_ch = 0; trim_ch &= 3;
} }
else // FX_Q560, QF012 else // FX_Q560 & FX_QF012
trim_ch = 0; trim_ch = 0;
} }
} }
else // FX816 and FX620 else // FX816 & FX620
{ {
hopping_frequency_no &= 0x03; hopping_frequency_no &= 0x03;
} }
@ -220,13 +220,14 @@ static void __attribute__((unused)) FX_initialize_txid()
} }
else // FX9630 & FX_Q560 else // FX9630 & FX_Q560
{ {
//??? Need to find out how the first RF channel is calculated ???
hopping_frequency[0] = 0x13;
//Other 2 RF channels are sent during the bind phase so they can be whatever
hopping_frequency[1] = RX_num & 0x0F + 0x1A;
hopping_frequency[2] = rx_tx_addr[3] & 0x0F + 0x38;
#ifdef FORCE_FX9630_ID #ifdef FORCE_FX9630_ID
memcpy(rx_tx_addr,(uint8_t*)"\xCE\x31\x9B\x73", 4); memcpy(rx_tx_addr,(uint8_t*)"\xCE\x31\x9B\x73", 4);
memcpy(hopping_frequency,"\x13\x1A\x38", FX9630_NUM_CHANNELS); //Original dump=>19=0x13,26=0x1A,56=0x38 memcpy(hopping_frequency,"\x13\x1A\x38", FX9630_NUM_CHANNELS); //Original dump=>19=0x13,26=0x1A,56=0x38
#else
hopping_frequency[0] = 0x13; // constant???
hopping_frequency[1] = RX_num & 0x0F + 0x1A;
hopping_frequency[2] = rx_tx_addr[3] & 0x0F + 0x38;
#endif #endif
#ifdef FORCE_QIDI_ID #ifdef FORCE_QIDI_ID
memcpy(rx_tx_addr,(uint8_t*)"\x23\xDC\x76\xA2", 4); memcpy(rx_tx_addr,(uint8_t*)"\x23\xDC\x76\xA2", 4);
@ -236,7 +237,6 @@ static void __attribute__((unused)) FX_initialize_txid()
//memcpy(rx_tx_addr,(uint8_t*)"\x38\xC7\x6D\x8D", 4); //memcpy(rx_tx_addr,(uint8_t*)"\x38\xC7\x6D\x8D", 4);
//memcpy(hopping_frequency,"\x0D\x20\x3A", FX9630_NUM_CHANNELS); //memcpy(hopping_frequency,"\x0D\x20\x3A", FX9630_NUM_CHANNELS);
#endif #endif
//??? Need to find out how the first RF channel is calculated ???
} }
} }

2
Multiprotocol/Multiprotocol.h
View File

@ -492,7 +492,7 @@ enum FX
FX620 = 1, FX620 = 1,
FX9630 = 2, FX9630 = 2,
FX_Q560 = 3, FX_Q560 = 3,
FX_QF012 = 4, FX_QF012 = 4,
}; };
enum SGF22 enum SGF22
{ {