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

fix(keyboard): rename QWERTY label to ABC (layout is alphabetical, not QWERTY)

Browse Source 
The on-screen keyboard grid has been a-b-c...z alphabetical order since
it was first introduced, never an actual QWERTY row layout. The
"QWERTY" name only appeared with the T9 option (needed something to
contrast it against) and was inaccurate from the start.
This commit is contained in:
Jakub
2026-07-02 18:33:40 +02:00
parent 5fe9240fc5
commit 3419e590fe
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/companion_radio/NodePrefs.h
View File

@@ -285,8 +285,8 @@ struct NodePrefs { // persisted to file
uint8_t alarm_min; // 0-59
// On-screen keyboard layout, shared across every text-entry screen (Settings >
// Keyboard). 0=QWERTY grid (default), 1=T9 multi-tap (phone-keypad groups,
// cycled with repeated Enter presses — see KeyboardWidget.h).
// Keyboard). 0=ABC grid, alphabetical order (default), 1=T9 multi-tap
// (phone-keypad groups, cycled with repeated Enter presses — see KeyboardWidget.h).
uint8_t keyboard_type;
// Single source of truth for the live-share option tables (shared by the Map

4
examples/companion_radio/ui-new/KeyboardWidget.h
View File

@@ -34,7 +34,7 @@ static const int KB_SPECIAL = 6; // ⇧ ⎵ ⌫ {} #@/abc ✓
// presses on the same cell within KB_T9_TIMEOUT_MS cycle through the group, ending
// on the cell's own digit (computed as '1'+cell, not stored here) before wrapping.
// Keys 0/*/# aren't part of the grid — space/backspace/etc. already live on the
// special row below, shared with the QWERTY layout.
// special row below, shared with the ABC layout.
static const int KB_T9_ROWS = 3;
static const int KB_T9_COLS = 3;
static const uint32_t KB_T9_TIMEOUT_MS = 800;
@@ -68,7 +68,7 @@ struct KeyboardWidget {
// Live setting lookup — set once by UITask::begin(). NULL only in tests/tools
// that construct a KeyboardWidget standalone, in which case isT9() defaults
// to QWERTY.
// to ABC.
NodePrefs* prefs = nullptr;
bool isT9() const { return prefs && prefs->keyboard_type == 1; }

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

@@ -557,7 +557,7 @@ class SettingsScreen : public UIScreen {
} else if (item == KEYBOARD_TYPE) {
display.print("Type");
display.setCursor(valCol(display), y);
display.print((p && p->keyboard_type) ? "T9" : "QWERTY");
display.print((p && p->keyboard_type) ? "T9" : "ABC");
} else if (item == BATT_DISPLAY) {
display.print("BattDisp");
display.setCursor(valCol(display), y);