O4L 5x12 refactor (#11392)

* O4L 5x12 refactor

* Remove config.h

1 files changed, 189 insertions, 180 deletions

diff --git a/keyboards/keycapsss/o4l_5x12/info.json b/keyboards/keycapsss/o4l_5x12/info.json
index 7dba0dab56..b2eb8ad51e 100644
--- a/keyboards/keycapsss/o4l_5x12/info.json
+++ b/keyboards/keycapsss/o4l_5x12/info.json
@@ -7,195 +7,204 @@
     "height": 5,
     "layouts": {
         "LAYOUT_ortho_5x12": {
-            "key_count": 60,
             "layout": [
-                {"w": 1, "x": 0, "y": 0},
-                {"w": 1, "x": 1, "y": 0},
-                {"w": 1, "x": 2, "y": 0},
-                {"w": 1, "x": 3, "y": 0},
-                {"w": 1, "x": 4, "y": 0},
-                {"w": 1, "x": 5, "y": 0},
-                {"w": 1, "x": 6, "y": 0},
-                {"w": 1, "x": 7, "y": 0},
-                {"w": 1, "x": 8, "y": 0},
-                {"w": 1, "x": 9, "y": 0},
-                {"w": 1, "x": 10, "y": 0},
-                {"w": 1, "x": 11, "y": 0},
-                {"w": 1, "x": 0, "y": 1},
-                {"w": 1, "x": 1, "y": 1},
-                {"w": 1, "x": 2, "y": 1},
-                {"w": 1, "x": 3, "y": 1},
-                {"w": 1, "x": 4, "y": 1},
-                {"w": 1, "x": 5, "y": 1},
-                {"w": 1, "x": 6, "y": 1},
-                {"w": 1, "x": 7, "y": 1},
-                {"w": 1, "x": 8, "y": 1},
-                {"w": 1, "x": 9, "y": 1},
-                {"w": 1, "x": 10, "y": 1},
-                {"w": 1, "x": 11, "y": 1},
-                {"w": 1, "x": 0, "y": 2},
-                {"w": 1, "x": 1, "y": 2},
-                {"w": 1, "x": 2, "y": 2},
-                {"w": 1, "x": 3, "y": 2},
-                {"w": 1, "x": 4, "y": 2},
-                {"w": 1, "x": 5, "y": 2},
-                {"w": 1, "x": 6, "y": 2},
-                {"w": 1, "x": 7, "y": 2},
-                {"w": 1, "x": 8, "y": 2},
-                {"w": 1, "x": 9, "y": 2},
-                {"w": 1, "x": 10, "y": 2},
-                {"w": 1, "x": 11, "y": 2},
-                {"w": 1, "x": 0, "y": 3},
-                {"w": 1, "x": 1, "y": 3},
-                {"w": 1, "x": 2, "y": 3},
-                {"w": 1, "x": 3, "y": 3},
-                {"w": 1, "x": 4, "y": 3},
-                {"w": 1, "x": 5, "y": 3},
-                {"w": 1, "x": 6, "y": 3},
-                {"w": 1, "x": 7, "y": 3},
-                {"w": 1, "x": 8, "y": 3},
-                {"w": 1, "x": 9, "y": 3},
-                {"w": 1, "x": 10, "y": 3},
-                {"w": 1, "x": 11, "y": 3},
-                {"w": 1, "x": 0, "y": 4},
-                {"w": 1, "x": 1, "y": 4},
-                {"w": 1, "x": 2, "y": 4},
-                {"w": 1, "x": 3, "y": 4},
-                {"w": 1, "x": 4, "y": 4},
-                {"w": 1, "x": 5, "y": 4},
-                {"w": 1, "x": 6, "y": 4},
-                {"w": 1, "x": 7, "y": 4},
-                {"w": 1, "x": 8, "y": 4},
-                {"w": 1, "x": 9, "y": 4},
-                {"w": 1, "x": 10, "y": 4},
-                {"w": 1, "x": 11, "y": 4}
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1},
+                {"x": 5, "y": 1},
+                {"x": 6, "y": 1},
+                {"x": 7, "y": 1},
+                {"x": 8, "y": 1},
+                {"x": 9, "y": 1},
+                {"x": 10, "y": 1},
+                {"x": 11, "y": 1},
+
+                {"x": 0, "y": 2},
+                {"x": 1, "y": 2},
+                {"x": 2, "y": 2},
+                {"x": 3, "y": 2},
+                {"x": 4, "y": 2},
+                {"x": 5, "y": 2},
+                {"x": 6, "y": 2},
+                {"x": 7, "y": 2},
+                {"x": 8, "y": 2},
+                {"x": 9, "y": 2},
+                {"x": 10, "y": 2},
+                {"x": 11, "y": 2},
+
+                {"x": 0, "y": 3},
+                {"x": 1, "y": 3},
+                {"x": 2, "y": 3},
+                {"x": 3, "y": 3},
+                {"x": 4, "y": 3},
+                {"x": 5, "y": 3},
+                {"x": 6, "y": 3},
+                {"x": 7, "y": 3},
+                {"x": 8, "y": 3},
+                {"x": 9, "y": 3},
+                {"x": 10, "y": 3},
+                {"x": 11, "y": 3},
+
+                {"x": 0, "y": 4},
+                {"x": 1, "y": 4},
+                {"x": 2, "y": 4},
+                {"x": 3, "y": 4},
+                {"x": 4, "y": 4},
+                {"x": 5, "y": 4},
+                {"x": 6, "y": 4},
+                {"x": 7, "y": 4},
+                {"x": 8, "y": 4},
+                {"x": 9, "y": 4},
+                {"x": 10, "y": 4},
+                {"x": 11, "y": 4}
             ]
         },
         "LAYOUT_ortho_5x12_1x2uC": {
-            "key_count": 59,
             "layout": [
-                {"w": 1, "x": 0, "y": 0},
-                {"w": 1, "x": 1, "y": 0},
-                {"w": 1, "x": 2, "y": 0},
-                {"w": 1, "x": 3, "y": 0},
-                {"w": 1, "x": 4, "y": 0},
-                {"w": 1, "x": 5, "y": 0},
-                {"w": 1, "x": 6, "y": 0},
-                {"w": 1, "x": 7, "y": 0},
-                {"w": 1, "x": 8, "y": 0},
-                {"w": 1, "x": 9, "y": 0},
-                {"w": 1, "x": 10, "y": 0},
-                {"w": 1, "x": 11, "y": 0},
-                {"w": 1, "x": 0, "y": 1},
-                {"w": 1, "x": 1, "y": 1},
-                {"w": 1, "x": 2, "y": 1},
-                {"w": 1, "x": 3, "y": 1},
-                {"w": 1, "x": 4, "y": 1},
-                {"w": 1, "x": 5, "y": 1},
-                {"w": 1, "x": 6, "y": 1},
-                {"w": 1, "x": 7, "y": 1},
-                {"w": 1, "x": 8, "y": 1},
-                {"w": 1, "x": 9, "y": 1},
-                {"w": 1, "x": 10, "y": 1},
-                {"w": 1, "x": 11, "y": 1},
-                {"w": 1, "x": 0, "y": 2},
-                {"w": 1, "x": 1, "y": 2},
-                {"w": 1, "x": 2, "y": 2},
-                {"w": 1, "x": 3, "y": 2},
-                {"w": 1, "x": 4, "y": 2},
-                {"w": 1, "x": 5, "y": 2},
-                {"w": 1, "x": 6, "y": 2},
-                {"w": 1, "x": 7, "y": 2},
-                {"w": 1, "x": 8, "y": 2},
-                {"w": 1, "x": 9, "y": 2},
-                {"w": 1, "x": 10, "y": 2},
-                {"w": 1, "x": 11, "y": 2},
-                {"w": 1, "x": 0, "y": 3},
-                {"w": 1, "x": 1, "y": 3},
-                {"w": 1, "x": 2, "y": 3},
-                {"w": 1, "x": 3, "y": 3},
-                {"w": 1, "x": 4, "y": 3},
-                {"w": 1, "x": 5, "y": 3},
-                {"w": 1, "x": 6, "y": 3},
-                {"w": 1, "x": 7, "y": 3},
-                {"w": 1, "x": 8, "y": 3},
-                {"w": 1, "x": 9, "y": 3},
-                {"w": 1, "x": 10, "y": 3},
-                {"w": 1, "x": 11, "y": 3},
-                {"w": 1, "x": 0, "y": 4},
-                {"w": 1, "x": 1, "y": 4},
-                {"w": 1, "x": 2, "y": 4},
-                {"w": 1, "x": 3, "y": 4},
-                {"w": 1, "x": 4, "y": 4},
-                {"w": 2, "x": 5, "y": 4},
-                {"w": 1, "x": 7, "y": 4},
-                {"w": 1, "x": 8, "y": 4},
-                {"w": 1, "x": 9, "y": 4},
-                {"w": 1, "x": 10, "y": 4},
-                {"w": 1, "x": 11, "y": 4}
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1},
+                {"x": 5, "y": 1},
+                {"x": 6, "y": 1},
+                {"x": 7, "y": 1},
+                {"x": 8, "y": 1},
+                {"x": 9, "y": 1},
+                {"x": 10, "y": 1},
+                {"x": 11, "y": 1},
+
+                {"x": 0, "y": 2},
+                {"x": 1, "y": 2},
+                {"x": 2, "y": 2},
+                {"x": 3, "y": 2},
+                {"x": 4, "y": 2},
+                {"x": 5, "y": 2},
+                {"x": 6, "y": 2},
+                {"x": 7, "y": 2},
+                {"x": 8, "y": 2},
+                {"x": 9, "y": 2},
+                {"x": 10, "y": 2},
+                {"x": 11, "y": 2},
+
+                {"x": 0, "y": 3},
+                {"x": 1, "y": 3},
+                {"x": 2, "y": 3},
+                {"x": 3, "y": 3},
+                {"x": 4, "y": 3},
+                {"x": 5, "y": 3},
+                {"x": 6, "y": 3},
+                {"x": 7, "y": 3},
+                {"x": 8, "y": 3},
+                {"x": 9, "y": 3},
+                {"x": 10, "y": 3},
+                {"x": 11, "y": 3},
+
+                {"x": 0, "y": 4},
+                {"x": 1, "y": 4},
+                {"x": 2, "y": 4},
+                {"x": 3, "y": 4},
+                {"x": 4, "y": 4},
+                {"x": 5, "y": 4, "w": 2},
+                {"x": 7, "y": 4},
+                {"x": 8, "y": 4},
+                {"x": 9, "y": 4},
+                {"x": 10, "y": 4},
+                {"x": 11, "y": 4}
             ]
         },
         "LAYOUT_ortho_5x12_2x2u": {
-            "key_count": 58,
             "layout": [
-                {"w": 1, "x": 0, "y": 0},
-                {"w": 1, "x": 1, "y": 0},
-                {"w": 1, "x": 2, "y": 0},
-                {"w": 1, "x": 3, "y": 0},
-                {"w": 1, "x": 4, "y": 0},
-                {"w": 1, "x": 5, "y": 0},
-                {"w": 1, "x": 6, "y": 0},
-                {"w": 1, "x": 7, "y": 0},
-                {"w": 1, "x": 8, "y": 0},
-                {"w": 1, "x": 9, "y": 0},
-                {"w": 1, "x": 10, "y": 0},
-                {"w": 1, "x": 11, "y": 0},
-                {"w": 1, "x": 0, "y": 1},
-                {"w": 1, "x": 1, "y": 1},
-                {"w": 1, "x": 2, "y": 1},
-                {"w": 1, "x": 3, "y": 1},
-                {"w": 1, "x": 4, "y": 1},
-                {"w": 1, "x": 5, "y": 1},
-                {"w": 1, "x": 6, "y": 1},
-                {"w": 1, "x": 7, "y": 1},
-                {"w": 1, "x": 8, "y": 1},
-                {"w": 1, "x": 9, "y": 1},
-                {"w": 1, "x": 10, "y": 1},
-                {"w": 1, "x": 11, "y": 1},
-                {"w": 1, "x": 0, "y": 2},
-                {"w": 1, "x": 1, "y": 2},
-                {"w": 1, "x": 2, "y": 2},
-                {"w": 1, "x": 3, "y": 2},
-                {"w": 1, "x": 4, "y": 2},
-                {"w": 1, "x": 5, "y": 2},
-                {"w": 1, "x": 6, "y": 2},
-                {"w": 1, "x": 7, "y": 2},
-                {"w": 1, "x": 8, "y": 2},
-                {"w": 1, "x": 9, "y": 2},
-                {"w": 1, "x": 10, "y": 2},
-                {"w": 1, "x": 11, "y": 2},
-                {"w": 1, "x": 0, "y": 3},
-                {"w": 1, "x": 1, "y": 3},
-                {"w": 1, "x": 2, "y": 3},
-                {"w": 1, "x": 3, "y": 3},
-                {"w": 1, "x": 4, "y": 3},
-                {"w": 1, "x": 5, "y": 3},
-                {"w": 1, "x": 6, "y": 3},
-                {"w": 1, "x": 7, "y": 3},
-                {"w": 1, "x": 8, "y": 3},
-                {"w": 1, "x": 9, "y": 3},
-                {"w": 1, "x": 10, "y": 3},
-                {"w": 1, "x": 11, "y": 3},
-                {"w": 1, "x": 0, "y": 4},
-                {"w": 1, "x": 1, "y": 4},
-                {"w": 1, "x": 2, "y": 4},
-                {"w": 1, "x": 3, "y": 4},
-                {"w": 2, "x": 4, "y": 4},
-                {"w": 2, "x": 6, "y": 4},
-                {"w": 1, "x": 8, "y": 4},
-                {"w": 1, "x": 9, "y": 4},
-                {"w": 1, "x": 10, "y": 4},
-                {"w": 1, "x": 11, "y": 4}
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1},
+                {"x": 5, "y": 1},
+                {"x": 6, "y": 1},
+                {"x": 7, "y": 1},
+                {"x": 8, "y": 1},
+                {"x": 9, "y": 1},
+                {"x": 10, "y": 1},
+                {"x": 11, "y": 1},
+
+                {"x": 0, "y": 2},
+                {"x": 1, "y": 2},
+                {"x": 2, "y": 2},
+                {"x": 3, "y": 2},
+                {"x": 4, "y": 2},
+                {"x": 5, "y": 2},
+                {"x": 6, "y": 2},
+                {"x": 7, "y": 2},
+                {"x": 8, "y": 2},
+                {"x": 9, "y": 2},
+                {"x": 10, "y": 2},
+                {"x": 11, "y": 2},
+
+                {"x": 0, "y": 3},
+                {"x": 1, "y": 3},
+                {"x": 2, "y": 3},
+                {"x": 3, "y": 3},
+                {"x": 4, "y": 3},
+                {"x": 5, "y": 3},
+                {"x": 6, "y": 3},
+                {"x": 7, "y": 3},
+                {"x": 8, "y": 3},
+                {"x": 9, "y": 3},
+                {"x": 10, "y": 3},
+                {"x": 11, "y": 3},
+
+                {"x": 0, "y": 4},
+                {"x": 1, "y": 4},
+                {"x": 2, "y": 4},
+                {"x": 3, "y": 4},
+                {"x": 4, "y": 4, "w": 2},
+                {"x": 6, "y": 4, "w": 2},
+                {"x": 8, "y": 4},
+                {"x": 9, "y": 4},
+                {"x": 10, "y": 4},
+                {"x": 11, "y": 4}
             ]
         }
     }