Mirrors/MeshCore-Solo
1
0
Fork 0
mirror of https://github.com/MarekZegare4/MeshCore-Solo.git synced 2026-08-01 09:46:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Channel context menu: defer flash write until CANCEL closes menu

Browse Source 
savePrefs() is now called once when the user closes the menu with
Back/Cancel, only if the notification state was actually changed
(_ctx_dirty flag). Toggling multiple times before closing still
results in a single write.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Jakub
2026-05-13 21:09:47 +02:00
co-authored by Claude Sonnet 4.6
parent 158bbf74c8
commit 4b06dff4e7
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/companion_radio/ui-new/UITask.cpp
+11 -6
View File
@@ -730,6 +730,7 @@ class QuickMsgScreen : public UIScreen {
// Context menu (opened by long-press ENTER in CHANNEL_PICK) // Context menu (opened by long-press ENTER in CHANNEL_PICK)
bool _ctx_open; bool _ctx_open;
bool _ctx_dirty;
int _ctx_ch_idx; int _ctx_ch_idx;
int _ctx_sel; int _ctx_sel;
@@ -916,7 +917,6 @@ class QuickMsgScreen : public UIScreen {
p->ch_notif_override |= mask; p->ch_notif_override |= mask;
p->ch_notif_muted &= ~mask; p->ch_notif_muted &= ~mask;
} }
the_mesh.savePrefs();
} }
public: public:
@@ -931,7 +931,7 @@ public:
_hist_head(0), _hist_count(0), _hist_head(0), _hist_count(0),
_kb_row(0), _kb_col(0), _kb_len(0), _kb_row(0), _kb_col(0), _kb_len(0),
_kb_caps(false), _kb_ph_mode(false), _kb_ph_sel(0), _kb_caps(false), _kb_ph_mode(false), _kb_ph_sel(0),
_ctx_open(false), _ctx_ch_idx(-1), _ctx_sel(0) { _ctx_open(false), _ctx_dirty(false), _ctx_ch_idx(-1), _ctx_sel(0) {
_kb_text[0] = '\0'; _kb_text[0] = '\0';
memset(_ch_unread, 0, sizeof(_ch_unread)); memset(_ch_unread, 0, sizeof(_ch_unread));
} }
@@ -1416,18 +1416,22 @@ public:
} else if (_phase == CHANNEL_PICK) { } else if (_phase == CHANNEL_PICK) {
// Context menu consumes all input while open // Context menu consumes all input while open
if (_ctx_open) { if (_ctx_open) {
if (c == KEY_CANCEL) { _ctx_open = false; return true; } if (c == KEY_CANCEL) {
if (_ctx_dirty) { the_mesh.savePrefs(); _ctx_dirty = false; }
_ctx_open = false;
return true;
}
if (c == KEY_UP && _ctx_sel > 0) { _ctx_sel--; return true; } if (c == KEY_UP && _ctx_sel > 0) { _ctx_sel--; return true; }
if (c == KEY_DOWN && _ctx_sel < 1) { _ctx_sel++; return true; } if (c == KEY_DOWN && _ctx_sel < 1) { _ctx_sel++; return true; }
if (c == KEY_ENTER && _num_channels > 0) { if (c == KEY_ENTER && _num_channels > 0) {
uint8_t ch_idx = _channel_indices[_channel_sel]; uint8_t ch_idx = _channel_indices[_channel_sel];
if (_ctx_sel == 0) { if (_ctx_sel == 0) {
_ch_unread[ch_idx] = 0; // mark all read _ch_unread[ch_idx] = 0;
} else { } else {
uint8_t nstate = chNotifState(ch_idx); uint8_t nstate = chNotifState(ch_idx);
setChNotifState(ch_idx, (nstate + 1) % 3); // cycle: default→OFF→ON→default setChNotifState(ch_idx, (nstate + 1) % 3);
_ctx_dirty = true;
} }
// stay open so user can see result; CANCEL closes
return true; return true;
} }
return true; return true;
@@ -1454,6 +1458,7 @@ public:
if (c == KEY_CONTEXT_MENU && _num_channels > 0) { if (c == KEY_CONTEXT_MENU && _num_channels > 0) {
_ctx_ch_idx = _channel_indices[_channel_sel]; _ctx_ch_idx = _channel_indices[_channel_sel];
_ctx_sel = 0; _ctx_sel = 0;
_ctx_dirty = false;
_ctx_open = true; _ctx_open = true;
return true; return true;
} }