Mirrors/MeshCore-Solo
1
0
Fork 0
mirror of https://github.com/MarekZegare4/MeshCore-Solo.git synced 2026-07-30 08:48:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: address code-audit hygiene (stale refs, dead TODO, popup scroll)

Browse Source 
- FEATURES audit: refresh references the Nearby/Trail refactors made stale —
  M4 (renderDiscoverDetail → renderScanDetail), L1 (SNR %.1f now in scan detail
  + ping; list cards show RSSI), Trail grid (round-step renderGrid + MIN_GRID_PX).
- MyMesh: drop the obsolete `// TODO: add expected ACK to table` — the code
  right below already populates expected_ack_table.
- PopupMenu: render() is now the single source of truth for _scroll, clamping
  the selection into view from the live-height cap, so handleInput() only moves
  _sel and never depends on a stale _cap (M3). Behaviour-preserving.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
MarekZegare4
2026-06-15 10:00:48 +02:00
parent 27d88bed52
commit 4145185031
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
examples/companion_radio/MyMesh.cpp
View File

@@ -1485,7 +1485,6 @@ void MyMesh::handleCmdFrame(size_t len) {
} else {
result = sendMessage(*recipient, msg_timestamp, attempt, text, expected_ack, est_timeout);
}
// TODO: add expected ACK to table
if (result == MSG_SEND_FAILED) {
writeErrFrame(ERR_CODE_TABLE_FULL);
} else {

25
examples/companion_radio/ui-new/PopupMenu.h
View File

@@ -42,6 +42,16 @@ struct PopupMenu {
if (max_by_height < 1) max_by_height = 1;
_cap = max_by_height;
int vis = (_count < _cap) ? _count : _cap;
// render() is the single source of truth for _scroll: using the cap just
// computed from the live display height, keep the selection inside the
// visible window. handleInput() therefore never has to touch _scroll (and
// can't act on a stale _cap from before the first render).
if (_sel < _scroll) _scroll = _sel;
else if (_sel >= _scroll + vis) _scroll = _sel - vis + 1;
int max_scroll = _count - vis;
if (max_scroll < 0) max_scroll = 0;
if (_scroll > max_scroll) _scroll = max_scroll;
if (_scroll < 0) _scroll = 0;
int bh = 12 + vis * PM_ITEM_H;
display.setColor(DisplayDriver::DARK);
@@ -76,18 +86,9 @@ struct PopupMenu {
Result handleInput(char c) {
if (_count == 0) { active = false; return CANCELLED; }
if (c == KEY_UP) {
_sel = (_sel > 0) ? _sel - 1 : _count - 1;
if (_sel < _scroll) _scroll = _sel;
else if (_sel == _count - 1 && _count > _cap) _scroll = _count - _cap;
return NONE;
}
if (c == KEY_DOWN) {
_sel = (_sel < _count - 1) ? _sel + 1 : 0;
if (_sel >= _scroll + _cap) _scroll = _sel - _cap + 1;
else if (_sel == 0) _scroll = 0;
return NONE;
}
// Selection only moves here; render() keeps it scrolled into view.
if (c == KEY_UP) { _sel = (_sel > 0) ? _sel - 1 : _count - 1; return NONE; }
if (c == KEY_DOWN) { _sel = (_sel < _count - 1) ? _sel + 1 : 0; return NONE; }
if (c == KEY_ENTER) { active = false; return SELECTED; }
if (c == KEY_CANCEL || c == KEY_CONTEXT_MENU) { active = false; return CANCELLED; }
return NONE;