rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-17 00:02:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

we now send owner at boot

Browse Source
This commit is contained in:
geeksville
2020-02-06 10:58:19 -08:00
parent 241e262f5c
commit 2792e2148f
5 changed files with 44 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/NodeDB.cpp
View File

@@ -31,7 +31,7 @@ static NodeNum getDesiredNodeNum()
// FIXME not the right way to guess node numes
uint8_t r = ourMacAddr[5];
assert(r != 0xff); // It better not be the broadcast address
assert(r != 0xff && r != 0); // It better not be the broadcast address or zero
return r;
}
@@ -50,6 +50,8 @@ void NodeDB::init() {
ourMacAddr[1], ourMacAddr[2], ourMacAddr[3], ourMacAddr[4], ourMacAddr[5]);
memcpy(owner.macaddr, ourMacAddr, sizeof(owner.macaddr));
sprintf(owner.long_name, "Unknown %02x%02x", ourMacAddr[4], ourMacAddr[5]);
sprintf(owner.short_name, "?%02X", ourMacAddr[5]);
// FIXME, read owner info from flash
// Include our owner in the node db under our nodenum
@@ -74,7 +76,7 @@ void NodeDB::updateFrom(const MeshPacket &mp)
if (mp.has_payload)
{
const SubPacket &p = mp.payload;
DEBUG_MSG("Update DB node %x for %d\n", mp.from, p.which_variant);
DEBUG_MSG("Update DB node %x for variant %d\n", mp.from, p.which_variant);
if (p.which_variant != SubPacket_want_node_tag) // we don't create nodeinfo records for someone that is just trying to claim a nodenum
{
int oldNumNodes = numNodes;