From 13c4934a377044ac6476301e860dc4bc5edbcd4d Mon Sep 17 00:00:00 2001
From: Harald Pichler <harald@the-develop.net>
Date: Thu, 31 Aug 2017 16:06:15 +0200
Subject: [PATCH] bugfix settings mananger read EUI64 from bootloader

---
 platform/osd-merkur-128/params.c | 9 ++++++++-
 platform/osd-merkur-256/params.c | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/platform/osd-merkur-128/params.c b/platform/osd-merkur-128/params.c
index 31e588ebe..f9cab9f0e 100644
--- a/platform/osd-merkur-128/params.c
+++ b/platform/osd-merkur-128/params.c
@@ -216,7 +216,14 @@ params_get_eui64(uint8_t *eui64) {
   PRINTD("Generating random EUI64 MAC\n");
   generate_new_eui64(eui64);
 #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
   if (settings_add(SETTINGS_KEY_EUI64,(unsigned char*)eui64,8) == SETTINGS_STATUS_OK) {
     PRINTD("->Set EEPROM MAC address\n");
diff --git a/platform/osd-merkur-256/params.c b/platform/osd-merkur-256/params.c
index 31e588ebe..f9cab9f0e 100644
--- a/platform/osd-merkur-256/params.c
+++ b/platform/osd-merkur-256/params.c
@@ -216,7 +216,14 @@ params_get_eui64(uint8_t *eui64) {
   PRINTD("Generating random EUI64 MAC\n");
   generate_new_eui64(eui64);
 #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
   if (settings_add(SETTINGS_KEY_EUI64,(unsigned char*)eui64,8) == SETTINGS_STATUS_OK) {
     PRINTD("->Set EEPROM MAC address\n");