Move layout definition into k12_pro/info.json

3 files changed, 72 insertions, 143 deletions

diff --git a/keyboards/keychron/k12_pro/ansi/rgb/info.json b/keyboards/keychron/k12_pro/ansi/rgb/info.json
index 076ff2981a..19a90487a9 100755
--- a/keyboards/keychron/k12_pro/ansi/rgb/info.json
+++ b/keyboards/keychron/k12_pro/ansi/rgb/info.json
@@ -6,77 +6,6 @@
     "features": {
         "rgb_matrix": true
     },
-    "layouts": {
-        "LAYOUT_61_ansi": {
-            "layout": [
-                {"matrix":[0,0], "x":0, "y":0},
-                {"matrix":[0,1], "x":1, "y":0},
-                {"matrix":[0,2], "x":2, "y":0},
-                {"matrix":[0,3], "x":3, "y":0},
-                {"matrix":[0,4], "x":4, "y":0},
-                {"matrix":[0,5], "x":5, "y":0},
-                {"matrix":[0,6], "x":6, "y":0},
-                {"matrix":[0,7], "x":7, "y":0},
-                {"matrix":[0,8], "x":8, "y":0},
-                {"matrix":[0,9], "x":9, "y":0},
-                {"matrix":[0,10], "x":10, "y":0},
-                {"matrix":[0,11], "x":11, "y":0},
-                {"matrix":[0,12], "x":12, "y":0},
-                {"matrix":[0,13], "x":13, "y":0, "w":2},
-
-                {"matrix":[1,0], "x":0, "y":1, "w":1.5},
-                {"matrix":[1,1], "x":1.5, "y":1},
-                {"matrix":[1,2], "x":2.5, "y":1},
-                {"matrix":[1,3], "x":3.5, "y":1},
-                {"matrix":[1,4], "x":4.5, "y":1},
-                {"matrix":[1,5], "x":5.5, "y":1},
-                {"matrix":[1,6], "x":6.5, "y":1},
-                {"matrix":[1,7], "x":7.5, "y":1},
-                {"matrix":[1,8], "x":8.5, "y":1},
-                {"matrix":[1,9], "x":9.5, "y":1},
-                {"matrix":[1,10], "x":10.5, "y":1},
-                {"matrix":[1,11], "x":11.5, "y":1},
-                {"matrix":[1,12], "x":12.5, "y":1},
-                {"matrix":[1,13], "x":13.5, "y":1, "w":1.5},
-
-                {"matrix":[2,0], "x":0, "y":2, "w":1.75},
-                {"matrix":[2,1], "x":1.75, "y":2},
-                {"matrix":[2,2], "x":2.75, "y":2},
-                {"matrix":[2,3], "x":3.75, "y":2},
-                {"matrix":[2,4], "x":4.75, "y":2},
-                {"matrix":[2,5], "x":5.75, "y":2},
-                {"matrix":[2,6], "x":6.75, "y":2},
-                {"matrix":[2,7], "x":7.75, "y":2},
-                {"matrix":[2,8], "x":8.75, "y":2},
-                {"matrix":[2,9], "x":9.75, "y":2},
-                {"matrix":[2,10], "x":10.75, "y":2},
-                {"matrix":[2,11], "x":11.75, "y":2},
-                {"matrix":[2,13], "x":12.75, "y":2, "w":2.25},
-
-                {"matrix":[3,0], "x":0, "y":3, "w":2.25},
-                {"matrix":[3,2], "x":2.25, "y":3},
-                {"matrix":[3,3], "x":3.25, "y":3},
-                {"matrix":[3,4], "x":4.25, "y":3},
-                {"matrix":[3,5], "x":5.25, "y":3},
-                {"matrix":[3,6], "x":6.25, "y":3},
-                {"matrix":[3,7], "x":7.25, "y":3},
-                {"matrix":[3,8], "x":8.25, "y":3},
-                {"matrix":[3,9], "x":9.25, "y":3},
-                {"matrix":[3,10], "x":10.25, "y":3},
-                {"matrix":[3,11], "x":11.25, "y":3},
-                {"matrix":[3,13], "x":12.25, "y":3, "w":2.75},
-
-                {"matrix":[4,0], "x":0, "y":4, "w":1.25},
-                {"matrix":[4,1], "x":1.25, "y":4, "w":1.25},
-                {"matrix":[4,2], "x":2.5, "y":4, "w":1.25},
-                {"matrix":[4,6], "x":3.75, "y":4, "w":6.25},
-                {"matrix":[4,10], "x":10, "y":4, "w":1.25},
-                {"matrix":[4,11], "x":11.25, "y":4, "w":1.25},
-                {"matrix":[4,12], "x":12.5, "y":4, "w":1.25},
-                {"matrix":[4,13], "x":13.75, "y":4, "w":1.25}
-            ]
-        }
-    },
     "rgb_matrix": {
         "driver": "CKLED2001",
         "animations": {
diff --git a/keyboards/keychron/k12_pro/ansi/white/info.json b/keyboards/keychron/k12_pro/ansi/white/info.json
index a5924349fd..3193ebb0f8 100755
--- a/keyboards/keychron/k12_pro/ansi/white/info.json
+++ b/keyboards/keychron/k12_pro/ansi/white/info.json
@@ -6,77 +6,6 @@
     "features": {
         "led_matrix": true
     },
-    "layouts": {
-        "LAYOUT_61_ansi": {
-            "layout": [
-                {"matrix":[0,0], "x":0, "y":0},
-                {"matrix":[0,1], "x":1, "y":0},
-                {"matrix":[0,2], "x":2, "y":0},
-                {"matrix":[0,3], "x":3, "y":0},
-                {"matrix":[0,4], "x":4, "y":0},
-                {"matrix":[0,5], "x":5, "y":0},
-                {"matrix":[0,6], "x":6, "y":0},
-                {"matrix":[0,7], "x":7, "y":0},
-                {"matrix":[0,8], "x":8, "y":0},
-                {"matrix":[0,9], "x":9, "y":0},
-                {"matrix":[0,10], "x":10, "y":0},
-                {"matrix":[0,11], "x":11, "y":0},
-                {"matrix":[0,12], "x":12, "y":0},
-                {"matrix":[0,13], "x":13, "y":0, "w":2},
-
-                {"matrix":[1,0], "x":0, "y":1, "w":1.5},
-                {"matrix":[1,1], "x":1.5, "y":1},
-                {"matrix":[1,2], "x":2.5, "y":1},
-                {"matrix":[1,3], "x":3.5, "y":1},
-                {"matrix":[1,4], "x":4.5, "y":1},
-                {"matrix":[1,5], "x":5.5, "y":1},
-                {"matrix":[1,6], "x":6.5, "y":1},
-                {"matrix":[1,7], "x":7.5, "y":1},
-                {"matrix":[1,8], "x":8.5, "y":1},
-                {"matrix":[1,9], "x":9.5, "y":1},
-                {"matrix":[1,10], "x":10.5, "y":1},
-                {"matrix":[1,11], "x":11.5, "y":1},
-                {"matrix":[1,12], "x":12.5, "y":1},
-                {"matrix":[1,13], "x":13.5, "y":1, "w":1.5},
-
-                {"matrix":[2,0], "x":0, "y":2, "w":1.75},
-                {"matrix":[2,1], "x":1.75, "y":2},
-                {"matrix":[2,2], "x":2.75, "y":2},
-                {"matrix":[2,3], "x":3.75, "y":2},
-                {"matrix":[2,4], "x":4.75, "y":2},
-                {"matrix":[2,5], "x":5.75, "y":2},
-                {"matrix":[2,6], "x":6.75, "y":2},
-                {"matrix":[2,7], "x":7.75, "y":2},
-                {"matrix":[2,8], "x":8.75, "y":2},
-                {"matrix":[2,9], "x":9.75, "y":2},
-                {"matrix":[2,10], "x":10.75, "y":2},
-                {"matrix":[2,11], "x":11.75, "y":2},
-                {"matrix":[2,13], "x":12.75, "y":2, "w":2.25},
-
-                {"matrix":[3,0], "x":0, "y":3, "w":2.25},
-                {"matrix":[3,2], "x":2.25, "y":3},
-                {"matrix":[3,3], "x":3.25, "y":3},
-                {"matrix":[3,4], "x":4.25, "y":3},
-                {"matrix":[3,5], "x":5.25, "y":3},
-                {"matrix":[3,6], "x":6.25, "y":3},
-                {"matrix":[3,7], "x":7.25, "y":3},
-                {"matrix":[3,8], "x":8.25, "y":3},
-                {"matrix":[3,9], "x":9.25, "y":3},
-                {"matrix":[3,10], "x":10.25, "y":3},
-                {"matrix":[3,11], "x":11.25, "y":3},
-                {"matrix":[3,13], "x":12.25, "y":3, "w":2.75},
-
-                {"matrix":[4,0], "x":0, "y":4, "w":1.25},
-                {"matrix":[4,1], "x":1.25, "y":4, "w":1.25},
-                {"matrix":[4,2], "x":2.5, "y":4, "w":1.25},
-                {"matrix":[4,6], "x":3.75, "y":4, "w":6.25},
-                {"matrix":[4,10], "x":10, "y":4, "w":1.25},
-                {"matrix":[4,11], "x":11.25, "y":4, "w":1.25},
-                {"matrix":[4,12], "x":12.5, "y":4, "w":1.25},
-                {"matrix":[4,13], "x":13.75, "y":4, "w":1.25}
-            ]
-        }
-    },
     "led_matrix": {
         "driver": "CKLED2001",
         "animations": {
diff --git a/keyboards/keychron/k12_pro/info.json b/keyboards/keychron/k12_pro/info.json
index 069269ad7c..e743e42efb 100755
--- a/keyboards/keychron/k12_pro/info.json
+++ b/keyboards/keychron/k12_pro/info.json
@@ -25,5 +25,76 @@
         "custom": true,
         "custom_lite": true
     },
-    "diode_direction": "ROW2COL"
+    "diode_direction": "ROW2COL",
+    "layouts": {
+        "LAYOUT_61_ansi": {
+            "layout": [
+                {"matrix":[0,0], "x":0, "y":0},
+                {"matrix":[0,1], "x":1, "y":0},
+                {"matrix":[0,2], "x":2, "y":0},
+                {"matrix":[0,3], "x":3, "y":0},
+                {"matrix":[0,4], "x":4, "y":0},
+                {"matrix":[0,5], "x":5, "y":0},
+                {"matrix":[0,6], "x":6, "y":0},
+                {"matrix":[0,7], "x":7, "y":0},
+                {"matrix":[0,8], "x":8, "y":0},
+                {"matrix":[0,9], "x":9, "y":0},
+                {"matrix":[0,10], "x":10, "y":0},
+                {"matrix":[0,11], "x":11, "y":0},
+                {"matrix":[0,12], "x":12, "y":0},
+                {"matrix":[0,13], "x":13, "y":0, "w":2},
+
+                {"matrix":[1,0], "x":0, "y":1, "w":1.5},
+                {"matrix":[1,1], "x":1.5, "y":1},
+                {"matrix":[1,2], "x":2.5, "y":1},
+                {"matrix":[1,3], "x":3.5, "y":1},
+                {"matrix":[1,4], "x":4.5, "y":1},
+                {"matrix":[1,5], "x":5.5, "y":1},
+                {"matrix":[1,6], "x":6.5, "y":1},
+                {"matrix":[1,7], "x":7.5, "y":1},
+                {"matrix":[1,8], "x":8.5, "y":1},
+                {"matrix":[1,9], "x":9.5, "y":1},
+                {"matrix":[1,10], "x":10.5, "y":1},
+                {"matrix":[1,11], "x":11.5, "y":1},
+                {"matrix":[1,12], "x":12.5, "y":1},
+                {"matrix":[1,13], "x":13.5, "y":1, "w":1.5},
+
+                {"matrix":[2,0], "x":0, "y":2, "w":1.75},
+                {"matrix":[2,1], "x":1.75, "y":2},
+                {"matrix":[2,2], "x":2.75, "y":2},
+                {"matrix":[2,3], "x":3.75, "y":2},
+                {"matrix":[2,4], "x":4.75, "y":2},
+                {"matrix":[2,5], "x":5.75, "y":2},
+                {"matrix":[2,6], "x":6.75, "y":2},
+                {"matrix":[2,7], "x":7.75, "y":2},
+                {"matrix":[2,8], "x":8.75, "y":2},
+                {"matrix":[2,9], "x":9.75, "y":2},
+                {"matrix":[2,10], "x":10.75, "y":2},
+                {"matrix":[2,11], "x":11.75, "y":2},
+                {"matrix":[2,13], "x":12.75, "y":2, "w":2.25},
+
+                {"matrix":[3,0], "x":0, "y":3, "w":2.25},
+                {"matrix":[3,2], "x":2.25, "y":3},
+                {"matrix":[3,3], "x":3.25, "y":3},
+                {"matrix":[3,4], "x":4.25, "y":3},
+                {"matrix":[3,5], "x":5.25, "y":3},
+                {"matrix":[3,6], "x":6.25, "y":3},
+                {"matrix":[3,7], "x":7.25, "y":3},
+                {"matrix":[3,8], "x":8.25, "y":3},
+                {"matrix":[3,9], "x":9.25, "y":3},
+                {"matrix":[3,10], "x":10.25, "y":3},
+                {"matrix":[3,11], "x":11.25, "y":3},
+                {"matrix":[3,13], "x":12.25, "y":3, "w":2.75},
+
+                {"matrix":[4,0], "x":0, "y":4, "w":1.25},
+                {"matrix":[4,1], "x":1.25, "y":4, "w":1.25},
+                {"matrix":[4,2], "x":2.5, "y":4, "w":1.25},
+                {"matrix":[4,6], "x":3.75, "y":4, "w":6.25},
+                {"matrix":[4,10], "x":10, "y":4, "w":1.25},
+                {"matrix":[4,11], "x":11.25, "y":4, "w":1.25},
+                {"matrix":[4,12], "x":12.5, "y":4, "w":1.25},
+                {"matrix":[4,13], "x":13.75, "y":4, "w":1.25}
+            ]
+        }
+    }
 }