Merge branch 'master' into meteor

1 files changed, 89 insertions, 51 deletions

diff --git a/keyboards/ymdk_np21/info.json b/keyboards/ymdk_np21/info.json
index b17059a1c..bc5b101c9 100644
--- a/keyboards/ymdk_np21/info.json
+++ b/keyboards/ymdk_np21/info.json
@@ -6,63 +6,101 @@
         "LAYOUT_ortho_6x4": {
             "width": 4,
             "height": 6.25,
-            "key_count": 24,
             "layout": [
-                {"label":"K06", "x":0, "y":0},
-                {"label":"K16", "x":1, "y":0},
-                {"label":"K26", "x":2, "y":0},
-                {"label":"K36", "x":3, "y":0},
-                {"label":"K05", "x":0, "y":1.25},
-                {"label":"K15", "x":1, "y":1.25},
-                {"label":"K25", "x":2, "y":1.25},
-                {"label":"K35", "x":3, "y":1.25},
-                {"label":"K04", "x":0, "y":2.25},
-                {"label":"K14", "x":1, "y":2.25},
-                {"label":"K24", "x":2, "y":2.25},
-                {"label":"K34", "x":3, "y":2.25},
-                {"label":"K03", "x":0, "y":3.25},
-                {"label":"K13", "x":1, "y":3.25},
-                {"label":"K23", "x":2, "y":3.25},
-                {"label":"K33", "x":3, "y":3.25},
-                {"label":"K02", "x":0, "y":4.25},
-                {"label":"K12", "x":1, "y":4.25},
-                {"label":"K22", "x":2, "y":4.25},
-                {"label":"K32", "x":3, "y":4.25},
-                {"label":"K01", "x":0, "y":5.25},
-                {"label":"K11", "x":1, "y":5.25},
-                {"label":"K21", "x":2, "y":5.25},
-                {"label":"K31", "x":3, "y":5.25}
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+
+                {"x": 0, "y": 1.25},
+                {"x": 1, "y": 1.25},
+                {"x": 2, "y": 1.25},
+                {"x": 3, "y": 1.25},
+
+                {"x": 0, "y": 2.25},
+                {"x": 1, "y": 2.25},
+                {"x": 2, "y": 2.25},
+                {"x": 3, "y": 2.25},
+
+                {"x": 0, "y": 3.25},
+                {"x": 1, "y": 3.25},
+                {"x": 2, "y": 3.25},
+                {"x": 3, "y": 3.25},
+
+                {"x": 0, "y": 4.25},
+                {"x": 1, "y": 4.25},
+                {"x": 2, "y": 4.25},
+                {"x": 3, "y": 4.25},
+
+                {"x": 0, "y": 5.25},
+                {"x": 1, "y": 5.25},
+                {"x": 2, "y": 5.25},
+                {"x": 3, "y": 5.25}
             ]
         },
-        "LAYOUT": {
+        "LAYOUT_ortho_4x6": {
             "width": 6.25,
             "height": 4,
-            "key_count": 24,
             "layout": [
-                {"label":"K01", "x":0, "y":0},
-                {"label":"K02", "x":1, "y":0},
-                {"label":"K03", "x":2, "y":0},
-                {"label":"K04", "x":3, "y":0},
-                {"label":"K05", "x":4, "y":0},
-                {"label":"K06", "x":5.25, "y":0},
-                {"label":"K11", "x":0, "y":1},
-                {"label":"K12", "x":1, "y":1},
-                {"label":"K13", "x":2, "y":1},
-                {"label":"K14", "x":3, "y":1},
-                {"label":"K15", "x":4, "y":1},
-                {"label":"K16", "x":5.25, "y":1},
-                {"label":"K21", "x":0, "y":2},
-                {"label":"K22", "x":1, "y":2},
-                {"label":"K23", "x":2, "y":2},
-                {"label":"K24", "x":3, "y":2},
-                {"label":"K25", "x":4, "y":2},
-                {"label":"K26", "x":5.25, "y":2},
-                {"label":"K31", "x":0, "y":3},
-                {"label":"K32", "x":1, "y":3},
-                {"label":"K33", "x":2, "y":3},
-                {"label":"K34", "x":3, "y":3},
-                {"label":"K35", "x":4, "y":3},
-                {"label":"K36", "x":5.25, "y":3}
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5.25, "y": 0},
+
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1},
+                {"x": 5.25, "y": 1},
+
+                {"x": 0, "y": 2},
+                {"x": 1, "y": 2},
+                {"x": 2, "y": 2},
+                {"x": 3, "y": 2},
+                {"x": 4, "y": 2},
+                {"x": 5.25, "y": 2},
+
+                {"x": 0, "y": 3},
+                {"x": 1, "y": 3},
+                {"x": 2, "y": 3},
+                {"x": 3, "y": 3},
+                {"x": 4, "y": 3},
+                {"x": 5.25, "y": 3}
+            ]
+        },
+        "LAYOUT_numpad_6x4": {
+            "width": 4,
+            "height": 6.25,
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+
+                {"x": 0, "y": 1.25},
+                {"x": 1, "y": 1.25},
+                {"x": 2, "y": 1.25},
+                {"x": 3, "y": 1.25},
+
+                {"x": 0, "y": 2.25},
+                {"x": 1, "y": 2.25},
+                {"x": 2, "y": 2.25},
+
+                {"x": 0, "y": 3.25},
+                {"x": 1, "y": 3.25},
+                {"x": 2, "y": 3.25},
+                {"x": 3, "y": 2.25, "h": 2},
+
+                {"x": 0, "y": 4.25},
+                {"x": 1, "y": 4.25},
+                {"x": 2, "y": 4.25},
+
+                {"x": 0, "y": 5.25, "w": 2},
+                {"x": 2, "y": 5.25},
+                {"x": 3, "y": 4.25, "h": 2}
             ]
         }
     }