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

XK X420/X520: 2 valid IDs

Browse Source 
IDs are selected using RX num.
This commit is contained in:
pascallanger 2020-01-14 22:51:47 +01:00
parent 5df877f32c
commit 7a5b4dea1a
2 changed files with 56 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Multiprotocol/Multiprotocol.h
View File

@ -19,7 +19,7 @@
#define VERSION_MAJOR 1 #define VERSION_MAJOR 1
#define VERSION_MINOR 3 #define VERSION_MINOR 3
#define VERSION_REVISION 0 #define VERSION_REVISION 0
#define VERSION_PATCH_LEVEL 59 #define VERSION_PATCH_LEVEL 60
//****************** //******************
// Protocols // Protocols

85
Multiprotocol/XK_nrf24l01.ino
View File

@ -12,7 +12,7 @@ Multiprotocol is distributed in the hope that it will be useful,
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with Multiprotocol. If not, see <http://www.gnu.org/licenses/>. along with Multiprotocol. If not, see <http://www.gnu.org/licenses/>.
*/ */
// Compatible with X450 and X420 plane. // Compatible with X450 and X420/X520 plane.
#if defined(XK_NRF24L01_INO) #if defined(XK_NRF24L01_INO)
@ -47,9 +47,9 @@ static uint16_t __attribute__((unused)) XK_convert_channel(uint8_t num)
static void __attribute__((unused)) XK_send_packet() static void __attribute__((unused)) XK_send_packet()
{ {
memset(packet,0x00,16); memset(packet,0x00,7);
memset(&packet[10],0x00,5);
memcpy(&packet[7],rx_tx_addr,3);
packet[12]=0x40; packet[12]=0x40;
packet[13]=0x40; packet[13]=0x40;
if(IS_BIND_IN_PROGRESS) if(IS_BIND_IN_PROGRESS)
@ -58,16 +58,16 @@ static void __attribute__((unused)) XK_send_packet()
{ {
uint16_t val=convert_channel_10b(THROTTLE); uint16_t val=convert_channel_10b(THROTTLE);
packet[0] = val>>2; // 0..255 packet[0] = val>>2; // 0..255
if(sub_protocol==X450) packet[12] |= val & 2; packet[12] |= val & 2;
val=XK_convert_channel(RUDDER); val=XK_convert_channel(RUDDER);
packet[1] = val>>2; packet[1] = val>>2;
if(sub_protocol==X450) packet[12] |= (val & 2)<<2; packet[12] |= (val & 2)<<2;
val=XK_convert_channel(ELEVATOR); val=XK_convert_channel(ELEVATOR);
packet[2] = val>>2; packet[2] = val>>2;
if(sub_protocol==X450) packet[13] |= val & 2; packet[13] |= val & 2;
val=XK_convert_channel(AILERON); val=XK_convert_channel(AILERON);
packet[3] = val>>2; packet[3] = val>>2;
if(sub_protocol==X450) packet[13] |= (val & 2)<<2; packet[13] |= (val & 2)<<2;
memset(&packet[4],0x40,3); // Trims memset(&packet[4],0x40,3); // Trims
@ -91,16 +91,16 @@ static void __attribute__((unused)) XK_send_packet()
crc+=packet[i]; crc+=packet[i];
packet[15]=crc; packet[15]=crc;
//debug("C: %02X, P:",hopping_frequency[(IS_BIND_IN_PROGRESS?0:XK_RF_BIND_NUM_CHANNELS)+(hopping_frequency_no>>1)]); debug("C: %02X, P:",hopping_frequency[(IS_BIND_IN_PROGRESS?0:XK_RF_BIND_NUM_CHANNELS)+(hopping_frequency_no>>1)]);
XN297L_Hopping((IS_BIND_IN_PROGRESS?0:XK_RF_BIND_NUM_CHANNELS)+(hopping_frequency_no>>1)); XN297L_Hopping((IS_BIND_IN_PROGRESS?0:XK_RF_BIND_NUM_CHANNELS)+(hopping_frequency_no>>1));
hopping_frequency_no++; hopping_frequency_no++;
if(hopping_frequency_no >= (IS_BIND_IN_PROGRESS?XK_RF_BIND_NUM_CHANNELS*2:XK_RF_NUM_CHANNELS*2)) if(hopping_frequency_no >= (IS_BIND_IN_PROGRESS?XK_RF_BIND_NUM_CHANNELS*2:XK_RF_NUM_CHANNELS*2))
hopping_frequency_no=0; hopping_frequency_no=0;
XN297L_WritePayload(packet, XK_PAYLOAD_SIZE); XN297L_WritePayload(packet, XK_PAYLOAD_SIZE);
//for(uint8_t i=0; i<XK_PAYLOAD_SIZE; i++) for(uint8_t i=0; i<XK_PAYLOAD_SIZE; i++)
// debug(" %02X",packet[i]); debug(" %02X",packet[i]);
//debugln(""); debugln("");
XN297L_SetPower(); // Set tx_power XN297L_SetPower(); // Set tx_power
XN297L_SetFreqOffset(); // Set frequency offset XN297L_SetFreqOffset(); // Set frequency offset
@ -114,33 +114,43 @@ static void __attribute__((unused)) XK_initialize_txid()
for(uint8_t i=0; i<XK_RF_BIND_NUM_CHANNELS; i++) for(uint8_t i=0; i<XK_RF_BIND_NUM_CHANNELS; i++)
hopping_frequency[i]=pgm_read_byte_near( &XK_bind_hop[i] ); hopping_frequency[i]=pgm_read_byte_near( &XK_bind_hop[i] );
#ifdef FORCE_XK_ORIGINAL_ID switch(RX_num%2) // only 2 valid IDs for now
if(sub_protocol==X450)
{ {
default:
// TX1 X8 X450 // TX1 X8 X450
rx_tx_addr[0]=0x04; //GID
rx_tx_addr[1]=0x15; packet[7]=0x04;
rx_tx_addr[2]=0x22; packet[8]=0x15;
memcpy(&hopping_frequency[XK_RF_BIND_NUM_CHANNELS],"\x3B\x48\x40\x49", XK_RF_NUM_CHANNELS); // freq and order verified packet[9]=0x22;
//Normal packet address \x2C\x96\x2A\xA9\x32 //Normal hop
memcpy(&hopping_frequency[XK_RF_BIND_NUM_CHANNELS],(uint8_t*)"\x3B\x48\x40\x49", XK_RF_NUM_CHANNELS); // freq and order verified
//Normal packet address
memcpy(rx_tx_addr,(uint8_t*)"\x2C\x96\x2A\xA9\x32",5);
break;
//TX2 X450 X8? case 1:
//rx_tx_addr[0]=0x24; //TX2 X420
//rx_tx_addr[1]=0x14; //GID
//rx_tx_addr[2]=0x22; packet[7]=0x13;
//memcpy(&hopping_frequency[XK_RF_BIND_NUM_CHANNELS],"\x3A\x3B\x42\x48", XK_RF_NUM_CHANNELS); // freq unsure and order unknown packet[8]=0x24;
//Normal packet address \x2C\x96\x2A\xA9\x32 packet[9]=0x18;
//Normal hop
memcpy(&hopping_frequency[XK_RF_BIND_NUM_CHANNELS],(uint8_t*)"\x36\x41\x37\x4E", XK_RF_NUM_CHANNELS); // freq ok and order from xn297dump auto
//Normal packet address
memcpy(rx_tx_addr,(uint8_t*)"\xA6\x83\xEB\x4B\xC9",5);
break;
//case 2:
//// TX3 X8 X450
////GID
//packet[7]=0x24;
//packet[8]=0x14;
//packet[9]=0x22;
////Normal hop
//memcpy(&hopping_frequency[XK_RF_BIND_NUM_CHANNELS],(uint8_t*)"\x3A\x42\x3B\x48", XK_RF_NUM_CHANNELS); // freq unsure and order unknown
////Normal packet address
//memcpy(rx_tx_addr,(uint8_t*)"\x2C\x96\x2A\xA9\x32",5);
//break;
} }
else
{
//TX3 X420
rx_tx_addr[0]=0x13;
rx_tx_addr[1]=0x24;
rx_tx_addr[2]=0x18;
memcpy(&hopping_frequency[XK_RF_BIND_NUM_CHANNELS],"\x36\x41\x37\x4E", XK_RF_NUM_CHANNELS); // freq ok and order from xn297dump auto
//Normal packet address \xA6\x83\xEB\x4B\xC9
}
#endif
} }
static void __attribute__((unused)) XK_init() static void __attribute__((unused)) XK_init()
@ -161,10 +171,7 @@ uint16_t XK_callback()
if(--bind_counter==0) if(--bind_counter==0)
{ {
BIND_DONE; BIND_DONE;
if(sub_protocol==X450) XN297L_SetTXAddr(rx_tx_addr, 5); // Normal packets address
XN297L_SetTXAddr((uint8_t*)"\x2C\x96\x2A\xA9\x32", 5); // Normal address X450
else
XN297L_SetTXAddr((uint8_t*)"\xA6\x83\xEB\x4B\xC9", 5); // Normal address X420
} }
XK_send_packet(); XK_send_packet();
return XK_PACKET_PERIOD; return XK_PACKET_PERIOD;
@ -178,7 +185,7 @@ uint16_t initXK()
XK_initialize_txid(); XK_initialize_txid();
XK_init(); XK_init();
if(sub_protocol==X420) if(sub_protocol==X420)
NRF24L01_SetBitrate(NRF24L01_BR_1M); // 1Mbps NRF24L01_SetBitrate(NRF24L01_BR_1M); // X420/X520 runs @1Mbps
hopping_frequency_no = 0; hopping_frequency_no = 0;
bind_counter=XK_BIND_COUNT; bind_counter=XK_BIND_COUNT;
return XK_INITIAL_WAIT; return XK_INITIAL_WAIT;