From 07c5eef6222a274b8e52a9691b871da65403f43c Mon Sep 17 00:00:00 2001
From: Johannes Marbach <n0-0ne+gitlab@mailbox.org>
Date: Tue, 12 Oct 2021 19:55:59 +0200
Subject: [PATCH] Fix scancodes for / and ?

---
 .../us-terminal-with-scancodes/sq2lv_layouts.c     | 14 +++++++-------
 squeek2lvgl.py                                     |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.c b/examples/us-terminal-with-scancodes/sq2lv_layouts.c
index 8eb8565..0249a9e 100644
--- a/examples/us-terminal-with-scancodes/sq2lv_layouts.c
+++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.c
@@ -179,24 +179,24 @@ static const int num_scancodes_numbers_terminal_us = 5;
 static const int scancodes_numbers_terminal_us[] = { \
     KEY_LEFTCTRL, KEY_LEFTALT, KEY_UP, KEY_DOWN, KEY_LEFT, KEY_RIGHT, \
     KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7, KEY_8, KEY_9, KEY_0, \
-    KEY_LEFTSHIFT, KEY_8, KEY_LEFTSHIFT, KEY_3, KEY_LEFTSHIFT, KEY_4, KEY_LEFTSHIFT, KEY_QUESTION, KEY_LEFTSHIFT, KEY_7, KEY_MINUS, KEY_LEFTSHIFT, KEY_MINUS, KEY_LEFTSHIFT, KEY_EQUAL, KEY_LEFTSHIFT, KEY_9, KEY_LEFTSHIFT, KEY_0, \
-    KEY_COMMA, KEY_LEFTSHIFT, KEY_APOSTROPHE, KEY_APOSTROPHE, KEY_LEFTSHIFT, KEY_SEMICOLON, KEY_SEMICOLON, KEY_LEFTSHIFT, KEY_1, KEY_QUESTION, KEY_BACKSPACE, \
+    KEY_LEFTSHIFT, KEY_8, KEY_LEFTSHIFT, KEY_3, KEY_LEFTSHIFT, KEY_4, KEY_SLASH, KEY_LEFTSHIFT, KEY_7, KEY_MINUS, KEY_LEFTSHIFT, KEY_MINUS, KEY_LEFTSHIFT, KEY_EQUAL, KEY_LEFTSHIFT, KEY_9, KEY_LEFTSHIFT, KEY_0, \
+    KEY_COMMA, KEY_LEFTSHIFT, KEY_APOSTROPHE, KEY_APOSTROPHE, KEY_LEFTSHIFT, KEY_SEMICOLON, KEY_SEMICOLON, KEY_LEFTSHIFT, KEY_1, KEY_LEFTSHIFT, KEY_SLASH, KEY_BACKSPACE, \
     KEY_SPACE, KEY_DOT, KEY_ENTER \
 };
 
 static const int scancode_idxs_numbers_terminal_us[] = { \
     0, 1, 2, 3, 4, 5, \
     6, 7, 8, 9, 10, 11, 12, 13, 14, 15, \
-    16, 18, 20, 22, 24, 26, 27, 29, 31, 33, \
-    35, 36, 38, 39, 41, 42, 44, 45, \
+    16, 18, 20, 22, 23, 25, 26, 28, 30, 32, \
+    34, 35, 37, 38, 40, 41, 43, 45, \
     -1, 46, 47, 48 \
 };
 
 static const int scancode_nums_numbers_terminal_us[] = { \
     1, 1, 1, 1, 1, 1, \
     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \
-    2, 2, 2, 2, 2, 1, 2, 2, 2, 2, \
-    1, 2, 1, 2, 1, 2, 1, 1, \
+    2, 2, 2, 1, 2, 1, 2, 2, 2, 2, \
+    1, 2, 1, 2, 1, 2, 2, 1, \
     0, 1, 1, 1 \
 };
 
@@ -279,5 +279,5 @@ const int sq2lv_unique_scancodes[] = {
     KEY_G, KEY_H, KEY_J, KEY_K, KEY_L, KEY_Z, KEY_X, KEY_C, KEY_V, KEY_B,
     KEY_N, KEY_M, KEY_BACKSPACE, KEY_SPACE, KEY_ENTER, KEY_PAGEUP, KEY_PAGEDOWN, KEY_HOME, KEY_END, KEY_LEFTSHIFT,
     KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7, KEY_8, KEY_9, KEY_0,
-    KEY_QUESTION, KEY_MINUS, KEY_EQUAL, KEY_COMMA, KEY_APOSTROPHE, KEY_SEMICOLON, KEY_DOT
+    KEY_SLASH, KEY_MINUS, KEY_EQUAL, KEY_COMMA, KEY_APOSTROPHE, KEY_SEMICOLON, KEY_DOT
 };
diff --git a/squeek2lvgl.py b/squeek2lvgl.py
index 4992df3..9f1c1cf 100644
--- a/squeek2lvgl.py
+++ b/squeek2lvgl.py
@@ -478,7 +478,7 @@ scancodes_for_keycap = {
     '*': ['KEY_LEFTSHIFT', 'KEY_8'],
     '#': ['KEY_LEFTSHIFT', 'KEY_3'],
     '$': ['KEY_LEFTSHIFT', 'KEY_4'],
-    '/': ['KEY_LEFTSHIFT', 'KEY_QUESTION'],
+    '/': ['KEY_SLASH'],
     '&': ['KEY_LEFTSHIFT', 'KEY_7'],
     '-': ['KEY_MINUS'],
     '_': ['KEY_LEFTSHIFT', 'KEY_MINUS'],
@@ -491,7 +491,7 @@ scancodes_for_keycap = {
     ':': ['KEY_LEFTSHIFT', 'KEY_SEMICOLON'],
     ';': ['KEY_SEMICOLON'],
     '!': ['KEY_LEFTSHIFT', 'KEY_1'],
-    '?': ['KEY_QUESTION'],
+    '?': ['KEY_LEFTSHIFT', 'KEY_SLASH'],
     '.': ['KEY_DOT']
 }