pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-09 14:42:05 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Fix #3641: Always set MAC when picking new NodeNum (#3651)

Browse Source 
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
This commit is contained in:
GUVWAF 2024-04-17 14:07:40 +02:00 committed by GitHub
parent 2450031b1b
commit bc085ab840
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesh/NodeDB.cpp
View File

@ -527,8 +527,8 @@ void NodeDB::installDefaultDeviceState()
void NodeDB::pickNewNodeNum() void NodeDB::pickNewNodeNum()
{ {
NodeNum nodeNum = myNodeInfo.my_node_num; NodeNum nodeNum = myNodeInfo.my_node_num;
if (nodeNum == 0) {
getMacAddr(ourMacAddr); // Make sure ourMacAddr is set getMacAddr(ourMacAddr); // Make sure ourMacAddr is set
if (nodeNum == 0) {
// Pick an initial nodenum based on the macaddr // Pick an initial nodenum based on the macaddr
nodeNum = (ourMacAddr[2] << 24) | (ourMacAddr[3] << 16) | (ourMacAddr[4] << 8) | ourMacAddr[5]; nodeNum = (ourMacAddr[2] << 24) | (ourMacAddr[3] << 16) | (ourMacAddr[4] << 8) | ourMacAddr[5];
} }