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

keyboards/adm42/info.json

@@ -0,0 +1,56 @@
+{
+    "keyboard_name": "ADM42 rev4",
+    "url": "https://adm42.dev/",
+    "maintainer": "lleonini",
+    "layouts": {
+        "LAYOUT_adm42_3x12_6": {
+            "layout": [
+                {"label":"GUI/`~", "x":0, "y":0.8},
+                {"label":"Q", "x":1, "y":0.8},
+                {"label":"W", "x":2, "y":0},
+                {"label":"E", "x":3, "y":0},
+                {"label":"R", "x":4, "y":0.5},
+                {"label":"T", "x":5, "y":0.5},
+                {"label":"Y", "x":7.5, "y":0.5},
+                {"label":"U", "x":8.5, "y":0.5},
+                {"label":"I", "x":9.5, "y":0},
+                {"label":"O", "x":10.5, "y":0},
+                {"label":"P", "x":11.5, "y":0.8},
+                {"label":"GUI/=+", "x":12.5, "y":0.8},
+
+                {"label":"Ctrl/Tab", "x":0, "y":1.8},
+                {"label":"A", "x":1, "y":1.8},
+                {"label":"S", "x":2, "y":1},
+                {"label":"D", "x":3, "y":1},
+                {"label":"F", "x":4, "y":1.5},
+                {"label":"G", "x":5, "y":1.5},
+                {"label":"H", "x":7.5, "y":1.5},
+                {"label":"J", "x":8.5, "y":1.5},
+                {"label":"K", "x":9.5, "y":1},
+                {"label":"L", "x":10.5, "y":1},
+                {"label":";:", "x":11.5, "y":1.8},
+                {"label":"Ctrl/'\"", "x":12.5, "y":1.8},
+
+                {"label":"Alt", "x":0, "y":2.8},
+                {"label":"Z", "x":1, "y":2.8},
+                {"label":"X", "x":2, "y":2},
+                {"label":"C", "x":3, "y":2},
+                {"label":"V", "x":4, "y":2.5},
+                {"label":"B", "x":5, "y":2.5},
+                {"label":"N", "x":7.5, "y":2.5},
+                {"label":"M", "x":8.5, "y":2.5},
+                {"label":",<", "x":9.5, "y":2},
+                {"label":".>", "x":10.5, "y":2},
+                {"label":"/?", "x":11.5, "y":2.8},
+                {"label":"Alt", "x":12.5, "y":2.8},
+
+                {"label":"Special/Esc", "x":4.25, "y":3.55},
+                {"label":"Shift/Backspace", "x":5.25, "y":3.65},
+                {"label":"Adm/Delete", "x":6.25, "y":1.875, "h":1.25},
+                {"label":"Extra/Enter", "x":6.25, "y":4.05},
+                {"label":"Shift/Space", "x":7.25, "y":3.65},
+                {"label":"Special/Alt", "x":8.25, "y":3.55}
+            ]
+        }
+    }
+}