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

Skip favorite nodes when clearing out oldest in NodeDB (#3464)

Browse Source 
* Skip favorite nodes when clearing out oldest in NodeDB

* We should actually map between the types
This commit is contained in:
Ben Meadors 2024-03-21 19:51:02 -05:00 committed by GitHub
parent a57f7730ea
commit 7aa013a716
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 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

@ -939,7 +939,7 @@ meshtastic_NodeInfoLite *NodeDB::getOrCreateMeshNode(NodeNum n)
uint32_t oldest = UINT32_MAX; uint32_t oldest = UINT32_MAX;
int oldestIndex = -1; int oldestIndex = -1;
for (int i = 1; i < numMeshNodes; i++) { for (int i = 1; i < numMeshNodes; i++) {
if (meshNodes->at(i).last_heard < oldest) { if (!meshNodes->at(i).is_favorite && meshNodes->at(i).last_heard < oldest) {
oldest = meshNodes->at(i).last_heard; oldest = meshNodes->at(i).last_heard;
oldestIndex = i; oldestIndex = i;
} }

1
src/mesh/TypeConversions.cpp
View File

@ -12,6 +12,7 @@ meshtastic_NodeInfo TypeConversions::ConvertToNodeInfo(const meshtastic_NodeInfo
info.channel = lite->channel; info.channel = lite->channel;
info.via_mqtt = lite->via_mqtt; info.via_mqtt = lite->via_mqtt;
info.hops_away = lite->hops_away; info.hops_away = lite->hops_away;
info.is_favorite = lite->is_favorite;
if (lite->has_position) { if (lite->has_position) {
info.has_position = true; info.has_position = true;