add another symbol keyboard

has the missing characters: "^", "|", "~", "`"
Seeed-Solution · Aug 17, 2024 · cb09152 · cb09152
1 parent 9118406
commit cb09152
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 11 deletions.
diff --git a/components/lvgl/src/extra/widgets/keyboard/lv_keyboard.c b/components/lvgl/src/extra/widgets/keyboard/lv_keyboard.c
@@ -72,19 +72,32 @@ static const lv_btnmatrix_ctrl_t default_kb_ctrl_uc_map[] = {
     LV_KEYBOARD_CTRL_BTN_FLAGS | 2, LV_BTNMATRIX_CTRL_CHECKED | 2, 6, LV_BTNMATRIX_CTRL_CHECKED | 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 2
 };
 
-static const char * const default_kb_map_spec[] = {"1", "2", "3", "4", "5", "6", "7", "8", "9", "0", LV_SYMBOL_BACKSPACE, "\n",
+static const char * const default_kb_map_spec1[] = {"2#", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", LV_SYMBOL_BACKSPACE, "\n",
                                                    "abc", "+", "-", "/", "*", "=", "%", "!", "?", "#", "<", ">", "\n",
                                                    "\\",  "@", "$", "(", ")", "{", "}", "[", "]", ";", "\"", "'", "\n",
                                                    LV_SYMBOL_KEYBOARD, LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, LV_SYMBOL_OK, ""
                                                   };
 
-static const lv_btnmatrix_ctrl_t default_kb_ctrl_spec_map[] = {
-    LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_BTNMATRIX_CTRL_CHECKED | 2,
+static const lv_btnmatrix_ctrl_t default_kb_ctrl_spec1_map[] = {
+        LV_KEYBOARD_CTRL_BTN_FLAGS | 2,LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_BTNMATRIX_CTRL_CHECKED | 2,
     LV_KEYBOARD_CTRL_BTN_FLAGS | 2, LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1),
     LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1),
     LV_KEYBOARD_CTRL_BTN_FLAGS | 2, LV_BTNMATRIX_CTRL_CHECKED | 2, 6, LV_BTNMATRIX_CTRL_CHECKED | 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 2
 };
 
+static const char * const default_kb_map_spec2[] = {"1#","1", "2", "3", "4", "5", "6", "7", "8", "9", "0", LV_SYMBOL_BACKSPACE, "\n",
+                                                    "abc", "^", "|", "~", "`", "=", "%", "!", "?", "#", "<", ">", "\n",
+                                                    "\\",  "@", "$", "(", ")", "{", "}", "[", "]", ";", "\"", "'", "\n",
+                                                    LV_SYMBOL_KEYBOARD, LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, LV_SYMBOL_OK, ""
+};
+
+static const lv_btnmatrix_ctrl_t default_kb_ctrl_spec2_map[] = {
+        LV_KEYBOARD_CTRL_BTN_FLAGS | 2,LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_BTNMATRIX_CTRL_CHECKED | 2,
+        LV_KEYBOARD_CTRL_BTN_FLAGS | 2, LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1),
+        LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1), LV_KB_BTN(1),
+        LV_KEYBOARD_CTRL_BTN_FLAGS | 2, LV_BTNMATRIX_CTRL_CHECKED | 2, 6, LV_BTNMATRIX_CTRL_CHECKED | 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 2
+};
+
 static const char * const default_kb_map_num[] = {"1", "2", "3", LV_SYMBOL_KEYBOARD, "\n",
                                                   "4", "5", "6", LV_SYMBOL_OK, "\n",
                                                   "7", "8", "9", LV_SYMBOL_BACKSPACE, "\n",
@@ -101,23 +114,23 @@ static const lv_btnmatrix_ctrl_t default_kb_ctrl_num_map[] = {
 static const char * * kb_map[9] = {
     (const char * *)default_kb_map_lc,
     (const char * *)default_kb_map_uc,
-    (const char * *)default_kb_map_spec,
+    (const char * *)default_kb_map_spec1,
+    (const char * *)default_kb_map_spec2,
     (const char * *)default_kb_map_num,
     (const char * *)default_kb_map_lc,
     (const char * *)default_kb_map_lc,
     (const char * *)default_kb_map_lc,
-    (const char * *)default_kb_map_lc,
     (const char * *)NULL,
 };
 static const lv_btnmatrix_ctrl_t * kb_ctrl[9] = {
     default_kb_ctrl_lc_map,
     default_kb_ctrl_uc_map,
-    default_kb_ctrl_spec_map,
+    default_kb_ctrl_spec1_map,
+    default_kb_ctrl_spec2_map,
     default_kb_ctrl_num_map,
     default_kb_ctrl_lc_map,
     default_kb_ctrl_lc_map,
     default_kb_ctrl_lc_map,
-    default_kb_ctrl_lc_map,
     NULL,
 };
 
@@ -295,8 +308,14 @@ void lv_keyboard_def_event_cb(lv_event_t * e)
         return;
     }
     else if(strcmp(txt, "1#") == 0) {
-        keyboard->mode = LV_KEYBOARD_MODE_SPECIAL;
-        lv_btnmatrix_set_map(obj, kb_map[LV_KEYBOARD_MODE_SPECIAL]);
+        keyboard->mode = LV_KEYBOARD_MODE_SPECIAL_1;
+        lv_btnmatrix_set_map(obj, kb_map[LV_KEYBOARD_MODE_SPECIAL_1]);
+        lv_keyboard_update_ctrl_map(obj);
+        return;
+    }
+    else if(strcmp(txt, "2#") == 0) {
+        keyboard->mode = LV_KEYBOARD_MODE_SPECIAL_2;
+        lv_btnmatrix_set_map(obj, kb_map[LV_KEYBOARD_MODE_SPECIAL_2]);
         lv_keyboard_update_ctrl_map(obj);
         return;
     }

diff --git a/components/lvgl/src/extra/widgets/keyboard/lv_keyboard.h b/components/lvgl/src/extra/widgets/keyboard/lv_keyboard.h
@@ -39,12 +39,12 @@ extern "C" {
 enum {
     LV_KEYBOARD_MODE_TEXT_LOWER,
     LV_KEYBOARD_MODE_TEXT_UPPER,
-    LV_KEYBOARD_MODE_SPECIAL,
+    LV_KEYBOARD_MODE_SPECIAL_1,
+    LV_KEYBOARD_MODE_SPECIAL_2,
     LV_KEYBOARD_MODE_NUMBER,
     LV_KEYBOARD_MODE_USER_1,
     LV_KEYBOARD_MODE_USER_2,
     LV_KEYBOARD_MODE_USER_3,
-    LV_KEYBOARD_MODE_USER_4,
 };
 typedef uint8_t lv_keyboard_mode_t;