Fixing ascii string macro processing

[kiibohd-kll.git] / kll_lib / hid_dict.py

diff --git a/kll_lib/hid_dict.py b/kll_lib/hid_dict.py
index a0bfc5b3baa736422d4c3de1375cc9c1589e9b69..4206a011d051e7ef3b199c7b86a109ed422c89ab 100644 (file)
--- a/kll_lib/hid_dict.py
+++ b/kll_lib/hid_dict.py
@@ -71,8 +71,8 @@ hid_lookup_dictionary = dict([
        ( ('USB', 0x2C), 'KEY_SPACE' ),
        ( ('USB', 0x2D), 'KEY_MINUS' ),
        ( ('USB', 0x2E), 'KEY_EQUAL' ),
-       ( ('USB', 0x2F), 'KEY_LEFT_BRACE' ),
-       ( ('USB', 0x30), 'KEY_RIGHT_BRACE' ),
+       ( ('USB', 0x2F), 'KEY_LEFT_BRACKET' ),
+       ( ('USB', 0x30), 'KEY_RIGHT_BRACKET' ),
        ( ('USB', 0x31), 'KEY_BACKSLASH' ),
        ( ('USB', 0x32), 'KEY_NUMBER' ),
        ( ('USB', 0x33), 'KEY_SEMICOLON' ),
@@ -198,8 +198,8 @@ hid_lookup_dictionary = dict([
        ( ('USB', 0xB5), 'KEY_CURRENCY_SUB' ),
        ( ('USB', 0xB6), 'KEYPAD_LPAREN' ),
        ( ('USB', 0xB7), 'KEYPAD_RPAREN' ),
-       ( ('USB', 0xB8), 'KEYPAD_LBRACE' ),
-       ( ('USB', 0xB9), 'KEYPAD_RBRACE' ),
+       ( ('USB', 0xB8), 'KEYPAD_LBRACKET' ),
+       ( ('USB', 0xB9), 'KEYPAD_RBRACKET' ),
        ( ('USB', 0xBA), 'KEYPAD_TAB' ),
        ( ('USB', 0xBB), 'KEYPAD_BACKSPACE' ),
        ( ('USB', 0xBC), 'KEYPAD_A' ),
@@ -262,7 +262,7 @@ hid_lookup_dictionary = dict([
        ( ('USB', 0xFD), 'KEY_FUN14' ),
        ( ('USB', 0xFE), 'KEY_FUN15' ),
        ( ('USB', 0xFF), 'KEY_FUN16' ),
-# ('USB', 0x100) to ('USB', 0x11F) for function key placeholders, not valid usb codes (must use a translation .kll file before firmware compilation)
+# ('USB', 0x100) to ('USB', 0x121) for function key placeholders, not valid usb codes (must use a translation .kll file before firmware compilation)
        ( ('USB', 0x100), 'KEY_LCK1' ),
        ( ('USB', 0x101), 'KEY_LCK2' ),
        ( ('USB', 0x102), 'KEY_LCK3' ),
@@ -295,6 +295,8 @@ hid_lookup_dictionary = dict([
        ( ('USB', 0x11D), 'KEY_LAT14' ),
        ( ('USB', 0x11E), 'KEY_LAT15' ),
        ( ('USB', 0x11F), 'KEY_LAT16' ),
+       ( ('USB', 0x120), 'KEY_NEXT_LAYER' ),
+       ( ('USB', 0x121), 'KEY_PREV_LAYER' ),
 
        # USB HID Consumer Control Codes
 # List of Consumer Codes - USB HID 1.12v2
@@ -833,8 +835,8 @@ kll_hid_lookup_dictionary['USBCode'] = dict([
        ( 'SPACE', ('USB', 0x2C) ), ( 'SPACEBAR', ('USB', 0x2C) ),
        ( '-', ('USB', 0x2D) ), ( 'MINUS', ('USB', 0x2D) ),
        ( '=', ('USB', 0x2E) ), ( 'EQUALS', ('USB', 0x2E) ), ( 'EQUAL', ('USB', 0x2E) ),
-       ( '{', ('USB', 0x2F) ), ( 'LEFT BRACE', ('USB', 0x2F) ), ( 'LBRACE', ('USB', 0x2F) ),
-       ( '}', ('USB', 0x30) ), ( 'RIGHT BRACE', ('USB', 0x30) ), ( 'RBRACE', ('USB', 0x30) ),
+       ( '[', ('USB', 0x2F) ), ( 'LEFT BRACKET', ('USB', 0x2F) ), ( 'LBRACKET', ('USB', 0x2F) ), ( 'LEFT BRACE', ('USB', 0x2F) ), ( 'LBRACE', ('USB', 0x2F) ),
+       ( ']', ('USB', 0x30) ), ( 'RIGHT BRACKET', ('USB', 0x30) ), ( 'RBRACKET', ('USB', 0x30) ), ( 'RIGHT BRACE', ('USB', 0x30) ), ( 'RBRACE', ('USB', 0x30) ),
        ( '\\', ('USB', 0x31) ), ( 'BACKSLASH', ('USB', 0x31) ),
        ( '#', ('USB', 0x32) ), ( 'NUMBER', ('USB', 0x32) ), ( 'HASH', ('USB', 0x32) ),
        ( ';', ('USB', 0x33) ), ( 'SEMICOLON', ('USB', 0x33) ),
@@ -1057,6 +1059,8 @@ kll_hid_lookup_dictionary['USBCode'] = dict([
        ( 'LAT14', ('USB', 0x11D) ), ( 'LATCH14', ('USB', 0x11D) ),
        ( 'LAT15', ('USB', 0x11E) ), ( 'LATCH15', ('USB', 0x11E) ),
        ( 'LAT16', ('USB', 0x11F) ), ( 'LATCH16', ('USB', 0x11F) ),
+       ( 'NLAYER', ('USB', 0x120) ), ( 'NEXT LAYER', ('USB', 0x120) ),
+       ( 'PLAYER', ('USB', 0x121) ), ( 'PREV LAYER', ('USB', 0x121) ),
 ])