gomaomao/DIY-Multiprotocol-TX-Module
1
0
Fork 0
mirror of https://github.com/pascallanger/DIY-Multiprotocol-TX-Module.git synced 2025-02-10 13:18:12 +00:00
Code Issues Projects Releases Wiki Activity

E016H: compilation fix

Browse Source
This commit is contained in:
Pascal Langer 2020-12-17 21:09:13 +01:00
parent cc7b7638d3
commit 360dde2e1b
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Multiprotocol/E016H_cc2500.ino
View File

@ -27,7 +27,10 @@ Multiprotocol is distributed in the hope that it will be useful,
static void __attribute__((unused)) E016H_send_packet() static void __attribute__((unused)) E016H_send_packet()
{ {
packet[0 ] = rx_tx_addr[0]; //payload length (after this byte)
packet[0 ] = 0x0A;
//bind indicator
if(IS_BIND_IN_PROGRESS) if(IS_BIND_IN_PROGRESS)
{ {
packet[1 ] = 0x02; packet[1 ] = 0x02;
@ -41,6 +44,8 @@ static void __attribute__((unused)) E016H_send_packet()
} }
else else
packet[1 ] = 0x20; packet[1 ] = 0x20;
//ID
packet[2 ] = rx_tx_addr[2]; packet[2 ] = rx_tx_addr[2];
packet[3 ] = rx_tx_addr[3]; packet[3 ] = rx_tx_addr[3];
@ -116,18 +121,6 @@ uint16_t E016H_callback()
return E016H_PACKET_PERIOD; return E016H_PACKET_PERIOD;
} }
static void __attribute__((unused)) E016H_initialize_txid()
{
//need to figure out ID&Freq
#ifdef FORCE_E016H_ORIGINAL_ID
rx_tx_addr[0]=0x0A;
rx_tx_addr[1]=0x02; // not used in the code
rx_tx_addr[2]=0x27;
rx_tx_addr[3]=0x1B;
hopping_frequency_no = 44;
#endif
}
uint16_t initE016H() uint16_t initE016H()
{ {
//Config CC2500 //Config CC2500
@ -136,7 +129,12 @@ uint16_t initE016H()
XN297L_Init(); XN297L_Init();
XN297L_RFChannel(E016H_RF_BIND_CHANNEL); // Set bind channel XN297L_RFChannel(E016H_RF_BIND_CHANNEL); // Set bind channel
E016H_initialize_txid(); //need to figure out ID&Freq
#ifdef FORCE_E016H_ORIGINAL_ID
rx_tx_addr[2]=0x27;
rx_tx_addr[3]=0x1B;
hopping_frequency_no = 44;
#endif
bind_counter = E016H_BIND_COUNT; bind_counter = E016H_BIND_COUNT;
BIND_IN_PROGRESS; // Autobind protocol BIND_IN_PROGRESS; // Autobind protocol

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 1 #define VERSION_REVISION 1
#define VERSION_PATCH_LEVEL 87 #define VERSION_PATCH_LEVEL 88
//****************** //******************
// Protocols // Protocols