Mirrors/MeshCore-Solo
1
0
Fork 0
mirror of https://github.com/MarekZegare4/MeshCore-Solo.git synced 2026-11-02 10:51:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: review pass - Discover's late replies dropped and its way back usable, the Gallery's newest first and faster, the network clock's toast

Browse Source 
- Discover: a reply after its try timed out, was stopped or was overtaken
  went on to the normal handling and became the contact's route (and sent
  a path back); the last tags sent are kept and a late reply is dropped.
  Leaving Route on the L2 stops a discovery as it stops a trace.
- Discover: a route whose reply came back another way offers that way too
  (L2 There / Back, L1 a Back row), turned round into a route there, so a
  trace checks it; the Discover button no longer sits on its group.
- Screenshots: numbered one past the highest (one pass over the folder,
  not a stat per number), so one taken after a delete is still the newest.
- Gallery: the newest 300 kept whatever order the folder lists them in;
  BMP rows read in the file's order and several at a time; the thumbnail
  buffer sized to the page; the folder read once per visit; a failed
  open frees or restores the picture.
- NTP: the slot the router's server goes in emptied before joining, so a
  cached address isn't taken for it; "Clock set from the network" judged
  against the clock a tick before (SNTP has set the system time already).
- Sim: sim_scroll up stops at the top.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Jakub
2026-10-29 16:30:19 +01:00
co-authored by Claude Opus 5.5
parent e154a4e721
commit 3a26a8bee7
11 changed files with 171 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/companion_radio/ui-new/NearbyScreen.h
+20 -10
View File
@@ -24,8 +24,8 @@ class RouteView {
bool _seen_disc = false; // a discovery running at the last pass: its end said once
uint8_t _tries = 1; // Discover: triesOf(_tries) tries
// R_FOUND before R_NODE: like the hops, not an action the cursor follows.
enum Row : uint8_t { R_HOP, R_FOUND, R_NODE, R_ADD, R_TRACE, R_PROBE, R_TO_NODE, R_SAVE, R_KEEP, R_DISCOVER };
// R_FOUND(_BACK) before R_NODE: like the hops, not an action the cursor follows.
enum Row : uint8_t { R_HOP, R_FOUND, R_FOUND_BACK, R_NODE, R_ADD, R_TRACE, R_PROBE, R_TO_NODE, R_SAVE, R_KEEP, R_DISCOVER };
static int triesOf(int i) { return i == 0 ? 1 : i == 1 ? 3 : 5; }
PathEditor& R() { return _task->core().route; }
@@ -43,14 +43,17 @@ class RouteView {
out[k++] = R_SAVE;
out[k++] = R_KEEP;
out[k++] = R_DISCOVER;
for (int i = 0; i < r.foundCount(); i++) out[k++] = R_FOUND;
for (int i = 0; i < r.foundCount(); i++) { // a way back of its own: a row to use that too
out[k++] = R_FOUND;
if (!r.foundBackSame(i)) out[k++] = R_FOUND_BACK;
}
return k;
}
static const int ROWS_MAX = PathEditor::MAX_HOPS + 8 + PathEditor::FOUND_MAX;
// Which found route row `idx` is.
static const int ROWS_MAX = PathEditor::MAX_HOPS + 8 + 2 * PathEditor::FOUND_MAX;
// Which found route row `idx` (R_FOUND or the R_FOUND_BACK after it) is of.
static int foundIndex(const Row* kind, int idx) {
int f = 0;
for (int i = 0; i < idx; i++) if (kind[i] == R_FOUND) f++;
int f = -1;
for (int i = 0; i <= idx; i++) if (kind[i] == R_FOUND) f++;
return f;
}
@@ -192,6 +195,12 @@ public:
snprintf(right, sizeof(right), "%ux", (unsigned)r.found(f).times);
break;
}
case R_FOUND_BACK: { // the way the reply came, turned round as the list will have it
char route[40];
r.foundText(foundIndex(kind, idx), true, route, sizeof(route), true);
snprintf(left, sizeof(left), " Back %s", route);
break;
}
}
const int rw = right[0] ? display.getTextWidth(right) + display.getCharWidth() : 0;
display.drawTextEllipsized(2, y, display.width() - reserve - 4 - rw, left, sel);
@@ -260,10 +269,11 @@ public:
else if (!r.discover(triesOf(_tries))) _task->showAlert("Send failed", 1000);
else _seen_disc = true;
break;
case R_FOUND: {
case R_FOUND: case R_FOUND_BACK: {
const int f = foundIndex(kind, _sel);
if (PathEditor::hopsOf(r.found(f).out_len) > PathEditor::MAX_HOPS) { _task->showAlert("Too long", 1000); break; }
if (r.useFound(f)) { _task->showAlert("In list: Trace, Save", 1200); _sel = 0; }
const bool back = k == R_FOUND_BACK;
if (PathEditor::foundHops(r.found(f), back) > PathEditor::MAX_HOPS) { _task->showAlert("Too long", 1000); break; }
if (r.useFound(f, back)) { _task->showAlert(back ? "Way back in list" : "In list: Trace, Save", 1200); _sel = 0; }
break;
}
}