Move remaining `LAYOUT`s to data driven (#20422)

2 files changed, 174 insertions, 59 deletions

diff --git a/keyboards/rotor/info.json b/keyboards/rotor/info.json
index d9494ccdf4..471a41ce1e 100644
--- a/keyboards/rotor/info.json
+++ b/keyboards/rotor/info.json
@@ -17,7 +17,180 @@
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"label":"Esc", "x":2.25, "y":0}, {"label":"!", "x":3.25, "y":0}, {"label":"@", "x":4.25, "y":0}, {"label":"#", "x":5.25, "y":0}, {"label":"$", "x":6.25, "y":0}, {"label":"%", "x":7.25, "y":0}, {"label":"^", "x":8.25, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Backspace", "x":15.25, "y":0, "w":2}, {"label":"Home", "x":17.25, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"label":"Tab", "x":2.25, "y":1, "w":1.5}, {"label":"Q", "x":3.75, "y":1}, {"label":"W", "x":4.75, "y":1}, {"label":"E", "x":5.75, "y":1}, {"label":"R", "x":6.75, "y":1}, {"label":"T", "x":7.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"|", "x":15.75, "y":1, "w":1.5}, {"label":"PgUp", "x":17.25, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"label":"Caps Lock", "x":2.25, "y":2, "w":1.75}, {"label":"A", "x":4, "y":2}, {"label":"S", "x":5, "y":2}, {"label":"D", "x":6, "y":2}, {"label":"F", "x":7, "y":2}, {"label":"G", "x":8, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"Enter", "x":15, "y":2, "w":2.25}, {"label":"PgDn", "x":17.25, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"label":"Shift", "x":2.25, "y":3, "w":2.25}, {"label":"Z", "x":4.5, "y":3}, {"label":"X", "x":5.5, "y":3}, {"label":"C", "x":6.5, "y":3}, {"label":"V", "x":7.5, "y":3}, {"label":"B", "x":8.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"\u2191", "x":16.25, "y":3}, {"label":"End", "x":17.25, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"label":"Ctrl", "x":2.25, "y":4, "w":1.5}, {"x":3.75, "y":4}, {"label":"Alt", "x":4.75, "y":4, "w":1.5}, {"label":"7u", "x":6.25, "y":4, "w":7}, {"label":"Ctrl", "x":13.25, "y":4, "w":1.5}, {"label":"\u2190", "x":15.25, "y":4}, {"label":"\u2193", "x":16.25, "y":4}, {"label":"\u2192", "x":17.25, "y":4}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+                {"matrix": [0, 14], "x": 14.25, "y": 0},
+                {"matrix": [0, 16], "x": 15.25, "y": 0, "w": 2},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1},
+                {"matrix": [1, 16], "x": 15.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 17], "x": 17.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+                {"matrix": [2, 16], "x": 15, "y": 2, "w": 2.25},
+                {"matrix": [2, 17], "x": 17.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3},
+                {"matrix": [3, 12], "x": 12.5, "y": 3},
+                {"matrix": [3, 13], "x": 13.5, "y": 3},
+                {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 16], "x": 16.25, "y": 3},
+                {"matrix": [3, 17], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 3.75, "y": 4},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
+                {"matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 16], "x": 16.25, "y": 4},
+                {"matrix": [4, 17], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_all": {
+            "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},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+                {"matrix": [0, 16], "x": 16, "y": 0},
+                {"matrix": [0, 17], "x": 17, "y": 0},
+                {"matrix": [1, 0], "x": 18, "y": 0},
+                {"matrix": [1, 1], "x": 19, "y": 0},
+                {"matrix": [1, 2], "x": 20, "y": 0},
+                {"matrix": [1, 3], "x": 21, "y": 0},
+                {"matrix": [1, 4], "x": 22, "y": 0},
+                {"matrix": [1, 5], "x": 23, "y": 0},
+                {"matrix": [1, 6], "x": 24, "y": 0},
+                {"matrix": [1, 7], "x": 25, "y": 0},
+                {"matrix": [1, 8], "x": 26, "y": 0},
+                {"matrix": [1, 9], "x": 27, "y": 0},
+                {"matrix": [1, 10], "x": 28, "y": 0},
+                {"matrix": [1, 11], "x": 29, "y": 0},
+                {"matrix": [1, 12], "x": 30, "y": 0},
+                {"matrix": [1, 13], "x": 31, "y": 0},
+                {"matrix": [1, 14], "x": 32, "y": 0},
+                {"matrix": [1, 16], "x": 33, "y": 0},
+                {"matrix": [1, 17], "x": 34, "y": 0},
+                {"matrix": [2, 0], "x": 35, "y": 0},
+                {"matrix": [2, 1], "x": 36, "y": 0},
+                {"matrix": [2, 2], "x": 37, "y": 0},
+                {"matrix": [2, 3], "x": 38, "y": 0},
+                {"matrix": [2, 4], "x": 39, "y": 0},
+                {"matrix": [2, 5], "x": 40, "y": 0},
+                {"matrix": [2, 6], "x": 41, "y": 0},
+                {"matrix": [2, 7], "x": 42, "y": 0},
+                {"matrix": [2, 8], "x": 43, "y": 0},
+                {"matrix": [2, 9], "x": 44, "y": 0},
+                {"matrix": [2, 10], "x": 45, "y": 0},
+                {"matrix": [2, 11], "x": 46, "y": 0},
+                {"matrix": [2, 12], "x": 47, "y": 0},
+                {"matrix": [2, 13], "x": 48, "y": 0},
+                {"matrix": [2, 14], "x": 49, "y": 0},
+                {"matrix": [2, 16], "x": 50, "y": 0},
+                {"matrix": [2, 17], "x": 51, "y": 0},
+                {"matrix": [3, 0], "x": 52, "y": 0},
+                {"matrix": [3, 1], "x": 53, "y": 0},
+                {"matrix": [3, 2], "x": 54, "y": 0},
+                {"matrix": [3, 3], "x": 55, "y": 0},
+                {"matrix": [3, 4], "x": 56, "y": 0},
+                {"matrix": [3, 5], "x": 57, "y": 0},
+                {"matrix": [3, 6], "x": 58, "y": 0},
+                {"matrix": [3, 7], "x": 59, "y": 0},
+                {"matrix": [3, 8], "x": 60, "y": 0},
+                {"matrix": [3, 9], "x": 61, "y": 0},
+                {"matrix": [3, 10], "x": 62, "y": 0},
+                {"matrix": [3, 11], "x": 63, "y": 0},
+                {"matrix": [3, 12], "x": 64, "y": 0},
+                {"matrix": [3, 13], "x": 65, "y": 0},
+                {"matrix": [3, 14], "x": 66, "y": 0},
+                {"matrix": [3, 16], "x": 67, "y": 0},
+                {"matrix": [3, 17], "x": 68, "y": 0},
+                {"matrix": [4, 0], "x": 69, "y": 0},
+                {"matrix": [4, 1], "x": 70, "y": 0},
+                {"matrix": [4, 2], "x": 71, "y": 0},
+                {"matrix": [4, 3], "x": 72, "y": 0},
+                {"matrix": [4, 4], "x": 73, "y": 0},
+                {"matrix": [4, 6], "x": 74, "y": 0},
+                {"matrix": [4, 8], "x": 75, "y": 0},
+                {"matrix": [4, 10], "x": 76, "y": 0},
+                {"matrix": [4, 12], "x": 77, "y": 0},
+                {"matrix": [4, 13], "x": 78, "y": 0},
+                {"matrix": [4, 14], "x": 79, "y": 0},
+                {"matrix": [4, 16], "x": 80, "y": 0},
+                {"matrix": [4, 17], "x": 81, "y": 0}
+            ]
         }
     }
 }
