Merge remote-tracking branch 'upstream/master' into develop

1 files changed, 96 insertions, 91 deletions

diff --git a/keyboards/handwired/unicomp_mini_m/info.json b/keyboards/handwired/unicomp_mini_m/info.json
index 1f252743a1..d1a0558aa2 100644
--- a/keyboards/handwired/unicomp_mini_m/info.json
+++ b/keyboards/handwired/unicomp_mini_m/info.json
@@ -5,97 +5,102 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 2, "y": 0 },
-                { "label": "F2", "x": 3, "y": 0 },
-                { "label": "F3", "x": 4, "y": 0 },
-                { "label": "F4", "x": 5, "y": 0 },
-                { "label": "F5", "x": 6.5, "y": 0 },
-                { "label": "F6", "x": 7.5, "y": 0 },
-                { "label": "F7", "x": 8.5, "y": 0 },
-                { "label": "F8", "x": 9.5, "y": 0 },
-                { "label": "F9", "x": 11, "y": 0 },
-                { "label": "F10", "x": 12, "y": 0 },
-                { "label": "F11", "x": 13, "y": 0 },
-                { "label": "F12", "x": 14, "y": 0 },
-                { "label": "PrtSc", "x": 15.25, "y": 0 },
-                { "label": "Scroll Lock", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
-                { "label": "~", "x": 0, "y": 1.5 },
-                { "label": "!", "x": 1, "y": 1.5 },
-                { "label": "@", "x": 2, "y": 1.5 },
-                { "label": "#", "x": 3, "y": 1.5 },
-                { "label": "$", "x": 4, "y": 1.5 },
-                { "label": "%", "x": 5, "y": 1.5 },
-                { "label": "^", "x": 6, "y": 1.5 },
-                { "label": "&", "x": 7, "y": 1.5 },
-                { "label": "*", "x": 8, "y": 1.5 },
-                { "label": "(", "x": 9, "y": 1.5 },
-                { "label": ")", "x": 10, "y": 1.5 },
-                { "label": "_", "x": 11, "y": 1.5 },
-                { "label": "+", "x": 12, "y": 1.5 },
-                { "label": "KC_NO", "w": 1, "x": 13, "y": 1.5 },
-                { "label": "Backspace", "w": 1, "x": 14, "y": 1.5 },
-                { "label": "Insert", "x": 15.25, "y": 1.5 },
-                { "label": "Home", "x": 16.25, "y": 1.5 },
-                { "label": "PgUp", "x": 17.25, "y": 1.5 },
-                { "label": "Tab", "w": 1.5, "x": 0, "y": 2.5 },
-                { "label": "Q", "x": 1.5, "y": 2.5 },
-                { "label": "W", "x": 2.5, "y": 2.5 },
-                { "label": "E", "x": 3.5, "y": 2.5 },
-                { "label": "R", "x": 4.5, "y": 2.5 },
-                { "label": "T", "x": 5.5, "y": 2.5 },
-                { "label": "Y", "x": 6.5, "y": 2.5 },
-                { "label": "U", "x": 7.5, "y": 2.5 },
-                { "label": "I", "x": 8.5, "y": 2.5 },
-                { "label": "O", "x": 9.5, "y": 2.5 },
-                { "label": "P", "x": 10.5, "y": 2.5 },
-                { "label": "{", "x": 11.5, "y": 2.5 },
-                { "label": "}", "x": 12.5, "y": 2.5 },
-                { "label": "|", "w": 1.5, "x": 13.5, "y": 2.5 },
-                { "label": "Delete", "x": 15.25, "y": 2.5 },
-                { "label": "End", "x": 16.25, "y": 2.5 },
-                { "label": "PgDn", "x": 17.25, "y": 2.5 },
-                { "label": "Caps Lock", "w": 1.75, "x": 0, "y": 3.5 },
-                { "label": "A", "x": 1.75, "y": 3.5 },
-                { "label": "S", "x": 2.75, "y": 3.5 },
-                { "label": "D", "x": 3.75, "y": 3.5 },
-                { "label": "F", "x": 4.75, "y": 3.5 },
-                { "label": "G", "x": 5.75, "y": 3.5 },
-                { "label": "H", "x": 6.75, "y": 3.5 },
-                { "label": "J", "x": 7.75, "y": 3.5 },
-                { "label": "K", "x": 8.75, "y": 3.5 },
-                { "label": "L", "x": 9.75, "y": 3.5 },
-                { "label": ":", "x": 10.75, "y": 3.5 },
-                { "label": "\"", "x": 11.75, "y": 3.5 },
-                { "label": "NUHS", "x": 12.75, "y": 3.5 },
-                { "label": "Enter", "w": 1.25, "x": 13.75, "y": 3.5 },
-                { "label": "Shift", "w": 1.25, "x": 0, "y": 4.5 },
-                { "label": "NUBS", "x": 1.25, "y": 4.5 },
-                { "label": "Z", "x": 2.25, "y": 4.5 },
-                { "label": "X", "x": 3.25, "y": 4.5 },
-                { "label": "C", "x": 4.25, "y": 4.5 },
-                { "label": "V", "x": 5.25, "y": 4.5 },
-                { "label": "B", "x": 6.25, "y": 4.5 },
-                { "label": "N", "x": 7.25, "y": 4.5 },
-                { "label": "M", "x": 8.25, "y": 4.5 },
-                { "label": "<", "x": 9.25, "y": 4.5 },
-                { "label": ">", "x": 10.25, "y": 4.5 },
-                { "label": "?", "x": 11.25, "y": 4.5 },
-                { "label": "KC_NO", "x": 12.25, "y": 4.5 },
-                { "label": "Shift", "w": 1.75, "x": 13.25, "y": 4.5 },
-                { "label": "\u2191", "x": 16.25, "y": 4.5 },
-                { "label": "Ctrl", "w": 1.5, "x": 0, "y": 5.5 },
-                { "label": "Meta", "w": 1, "x": 1.5, "y": 5.5 },
-                { "label": "Alt", "w": 1.5, "x": 2.5, "y": 5.5 },
-                { "label": "Space", "w": 5.75, "x": 4, "y": 5.5 },
-                { "label": "Alt", "w": 1.25, "x": 9.75, "y": 5.5 },
-                { "label": "Meta", "w": 1.5, "x": 11, "y": 5.5 },
-                { "label": "Menu", "w": 1, "x": 12.5, "y": 5.5 },
-                { "label": "Ctrl", "w": 1.5, "x": 13.5, "y": 5.5 },
-                { "label": "\u2190", "x": 15.25, "y": 5.5 },
-                { "label": "\u2193", "x": 16.25, "y": 5.5 },
-                { "label": "\u2192", "x": 17.25, "y": 5.5 }
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"Pause / SysReq", "x":15.5, "y":0},
+                {"label":"Scroll Lock / Num Lock", "x":16.5, "y":0},
+                {"label":"Pause / Reset", "x":17.5, "y":0},
+
+                {"label":"`", "x":0, "y":2},
+                {"label":"1", "x":1, "y":2},
+                {"label":"2", "x":2, "y":2},
+                {"label":"3", "x":3, "y":2},
+                {"label":"4", "x":4, "y":2},
+                {"label":"5", "x":5, "y":2},
+                {"label":"6", "x":6, "y":2},
+                {"label":"7", "x":7, "y":2},
+                {"label":"8", "x":8, "y":2},
+                {"label":"9", "x":9, "y":2},
+                {"label":"0", "x":10, "y":2},
+                {"label":"-", "x":11, "y":2},
+                {"label":"=", "x":12, "y":2},
+                {"label":"No", "x":13, "y":2},
+                {"label":"Backspace", "x":14, "y":2},
+                {"label":"Insert", "x":15.5, "y":2},
+                {"label":"Home", "x":16.5, "y":2},
+                {"label":"Page Up", "x":17.5, "y":2},
+
+                {"label":"Tab", "x":0, "y":3, "w":1.5},
+                {"label":"Q", "x":1.5, "y":3},
+                {"label":"W", "x":2.5, "y":3},
+                {"label":"E", "x":3.5, "y":3},
+                {"label":"R", "x":4.5, "y":3},
+                {"label":"T", "x":5.5, "y":3},
+                {"label":"Y", "x":6.5, "y":3},
+                {"label":"U", "x":7.5, "y":3},
+                {"label":"I", "x":8.5, "y":3},
+                {"label":"O", "x":9.5, "y":3},
+                {"label":"P", "x":10.5, "y":3},
+                {"label":"[", "x":11.5, "y":3},
+                {"label":"]", "x":12.5, "y":3},
+                {"label":"\\", "x":13.5, "y":3, "w":1.5},
+                {"label":"Delete", "x":15.5, "y":3},
+                {"label":"End", "x":16.5, "y":3},
+                {"label":"Page Down", "x":17.5, "y":3},
+
+                {"label":"Caps Lock", "x":0, "y":4, "w":1.75},
+                {"label":"A", "x":1.75, "y":4},
+                {"label":"S", "x":2.75, "y":4},
+                {"label":"D", "x":3.75, "y":4},
+                {"label":"F", "x":4.75, "y":4},
+                {"label":"G", "x":5.75, "y":4},
+                {"label":"H", "x":6.75, "y":4},
+                {"label":"J", "x":7.75, "y":4},
+                {"label":"K", "x":8.75, "y":4},
+                {"label":"L", "x":9.75, "y":4},
+                {"label":";", "x":10.75, "y":4},
+                {"label":"'", "x":11.75, "y":4},
+                {"label":"No", "x":12.75, "y":4},
+                {"label":"Enter", "x":13.75, "y":4, "w":1.25},
+
+                {"label":"Shift", "x":0, "y":5, "w":1.25},
+                {"label":"No", "x":1.25, "y":5},
+                {"label":"Z", "x":2.25, "y":5},
+                {"label":"X", "x":3.25, "y":5},
+                {"label":"C", "x":4.25, "y":5},
+                {"label":"V", "x":5.25, "y":5},
+                {"label":"B", "x":6.25, "y":5},
+                {"label":"N", "x":7.25, "y":5},
+                {"label":"M", "x":8.25, "y":5},
+                {"label":",", "x":9.25, "y":5},
+                {"label":".", "x":10.25, "y":5},
+                {"label":"/", "x":11.25, "y":5},
+                {"label":"No", "x":12.25, "y":5},
+                {"label":"Shift", "x":13.25, "y":5, "w":1.75},
+                {"label":"Up", "x":16.5, "y":5},
+
+                {"label":"Ctrl", "x":0, "y":6, "w":1.5},
+                {"label":"GUI", "x":1.5, "y":6},
+                {"label":"Alt", "x":2.5, "y":6, "w":1.5},
+                {"label":"Space", "x":4, "y":6, "w":6},
+                {"label":"Alt", "x":10, "y":6},
+                {"label":"GUI", "x":11, "y":6, "w":1.5},
+                {"label":"App", "x":12.5, "y":6},
+                {"label":"Ctrl", "x":13.5, "y":6, "w":1.5},
+                {"label":"Left", "x":15.5, "y":6},
+                {"label":"Down", "x":16.5, "y":6},
+                {"label":"Right", "x":17.5, "y":6}
             ]
         }
     }