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

feat(l2): keyboard - a second symbols page behind #+= with the brackets and the rest of ASCII ([ ] { } < > \ | ~ ^ ` $ and a few more)

Browse Source 
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Jakub
2026-10-29 14:09:25 +01:00
co-authored by Claude Opus 5.5
parent cce2798d2d
commit c46a0a2b55
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/solo/messages.md
+3 -1
View File
@@ -119,7 +119,9 @@ correctly whatever the keyboard is set to.
> [!NOTE] > [!NOTE]
> **Wio Tracker L2:** a phone-style keyboard. Hold a key for its accents; the > **Wio Tracker L2:** a phone-style keyboard. Hold a key for its accents; the
> globe key switches between the two alphabets. > globe key switches between the two alphabets. **1#** opens digits and
> symbols; **#+=** there opens a second page with brackets `[ ] { } < >`,
> `` \ | ~ ^ ` $ `` and a few more (`£ ¥ § ° ± × ÷ • … « » –`).
## Channels ## Channels
examples/companion_radio/ui-lvgl/Keyboard.h
+17 -7
View File
@@ -7,7 +7,8 @@
// - hold a key for its variants (ą ć ę … / ё є ї … / ά έ … / punctuation // - hold a key for its variants (ą ć ę … / ё є ї … / ά έ … / punctuation
// behind '.'), from the shared table in ui-core/KeyboardData.h. The popup // behind '.'), from the shared table in ui-core/KeyboardData.h. The popup
// opens above the key; tap a variant to type it, tap elsewhere to close. // opens above the key; tap a variant to type it, tap elsewhere to close.
// - one-shot shift; digits / symbols page behind "1#"; the keyboard key // - one-shot shift; digits / symbols page behind "1#", the rest of ASCII
// (brackets, \ | ~ ^ ` $ …) on a second page behind "#+="; the keyboard key
// closes it (LV_EVENT_CANCEL: the compose bar keeps its text, a dialog // closes it (LV_EVENT_CANCEL: the compose bar keeps its text, a dialog
// is left without saving). // is left without saving).
// Letters type on release (popover keys), so a long press never types the // Letters type on release (popover keys), so a long press never types the
@@ -24,6 +25,8 @@ namespace kb {
static const char* const K_SYM = "1#"; static const char* const K_SYM = "1#";
static const char* const K_BACK = "abc"; static const char* const K_BACK = "abc";
static const char* const K_SYM2 = "#+="; // symbols page 1 -> 2
static const char* const K_SYM1 = "123"; // symbols page 2 -> 1
static const char* const K_GLOBE = "\xEF\x82\xAC"; // FontAwesome globe (U+F0AC) -- see fonts/generate.sh static const char* const K_GLOBE = "\xEF\x82\xAC"; // FontAwesome globe (U+F0AC) -- see fonts/generate.sh
static const char* const LAT[] = { static const char* const LAT[] = {
@@ -61,12 +64,17 @@ static const char* const SYM[] = {
"-","/",":",";","(",")","€","&","@","\"","\n", "-","/",":",";","(",")","€","&","@","\"","\n",
".",",","?","!","'","#","%","+","=","_",KB_BS,"\n", ".",",","?","!","'","#","%","+","=","_",KB_BS,"\n",
nullptr }; nullptr };
static const char* const SYM2[] = {
"[","]","{","}","<",">","^","~","`","|","\n",
"\\","$","£","¥","§","°","±","×","÷","•","\n",
".",",","?","!","'","\"","…","«","»","–",KB_BS,"\n",
nullptr };
// Layout ids; letter layouts in (lower, upper) pairs, in NodePrefs // Layout ids; letter layouts in (lower, upper) pairs, in NodePrefs
// KB_ALPHABET_* order (Latin, Cyrillic, Greek) so script * 2 = its lower layout. // KB_ALPHABET_* order (Latin, Cyrillic, Greek) so script * 2 = its lower layout.
enum : uint8_t { L_LAT, L_LAT_UP, L_CYR, L_CYR_UP, L_GRK, L_GRK_UP, L_PAIRED_END = L_GRK_UP, enum : uint8_t { L_LAT, L_LAT_UP, L_CYR, L_CYR_UP, L_GRK, L_GRK_UP, L_PAIRED_END = L_GRK_UP,
L_SYM, L_COUNT }; L_SYM, L_SYM2, L_COUNT };
static const char* const* const ROWS[L_COUNT] = { LAT, LAT_UP, CYR, CYR_UP, GRK, GRK_UP, SYM }; static const char* const* const ROWS[L_COUNT] = { LAT, LAT_UP, CYR, CYR_UP, GRK, GRK_UP, SYM, SYM2 };
// Full lv_keyboard maps: the rows above + a bottom row assembled in // Full lv_keyboard maps: the rows above + a bottom row assembled in
// buildMaps() (globe only when a second script is enabled). // buildMaps() (globe only when a second script is enabled).
@@ -91,7 +99,7 @@ static uint8_t altScript() {
static bool hasAlt() { return altScript() != mainScript(); } static bool hasAlt() { return altScript() != mainScript(); }
static bool isSpecial(const char* t) { static bool isSpecial(const char* t) {
static const char* const SP[] = { KB_SH, KB_BS, KB_OK, KB_HIDE, K_SYM, K_BACK, K_GLOBE }; static const char* const SP[] = { KB_SH, KB_BS, KB_OK, KB_HIDE, K_SYM, K_BACK, K_GLOBE, K_SYM2, K_SYM1 };
for (const char* s : SP) if (strcmp(t, s) == 0) return true; for (const char* s : SP) if (strcmp(t, s) == 0) return true;
return false; return false;
} }
@@ -104,8 +112,9 @@ static void buildMaps() {
for (int l = 0; l < L_COUNT; l++) { for (int l = 0; l < L_COUNT; l++) {
int m = 0; int m = 0;
for (const char* const* p = ROWS[l]; *p; p++) s_maps[l][m++] = *p; for (const char* const* p = ROWS[l]; *p; p++) s_maps[l][m++] = *p;
if (l == L_SYM) { if (l >= L_SYM) {
s_maps[l][m++] = KB_HIDE; s_maps[l][m++] = K_BACK; s_maps[l][m++] = " "; s_maps[l][m++] = KB_HIDE; s_maps[l][m++] = K_BACK;
s_maps[l][m++] = l == L_SYM ? K_SYM2 : K_SYM1; s_maps[l][m++] = " ";
s_maps[l][m++] = "*"; s_maps[l][m++] = KB_OK; s_maps[l][m++] = "*"; s_maps[l][m++] = KB_OK;
} else { } else {
s_maps[l][m++] = KB_HIDE; s_maps[l][m++] = K_SYM; s_maps[l][m++] = KB_HIDE; s_maps[l][m++] = K_SYM;
@@ -251,7 +260,8 @@ static void onEvent(lv_event_t* e) {
if (!t) return; if (!t) return;
if (strcmp(t, KB_SH) == 0) { if (s_layout <= L_PAIRED_END) apply(kbd, s_layout ^ 1); return; } if (strcmp(t, KB_SH) == 0) { if (s_layout <= L_PAIRED_END) apply(kbd, s_layout ^ 1); return; }
if (strcmp(t, K_SYM) == 0) { apply(kbd, L_SYM); return; } if (strcmp(t, K_SYM) == 0 || strcmp(t, K_SYM1) == 0) { apply(kbd, L_SYM); return; }
if (strcmp(t, K_SYM2) == 0) { apply(kbd, L_SYM2); return; }
if (strcmp(t, K_BACK) == 0) { apply(kbd, s_script * 2); return; } if (strcmp(t, K_BACK) == 0) { apply(kbd, s_script * 2); return; }
if (strcmp(t, K_GLOBE) == 0) { if (strcmp(t, K_GLOBE) == 0) {
s_script = (s_script == mainScript()) ? altScript() : mainScript(); s_script = (s_script == mainScript()) ? altScript() : mainScript();