\ No newline at end of file
diff --git a/keyboards/rotor/rotor.h b/keyboards/rotor/rotor.h
deleted file mode 100644
index 0a29bc2fe3..0000000000
--- a/keyboards/rotor/rotor.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright 2021 Densus Design and Basekeys.jp
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO//readabilty 
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00,  k01,  k02,  k03,  k04,  k05,  k06,  k07,  k08,  k09,  k0A,  k0B,  k0C,  k0D,  k0E,  k0G,  k0H, \
-    k10,  k11,  k12,  k13,  k14,  k15,  k16,  k17,  k18,  k19,  k1A,  k1B,  k1C,  k1D,  k1E,        k1G,  k1H, \
-    k20,  k21,  k22,  k23,  k24,  k25,  k26,  k27,  k28,  k29,  k2A,  k2B,  k2C,  k2D,              k2G,  k2H, \
-    k30,  k31,  k32,        k34,  k35,  k36,  k37,  k38,  k39,  k3A,  k3B,  k3C,  k3D,  k3E,        k3G,  k3H, \
-    k40,  k41,  k42,  k43,  k44,                    k48,                          k4D,  k4E,        k4G,  k4H  \
-) \
-{ \
-   { k00,  k01,  k02,  k03,  k04,  k05,  k06,  k07, k08, k09, k0A, k0B, k0C, k0D, k0E, XXX, k0G, k0H}, \
-   { k10,  k11,  k12,  k13,  k14,  k15,  k16,  k17, k18, k19, k1A, k1B, k1C, k1D, k1E, XXX, k1G, k1H}, \
-   { k20,  k21,  k22,  k23,  k24,  k25,  k26,  k27, k28, k29, k2A, k2B, k2C, k2D, XXX, XXX, k2G, k2H}, \
-   { k30,  k31,  k32,  XXX,  k34,  k35,  k36,  k37, k38, k39, k3A, k3B, k3C, k3D, k3E, XXX, k3G, k3H}, \
-   { k40,  k41,  k42,  k43,  k44,  XXX,  XXX,  XXX, k48, XXX, XXX, XXX, XXX, k4D, k4E, XXX, k4G, k4H} \
-}
-
-#define LAYOUT_all( \
-    k00,  k01,  k02,  k03,  k04,  k05,  k06,  k07,  k08,  k09,  k0A,  k0B,  k0C,  k0D,  k0E,  k0F,  k0G,  k0H, \
-    k10,  k11,  k12,  k13,  k14,  k15,  k16,  k17,  k18,  k19,  k1A,  k1B,  k1C,  k1D,  k1E,        k1G,  k1H, \
-    k20,  k21,  k22,  k23,  k24,  k25,  k26,  k27,  k28,  k29,  k2A,  k2B,  k2C,  k2D,  k2E,        k2G,  k2H, \
-    k30,  k31,  k32,  k33,  k34,  k35,  k36,  k37,  k38,  k39,  k3A,  k3B,  k3C,  k3D,  k3E,        k3G,  k3H, \
-    k40,  k41,  k42,  k43,  k44,        k46,        k48,        k4A,        k4C,  k4D,  k4E,        k4G,  k4H  \
-) \
-{ \
-   { k00,  k01,  k02,  k03,  k04,  k05,  k06,  k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H}, \
-   { k10,  k11,  k12,  k13,  k14,  k15,  k16,  k17, k18, k19, k1A, k1B, k1C, k1D, k1E, XXX, k1G, k1H}, \
-   { k20,  k21,  k22,  k23,  k24,  k25,  k26,  k27, k28, k29, k2A, k2B, k2C, k2D, k2E, XXX, k2G, k2H}, \
-   { k30,  k31,  k32,  k33,  k34,  k35,  k36,  k37, k38, k39, k3A, k3B, k3C, k3D, k3E, XXX, k3G, k3H}, \
-   { k40,  k41,  k42,  k43,  k44,  XXX,  k46,  XXX, k48, XXX, k4A, XXX, k4C, k4D, k4E, XXX, k4G, k4H} \
-}