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

Fix module id returned to be 0 when saved to eeprom (#170)

Browse Source 
Also fix that stm32 id is always either 0 or stm32 id
This commit is contained in:
Arne Schwabe 2018-06-12 12:41:38 +02:00 committed by pascallanger
parent 51c1936c24
commit add3fb13ef
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Multiprotocol/Multiprotocol.ino
View File

@ -1565,20 +1565,25 @@ static uint32_t random_id(uint16_t address, uint8_t create_new)
id|=eeprom_read_byte((EE_ADDR)address+i-1); id|=eeprom_read_byte((EE_ADDR)address+i-1);
} }
if(id!=0x2AD141A7) //ID with seed=0 if(id!=0x2AD141A7) //ID with seed=0
return id; {
debugln("Read ID from EEPROM");
return id;
}
} }
// Generate a random ID // Generate a random ID
#if defined STM32_BOARD #if defined STM32_BOARD
#define STM32_UUID ((uint32_t *)0x1FFFF7E8) #define STM32_UUID ((uint32_t *)0x1FFFF7E8)
if (!create_new) if (!create_new) {
id = STM32_UUID[0] ^ STM32_UUID[1] ^ STM32_UUID[2]; id = STM32_UUID[0] ^ STM32_UUID[1] ^ STM32_UUID[2];
#else debugln("Generated ID from STM32 UUID");
id = random(0xfefefefe) + ((uint32_t)random(0xfefefefe) << 16);
} else
#endif #endif
id = random(0xfefefefe) + ((uint32_t)random(0xfefefefe) << 16);
for(uint8_t i=0;i<4;i++) for(uint8_t i=0;i<4;i++)
{ {
eeprom_write_byte((EE_ADDR)address+i,id); eeprom_write_byte((EE_ADDR)address+i,id >> (i*8));
id>>=8;
} }
eeprom_write_byte((EE_ADDR)(address+10),0xf0);//write bind flag in eeprom. eeprom_write_byte((EE_ADDR)(address+10),0xf0);//write bind flag in eeprom.
return id; return id;