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

refactor(ui): move trail Min-dist setting out of Settings into the tool itself

Browse Source 
Per-tool config belongs in the tool, matching Auto-Advert's pattern.
SettingsScreen drops:
- TRAIL_MIN_DELTA enum entry + the entire SECTION_GPS gate (it was its
  only remaining item after GPS upd / Trail int were removed)
- Render and input handler blocks

TrailScreen gains a small modal popup opened with Hold Enter (the
KEY_CONTEXT_MENU input). Enter cycles through the four min-dist values
(5/10/25/100 m), Esc closes the popup. The popup overlays whichever
view is active; savePrefs runs on each cycle so the value persists.

NodePrefs::trail_min_delta_idx and the TrailStore::MIN_DELTA_* helpers
are unchanged — only the entry point shifted.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Jakub
2026-05-25 12:54:51 +02:00
parent 178a34d1ec
commit 08c09163ca
2 changed files with 50 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
examples/companion_radio/ui-new/SettingsScreen.h
View File

@@ -56,11 +56,6 @@ class SettingsScreen : public UIScreen {
SECTION_SYSTEM,
TIMEZONE,
LOW_BAT,
#if ENV_INCLUDE_GPS == 1
// GPS section
SECTION_GPS,
TRAIL_MIN_DELTA,
#endif
// Contacts section
SECTION_CONTACTS, DM_FILTER, ROOM_FILTER,
// Messages section
@@ -406,12 +401,6 @@ class SettingsScreen : public UIScreen {
display.print("AutoLock");
display.setCursor(display.valCol(), y);
display.print((p && p->auto_lock) ? "ON" : "OFF");
#if ENV_INCLUDE_GPS == 1
} else if (item == TRAIL_MIN_DELTA) {
display.print("Trail dist");
display.setCursor(display.valCol(), y);
display.print(TrailStore::minDeltaLabel(p ? p->trail_min_delta_idx : 0));
#endif
} else if (item == TIMEZONE) {
display.print("TimeZone");
char buf[8];
@@ -636,16 +625,6 @@ public:
_dirty = true;
return true;
}
#if ENV_INCLUDE_GPS == 1
if (_selected == TRAIL_MIN_DELTA && p && (left || right)) {
int idx = p->trail_min_delta_idx;
if (idx >= TrailStore::MIN_DELTA_COUNT) idx = 0;
idx = (idx + (right ? 1 : TrailStore::MIN_DELTA_COUNT - 1)) % TrailStore::MIN_DELTA_COUNT;
p->trail_min_delta_idx = (uint8_t)idx;
_dirty = true;
return true;
}
#endif
if (_selected == TIMEZONE && p) {
if (right && p->tz_offset_hours < 14) { p->tz_offset_hours++; _dirty = true; return true; }
if (left && p->tz_offset_hours > -12) { p->tz_offset_hours--; _dirty = true; return true; }

52
examples/companion_radio/ui-new/TrailScreen.h
View File

@@ -16,6 +16,7 @@ class TrailScreen : public UIScreen {
uint8_t _view = V_SUMMARY;
int _summary_scroll = 0; // top visible item index in Summary view
int _list_scroll = 0; // top visible row in List view (newest = row 0)
bool _opts_open = false; // tool-local options popup (min-delta)
static const int SUMMARY_ITEM_COUNT = 5;
@@ -47,14 +48,31 @@ public:
display.setCursor(2, hint_y);
display.print(hint);
// Options popup overlay (Hold Enter to open) — tool-local Min-delta setting.
if (_opts_open) renderOptions(display);
return _store->isActive() ? 1000 : 5000;
}
bool handleInput(char c) override {
if (c == KEY_CANCEL || c == KEY_CONTEXT_MENU) {
_task->gotoToolsScreen();
// Options popup consumes all input while open.
if (_opts_open) {
if (c == KEY_CANCEL || c == KEY_CONTEXT_MENU) { _opts_open = false; return true; }
if (c == KEY_ENTER) {
NodePrefs* p = _task->getNodePrefs();
if (p) {
uint8_t idx = p->trail_min_delta_idx;
if (idx >= TrailStore::MIN_DELTA_COUNT) idx = 0;
idx = (idx + 1) % TrailStore::MIN_DELTA_COUNT;
p->trail_min_delta_idx = idx;
the_mesh.savePrefs();
}
}
return true;
}
if (c == KEY_CANCEL) { _task->gotoToolsScreen(); return true; }
if (c == KEY_CONTEXT_MENU) { _opts_open = true; return true; }
if (c == KEY_LEFT || c == KEY_PREV) { _view = (_view + V_COUNT - 1) % V_COUNT; return true; }
if (c == KEY_RIGHT || c == KEY_NEXT) { _view = (_view + 1) % V_COUNT; return true; }
if (_view == V_SUMMARY && c == KEY_UP && _summary_scroll > 0) { _summary_scroll--; return true; }
@@ -74,6 +92,36 @@ public:
return false;
}
// Small modal overlay with the only tool-local option: minimum distance
// between consecutive samples. Pressing Enter cycles through the 4 options
// (5/10/25/100 m) so the user can keep tapping; Esc closes the popup.
void renderOptions(DisplayDriver& display) {
NodePrefs* p = _task->getNodePrefs();
int step = display.lineStep();
int bw = display.width() - 16;
int bh = step * 3 + 4;
int bx = (display.width() - bw) / 2;
int by = (display.height() - bh) / 2;
display.setColor(DisplayDriver::DARK);
display.fillRect(bx, by, bw, bh);
display.setColor(DisplayDriver::LIGHT);
display.drawRect(bx, by, bw, bh);
display.setCursor(bx + 4, by + 2);
display.print("Trail options");
display.fillRect(bx, by + step + 1, bw, 1);
char buf[24];
snprintf(buf, sizeof(buf), "Min dist: %s",
TrailStore::minDeltaLabel(p ? p->trail_min_delta_idx : 0));
display.setCursor(bx + 4, by + step + 3);
display.print(buf);
display.setCursor(bx + 4, by + step * 2 + 3);
display.print("[Ent] cycle [Esc]");
}
// True when the global SensorManager has a usable GPS fix.
static bool gpsHasFix() {
#if ENV_INCLUDE_GPS == 1