~ruther/qmk_firmware: Merge remote-tracking branch 'origin/master' into develop

2 files changed, 79 insertions(+), 77 deletions(-)

M docs/feature_programmable_button.md
M keyboards/rastersoft/minitkl/info.json

M docs/feature_programmable_button.md => docs/feature_programmable_button.md +1 -1

@@ 2,7 2,7 @@
 
 Programmable Buttons are keys that have no predefined meaning. This means they can be processed on the host side by custom software without the operating system trying to interpret them.
 
-The keycodes are emitted according to the HID Telephony Device page (`0x0B`), Programmable Button usage (`0x07`). On Linux (> 5.14) they are handled automatically and translated to `KEY_MACRO#` keycodes (up to `KEY_MACRO30`).
+The keycodes are emitted according to the HID Telephony Device page (`0x0B`), Programmable Button usage (`0x09`). On Linux (> 5.14) they are handled automatically and translated to `KEY_MACRO#` keycodes (up to `KEY_MACRO30`).
 
 ?> Currently there is no known support in Windows or macOS. It may be possible to write a custom HID driver to receive these usages, but this is out of the scope of the QMK documentation.

M keyboards/rastersoft/minitkl/info.json => keyboards/rastersoft/minitkl/info.json +78 -76

@@ 50,21 50,21 @@
         "LAYOUT_iso": {
             "layout": [
                 {"label":"esc", "x":0, "y":0, "matrix": [0, 0]},
-                {"label":"F1", "x":1, "y":0, "matrix": [0, 1]},
-                {"label":"F2", "x":2, "y":0, "matrix": [0, 2]},
-                {"label":"F3", "x":3, "y":0, "matrix": [0, 3]},
-                {"label":"F4", "x":4, "y":0, "matrix": [0, 4]},
-                {"label":"F5", "x":5, "y":0, "matrix": [0, 5]},
-                {"label":"F6", "x":6, "y":0, "matrix": [0, 6]},
-                {"label":"F7", "x":7, "y":0, "matrix": [0, 7]},
-                {"label":"F8", "x":8, "y":0, "matrix": [1, 7]},
-                {"label":"F9", "x":9, "y":0, "matrix": [1, 6]},
-                {"label":"F10", "x":10, "y":0, "matrix": [1, 5]},
-                {"label":"F11", "x":11, "y":0, "matrix": [1, 4]},
-                {"label":"F12", "x":12, "y":0, "matrix": [1, 3]},
-                {"label":"PrtScr", "x":13, "y":0, "matrix": [1, 2]},
-                {"label":"ScrollLock", "x":14, "y":0, "matrix": [1, 1]},
-                {"label":"Pause", "x":15, "y":0, "matrix": [1, 0]},
+                {"label":"F1", "x":1.25, "y":0, "matrix": [0, 1]},
+                {"label":"F2", "x":2.25, "y":0, "matrix": [0, 2]},
+                {"label":"F3", "x":3.25, "y":0, "matrix": [0, 3]},
+                {"label":"F4", "x":4.25, "y":0, "matrix": [0, 4]},
+                {"label":"F5", "x":5.5, "y":0, "matrix": [0, 5]},
+                {"label":"F6", "x":6.5, "y":0, "matrix": [0, 6]},
+                {"label":"F7", "x":7.5, "y":0, "matrix": [0, 7]},
+                {"label":"F8", "x":8.5, "y":0, "matrix": [1, 7]},
+                {"label":"F9", "x":9.75, "y":0, "matrix": [1, 6]},
+                {"label":"F10", "x":10.75, "y":0, "matrix": [1, 5]},
+                {"label":"F11", "x":11.75, "y":0, "matrix": [1, 4]},
+                {"label":"F12", "x":12.75, "y":0, "matrix": [1, 3]},
+                {"label":"PrtScr", "x":14, "y":0, "matrix": [1, 2]},
+                {"label":"ScrollLock", "x":15, "y":0, "matrix": [1, 1]},
+                {"label":"Pause", "x":16, "y":0, "matrix": [1, 0]},
 
                 {"label":"º", "x":0, "y":1, "matrix": [2, 0]},
                 {"label":"1", "x":1, "y":1, "matrix": [2, 1]},


@@ 97,7 97,7 @@
                 {"label":"^", "x":11.5, "y":2, "matrix": [5, 4]},
                 {"label":"*", "x":12.5, "y":2, "matrix": [5, 3]},
                 {"label":"Insert", "x":15, "y":2, "matrix": [5, 1]},
-                {"label":"PgUp", "x":15, "y":2, "matrix": [5, 0]},
+                {"label":"PgUp", "x":16, "y":2, "matrix": [5, 0]},
 
                 {"label":"Shift Lock", "x":0, "y":3, "w":1.75, "matrix": [6, 0]},
                 {"label":"A", "x":1.75, "y":3, "matrix": [6, 1]},


@@ 134,33 134,34 @@
 
                 {"label":"Ctrl", "x":0, "y":5, "w":1.25, "matrix": [10, 0]},
                 {"label":"Mod", "x":1.25, "y":5, "w":1.25, "matrix": [10, 1]},
-                {"label":"Alt", "x":2.25, "y":5, "w":1.25, "matrix": [10, 2]},
-                {"label":"Space", "x":3.5, "y":5, "w":6.5, "matrix": [10, 6]},
-                {"label":"AltGr", "x":10, "y":5, "w":1.25, "matrix": [11, 5]},
-                {"label":"Menu", "x":11, "y":5, "w":1.25, "matrix": [11, 4]},
-                {"label":"Ctrl", "x":12, "y":5, "w":1.25, "matrix": [11, 3]},
-                {"label":"Left", "x":13, "y":5, "matrix": [11, 2]},
-                {"label":"Bottom", "x":14, "y":5, "matrix": [11, 1]},
-                {"label":"Right", "x":15, "y":5, "matrix": [11, 0]}
+                {"label":"Alt", "x":2.5, "y":5, "w":1.25, "matrix": [10, 2]},
+                {"label":"Space", "x":3.75, "y":5, "w":6.5, "matrix": [10, 6]},
+                {"label":"AltGr", "x":10.25, "y":5, "w":1.25, "matrix": [11, 5]},
+                {"label":"Menu", "x":11.5, "y":5, "w":1.25, "matrix": [11, 4]},
+                {"label":"Ctrl", "x":12.75, "y":5, "w":1.25, "matrix": [11, 3]},
+                {"label":"Left", "x":14, "y":5, "matrix": [11, 2]},
+                {"label":"Bottom", "x":15, "y":5, "matrix": [11, 1]},
+                {"label":"Right", "x":16, "y":5, "matrix": [11, 0]}
             ]
-        },"LAYOUT_ansi": {
+        },
+        "LAYOUT_ansi": {
             "layout": [
                 {"label":"esc", "x":0, "y":0, "matrix": [0, 0]},
-                {"label":"F1", "x":1, "y":0, "matrix": [0, 1]},
-                {"label":"F2", "x":2, "y":0, "matrix": [0, 2]},
-                {"label":"F3", "x":3, "y":0, "matrix": [0, 3]},
-                {"label":"F4", "x":4, "y":0, "matrix": [0, 4]},
-                {"label":"F5", "x":5, "y":0, "matrix": [0, 5]},
-                {"label":"F6", "x":6, "y":0, "matrix": [0, 6]},
-                {"label":"F7", "x":7, "y":0, "matrix": [0, 7]},
-                {"label":"F8", "x":8, "y":0, "matrix": [1, 7]},
-                {"label":"F9", "x":9, "y":0, "matrix": [1, 6]},
-                {"label":"F10", "x":10, "y":0, "matrix": [1, 5]},
-                {"label":"F11", "x":11, "y":0, "matrix": [1, 4]},
-                {"label":"F12", "x":12, "y":0, "matrix": [1, 3]},
-                {"label":"PrtScr", "x":13, "y":0, "matrix": [1, 2]},
-                {"label":"ScrollLock", "x":14, "y":0, "matrix": [1, 1]},
-                {"label":"Pause", "x":15, "y":0, "matrix": [1, 0]},
+                {"label":"F1", "x":1.25, "y":0, "matrix": [0, 1]},
+                {"label":"F2", "x":2.25, "y":0, "matrix": [0, 2]},
+                {"label":"F3", "x":3.25, "y":0, "matrix": [0, 3]},
+                {"label":"F4", "x":4.25, "y":0, "matrix": [0, 4]},
+                {"label":"F5", "x":5.5, "y":0, "matrix": [0, 5]},
+                {"label":"F6", "x":6.5, "y":0, "matrix": [0, 6]},
+                {"label":"F7", "x":7.5, "y":0, "matrix": [0, 7]},
+                {"label":"F8", "x":8.5, "y":0, "matrix": [1, 7]},
+                {"label":"F9", "x":9.75, "y":0, "matrix": [1, 6]},
+                {"label":"F10", "x":10.75, "y":0, "matrix": [1, 5]},
+                {"label":"F11", "x":11.75, "y":0, "matrix": [1, 4]},
+                {"label":"F12", "x":12.75, "y":0, "matrix": [1, 3]},
+                {"label":"PrtScr", "x":14, "y":0, "matrix": [1, 2]},
+                {"label":"ScrollLock", "x":15, "y":0, "matrix": [1, 1]},
+                {"label":"Pause", "x":16, "y":0, "matrix": [1, 0]},
 
                 {"label":"º", "x":0, "y":1, "matrix": [2, 0]},
                 {"label":"1", "x":1, "y":1, "matrix": [2, 1]},


@@ 192,9 193,9 @@
                 {"label":"P", "x":10.5, "y":2, "matrix": [5, 5]},
                 {"label":"[", "x":11.5, "y":2, "matrix": [5, 4]},
                 {"label":"]", "x":12.5, "y":2, "matrix": [5, 3]},
-                {"label":"|", "x":13.75, "y":2, "w":1.25, "matrix": [5, 2]},
+                {"label":"|", "x":13.5, "y":2, "w":1.5, "matrix": [5, 2]},
                 {"label":"Insert", "x":15, "y":2, "matrix": [5, 1]},
-                {"label":"PgUp", "x":15, "y":2, "matrix": [5, 0]},
+                {"label":"PgUp", "x":16, "y":2, "matrix": [5, 0]},
 
                 {"label":"Shift Lock", "x":0, "y":3, "w":1.75, "matrix": [6, 0]},
                 {"label":"A", "x":1.75, "y":3, "matrix": [6, 1]},


@@ 229,33 230,34 @@
 
                 {"label":"Ctrl", "x":0, "y":5, "w":1.25, "matrix": [10, 0]},
                 {"label":"Mod", "x":1.25, "y":5, "w":1.25, "matrix": [10, 1]},
-                {"label":"Alt", "x":2.25, "y":5, "w":1.25, "matrix": [10, 2]},
-                {"label":"Space", "x":3.5, "y":5, "w":6.5, "matrix": [10, 6]},
-                {"label":"AltGr", "x":10, "y":5, "w":1.25, "matrix": [11, 5]},
-                {"label":"Menu", "x":11, "y":5, "w":1.25, "matrix": [11, 4]},
-                {"label":"Ctrl", "x":12, "y":5, "w":1.25, "matrix": [11, 3]},
-                {"label":"Left", "x":13, "y":5, "matrix": [11, 2]},
-                {"label":"Bottom", "x":14, "y":5, "matrix": [11, 1]},
-                {"label":"Right", "x":15, "y":5, "matrix": [11, 0]}
+                {"label":"Alt", "x":2.5, "y":5, "w":1.25, "matrix": [10, 2]},
+                {"label":"Space", "x":3.75, "y":5, "w":6.5, "matrix": [10, 6]},
+                {"label":"AltGr", "x":10.25, "y":5, "w":1.25, "matrix": [11, 5]},
+                {"label":"Menu", "x":11.5, "y":5, "w":1.25, "matrix": [11, 4]},
+                {"label":"Ctrl", "x":12.75, "y":5, "w":1.25, "matrix": [11, 3]},
+                {"label":"Left", "x":14, "y":5, "matrix": [11, 2]},
+                {"label":"Bottom", "x":15, "y":5, "matrix": [11, 1]},
+                {"label":"Right", "x":16, "y":5, "matrix": [11, 0]}
             ]
-        },"LAYOUT_hybrid": {
+        },
+        "LAYOUT_hybrid": {
             "layout": [
                 {"label":"esc", "x":0, "y":0, "matrix": [0, 0]},
-                {"label":"F1", "x":1, "y":0, "matrix": [0, 1]},
-                {"label":"F2", "x":2, "y":0, "matrix": [0, 2]},
-                {"label":"F3", "x":3, "y":0, "matrix": [0, 3]},
-                {"label":"F4", "x":4, "y":0, "matrix": [0, 4]},
-                {"label":"F5", "x":5, "y":0, "matrix": [0, 5]},
-                {"label":"F6", "x":6, "y":0, "matrix": [0, 6]},
-                {"label":"F7", "x":7, "y":0, "matrix": [0, 7]},
-                {"label":"F8", "x":8, "y":0, "matrix": [1, 7]},
-                {"label":"F9", "x":9, "y":0, "matrix": [1, 6]},
-                {"label":"F10", "x":10, "y":0, "matrix": [1, 5]},
-                {"label":"F11", "x":11, "y":0, "matrix": [1, 4]},
-                {"label":"F12", "x":12, "y":0, "matrix": [1, 3]},
-                {"label":"PrtScr", "x":13, "y":0, "matrix": [1, 2]},
-                {"label":"ScrollLock", "x":14, "y":0, "matrix": [1, 1]},
-                {"label":"Pause", "x":15, "y":0, "matrix": [1, 0]},
+                {"label":"F1", "x":1.25, "y":0, "matrix": [0, 1]},
+                {"label":"F2", "x":2.25, "y":0, "matrix": [0, 2]},
+                {"label":"F3", "x":3.25, "y":0, "matrix": [0, 3]},
+                {"label":"F4", "x":4.25, "y":0, "matrix": [0, 4]},
+                {"label":"F5", "x":5.5, "y":0, "matrix": [0, 5]},
+                {"label":"F6", "x":6.5, "y":0, "matrix": [0, 6]},
+                {"label":"F7", "x":7.5, "y":0, "matrix": [0, 7]},
+                {"label":"F8", "x":8.5, "y":0, "matrix": [1, 7]},
+                {"label":"F9", "x":9.75, "y":0, "matrix": [1, 6]},
+                {"label":"F10", "x":10.75, "y":0, "matrix": [1, 5]},
+                {"label":"F11", "x":11.75, "y":0, "matrix": [1, 4]},
+                {"label":"F12", "x":12.75, "y":0, "matrix": [1, 3]},
+                {"label":"PrtScr", "x":14, "y":0, "matrix": [1, 2]},
+                {"label":"ScrollLock", "x":15, "y":0, "matrix": [1, 1]},
+                {"label":"Pause", "x":16, "y":0, "matrix": [1, 0]},
 
                 {"label":"º", "x":0, "y":1, "matrix": [2, 0]},
                 {"label":"1", "x":1, "y":1, "matrix": [2, 1]},


@@ 287,9 289,9 @@
                 {"label":"P", "x":10.5, "y":2, "matrix": [5, 5]},
                 {"label":"[", "x":11.5, "y":2, "matrix": [5, 4]},
                 {"label":"]", "x":12.5, "y":2, "matrix": [5, 3]},
-                {"label":"|", "x":13.75, "y":2, "w":1.25, "matrix": [5, 2]},
+                {"label":"|", "x":13.5, "y":2, "w":1.5, "matrix": [5, 2]},
                 {"label":"Insert", "x":15, "y":2, "matrix": [5, 1]},
-                {"label":"PgUp", "x":15, "y":2, "matrix": [5, 0]},
+                {"label":"PgUp", "x":16, "y":2, "matrix": [5, 0]},
 
                 {"label":"Shift Lock", "x":0, "y":3, "w":1.75, "matrix": [6, 0]},
                 {"label":"A", "x":1.75, "y":3, "matrix": [6, 1]},


@@ 325,14 327,14 @@
 
                 {"label":"Ctrl", "x":0, "y":5, "w":1.25, "matrix": [10, 0]},
                 {"label":"Mod", "x":1.25, "y":5, "w":1.25, "matrix": [10, 1]},
-                {"label":"Alt", "x":2.25, "y":5, "w":1.25, "matrix": [10, 2]},
-                {"label":"Space", "x":3.5, "y":5, "w":6.5, "matrix": [10, 6]},
-                {"label":"AltGr", "x":10, "y":5, "w":1.25, "matrix": [11, 5]},
-                {"label":"Menu", "x":11, "y":5, "w":1.25, "matrix": [11, 4]},
-                {"label":"Ctrl", "x":12, "y":5, "w":1.25, "matrix": [11, 3]},
-                {"label":"Left", "x":13, "y":5, "matrix": [11, 2]},
-                {"label":"Bottom", "x":14, "y":5, "matrix": [11, 1]},
-                {"label":"Right", "x":15, "y":5, "matrix": [11, 0]}
+                {"label":"Alt", "x":2.5, "y":5, "w":1.25, "matrix": [10, 2]},
+                {"label":"Space", "x":3.75, "y":5, "w":6.5, "matrix": [10, 6]},
+                {"label":"AltGr", "x":10.25, "y":5, "w":1.25, "matrix": [11, 5]},
+                {"label":"Menu", "x":11.5, "y":5, "w":1.25, "matrix": [11, 4]},
+                {"label":"Ctrl", "x":12.75, "y":5, "w":1.25, "matrix": [11, 3]},
+                {"label":"Left", "x":14, "y":5, "matrix": [11, 2]},
+                {"label":"Bottom", "x":15, "y":5, "matrix": [11, 1]},
+                {"label":"Right", "x":16, "y":5, "matrix": [11, 0]}
             ]
         }
     }