Move single `LAYOUT`s to data driven (#20365)

3 files changed, 68 insertions, 102 deletions

diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json
index dde62eea4c..2d2f4d6ef5 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json
@@ -30,76 +30,77 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0.5},
-                {"x":1, "y":0.5},
-                {"x":2, "y":0.5},
-                {"x":3, "y":0.5},
-                {"x":4, "y":0.5},
-                {"x":5, "y":0.5},
-                {"x":6, "y":0.5},
-                {"x":7, "y":0.5},
-                {"x":8, "y":0.5},
-                {"x":9, "y":0.5},
-                {"x":10, "y":0.5},
-                {"x":11, "y":0.5},
-                {"x":12, "y":0.5},
-                {"x":13, "y":0.5},
-                {"x":14, "y":0.5},
-                {"x":13.9, "y":0, "w":0.6, "h":0.5},
-                {"x":14.5, "y":0, "w":0.6, "h":0.5},
+                {"matrix": [0, 0], "x": 0, "y": 0.5},
+                {"matrix": [0, 1], "x": 1, "y": 0.5},
+                {"matrix": [0, 2], "x": 2, "y": 0.5},
+                {"matrix": [0, 3], "x": 3, "y": 0.5},
+                {"matrix": [0, 4], "x": 4, "y": 0.5},
+                {"matrix": [0, 5], "x": 5, "y": 0.5},
+                {"matrix": [0, 6], "x": 6, "y": 0.5},
+                {"matrix": [0, 7], "x": 7, "y": 0.5},
+                {"matrix": [0, 8], "x": 8, "y": 0.5},
+                {"matrix": [0, 9], "x": 9, "y": 0.5},
+                {"matrix": [0, 10], "x": 10, "y": 0.5},
+                {"matrix": [0, 11], "x": 11, "y": 0.5},
+                {"matrix": [0, 12], "x": 12, "y": 0.5},
+                {"matrix": [0, 13], "x": 13, "y": 0.5},
+                {"matrix": [2, 12], "x": 14, "y": 0.5},
 
-                {"x":0, "y":1.5, "w":1.5},
-                {"x":1.5, "y":1.5},
-                {"x":2.5, "y":1.5},
-                {"x":3.5, "y":1.5},
-                {"x":4.5, "y":1.5},
-                {"x":5.5, "y":1.5},
-                {"x":6.5, "y":1.5},
-                {"x":7.5, "y":1.5},
-                {"x":8.5, "y":1.5},
-                {"x":9.5, "y":1.5},
-                {"x":10.5, "y":1.5},
-                {"x":11.5, "y":1.5},
-                {"x":12.5, "y":1.5},
-                {"x":13.5, "y":1.5, "w":1.5},
+                {"matrix": [4, 3], "x": 13.9, "y": 0, "w": 0.6, "h": 0.5},
+                {"matrix": [4, 4], "x": 14.5, "y": 0, "w": 0.6, "h": 0.5},
 
-                {"x":0, "y":2.5, "w":1.75},
-                {"x":1.75, "y":2.5},
-                {"x":2.75, "y":2.5},
-                {"x":3.75, "y":2.5},
-                {"x":4.75, "y":2.5},
-                {"x":5.75, "y":2.5},
-                {"x":6.75, "y":2.5},
-                {"x":7.75, "y":2.5},
-                {"x":8.75, "y":2.5},
-                {"x":9.75, "y":2.5},
-                {"x":10.75, "y":2.5},
-                {"x":11.75, "y":2.5},
-                {"x":12.75, "y":2.5, "w":2.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.5, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.5},
+                {"matrix": [1, 2], "x": 2.5, "y": 1.5},
+                {"matrix": [1, 3], "x": 3.5, "y": 1.5},
+                {"matrix": [1, 4], "x": 4.5, "y": 1.5},
+                {"matrix": [1, 5], "x": 5.5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6.5, "y": 1.5},
+                {"matrix": [1, 7], "x": 7.5, "y": 1.5},
+                {"matrix": [1, 8], "x": 8.5, "y": 1.5},
+                {"matrix": [1, 9], "x": 9.5, "y": 1.5},
+                {"matrix": [1, 10], "x": 10.5, "y": 1.5},
+                {"matrix": [1, 11], "x": 11.5, "y": 1.5},
+                {"matrix": [1, 12], "x": 12.5, "y": 1.5},
+                {"matrix": [1, 13], "x": 13.5, "y": 1.5, "w": 1.5},
 
-                {"x":0, "y":3.5, "w":2.25},
-                {"x":2.25, "y":3.5},
-                {"x":3.25, "y":3.5},
-                {"x":4.25, "y":3.5},
-                {"x":5.25, "y":3.5},
-                {"x":6.25, "y":3.5},
-                {"x":7.25, "y":3.5},
-                {"x":8.25, "y":3.5},
-                {"x":9.25, "y":3.5},
-                {"x":10.25, "y":3.5},
-                {"x":11.25, "y":3.5, "w":1.75},
-                {"x":13, "y":3.5},
-                {"x":14, "y":3.5},
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.75, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.75, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.75, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.75, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.75, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.75, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.75, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.75, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.75, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.75, "y": 2.5},
+                {"matrix": [2, 13], "x": 12.75, "y": 2.5, "w": 2.25},
 
-                {"x":0, "y":4.5, "w":1.25},
-                {"x":1.25, "y":4.5, "w":1.25},
-                {"x":2.5, "y":4.5, "w":1.25},
-                {"x":3.75, "y":4.5, "w":6.25},
-                {"x":10, "y":4.5},
-                {"x":11, "y":4.5},
-                {"x":12, "y":4.5},
-                {"x":13, "y":4.5},
-                {"x":14, "y":4.5}
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3.5},
+                {"matrix": [3, 2], "x": 3.25, "y": 3.5},
+                {"matrix": [3, 3], "x": 4.25, "y": 3.5},
+                {"matrix": [3, 4], "x": 5.25, "y": 3.5},
+                {"matrix": [3, 5], "x": 6.25, "y": 3.5},
+                {"matrix": [3, 6], "x": 7.25, "y": 3.5},
+                {"matrix": [3, 7], "x": 8.25, "y": 3.5},
+                {"matrix": [3, 8], "x": 9.25, "y": 3.5},
+                {"matrix": [3, 9], "x": 10.25, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.25, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 12], "x": 13, "y": 3.5},
+                {"matrix": [3, 13], "x": 14, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4.5, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4.5},
+                {"matrix": [4, 10], "x": 11, "y": 4.5},
+                {"matrix": [4, 11], "x": 12, "y": 4.5},
+                {"matrix": [4, 12], "x": 13, "y": 4.5},
+                {"matrix": [4, 13], "x": 14, "y": 4.5}
             ]
         }
     }
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c
index 001debe128..e738b47c40 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c
@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "rev2.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.h b/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.h
deleted file mode 100644
index 47da353b6c..0000000000
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2022 bdtc123
- * 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 LAYOUT( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2C, K43, K44,        \
-    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      \
-    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D,          \
-    K30,       K31, K32, K33, K34, K35, K36, K37, K38, K39, K3B,     K3C, K3D,   \
-    K40,  K41,  K42,              K45,                K49, K4A, K4B, K4C, K4D    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   KC_NO, K3B,   K3C,   K3D   }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   KC_NO, KC_NO, KC_NO, K49,   K4A,   K4B,   K4C,   K4D   }, \
-}
-
-
-
-