mirror of
https://github.com/MarekZegare4/MeshCore-Solo.git
synced 2026-08-07 04:36:11 +00:00
feat(admin): typed Radio/Routing field editors; pre-release audit fixes
Tools > Admin: split the Radio tab's single "f,bw,sf,cr" comma-string field (free-text keyboard) into 4 independent, type-appropriate rows -- Frequency (same digit-cursor DigitEditor Settings/Repeater use locally), Bandwidth/Spreading factor/Coding rate (discrete-set LEFT/RIGHT stepping), plus TX power and the 3 Routing numeric fields as number steppers and Repeat as an ON/OFF toggle. Edits happen locally (zero mesh traffic per keystroke); only Enter sends one combined `set`, Cancel sends nothing. Full pre-release audit of all 16 commits since v1.22 (5 parallel focus areas: display/font, keyboard/messages, Nodes/Admin, Bot/channels, UITask+NodePrefs schema) turned up and fixed: - Admin: fetched FK_NUMBER values weren't clamped to the field's range, so a value already out-of-range could get stuck unreachable; fixed commit-time float format noise (%.6f -> %.3f); Cancel/failed-login always returned to the Nodes picker even when Admin was opened directly from a node's Hold-Enter action -- now returns to wherever it was actually opened from (AdminScreen::_from_picker). - Keyboard: one-shot Shift was consumed after the *first* T9 multi-tap, so cycling to the 2nd/3rd candidate always came out lowercase -- fixed by caching the cycle's caps state (t9_caps). - Messages: history is numbered newest-first, so a message arriving while scrolled up to an older one silently relabeled the view onto a different message -- selection now shifts with the insert. - Channels: onChannelRemoved() didn't clear ch_notif_override/ ch_notif_muted/ch_fav_bitmask despite its own contract comment requiring it (now far more reachable via the on-device Delete); an all-zero hex secret silently self-deleted the channel it was just saved into (collides with the empty-slot sentinel) -- rejected. - Room login: isRoomLoggedIn() indexed the login-tracking ring directly instead of via its head offset, silently wrong once the ring wraps (8+ rooms/session) -- the new on-device Logout depends on this being right. - Font/display: removed the now fully-inert Settings > Display > Font toggle and the dead LemonFont.h (retired by the earlier misc-fixed font unification, zero remaining includes); fixed a copy-pasted "5x7" comment (font is 6x9), two meaningless dead ternaries, and an OLED/e-ink inconsistency in the undefined-glyph fallback box offset. - AdminField's `kind`/bounds fields no longer rely on default member initializers inside aggregate-init: this toolchain's actual nRF52 build (unlike env:native) has no explicit -std= override, so it predates C++14's aggregate-with-default-member-initializer rule. Given an explicit constructor instead -- portable regardless of standard, all existing field-table literals unchanged. Docs updated to match: tools_screen.md (Diagnostics as a 3-tab carousel, was documented as one flat screen), message_screen.md (chat bubbles, newest-at-bottom, cursor mode, secret validation), settings_screen.md (dropped the dead Font row), solo_ui_framework.md (header menu_hint signatures, icon priority-drop, KeyboardWidget's T9/alphabets/cursor-mode). release-notes.md gains the v1.23 section covering all of the above plus the other 15 commits since v1.22. Build-verified on WioTrackerL1_companion_solo_dual. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
@@ -629,12 +629,22 @@ public:
|
||||
// the outgoing path can attach a relay seq to that exact entry.
|
||||
int addChannelMsg(uint8_t ch_idx, const char* text, uint32_t timestamp = 0) {
|
||||
bool viewing = (_phase == CHANNEL_HIST && _sel_channel_idx == (int)ch_idx);
|
||||
return _history.addChannelMsg(ch_idx, text, viewing, timestamp);
|
||||
int pos = _history.addChannelMsg(ch_idx, text, viewing, timestamp);
|
||||
// Ring entries are numbered newest-first (0 == newest), so a new insert
|
||||
// shifts every older message's index up by one. If the user has scrolled
|
||||
// up to an older message (_hist_sel > 0), re-point the selection at that
|
||||
// same message instead of silently relabeling a different one in under
|
||||
// them. At _hist_sel <= 0 (already at newest, or -1 == compose button
|
||||
// focused) there's nothing to preserve.
|
||||
if (viewing && _hist_sel > 0) { _hist_sel++; _hist_scroll++; }
|
||||
return pos;
|
||||
}
|
||||
void markChannelRelayed(uint32_t seq) { _history.markChannelRelayed(seq); }
|
||||
void addDMMsg(const uint8_t* pub_key, bool outgoing, const char* text,
|
||||
uint32_t sender_timestamp = 0) {
|
||||
bool viewing = (_phase == DM_HIST && memcmp(_sel_contact.id.pub_key, pub_key, 4) == 0);
|
||||
_history.addDMMsg(pub_key, outgoing, text, sender_timestamp);
|
||||
if (viewing && _dm_hist_sel > 0) { _dm_hist_sel++; _dm_hist_scroll++; } // see addChannelMsg
|
||||
}
|
||||
void markDmDelivered(uint32_t ack_crc) { _history.markDmDelivered(ack_crc); }
|
||||
|
||||
@@ -648,8 +658,14 @@ public:
|
||||
int _room_login_head = 0, _room_login_count = 0;
|
||||
|
||||
bool isRoomLoggedIn(const uint8_t* pub_key) const {
|
||||
for (int i = 0; i < _room_login_count; i++)
|
||||
if (memcmp(_room_login_prefix[i], pub_key, 4) == 0) return true;
|
||||
// Indices are relative to _room_login_head, same as forgetRoomLoggedIn() --
|
||||
// direct 0.._room_login_count indexing only happens to work before the
|
||||
// ring has wrapped once (head==0); after that it silently checks the wrong
|
||||
// slots.
|
||||
for (int i = 0; i < _room_login_count; i++) {
|
||||
int pos = (_room_login_head + i) % ROOM_LOGIN_TABLE_SIZE;
|
||||
if (memcmp(_room_login_prefix[pos], pub_key, 4) == 0) return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user