Changed getMacAddr behavior (#1017)

1.2-legacy
Ben Meadors 2021-12-28 11:20:45 -06:00 zatwierdzone przez GitHub
rodzic 33769b8657
commit a70b849039
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
1 zmienionych plików z 7 dodań i 12 usunięć

Wyświetl plik

@ -38,18 +38,13 @@ void __attribute__((noreturn)) __assert_func(const char *file, int line, const c
void getMacAddr(uint8_t *dmac) void getMacAddr(uint8_t *dmac)
{ {
ble_gap_addr_t addr; const uint8_t *src = (const uint8_t *)NRF_FICR->DEVICEADDR;
if (sd_ble_gap_addr_get(&addr) == NRF_SUCCESS) { dmac[5] = src[0];
memcpy(dmac, addr.addr, 6); dmac[4] = src[1];
} else { dmac[3] = src[2];
const uint8_t *src = (const uint8_t *)NRF_FICR->DEVICEADDR; dmac[2] = src[3];
dmac[5] = src[0]; dmac[1] = src[4];
dmac[4] = src[1]; dmac[0] = src[5] | 0xc0; // MSB high two bits get set elsewhere in the bluetooth stack
dmac[3] = src[2];
dmac[2] = src[3];
dmac[1] = src[4];
dmac[0] = src[5] | 0xc0; // MSB high two bits get set elsewhere in the bluetooth stack
}
} }
static void initBrownout() static void initBrownout()