use a real macaddr on the nrf52

src/bare/main-bare.cpp

@@ -3,4 +3,5 @@
 void setBluetoothEnable(bool on)
 {
     // Do nothing
-}
+}
+

src/bare/main-nrf52.cpp

@@ -1,4 +1,9 @@
 #include <assert.h>
+#include <ble_gap.h>
+#include <memory.h>
+#include <nrf52840.h>
+
+// #define USE_SOFTDEVICE
 
 static inline void debugger_break(void)
 {
@@ -10,4 +15,20 @@ static inline void debugger_break(void)
 void __attribute__((noreturn)) __assert_func(const char *file, int line, const char *func, const char *failedexpr)
 {
     debugger_break();
+    while (1)
+        ;
+}
+
+void getMacAddr(uint8_t *dmac)
+{
+    ble_gap_addr_t addr;
+
+#ifdef USE_SOFTDEVICE
+    uint32_t res = sd_ble_gap_addr_get(&addr);
+    assert(res == NRF_SUCCESS);
+    memcpy(dmac, addr.addr, 6);
+#else
+    // FIXME - byte order might be wrong and high bits might be wrong
+    memcpy(dmac, (const void *)NRF_FICR->DEVICEADDR, 6);
+#endif
 }

src/esp32/main-esp32.cpp

@@ -50,4 +50,9 @@ void setBluetoothEnable(bool on)
             // heap_trace_dump();
         }
     }
+}
+
+void getMacAddr(uint8_t *dmac)
+{
+    assert(esp_efuse_mac_get_default(dmac) == ESP_OK);
 }

src/main.cpp

@@ -32,6 +32,7 @@
 #include "power.h"
 // #include "rom/rtc.h"
 #include "FloodingRouter.h"
+#include "main.h"
 #include "screen.h"
 #include "sleep.h"
 #include <Wire.h>
@@ -192,20 +193,6 @@ void axp192Init()
 #endif
 }
 
-void getMacAddr(uint8_t *dmac)
-{
-#ifndef NO_ESP32
-    assert(esp_efuse_mac_get_default(dmac) == ESP_OK);
-#else
-    dmac[0] = 0xde;
-    dmac[1] = 0xad;
-    dmac[2] = 0xbe;
-    dmac[3] = 0xef;
-    dmac[4] = 0x01;
-    dmac[5] = 0x02; // FIXME, macaddr stuff needed for NRF52
-#endif
-}
-
 const char *getDeviceName()
 {
     uint8_t dmac[6];
@@ -248,7 +235,6 @@ void setup()
 #endif
     scanI2Cdevice();
 
-
     // Buttons & LED
 #ifdef BUTTON_PIN
     pinMode(BUTTON_PIN, INPUT_PULLUP);

src/main.h

@@ -12,3 +12,5 @@ extern meshtastic::Screen screen;
 
 // Return a human readable string of the form "Meshtastic_ab13"
 const char *getDeviceName();
+
+void getMacAddr(uint8_t *dmac);