mirror of
https://github.com/MarekZegare4/MeshCore-Solo.git
synced 2026-07-26 23:08:11 +00:00
0e6bd743a6
The "_dirty bool, then if (_dirty) the_mesh.savePrefs() on exit" pattern was duplicated across 9 screens with subtle divergence: some cleared the flag after saving, some left it set and relied on onShow() to reset. Replace all 12 exit sites with a single _task->savePrefsIfDirty(flag) helper that saves once only if dirty and always clears the flag, so the "did we touch flash?" answer lives in one place and the reset is consistent. Edit sites still mark the flag manually (inherent to change tracking); only the persist-on-exit boilerplate is centralised. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
73 lines
2.3 KiB
C++
73 lines
2.3 KiB
C++
#pragma once
|
|
// Configures periodic automatic 0-hop advert with GPS position.
|
|
// Included by UITask.cpp after DashboardConfigScreen.h.
|
|
|
|
class AutoAdvertScreen : public UIScreen {
|
|
UITask* _task;
|
|
NodePrefs* _prefs;
|
|
bool _dirty;
|
|
|
|
static const int OPT_COUNT = 8;
|
|
static const uint32_t OPTS[OPT_COUNT];
|
|
static const char* OPT_LABELS[OPT_COUNT];
|
|
|
|
int currentIdx() const {
|
|
for (int i = 0; i < OPT_COUNT; i++)
|
|
if (OPTS[i] == _prefs->advert_auto_interval_sec) return i;
|
|
return 0;
|
|
}
|
|
|
|
public:
|
|
AutoAdvertScreen(UITask* task, NodePrefs* prefs) : _task(task), _prefs(prefs) {}
|
|
|
|
void onShow() override { _dirty = false; }
|
|
|
|
int render(DisplayDriver& display) override {
|
|
display.setTextSize(1);
|
|
display.setColor(DisplayDriver::LIGHT);
|
|
int label_y = display.listStart();
|
|
int bar_y = label_y + display.lineStep();
|
|
int bar_h = display.lineStep();
|
|
int tip_y = bar_y + bar_h + 4;
|
|
|
|
display.drawCenteredHeader("AUTO-ADVERT");
|
|
|
|
display.setCursor(2, label_y);
|
|
display.print("Interval:");
|
|
|
|
int idx = currentIdx();
|
|
display.setColor(DisplayDriver::LIGHT);
|
|
display.fillRect(0, bar_y, display.width(), bar_h);
|
|
display.setColor(DisplayDriver::DARK);
|
|
display.drawTextCentered(display.width() / 2, bar_y + 1, OPT_LABELS[idx]);
|
|
display.setColor(DisplayDriver::LIGHT);
|
|
|
|
display.setCursor(2, tip_y);
|
|
display.print("< > to change");
|
|
display.setCursor(2, tip_y + display.lineStep());
|
|
display.print("[Esc] to save");
|
|
return 500;
|
|
}
|
|
|
|
bool handleInput(char c) override {
|
|
if (c == KEY_CANCEL || c == KEY_CONTEXT_MENU) {
|
|
_task->savePrefsIfDirty(_dirty);
|
|
_task->gotoToolsScreen();
|
|
return true;
|
|
}
|
|
bool right = keyIsNext(c) || c == KEY_ENTER;
|
|
bool left = keyIsPrev(c);
|
|
if (right || left) {
|
|
int idx = currentIdx();
|
|
idx = right ? (idx + 1) % OPT_COUNT : (idx + OPT_COUNT - 1) % OPT_COUNT;
|
|
_prefs->advert_auto_interval_sec = OPTS[idx];
|
|
_dirty = true;
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
};
|
|
|
|
const uint32_t AutoAdvertScreen::OPTS[AutoAdvertScreen::OPT_COUNT] = { 0, 30, 60, 120, 300, 600, 1800, 3600 };
|
|
const char* AutoAdvertScreen::OPT_LABELS[AutoAdvertScreen::OPT_COUNT] = { "off", "30s", "1min", "2min", "5min", "10min", "30min", "1h" };
|