deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

bugfix settings mananger read EUI64 from bootloader

Browse source
This commit is contained in:
Harald Pichler 2017-08-31 16:06:15 +02:00
parent 75e8c162ed
commit 13c4934a37
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
platform/osd-merkur-128/params.c
View file

@ -216,7 +216,14 @@ params_get_eui64(uint8_t *eui64) {
PRINTD("Generating random EUI64 MAC\n"); PRINTD("Generating random EUI64 MAC\n");
generate_new_eui64(eui64); generate_new_eui64(eui64);
#else #else
{uint8_t i;for (i=0;i<8;i++) eui64[i] = pgm_read_byte_near(default_mac_address+i);} //test this uint8_t i;
#if BOOTLOADER_GET_MAC
for (i=0;i<sizeof(default_mac_address);i++){
eui64[i] = bootloader_get_mac(i);
}
#else
for (i=0;i<sizeof(default_mac_address);i++) eui64[i] = pgm_read_byte_near(default_mac_address+i);
#endif
#endif #endif
if (settings_add(SETTINGS_KEY_EUI64,(unsigned char*)eui64,8) == SETTINGS_STATUS_OK) { if (settings_add(SETTINGS_KEY_EUI64,(unsigned char*)eui64,8) == SETTINGS_STATUS_OK) {
PRINTD("->Set EEPROM MAC address\n"); PRINTD("->Set EEPROM MAC address\n");

9
platform/osd-merkur-256/params.c
View file

@ -216,7 +216,14 @@ params_get_eui64(uint8_t *eui64) {
PRINTD("Generating random EUI64 MAC\n"); PRINTD("Generating random EUI64 MAC\n");
generate_new_eui64(eui64); generate_new_eui64(eui64);
#else #else
{uint8_t i;for (i=0;i<8;i++) eui64[i] = pgm_read_byte_near(default_mac_address+i);} //test this uint8_t i;
#if BOOTLOADER_GET_MAC
for (i=0;i<sizeof(default_mac_address);i++){
eui64[i] = bootloader_get_mac(i);
}
#else
for (i=0;i<sizeof(default_mac_address);i++) eui64[i] = pgm_read_byte_near(default_mac_address+i);
#endif
#endif #endif
if (settings_add(SETTINGS_KEY_EUI64,(unsigned char*)eui64,8) == SETTINGS_STATUS_OK) { if (settings_add(SETTINGS_KEY_EUI64,(unsigned char*)eui64,8) == SETTINGS_STATUS_OK) {
PRINTD("->Set EEPROM MAC address\n"); PRINTD("->Set EEPROM MAC address\n");