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

1 files changed, 161 insertions, 6 deletions

diff --git a/keyboards/mechlovin/adelais/info.json b/keyboards/mechlovin/adelais/info.json
index 3ff03c2b62..7a858277e7 100644
--- a/keyboards/mechlovin/adelais/info.json
+++ b/keyboards/mechlovin/adelais/info.json
@@ -1,7 +1,10 @@
 {
     "keyboard_name": "Adelais",
     "url": "",
-    "maintainer": "Team Mechlovin'",
+    "maintainer": "mechlovin",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_alice_split_bs"
+    },
     "layouts": {
         "LAYOUT_alice_split_bs": {
             "layout": [
@@ -21,6 +24,7 @@
                 {"label":"K0C", "x":15.5, "y":0},
                 {"label":"K0D", "x":16.5, "y":0},
                 {"label":"K0E", "x":17.5, "y":0},
+
                 {"label":"K2E", "x":0, "y":1},
                 {"label":"K10", "x":1.5, "y":1, "w":1.5},
                 {"label":"K11", "x":3, "y":1},
@@ -36,6 +40,7 @@
                 {"label":"K1B", "x":15, "y":1},
                 {"label":"K1C", "x":16, "y":1},
                 {"label":"K1D", "x":17, "y":1, "w":1.5},
+
                 {"label":"K3E", "x":0, "y":2},
                 {"label":"K20", "x":1.5, "y":2, "w":1.75},
                 {"label":"K21", "x":3.25, "y":2},
@@ -50,6 +55,7 @@
                 {"label":"K2A", "x":14.25, "y":2},
                 {"label":"K2B", "x":15.25, "y":2},
                 {"label":"K2D", "x":16.25, "y":2, "w":2.25},
+
                 {"label":"K30", "x":1.5, "y":3, "w":2.25},
                 {"label":"K32", "x":3.75, "y":3},
                 {"label":"K33", "x":4.75, "y":3},
@@ -61,9 +67,10 @@
                 {"label":"K39", "x":11.75, "y":3},
                 {"label":"K3A", "x":12.75, "y":3},
                 {"label":"K3B", "x":13.75, "y":3},
-                {"label":"K4D", "x":14.75, "y":3},
+                {"label":"K3D", "x":14.75, "y":3},
                 {"label":"K3C", "x":15.75, "y":3, "w":1.75},
-                {"label":"K3D", "x":17.5, "y":3},
+                {"label":"K4D", "x":17.5, "y":3},
+
                 {"label":"K40", "x":1.5, "y":4, "w":1.5},
                 {"label":"K42", "x":4.5, "y":4, "w":1.25},
                 {"label":"K44", "x":5.75, "y":4, "w":2.25},
@@ -90,6 +97,7 @@
                 {"label":"K0B", "x":14.5, "y":0},
                 {"label":"K0C", "x":15.5, "y":0},
                 {"label":"K0D", "x":16.5, "y":0, "w":2},
+
                 {"label":"K2E", "x":0, "y":1},
                 {"label":"K10", "x":1.5, "y":1, "w":1.5},
                 {"label":"K11", "x":3, "y":1},
@@ -105,6 +113,7 @@
                 {"label":"K1B", "x":15, "y":1},
                 {"label":"K1C", "x":16, "y":1},
                 {"label":"K1D", "x":17, "y":1, "w":1.5},
+
                 {"label":"K3E", "x":0, "y":2},
                 {"label":"K20", "x":1.5, "y":2, "w":1.75},
                 {"label":"K21", "x":3.25, "y":2},
@@ -119,6 +128,7 @@
                 {"label":"K2A", "x":14.25, "y":2},
                 {"label":"K2B", "x":15.25, "y":2},
                 {"label":"K2D", "x":16.25, "y":2, "w":2.25},
+
                 {"label":"K30", "x":1.5, "y":3, "w":2.25},
                 {"label":"K32", "x":3.75, "y":3},
                 {"label":"K33", "x":4.75, "y":3},
@@ -130,9 +140,155 @@
                 {"label":"K39", "x":11.75, "y":3},
                 {"label":"K3A", "x":12.75, "y":3},
                 {"label":"K3B", "x":13.75, "y":3},
-                {"label":"K4D", "x":14.75, "y":3},
+                {"label":"K3D", "x":14.75, "y":3},
                 {"label":"K3C", "x":15.75, "y":3, "w":1.75},
-                {"label":"K3D", "x":17.5, "y":3},
+                {"label":"K4D", "x":17.5, "y":3},
+
+                {"label":"K40", "x":1.5, "y":4, "w":1.5},
+                {"label":"K42", "x":4.5, "y":4, "w":1.25},
+                {"label":"K44", "x":5.75, "y":4, "w":2.25},
+                {"label":"K46", "x":8, "y":4, "w":1.25},
+                {"label":"K48", "x":9.75, "y":4, "w":2.75},
+                {"label":"K4A", "x":12.5, "y":4, "w":1.25},
+                {"label":"K4E", "x":17, "y":4, "w":1.5}
+            ]
+        },
+        "LAYOUT_alice_split_bs_full_rshift": {
+            "layout": [
+                {"label":"K1E", "x":0, "y":0},
+                {"label":"K00", "x":1.5, "y":0},
+                {"label":"K01", "x":2.5, "y":0},
+                {"label":"K02", "x":3.5, "y":0},
+                {"label":"K03", "x":4.5, "y":0},
+                {"label":"K04", "x":5.5, "y":0},
+                {"label":"K05", "x":6.5, "y":0},
+                {"label":"K06", "x":7.5, "y":0},
+                {"label":"K07", "x":10.5, "y":0},
+                {"label":"K08", "x":11.5, "y":0},
+                {"label":"K09", "x":12.5, "y":0},
+                {"label":"K0A", "x":13.5, "y":0},
+                {"label":"K0B", "x":14.5, "y":0},
+                {"label":"K0C", "x":15.5, "y":0},
+                {"label":"K0D", "x":16.5, "y":0},
+                {"label":"K0E", "x":17.5, "y":0},
+
+                {"label":"K2E", "x":0, "y":1},
+                {"label":"K10", "x":1.5, "y":1, "w":1.5},
+                {"label":"K11", "x":3, "y":1},
+                {"label":"K12", "x":4, "y":1},
+                {"label":"K13", "x":5, "y":1},
+                {"label":"K14", "x":6, "y":1},
+                {"label":"K15", "x":7, "y":1},
+                {"label":"K16", "x":10, "y":1},
+                {"label":"K17", "x":11, "y":1},
+                {"label":"K18", "x":12, "y":1},
+                {"label":"K19", "x":13, "y":1},
+                {"label":"K1A", "x":14, "y":1},
+                {"label":"K1B", "x":15, "y":1},
+                {"label":"K1C", "x":16, "y":1},
+                {"label":"K1D", "x":17, "y":1, "w":1.5},
+
+                {"label":"K3E", "x":0, "y":2},
+                {"label":"K20", "x":1.5, "y":2, "w":1.75},
+                {"label":"K21", "x":3.25, "y":2},
+                {"label":"K22", "x":4.25, "y":2},
+                {"label":"K23", "x":5.25, "y":2},
+                {"label":"K24", "x":6.25, "y":2},
+                {"label":"K25", "x":7.25, "y":2},
+                {"label":"K26", "x":10.25, "y":2},
+                {"label":"K27", "x":11.25, "y":2},
+                {"label":"K28", "x":12.25, "y":2},
+                {"label":"K29", "x":13.25, "y":2},
+                {"label":"K2A", "x":14.25, "y":2},
+                {"label":"K2B", "x":15.25, "y":2},
+                {"label":"K2D", "x":16.25, "y":2, "w":2.25},
+
+                {"label":"K30", "x":1.5, "y":3, "w":2.25},
+                {"label":"K32", "x":3.75, "y":3},
+                {"label":"K33", "x":4.75, "y":3},
+                {"label":"K34", "x":5.75, "y":3},
+                {"label":"K35", "x":6.75, "y":3},
+                {"label":"K36", "x":7.75, "y":3},
+                {"label":"K37", "x":9.75, "y":3},
+                {"label":"K38", "x":10.75, "y":3},
+                {"label":"K39", "x":11.75, "y":3},
+                {"label":"K3A", "x":12.75, "y":3},
+                {"label":"K3B", "x":13.75, "y":3},
+                {"label":"K3D", "x":14.75, "y":3},
+                {"label":"K3C", "x":15.75, "y":3, "w":2.75},
+
+                {"label":"K40", "x":1.5, "y":4, "w":1.5},
+                {"label":"K42", "x":4.5, "y":4, "w":1.25},
+                {"label":"K44", "x":5.75, "y":4, "w":2.25},
+                {"label":"K46", "x":8, "y":4, "w":1.25},
+                {"label":"K48", "x":9.75, "y":4, "w":2.75},
+                {"label":"K4A", "x":12.5, "y":4, "w":1.25},
+                {"label":"K4E", "x":17, "y":4, "w":1.5}
+            ]
+        },
+        "LAYOUT_alice_full_rshift": {
+            "layout": [
+                {"label":"K1E", "x":0, "y":0},
+                {"label":"K00", "x":1.5, "y":0},
+                {"label":"K01", "x":2.5, "y":0},
+                {"label":"K02", "x":3.5, "y":0},
+                {"label":"K03", "x":4.5, "y":0},
+                {"label":"K04", "x":5.5, "y":0},
+                {"label":"K05", "x":6.5, "y":0},
+                {"label":"K06", "x":7.5, "y":0},
+                {"label":"K07", "x":10.5, "y":0},
+                {"label":"K08", "x":11.5, "y":0},
+                {"label":"K09", "x":12.5, "y":0},
+                {"label":"K0A", "x":13.5, "y":0},
+                {"label":"K0B", "x":14.5, "y":0},
+                {"label":"K0C", "x":15.5, "y":0},
+                {"label":"K0D", "x":16.5, "y":0, "w":2},
+
+                {"label":"K2E", "x":0, "y":1},
+                {"label":"K10", "x":1.5, "y":1, "w":1.5},
+                {"label":"K11", "x":3, "y":1},
+                {"label":"K12", "x":4, "y":1},
+                {"label":"K13", "x":5, "y":1},
+                {"label":"K14", "x":6, "y":1},
+                {"label":"K15", "x":7, "y":1},
+                {"label":"K16", "x":10, "y":1},
+                {"label":"K17", "x":11, "y":1},
+                {"label":"K18", "x":12, "y":1},
+                {"label":"K19", "x":13, "y":1},
+                {"label":"K1A", "x":14, "y":1},
+                {"label":"K1B", "x":15, "y":1},
+                {"label":"K1C", "x":16, "y":1},
+                {"label":"K1D", "x":17, "y":1, "w":1.5},
+
+                {"label":"K3E", "x":0, "y":2},
+                {"label":"K20", "x":1.5, "y":2, "w":1.75},
+                {"label":"K21", "x":3.25, "y":2},
+                {"label":"K22", "x":4.25, "y":2},
+                {"label":"K23", "x":5.25, "y":2},
+                {"label":"K24", "x":6.25, "y":2},
+                {"label":"K25", "x":7.25, "y":2},
+                {"label":"K26", "x":10.25, "y":2},
+                {"label":"K27", "x":11.25, "y":2},
+                {"label":"K28", "x":12.25, "y":2},
+                {"label":"K29", "x":13.25, "y":2},
+                {"label":"K2A", "x":14.25, "y":2},
+                {"label":"K2B", "x":15.25, "y":2},
+                {"label":"K2D", "x":16.25, "y":2, "w":2.25},
+
+                {"label":"K30", "x":1.5, "y":3, "w":2.25},
+                {"label":"K32", "x":3.75, "y":3},
+                {"label":"K33", "x":4.75, "y":3},
+                {"label":"K34", "x":5.75, "y":3},
+                {"label":"K35", "x":6.75, "y":3},
+                {"label":"K36", "x":7.75, "y":3},
+                {"label":"K37", "x":9.75, "y":3},
+                {"label":"K38", "x":10.75, "y":3},
+                {"label":"K39", "x":11.75, "y":3},
+                {"label":"K3A", "x":12.75, "y":3},
+                {"label":"K3B", "x":13.75, "y":3},
+                {"label":"K3D", "x":14.75, "y":3},
+                {"label":"K3C", "x":15.75, "y":3, "w":2.75},
+
                 {"label":"K40", "x":1.5, "y":4, "w":1.5},
                 {"label":"K42", "x":4.5, "y":4, "w":1.25},
                 {"label":"K44", "x":5.75, "y":4, "w":2.25},
@@ -143,5 +299,4 @@
             ]
         }
     }
-    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
 }