FX/FX620: only 1 ID

This commit is contained in:
pascallanger
2022-07-15 15:43:04 +02:00
parent 416f7d5c19
commit d9f8a3989a
3 changed files with 20 additions and 13 deletions

View File

@@ -18,7 +18,6 @@ Multiprotocol is distributed in the hope that it will be useful,
#include "iface_xn297.h"
#define FX_INITIAL_WAIT 500
#define FX_BIND_COUNT 300 //3sec
#define FX_SWITCH 20
#define FX_NUM_CHANNELS 4
@@ -74,6 +73,8 @@ static void __attribute__((unused)) FX_send_packet()
{
memcpy(packet,rx_tx_addr,3);
packet[3] = hopping_frequency[0];
if(bind_counter > (FX_BIND_COUNT >> 1))
packet[5] = 0x78;
}
else
{
@@ -108,11 +109,15 @@ static void __attribute__((unused)) FX_RF_init()
{
XN297_SetTXAddr((uint8_t *)"\xcc\xcc\xcc\xcc\xcc", 5);
XN297_RFChannel(FX816_BIND_CHANNEL);
packet_period = FX816_PACKET_PERIOD;
packet_length = FX816_PAYLOAD_SIZE;
}
else //FX620
{
XN297_SetTXAddr((uint8_t *)"\xaa\xbb\xcc", 3);
XN297_RFChannel(FX620_BIND_CHANNEL);
packet_period = FX620_BIND_PACKET_PERIOD;
packet_length = FX620_PAYLOAD_SIZE;
}
}
@@ -127,9 +132,6 @@ static void __attribute__((unused)) FX_initialize_txid()
memcpy(hopping_frequency,"\x09\x1B\x30\x42",FX_NUM_CHANNELS); //Original dump=9=0x09,27=0x1B,48=0x30,66=0x42
for(uint8_t i=0;i<FX_NUM_CHANNELS;i++)
hopping_frequency[i]+=rx_tx_addr[3]&0x07;
packet_length = FX816_PAYLOAD_SIZE;
packet_period = FX816_PACKET_PERIOD;
}
else//FX620
{
@@ -141,9 +143,6 @@ static void __attribute__((unused)) FX_initialize_txid()
#endif
for(uint8_t i=1;i<FX_NUM_CHANNELS;i++)
hopping_frequency[i] = i*10 + hopping_frequency[0];
packet_length = FX620_PAYLOAD_SIZE;
packet_period = FX620_BIND_PACKET_PERIOD;
}
}

View File

@@ -19,7 +19,7 @@
#define VERSION_MAJOR 1
#define VERSION_MINOR 3
#define VERSION_REVISION 3
#define VERSION_PATCH_LEVEL 17
#define VERSION_PATCH_LEVEL 18
#define MODE_SERIAL 0