DG4MLK/MeshCore-Evo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #850 from liamcottle/fix/legacy-neighbours-cli

Browse Source 
Backwards Compatibility: Legacy Neighbours CLI
This commit is contained in:
ripplebiz
2025-09-28 18:30:11 +10:00
committed by GitHub
parent 70ec996c08 f8f5f00549
commit 4bb16ef5a7
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
examples/simple_repeater/MyMesh.cpp
View File

@@ -706,9 +706,24 @@ void MyMesh::formatNeighborsReply(char *reply) {
char *dp = reply; char *dp = reply;
#if MAX_NEIGHBOURS #if MAX_NEIGHBOURS
for (int i = 0; i < MAX_NEIGHBOURS && dp - reply < 134; i++) { // create copy of neighbours list, skipping empty entries so we can sort it separately from main list
NeighbourInfo *neighbour = &neighbours[i]; int16_t neighbours_count = 0;
if (neighbour->heard_timestamp == 0) continue; // skip empty slots NeighbourInfo* sorted_neighbours[MAX_NEIGHBOURS];
for (int i = 0; i < MAX_NEIGHBOURS; i++) {
auto neighbour = &neighbours[i];
if (neighbour->heard_timestamp > 0) {
sorted_neighbours[neighbours_count] = neighbour;
neighbours_count++;
}
}
// sort neighbours newest to oldest
std::sort(sorted_neighbours, sorted_neighbours + neighbours_count, [](const NeighbourInfo* a, const NeighbourInfo* b) {
return a->heard_timestamp > b->heard_timestamp; // desc
});
for (int i = 0; i < neighbours_count && dp - reply < 134; i++) {
NeighbourInfo *neighbour = sorted_neighbours[i];
// add new line if not first item // add new line if not first item
if (i > 0) *dp++ = '\n'; if (i > 0) *dp++ = '\n';