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

BUGS EEPROM clean: need to rebind BUGS and BUGSMINI

Browse Source
This commit is contained in:
Pascal Langer 2019-06-09 14:51:21 +02:00
parent 9461f2d632
commit 9514e47ed3
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Multiprotocol/Bugs_a7105.ino
View File

@ -284,10 +284,11 @@ static void __attribute__((unused))BUGS_set_radio_data()
{ {
offset=BUGS_NUM_RFCHAN; offset=BUGS_NUM_RFCHAN;
// Read radio_id from EEPROM // Read radio_id from EEPROM
radio_id=0;
uint8_t base_adr=BUGS_EEPROM_OFFSET+RX_num*4; uint8_t base_adr=BUGS_EEPROM_OFFSET+RX_num*4;
for(uint8_t i=0; i<4; i++) uint16_t rxid=0;
radio_id|=eeprom_read_byte((EE_ADDR)(base_adr+i))<<(i*8); for(uint8_t i=0; i<2; i++)
rxid|=eeprom_read_byte((EE_ADDR)(base_adr+i))<<(i*8);
radio_id = BUGS_rxid_to_radioid(rxid);
} }
A7105_WriteID(radio_id); A7105_WriteID(radio_id);
@ -374,10 +375,10 @@ uint16_t ReadBUGS(void)
BIND_DONE; BIND_DONE;
// set radio_id // set radio_id
rxid = (packet[1] << 8) + packet[2]; rxid = (packet[1] << 8) + packet[2];
base_adr=BUGS_EEPROM_OFFSET+RX_num*2;
for(uint8_t i=0; i<2; i++)
eeprom_write_byte((EE_ADDR)(base_adr+i),rxid>>(i*8)); // Save rxid in EEPROM
radio_id = BUGS_rxid_to_radioid(rxid); radio_id = BUGS_rxid_to_radioid(rxid);
base_adr=BUGS_EEPROM_OFFSET+RX_num*4;
for(uint8_t i=0; i<4; i++)
eeprom_write_byte((EE_ADDR)(base_adr+i),radio_id>>(i*8)); // Save radio_id in EEPROM
BUGS_set_radio_data(); BUGS_set_radio_data();
phase = BUGS_DATA_1; phase = BUGS_DATA_1;
packet_count = 0; packet_count = 0;
@ -437,11 +438,11 @@ uint16_t ReadBUGS(void)
uint16_t initBUGS(void) uint16_t initBUGS(void)
{ {
uint32_t radio_id=0; uint16_t rxid=0;
uint8_t base_adr=BUGS_EEPROM_OFFSET+RX_num*4; uint8_t base_adr=BUGS_EEPROM_OFFSET+RX_num*2;
for(uint8_t i=0; i<4; i++) for(uint8_t i=0; i<2; i++)
radio_id|=eeprom_read_byte((EE_ADDR)(base_adr+i))<<(i*8); rxid|=eeprom_read_byte((EE_ADDR)(base_adr+i))<<(i*8);
if(radio_id==0xffffffff) if(rxid==0xffff)
BIND_IN_PROGRESS; BIND_IN_PROGRESS;
BUGS_set_radio_data(); BUGS_set_radio_data();

6
Multiprotocol/Multiprotocol.h
View File

@ -19,7 +19,7 @@
#define VERSION_MAJOR 1 #define VERSION_MAJOR 1
#define VERSION_MINOR 2 #define VERSION_MINOR 2
#define VERSION_REVISION 1 #define VERSION_REVISION 1
#define VERSION_PATCH_LEVEL 59 #define VERSION_PATCH_LEVEL 60
//****************** //******************
// Protocols // Protocols
@ -543,8 +543,8 @@ enum {
#define EEPROM_ID_VALID_OFFSET 20 // 1 byte flag that ID is valid #define EEPROM_ID_VALID_OFFSET 20 // 1 byte flag that ID is valid
#define MODELMODE_EEPROM_OFFSET 30 // Autobind mode, 1 byte per model, end is 30+16=46 #define MODELMODE_EEPROM_OFFSET 30 // Autobind mode, 1 byte per model, end is 30+16=46
#define AFHDS2A_EEPROM_OFFSET 50 // RX ID, 4 bytes per model id, end is 50+64=114 #define AFHDS2A_EEPROM_OFFSET 50 // RX ID, 4 bytes per model id, end is 50+64=114
#define BUGS_EEPROM_OFFSET 114 // TX ID, 4 bytes per model id, end is 114+64=178 #define BUGS_EEPROM_OFFSET 114 // RX ID, 2 bytes per model id, end is 114+32=146
#define BUGSMINI_EEPROM_OFFSET 178 // RX ID, 2 bytes per model id, end is 178+32=210 #define BUGSMINI_EEPROM_OFFSET 146 // RX ID, 2 bytes per model id, end is 146+32=178
//#define CONFIG_EEPROM_OFFSET 210 // Current configuration of the multimodule //#define CONFIG_EEPROM_OFFSET 210 // Current configuration of the multimodule
//**************************************** //****************************************