pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-25 01:42:15 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge branch 'master' into trFix

Browse Source
This commit is contained in:
GUVWAF 2024-09-09 21:29:37 +02:00 committed by GitHub
commit 5537f98dd6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesh/NodeDB.cpp
View File

@ -121,6 +121,8 @@ NodeDB::NodeDB()
owner.hw_model = HW_VENDOR; owner.hw_model = HW_VENDOR;
// Ensure user (nodeinfo) role is set to whatever we're configured to // Ensure user (nodeinfo) role is set to whatever we're configured to
owner.role = config.device.role; owner.role = config.device.role;
// Ensure macaddr is set to our macaddr as it will be copied in our info below
memcpy(owner.macaddr, ourMacAddr, sizeof(owner.macaddr));
// Include our owner in the node db under our nodenum // Include our owner in the node db under our nodenum
meshtastic_NodeInfoLite *info = getOrCreateMeshNode(getNodeNum()); meshtastic_NodeInfoLite *info = getOrCreateMeshNode(getNodeNum());

2
version.properties
View File

@ -1,4 +1,4 @@
[VERSION] [VERSION]
major = 2 major = 2
minor = 5 minor = 5
build = 1 build = 0