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

Pelikan Lite: force_id update

Browse Source
This commit is contained in:
Pascal Langer 2020-06-03 10:29:34 +02:00
parent fd3b026e12
commit ceea384a36
2 changed files with 20 additions and 12 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 1 #define VERSION_REVISION 1
#define VERSION_PATCH_LEVEL 8 #define VERSION_PATCH_LEVEL 9
//****************** //******************
// Protocols // Protocols

30
Multiprotocol/Pelikan_a7105.ino
View File

@ -19,7 +19,8 @@
#include "iface_a7105.h" #include "iface_a7105.h"
//#define PELIKAN_FORCE_ID //#define PELIKAN_FORCE_ID
#define PELIKAN_LITE_FORCE_ID //#define PELIKAN_LITE_FORCE_ID
#define PELIKAN_LITE_FORCE_HOP
#define PELIKAN_BIND_COUNT 400 #define PELIKAN_BIND_COUNT 400
#define PELIKAN_BIND_RF 0x3C #define PELIKAN_BIND_RF 0x3C
@ -246,6 +247,9 @@ uint16_t initPelikan()
A7105_Init(); A7105_Init();
if(IS_BIND_IN_PROGRESS || sub_protocol==PELIKAN_LITE) if(IS_BIND_IN_PROGRESS || sub_protocol==PELIKAN_LITE)
A7105_WriteReg(A7105_03_FIFOI,0x10); A7105_WriteReg(A7105_03_FIFOI,0x10);
pelikan_init_hop();
//ID from dump //ID from dump
#if defined(PELIKAN_FORCE_ID) #if defined(PELIKAN_FORCE_ID)
if(sub_protocol==PELIKAN_PRO) if(sub_protocol==PELIKAN_PRO)
@ -258,19 +262,23 @@ uint16_t initPelikan()
for(uint8_t i=0;i<PELIKAN_NUM_RF_CHAN;i++) for(uint8_t i=0;i<PELIKAN_NUM_RF_CHAN;i++)
hopping_frequency[i]=pgm_read_byte_near(&pelikan_hopp[0][i]); hopping_frequency[i]=pgm_read_byte_near(&pelikan_hopp[0][i]);
} }
#elif defined(PELIKAN_LITE_FORCE_ID) #endif
#if defined(PELIKAN_LITE_FORCE_ID) || defined(PELIKAN_LITE_FORCE_HOP)
if(sub_protocol==PELIKAN_LITE) if(sub_protocol==PELIKAN_LITE)
{ {
rx_tx_addr[0]=0x04; // hopping freq #if defined(PELIKAN_LITE_FORCE_ID)
rx_tx_addr[1]=0x63; // hopping freq // ID
rx_tx_addr[2]=0x60; // ID rx_tx_addr[2]=0x60;
rx_tx_addr[3]=0x18; // ID rx_tx_addr[3]=0x18;
// Fill frequency table #endif
for(uint8_t i=0;i<PELIKAN_NUM_RF_CHAN;i++) #if defined(PELIKAN_LITE_FORCE_HOP)
hopping_frequency[i]=pgm_read_byte_near(&pelikan_lite_hopp[0][i]); // Hop frequency table
rx_tx_addr[0]=0x04; // hopping freq
rx_tx_addr[1]=0x63; // hopping freq
for(uint8_t i=0;i<PELIKAN_NUM_RF_CHAN;i++)
hopping_frequency[i]=pgm_read_byte_near(&pelikan_lite_hopp[0][i]);
#endif
} }
#else
pelikan_init_hop();
#endif #endif
if(sub_protocol==PELIKAN_LITE && IS_BIND_DONE) if(sub_protocol==PELIKAN_LITE && IS_BIND_DONE)