Skip to content

fallback to device addr if no valid mac found in UICR #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fallback to device addr if no valid mac found in UICR #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified Newton_M3_Universal-full-flash.bin
View file
Open in desktop
Binary file not shown.
Binary file modified tag_fw/Newton_M3_Universal-full-flash.bin
View file
Open in desktop
Binary file not shown.
Binary file modified tag_fw/Newton_M3_Universal-ota.bin
View file
Open in desktop
Binary file not shown.
37 changes: 24 additions & 13 deletions tag_fw/hal/Newton_M3_nRF52811/HAL_Newton_M3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,20 +138,31 @@ void getTemperature() {
}

void boardGetOwnMac(uint8_t *mac) {
mac[0] = tag.macSuffix & 0xFF;
mac[1] = tag.macSuffix >> 8;
mac[2] = (NRF_UICR->CUSTOMER[0]) & 0xFF;
mac[3] = (NRF_UICR->CUSTOMER[0] >> 8) & 0xFF;
mac[4] = (NRF_UICR->CUSTOMER[0] >> 16) & 0xFF;
mac[5] = (NRF_UICR->CUSTOMER[0] >> 24);
mac[6] = 0;
mac[7] = 0;
uint8_t cksum = 0;
for (uint8_t c = 0; c < 8; c++) {
cksum ^= mac[c];
cksum ^= mac[c] >> 4;
if (NRF_UICR->CUSTOMER[0] == 0xFFFFFFFF) {
mac[0] = (NRF_FICR->DEVICEADDR[1]) & 0xFF;
mac[1] = (NRF_FICR->DEVICEADDR[1] >> 8) & 0xFF;
mac[2] = (NRF_FICR->DEVICEADDR[1] >> 16) & 0xFF;
mac[3] = (NRF_FICR->DEVICEADDR[1] >> 24);
mac[4] = (NRF_FICR->DEVICEADDR[0]) & 0xFF;
mac[5] = (NRF_FICR->DEVICEADDR[0] >> 8) & 0xFF;
mac[6] = (NRF_FICR->DEVICEADDR[0] >> 16) & 0xFF;
mac[7] = (NRF_FICR->DEVICEADDR[0] >> 24);
} else {
mac[0] = tag.macSuffix & 0xFF;
mac[1] = tag.macSuffix >> 8;
mac[2] = (NRF_UICR->CUSTOMER[0]) & 0xFF;
mac[3] = (NRF_UICR->CUSTOMER[0] >> 8) & 0xFF;
mac[4] = (NRF_UICR->CUSTOMER[0] >> 16) & 0xFF;
mac[5] = (NRF_UICR->CUSTOMER[0] >> 24);
mac[6] = 0;
mac[7] = 0;
uint8_t cksum = 0;
for (uint8_t c = 0; c < 8; c++) {
cksum ^= mac[c];
cksum ^= mac[c] >> 4;
}
mac[0] += cksum & 0x0F;
}
mac[0] += cksum & 0x0F;
}

void watchdog_enable(int timeout) {
Expand Down