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

Sort fixes

Browse Source
This commit is contained in:
Jonathan Bennett 2025-06-30 15:33:13 -05:00
parent 90b95e8e45
commit d6332c9cab
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/mesh/NodeDB.cpp
View File

@ -407,6 +407,7 @@ NodeDB::NodeDB()
#endif #endif
} }
#endif #endif
sortMeshDB();
saveToDisk(saveWhat); saveToDisk(saveWhat);
} }
@ -1002,6 +1003,8 @@ void NodeDB::cleanupMeshDB()
} }
if (newPos != i) if (newPos != i)
meshNodes->at(newPos++) = meshNodes->at(i); meshNodes->at(newPos++) = meshNodes->at(i);
else
newPos++;
} else { } else {
removed++; removed++;
} }
@ -1693,13 +1696,20 @@ void NodeDB::updateFrom(const meshtastic_MeshPacket &mp)
void NodeDB::sortMeshDB() void NodeDB::sortMeshDB()
{ {
if (!Throttle::isWithinTimespanMs(lastSort, 1000 * 5)) { if (lastSort == 0 || !Throttle::isWithinTimespanMs(lastSort, 1000 * 5)) {
lastSort = millis(); lastSort = millis();
bool changed = true; bool changed = true;
while (changed) { // dumb reverse bubble sort, but probably not bad for what we're doing while (changed) { // dumb reverse bubble sort, but probably not bad for what we're doing
changed = false; changed = false;
for (int i = numMeshNodes - 1; i > 1; i--) { // lowest case this should examine is i == 2 for (int i = numMeshNodes - 1; i > 0; i--) { // lowest case this should examine is i == 1
if (meshNodes->at(i).is_favorite && !meshNodes->at(i - 1).is_favorite) { if (meshNodes->at(i - 1).num == getNodeNum()) {
// noop
} else if (meshNodes->at(i).num ==
getNodeNum()) { // in the oddball case our own node num is not at location 0, put it there
// TODO: Look for at(i-1) also matching own node num, and throw the DB in the trash
std::swap(meshNodes->at(i), meshNodes->at(i - 1));
changed = true;
} else if (meshNodes->at(i).is_favorite && !meshNodes->at(i - 1).is_favorite) {
std::swap(meshNodes->at(i), meshNodes->at(i - 1)); std::swap(meshNodes->at(i), meshNodes->at(i - 1));
changed = true; changed = true;
} else if (meshNodes->at(i).last_heard > meshNodes->at(i - 1).last_heard) { } else if (meshNodes->at(i).last_heard > meshNodes->at(i - 1).last_heard) {