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

1 files changed, 102 insertions, 9 deletions

diff --git a/keyboards/alu84/info.json b/keyboards/alu84/info.json
index 97f2b5facc..cb3a1e5e10 100644
--- a/keyboards/alu84/info.json
+++ b/keyboards/alu84/info.json
@@ -1,12 +1,105 @@
 {
-  "keyboard_name": "ALU84",
-  "url": "",
-  "maintainer": "qmk",
-  "width": 16,
-  "height": 6,
-  "layouts": {
-    "LAYOUT": {
-      "layout": [{"label":"K000", "x":0, "y":0}, {"label":"K001", "x":1, "y":0}, {"label":"K002", "x":2, "y":0}, {"label":"K003", "x":3, "y":0}, {"label":"K004", "x":4, "y":0}, {"label":"K005", "x":5, "y":0}, {"label":"K006", "x":6, "y":0}, {"label":"K007", "x":7, "y":0}, {"label":"K008", "x":8, "y":0}, {"label":"K009", "x":9, "y":0}, {"label":"K010", "x":10, "y":0}, {"label":"K011", "x":11, "y":0}, {"label":"K012", "x":12, "y":0}, {"label":"K013", "x":13, "y":0}, {"label":"K014", "x":14, "y":0}, {"label":"K015", "x":15, "y":0}, {"label":"K100", "x":0, "y":1}, {"label":"K101", "x":1, "y":1}, {"label":"K102", "x":2, "y":1}, {"label":"K103", "x":3, "y":1}, {"label":"K104", "x":4, "y":1}, {"label":"K105", "x":5, "y":1}, {"label":"K106", "x":6, "y":1}, {"label":"K107", "x":7, "y":1}, {"label":"K108", "x":8, "y":1}, {"label":"K109", "x":9, "y":1}, {"label":"K110", "x":10, "y":1}, {"label":"K111", "x":11, "y":1}, {"label":"K112", "x":12, "y":1}, {"label":"K114", "x":13, "y":1, "w":2}, {"label":"K115", "x":15, "y":1}, {"label":"K200", "x":0, "y":2, "w":1.5}, {"label":"K202", "x":1.5, "y":2}, {"label":"K203", "x":2.5, "y":2}, {"label":"K204", "x":3.5, "y":2}, {"label":"K205", "x":4.5, "y":2}, {"label":"K206", "x":5.5, "y":2}, {"label":"K207", "x":6.5, "y":2}, {"label":"K208", "x":7.5, "y":2}, {"label":"K209", "x":8.5, "y":2}, {"label":"K210", "x":9.5, "y":2}, {"label":"K211", "x":10.5, "y":2}, {"label":"K212", "x":11.5, "y":2}, {"label":"K213", "x":12.5, "y":2}, {"label":"K214", "x":13.5, "y":2, "w":1.5}, {"label":"K215", "x":15, "y":2}, {"label":"K300", "x":0, "y":3, "w":1.75}, {"label":"K302", "x":1.75, "y":3}, {"label":"K303", "x":2.75, "y":3}, {"label":"K304", "x":3.75, "y":3}, {"label":"K305", "x":4.75, "y":3}, {"label":"K306", "x":5.75, "y":3}, {"label":"K307", "x":6.75, "y":3}, {"label":"K308", "x":7.75, "y":3}, {"label":"K309", "x":8.75, "y":3}, {"label":"K310", "x":9.75, "y":3}, {"label":"K311", "x":10.75, "y":3}, {"label":"K312", "x":11.75, "y":3}, {"label":"K313", "x":12.75, "y":3, "w":2.25}, {"label":"K315", "x":15, "y":3}, {"label":"K400", "x":0, "y":4, "w":2.25}, {"label":"K402", "x":2.25, "y":4}, {"label":"K403", "x":3.25, "y":4}, {"label":"K404", "x":4.25, "y":4}, {"label":"K405", "x":5.25, "y":4}, {"label":"K406", "x":6.25, "y":4}, {"label":"K407", "x":7.25, "y":4}, {"label":"K408", "x":8.25, "y":4}, {"label":"K409", "x":9.25, "y":4}, {"label":"K410", "x":10.25, "y":4}, {"label":"K411", "x":11.25, "y":4}, {"label":"K413", "x":12.25, "y":4, "w":1.75}, {"label":"K414", "x":14, "y":4}, {"label":"K415", "x":15, "y":4}, {"label":"K500", "x":0, "y":5, "w":1.25}, {"label":"K501", "x":1.25, "y":5, "w":1.25}, {"label":"K503", "x":2.5, "y":5, "w":1.25}, {"label":"K506", "x":3.75, "y":5, "w":6.25}, {"label":"K510", "x":10, "y":5}, {"label":"K511", "x":11, "y":5}, {"label":"K512", "x":12, "y":5}, {"label":"K513", "x":13, "y":5}, {"label":"K514", "x":14, "y":5}, {"label":"K515", "x":15, "y":5}]
+    "keyboard_name": "ALU84",
+    "url": "",
+    "maintainer": "qmk",
+    "width": 16,
+    "height": 6,
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_75_ansi"
+    },
+    "layouts": {
+        "LAYOUT_75_ansi": {
+            "layout": [
+                {"label":"K00", "x":0, "y":0},
+                {"label":"K01", "x":1, "y":0},
+                {"label":"K02", "x":2, "y":0},
+                {"label":"K03", "x":3, "y":0},
+                {"label":"K04", "x":4, "y":0},
+                {"label":"K05", "x":5, "y":0},
+                {"label":"K06", "x":6, "y":0},
+                {"label":"K07", "x":7, "y":0},
+                {"label":"K08", "x":8, "y":0},
+                {"label":"K09", "x":9, "y":0},
+                {"label":"K0A", "x":10, "y":0},
+                {"label":"K0B", "x":11, "y":0},
+                {"label":"K0C", "x":12, "y":0},
+                {"label":"K0D", "x":13, "y":0},
+                {"label":"K0E", "x":14, "y":0},
+                {"label":"K0F", "x":15, "y":0},
+
+                {"label":"K10", "x":0, "y":1},
+                {"label":"K11", "x":1, "y":1},
+                {"label":"K12", "x":2, "y":1},
+                {"label":"K13", "x":3, "y":1},
+                {"label":"K14", "x":4, "y":1},
+                {"label":"K15", "x":5, "y":1},
+                {"label":"K16", "x":6, "y":1},
+                {"label":"K17", "x":7, "y":1},
+                {"label":"K18", "x":8, "y":1},
+                {"label":"K19", "x":9, "y":1},
+                {"label":"K1A", "x":10, "y":1},
+                {"label":"K1B", "x":11, "y":1},
+                {"label":"K1C", "x":12, "y":1},
+                {"label":"K1E", "x":13, "y":1, "w":2},
+                {"label":"K1F", "x":15, "y":1},
+
+                {"label":"K20", "x":0, "y":2, "w":1.5},
+                {"label":"K22", "x":1.5, "y":2},
+                {"label":"K23", "x":2.5, "y":2},
+                {"label":"K24", "x":3.5, "y":2},
+                {"label":"K25", "x":4.5, "y":2},
+                {"label":"K26", "x":5.5, "y":2},
+                {"label":"K27", "x":6.5, "y":2},
+                {"label":"K28", "x":7.5, "y":2},
+                {"label":"K29", "x":8.5, "y":2},
+                {"label":"K2A", "x":9.5, "y":2},
+                {"label":"K2B", "x":10.5, "y":2},
+                {"label":"K2C", "x":11.5, "y":2},
+                {"label":"K2D", "x":12.5, "y":2},
+                {"label":"K2E", "x":13.5, "y":2, "w":1.5},
+                {"label":"K2F", "x":15, "y":2},
+
+                {"label":"K30", "x":0, "y":3, "w":1.75},
+                {"label":"K32", "x":1.75, "y":3},
+                {"label":"K33", "x":2.75, "y":3},
+                {"label":"K34", "x":3.75, "y":3},
+                {"label":"K35", "x":4.75, "y":3},
+                {"label":"K36", "x":5.75, "y":3},
+                {"label":"K37", "x":6.75, "y":3},
+                {"label":"K38", "x":7.75, "y":3},
+                {"label":"K39", "x":8.75, "y":3},
+                {"label":"K3A", "x":9.75, "y":3},
+                {"label":"K3B", "x":10.75, "y":3},
+                {"label":"K3C", "x":11.75, "y":3},
+                {"label":"K3D", "x":12.75, "y":3, "w":2.25},
+                {"label":"K3F", "x":15, "y":3},
+
+                {"label":"K40", "x":0, "y":4, "w":2.25},
+                {"label":"K42", "x":2.25, "y":4},
+                {"label":"K43", "x":3.25, "y":4},
+                {"label":"K44", "x":4.25, "y":4},
+                {"label":"K45", "x":5.25, "y":4},
+                {"label":"K46", "x":6.25, "y":4},
+                {"label":"K47", "x":7.25, "y":4},
+                {"label":"K48", "x":8.25, "y":4},
+                {"label":"K49", "x":9.25, "y":4},
+                {"label":"K4A", "x":10.25, "y":4},
+                {"label":"K4B", "x":11.25, "y":4},
+                {"label":"K4D", "x":12.25, "y":4, "w":1.75},
+                {"label":"K4E", "x":14, "y":4},
+                {"label":"K4F", "x":15, "y":4},
+
+                {"label":"K50", "x":0, "y":5, "w":1.25},
+                {"label":"K51", "x":1.25, "y":5, "w":1.25},
+                {"label":"K53", "x":2.5, "y":5, "w":1.25},
+                {"label":"K56", "x":3.75, "y":5, "w":6.25},
+                {"label":"K5A", "x":10, "y":5},
+                {"label":"K5B", "x":11, "y":5},
+                {"label":"K5C", "x":12, "y":5},
+                {"label":"K5D", "x":13, "y":5},
+                {"label":"K5E", "x":14, "y":5},
+                {"label":"K5F", "x":15, "y":5}
+            ]
+        }
     }
-  }
 }