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

include our local user in the node db

Browse Source
This commit is contained in:
geeksville
2020-02-04 09:00:17 -08:00
parent b04fb061c4
commit b538677ad2
6 changed files with 60 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/NodeDB.cpp
View File

@@ -10,32 +10,60 @@
MyNodeInfo myNodeInfo = MyNodeInfo_init_zero;
NodeDB nodeDB;
User owner = User_init_zero;
/**
*
* Normally userids are unique and start with +country code to look like Signal phone numbers.
* But there are some special ids used when we haven't yet been configured by a user. In that case
* we use !macaddr (no colons).
*/
User owner = {"+1650xxxyyyy", "unset name", "????", {0}};
static uint8_t ourMacAddr[6];
/**
* get our starting (provisional) nodenum from flash. But check first if anyone else is using it, by trying to send a message to it (arping)
*/
static NodeNum getDesiredNodeNum()
{
uint8_t dmac[6];
esp_efuse_mac_get_default(dmac);
esp_efuse_mac_get_default(ourMacAddr);
// FIXME not the right way to guess node numes
uint8_t r = dmac[5];
uint8_t r = ourMacAddr[5];
assert(r != 0xff); // It better not be the broadcast address
return r;
}
NodeDB::NodeDB() : ourNodeNum(getDesiredNodeNum())
{
}
/// return number msecs since 1970
uint64_t getCurrentTime()
{
return 4403; // FIXME
}
NodeDB::NodeDB()
{
}
void NodeDB::init() {
ourNodeNum = getDesiredNodeNum();
// Init our blank owner info to reasonable defaults
sprintf(owner.id, "!%02x%02x%02x%02x%02x%02x", ourMacAddr[0],
ourMacAddr[1], ourMacAddr[2], ourMacAddr[3], ourMacAddr[4], ourMacAddr[5]);
memcpy(owner.macaddr, ourMacAddr, sizeof(owner.macaddr));
// FIXME, read owner info from flash
// Include our owner in the node db under our nodenum
NodeInfo *info = getOrCreateNode(ourNodeNum);
info->user = owner;
info->has_user = true;
info->last_seen = getCurrentTime();
}
const NodeInfo *NodeDB::readNextInfo()
{
if (readPointer < numNodes)
@@ -60,8 +88,7 @@ void NodeDB::updateFrom(const MeshPacket &mp)
if (oldNumNodes != numNodes)
updateGUI = true; // we just created a nodeinfo
info->last_seen.msecs = getCurrentTime();
info->has_last_seen = true;
info->last_seen = getCurrentTime();
switch (p.which_variant)
{
@@ -99,7 +126,7 @@ NodeInfo *NodeDB::getOrCreateNode(NodeNum n)
{
NodeInfo *info = getNode(n);
if (!n)
if (!info)
{
// add the node
assert(numNodes < MAX_NUM_NODES);