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(l1): wrap-safe UI timers, a failed send keeps the text, bars stop at the ends

Browse Source 
- The redraw, alert, splash and sensor timers compare millis() wrap-safe
  (refreshDue(), alertShowing(); 0 = now / none), so the screen keeps
  refreshing past the 49.7-day rollover.
- A failed send leaves the keyboard with its text ("Not sent" in the field
  label, as alerts don't show over it) or the quick-message list with
  "Send failed", instead of dropping to Home. No "Sent" echo.
- The dashboard's Sats field shows "--" with the GPS off, not a stale count.
- Brightness and volume in Settings stop at both ends instead of wrapping.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Jakub
2026-10-02 13:49:16 +02:00
co-authored by Claude Opus 5.5
parent 6ae0e73663
commit 6cd081add1
4 changed files with 55 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/companion_radio/ui-new/SettingsScreen.h
+19 -5
View File
@@ -216,18 +216,24 @@ class SettingsScreen : public UIScreen {
return true;
}
// A schema setting: its short label, the value in the value column (a
// switch as ON / OFF, brightness and volume as bars). A value too long for
// the column starts further left, clear of the label, else scrolls.
// The number pad for the lock PIN, with what it's asking for.
void beginPinEntry(const char* prompt) {
_kb->beginPin("", KeyboardWidget::PIN_MAX_LEN, false, prompt);
_kb->clearPlaceholders(); // a PIN is literal, not a template message
}
// Brightness and volume: a row of level boxes, stopping at both ends.
static bool isBar(const settings::Setting& st) {
return st.offset == offsetof(NodePrefs, display_brightness) || st.offset == offsetof(NodePrefs, buzzer_volume);
}
// A schema setting: its short label, the value flush right (a switch for
// on / off, brightness and volume as bars); a value too long for the room
// beside the label is cut, and scrolls while selected.
int renderSchema(DisplayDriver& display, const settings::Setting& st, NodePrefs* p, int y, bool sel) {
const char* label = settings::shortLabel(st);
if (!p) { display.setCursor(2, y); display.print(label); return 0; }
if (st.offset == offsetof(NodePrefs, display_brightness) || st.offset == offsetof(NodePrefs, buzzer_volume)) {
if (isBar(st)) {
display.setCursor(2, y);
display.print(label);
renderBar(display, valCol(display), y, settings::get(*p, st) + 1, st.count);
@@ -899,7 +905,15 @@ public:
if (_selected >= SCHEMA_ITEM) {
if (!p || !(left || right || enter)) return false;
settings::step(*p, settings::ALL[_selected - SCHEMA_ITEM], left ? -1 : 1, _task->core());
const settings::Setting& st = settings::ALL[_selected - SCHEMA_ITEM];
if (isBar(st)) {
const int v = settings::get(*p, st) + (left ? -1 : 1);
if (v < 0 || v >= st.count) return true;
settings::set(*p, st, (uint8_t)v);
if (st.changed) st.changed(_task->core());
} else {
settings::step(*p, st, left ? -1 : 1, _task->core());
}
_dirty = true;
return true;
}