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

Merge branch 'wismeshtap_4.5.12' of github.com:DanielCao0/firmware into wismeshtap_4.5.12

Browse Source
This commit is contained in:
Daniel Cao 2024-11-10 01:21:56 +08:00
commit 54d890784d
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
protobufs

@ -1 +1 @@
Subproject commit 834915aa046532da0bd8478c250eb33847e9518f Subproject commit 04f21f5c7238b8e02f794d9282c4786752634b3c

4
src/mesh/NodeDB.cpp
View File

@ -1219,9 +1219,7 @@ meshtastic_NodeInfoLite *NodeDB::getOrCreateMeshNode(NodeNum n)
if (!lite) { if (!lite) {
if (isFull()) { if (isFull()) {
if (screen) LOG_INFO("Node database full with %i nodes and %i bytes free. Erasing oldest entry", numMeshNodes,
screen->print("Warn: node database full!\nErasing oldest entry\n");
LOG_WARN("Node database full with %i nodes and %i bytes free! Erasing oldest entry", numMeshNodes,
memGet.getFreeHeap()); memGet.getFreeHeap());
// look for oldest node and erase it // look for oldest node and erase it
uint32_t oldest = UINT32_MAX; uint32_t oldest = UINT32_MAX;

5
src/mesh/Router.cpp
View File

@ -187,9 +187,10 @@ ErrorCode Router::sendLocal(meshtastic_MeshPacket *p, RxSource src)
handleReceived(p, src); handleReceived(p, src);
} }
if (!p->channel && !p->pki_encrypted) { // don't override if a channel was requested // don't override if a channel was requested and no need to set it when PKI is enforced
if (!p->channel && !p->pki_encrypted) {
meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(p->to); meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(p->to);
if (node && node->user.public_key.size == 0) { if (node) {
p->channel = node->channel; p->channel = node->channel;
LOG_DEBUG("localSend to channel %d", p->channel); LOG_DEBUG("localSend to channel %d", p->channel);
} }