Add more keycodes

src/main/python/keycodes.py

@@ -4,15 +4,17 @@
 
 class Keycode():
 
-    def __init__(self, keycode, qmk_id, label):
-        self.keycode = keycode
+    def __init__(self, code, qmk_id, label, tooltip=None):
+        self.code = code
         self.qmk_id = qmk_id
         self.label = label
+        self.tooltip = tooltip
 
 
 K = Keycode
 
-KEYCODES = [
+KEYCODES_BASIC = [
+    K(0x00, "KC_NO", ""),
     K(0x01, "KC_TRNS", "▽"),
     K(0x04, "KC_A", "A"),
     K(0x05, "KC_B", "B"),
@@ -46,7 +48,7 @@ KEYCODES = [
     K(0x21, "KC_4", "$\n4"),
     K(0x22, "KC_5", "%\n5"),
     K(0x23, "KC_6", "^\n6"),
-    K(0x24, "KC_7", "&\n7"),
+    K(0x24, "KC_7", "&&\n7"),
     K(0x25, "KC_8", "*\n8"),
     K(0x26, "KC_9", "(\n9"),
     K(0x27, "KC_0", ")\n0"),
@@ -60,7 +62,6 @@ KEYCODES = [
     K(0x2F, "KC_LBRACKET", "{\n["),
     K(0x30, "KC_RBRACKET", "}\n]"),
     K(0x31, "KC_BSLASH", "|\n\\"),
-    K(0x32, "KC_NONUS_HASH", "~\n#"),
     K(0x33, "KC_SCOLON", ":\n;"),
     K(0x34, "KC_QUOTE", "\"\n'"),
     K(0x35, "KC_GRAVE", "~\n`"),
@@ -93,27 +94,26 @@ KEYCODES = [
     K(0x50, "KC_LEFT", "Left"),
     K(0x51, "KC_DOWN", "Down"),
     K(0x52, "KC_UP", "Up"),
-    # KC_NUMLOCK,
-    # KC_KP_SLASH,
-    # KC_KP_ASTERISK,
-    # KC_KP_MINUS,
-    # KC_KP_PLUS,
-    # KC_KP_ENTER,
-    # KC_KP_1,
-    # KC_KP_2,
-    # KC_KP_3,
-    # KC_KP_4,
-    # KC_KP_5,
-    # KC_KP_6,
-    # KC_KP_7,
-    # KC_KP_8,  // 0x60
-    # KC_KP_9,
-    # KC_KP_0,
-    # KC_KP_DOT,
-    # KC_NONUS_BSLASH,
-    # KC_APPLICATION,
+    K(0x53, "KC_NUMLOCK", "Num\nLock"),
+    K(0x54, "KC_KP_SLASH", "/"),
+    K(0x55, "KC_KP_ASTERISK", "*"),
+    K(0x56, "KC_KP_MINUS", "-"),
+    K(0x57, "KC_KP_PLUS", "+"),
+    K(0x58, "KC_KP_ENTER", "Num\nEnter"),
+    K(0x59, "KC_KP_1", "1"),
+    K(0x5A, "KC_KP_2", "2"),
+    K(0x5B, "KC_KP_3", "3"),
+    K(0x5C, "KC_KP_4", "4"),
+    K(0x5D, "KC_KP_5", "5"),
+    K(0x5E, "KC_KP_6", "6"),
+    K(0x5F, "KC_KP_7", "7"),
+    K(0x60, "KC_KP_8", "8"),
+    K(0x61, "KC_KP_9", "9"),
+    K(0x62, "KC_KP_0", "0"),
+    K(0x63, "KC_KP_DOT", "."),
+    K(0x65, "KC_APPLICATION", "Menu"),
     # KC_POWER,
-    # KC_KP_EQUAL,
+    K(0x67, "KC_KP_EQUAL", "="),
     # KC_F13,
     # KC_F14,
     # KC_F15,
@@ -176,15 +176,51 @@ KEYCODES = [
     # KC_CRSEL,
     # KC_EXSEL,
 
-    K(0x5C00, "RESET", "Reset"),
+    K(0xE0, "KC_LCTRL", "LCtrl"),
+    K(0xE1, "KC_LSHIFT", "LShift"),
+    K(0xE2, "KC_LALT", "LAlt"),
+    K(0xE3, "KC_LGUI", "LGui"),
+    K(0xE4, "KC_RCTRL", "RCtrl"),
+    K(0xE5, "KC_RSHIFT", "RShift"),
+    K(0xE6, "KC_RALT", "RAlt"),
+    K(0xE7, "KC_RGUI", "RGui"),
 ]
 
-KEYCODES_BASIC = KEYCODES
+KEYCODES_ISO = [
+    K(0x32, "KC_NONUS_HASH", "~\n#", "Non-US # and ~"),
+    K(0x64, "KC_NONUS_BSLASH", "|\n\\", "Non-US \\ and |"),
+]
+
+KEYCODES_MACRO = []
+
+KEYCODES_LAYERS = []
+
+KEYCODES_SPECIAL = [
+    K(0x5C00, "RESET", "Reset", "Reboot to bootloader"),
+    K(0x5C16, "GRAVE_ESC", "`Esc"),
+]
+
+KEYCODES = KEYCODES_BASIC + KEYCODES_ISO + KEYCODES_MACRO + KEYCODES_LAYERS + KEYCODES_SPECIAL
 
 K = None
 
-def keycode_to_label(code):
+def find_keycode(code):
     for keycode in KEYCODES:
-        if keycode.keycode == code:
-            return keycode.label
-    return "0x{:X}".format(code)
+        if keycode.code == code:
+            return keycode
+    return None
+
+def keycode_label(code):
+    keycode = find_keycode(code)
+    if keycode is None:
+        return "0x{:X}".format(code)
+    return keycode.label
+
+def keycode_tooltip(code):
+    keycode = find_keycode(code)
+    if keycode is None:
+        return None
+    tooltip = keycode.qmk_id
+    if keycode.tooltip:
+        tooltip = "{}: {}".format(tooltip, keycode.tooltip)
+    return tooltip

src/main/python/main.py

@@ -14,29 +14,41 @@ from flowlayout import FlowLayout
 from util import tr, find_vial_keyboards, open_device, hid_send, MSG_LEN
 from kle_serial import Serial as KleSerial
 from clickable_label import ClickableLabel
-from keycodes import keycode_to_label, KEYCODES_BASIC
+from keycodes import keycode_label, keycode_tooltip, KEYCODES_BASIC, KEYCODES_ISO, KEYCODES_MACRO, KEYCODES_LAYERS, KEYCODES_SPECIAL
 
 
 class TabbedKeycodes(QTabWidget):
 
     def __init__(self, kb, parent=None):
         super().__init__(parent)
+
         self.tab_basic = QWidget()
+        self.tab_iso = QWidget()
+        self.tab_macro = QWidget()
+        self.tab_layers = QWidget()
+        self.tab_special = QWidget()
+
+        for (tab, label, keycodes) in [
+            (self.tab_basic, "Basic", KEYCODES_BASIC),
+            (self.tab_iso, "ISO/JIS", KEYCODES_ISO),
+            (self.tab_macro, "Macro", KEYCODES_MACRO),
+            (self.tab_layers, "Layers", KEYCODES_LAYERS),
+            (self.tab_special, "Special", KEYCODES_SPECIAL),
+        ]:
+            self.create_buttons(tab, keycodes)
+            self.addTab(tab, tr("TabbedKeycodes", label))
+
+    def create_buttons(self, tab, keycodes):
         layout = FlowLayout()
 
-        for keycode in KEYCODES_BASIC:
+        for keycode in keycodes:
             btn = QPushButton(keycode.label)
             btn.setFixedSize(50, 50)
-            btn.clicked.connect(lambda st, k=keycode: kb.set_key(k.keycode))
+            btn.setToolTip(keycode_tooltip(keycode.code))
+            btn.clicked.connect(lambda st, k=keycode: kb.set_key(k.code))
             layout.addWidget(btn)
-        self.tab_basic.setLayout(layout)
 
-        self.tab_media = QWidget()
-        self.tab_macro = QWidget()
-
-        self.addTab(self.tab_basic, tr("TabbedKeycodes", "Basic"))
-        self.addTab(self.tab_media, tr("TabbedKeycodes", "Media"))
-        self.addTab(self.tab_macro, tr("TabbedKeycodes", "Macro"))
+        tab.setLayout(layout)
 
 
 KEY_WIDTH = 40
@@ -154,13 +166,15 @@ class KeyboardContainer(QWidget):
         self.layer_labels[self.current_layer].setStyleSheet("border: 1px solid black; padding: 5px; background-color: black; color: white")
 
         for (row, col), widgets in self.rowcol.items():
-            keycode = self.layout[(self.current_layer, row, col)]
-            text = keycode_to_label(keycode)
+            code = self.layout[(self.current_layer, row, col)]
+            text = keycode_label(code)
+            tooltip = keycode_tooltip(code)
             for widget in widgets:
                 widget.setStyleSheet('background-color:white; border: 1px solid black')
                 if widget == self.selected_key:
                     widget.setStyleSheet('background-color:black; color: white; border: 1px solid black')
                 widget.setText(text)
+                widget.setToolTip(tooltip)
 
     def switch_layer(self, idx):
         self.current_layer = idx