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

Fix EEPROM address variable types (#494)

Browse Source
This commit is contained in:
Ben Lye 2020-12-27 08:57:41 +00:00 committed by GitHub
parent 2098cdc5e0
commit 9b2318cc7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Multiprotocol/AFHDS2A_a7105.ino
View File

@ -298,7 +298,7 @@ uint16_t ReadAFHDS2A()
A7105_ReadData(AFHDS2A_RXPACKET_SIZE); A7105_ReadData(AFHDS2A_RXPACKET_SIZE);
if(packet[0] == 0xbc && packet[9] == 0x01) if(packet[0] == 0xbc && packet[9] == 0x01)
{ {
uint8_t addr; uint16_t addr;
if(RX_num<16) if(RX_num<16)
addr=AFHDS2A_EEPROM_OFFSET+RX_num*4; addr=AFHDS2A_EEPROM_OFFSET+RX_num*4;
else else
@ -433,7 +433,7 @@ uint16_t initAFHDS2A()
{ {
phase = AFHDS2A_DATA_INIT; phase = AFHDS2A_DATA_INIT;
//Read RX ID from EEPROM based on RX_num, RX_num must be uniq for each RX //Read RX ID from EEPROM based on RX_num, RX_num must be uniq for each RX
uint8_t addr; uint16_t addr;
if(RX_num<16) if(RX_num<16)
addr=AFHDS2A_EEPROM_OFFSET+RX_num*4; addr=AFHDS2A_EEPROM_OFFSET+RX_num*4;
else else

4
Multiprotocol/HOTT_cc2500.ino
View File

@ -159,7 +159,7 @@ static void __attribute__((unused)) HOTT_init()
else else
{ {
memcpy(&packet[40],rx_tx_addr,5); memcpy(&packet[40],rx_tx_addr,5);
uint8_t addr=HOTT_EEPROM_OFFSET+RX_num*5; uint16_t addr=HOTT_EEPROM_OFFSET+RX_num*5;
debug("RXID: "); debug("RXID: ");
for(uint8_t i=0;i<5;i++) for(uint8_t i=0;i<5;i++)
{ {
@ -380,7 +380,7 @@ uint16_t ReadHOTT()
for(uint8_t i=0;i<HOTT_RX_PACKET_LEN;i++) for(uint8_t i=0;i<HOTT_RX_PACKET_LEN;i++)
debug(" %02X", packet_in[i]); debug(" %02X", packet_in[i]);
debugln(""); debugln("");
uint8_t addr=HOTT_EEPROM_OFFSET+RX_num*5; uint16_t addr=HOTT_EEPROM_OFFSET+RX_num*5;
for(uint8_t i=0; i<5; i++) for(uint8_t i=0; i<5; i++)
eeprom_write_byte((EE_ADDR)(addr+i),packet_in[5+i]); eeprom_write_byte((EE_ADDR)(addr+i),packet_in[5+i]);
BIND_DONE; BIND_DONE;

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 93 #define VERSION_PATCH_LEVEL 94
//****************** //******************
// Protocols // Protocols