Move miscellaneous layouts to data driven (#20516)

3 files changed, 127 insertions, 167 deletions

diff --git a/keyboards/rart/rartlite/info.json b/keyboards/rart/rartlite/info.json
index 2b8a420eeb..db25aae529 100644
--- a/keyboards/rart/rartlite/info.json
+++ b/keyboards/rart/rartlite/info.json
@@ -23,127 +23,137 @@
     "layouts": {
         "LAYOUT_right_numpad": {
             "layout": [
-                {"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": 12.25, "y": 0},
-                {"x": 13.25, "y": 0},
-                {"x": 14.25, "y": 0},
-
-                {"x": 0, "y": 1, "w":1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1, "w":1.5},
-                {"x": 12.25, "y": 1},
-                {"x": 13.25, "y": 1},
-                {"x": 14.25, "y": 1},
-
-                {"x": 0, "y": 2, "w":1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 11, "y": 2.25},
-                {"x": 12.25, "y": 2},
-                {"x": 13.25, "y": 2},
-                {"x": 14.25, "y": 2},
-
-                {"x": 0, "y": 3, "w":1.25},
-                {"x": 1.25, "y": 3},
-                {"x": 2.25, "y": 3, "w":2.75},
-                {"x": 5, "y": 3, "w":1.25},
-                {"x": 6.25, "y": 3, "w":2.25},
-                {"x": 8.5, "y": 3, "w":1.25},
-                {"x": 10, "y": 3.25},
-                {"x": 11, "y": 3.25},
-                {"x": 12, "y": 3.25},
-                {"x": 13.25, "y": 3},
-                {"x": 14.25, "y": 3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [3, 4], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+
+                {"matrix": [1, 5], "x": 12.25, "y": 0},
+                {"matrix": [0, 6], "x": 13.25, "y": 0},
+                {"matrix": [1, 6], "x": 14.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [5, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 5], "x": 12.25, "y": 1},
+                {"matrix": [2, 6], "x": 13.25, "y": 1},
+                {"matrix": [3, 6], "x": 14.25, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [7, 4], "x": 9.75, "y": 2},
+
+                {"matrix": [4, 5], "x": 11, "y": 2.25},
+
+                {"matrix": [5, 5], "x": 12.25, "y": 2},
+                {"matrix": [4, 6], "x": 13.25, "y": 2},
+                {"matrix": [5, 6], "x": 14.25, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [7, 0], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3, "w": 2.75},
+                {"matrix": [6, 2], "x": 5, "y": 3, "w": 1.25},
+                {"matrix": [6, 3], "x": 6.25, "y": 3, "w": 2.25},
+                {"matrix": [7, 3], "x": 8.5, "y": 3, "w": 1.25},
+
+                {"matrix": [6, 4], "x": 10, "y": 3.25},
+                {"matrix": [6, 5], "x": 11, "y": 3.25},
+                {"matrix": [7, 5], "x": 12, "y": 3.25},
+
+                {"matrix": [6, 6], "x": 13.25, "y": 3},
+                {"matrix": [7, 6], "x": 14.25, "y": 3}
             ]
         },
-
         "LAYOUT_left_numpad": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3.25, "y": 0},
-                {"x": 4.25, "y": 0},
-                {"x": 5.25, "y": 0},
-                {"x": 6.25, "y": 0},
-                {"x": 7.25, "y": 0},
-                {"x": 8.25, "y": 0},
-                {"x": 9.25, "y": 0},
-                {"x": 10.25, "y": 0},
-                {"x": 11.25, "y": 0},
-                {"x": 12.25, "y": 0},
-                {"x": 13.25, "y": 0},
-                {"x": 14.25, "y": 0},
-
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3.25, "y": 1, "w":1.5},
-                {"x": 4.75, "y": 1},
-                {"x": 5.75, "y": 1},
-                {"x": 6.75, "y": 1},
-                {"x": 7.75, "y": 1},
-                {"x": 8.75, "y": 1},
-                {"x": 9.75, "y": 1},
-                {"x": 10.75, "y": 1},
-                {"x": 11.75, "y": 1},
-                {"x": 12.75, "y": 1},
-                {"x": 13.75, "y": 1, "w":1.5},
-
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3.25, "y": 2.25},
-                {"x": 4.5, "y": 2},
-                {"x": 5.5, "y": 2},
-                {"x": 6.5, "y": 2},
-                {"x": 7.5, "y": 2},
-                {"x": 8.5, "y": 2},
-                {"x": 9.5, "y": 2},
-                {"x": 10.5, "y": 2},
-                {"x": 11.5, "y": 2},
-                {"x": 12.5, "y": 2},
-                {"x": 13.5, "y": 2, "w":1.75},
-
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2.25, "y": 3.25},
-                {"x": 3.25, "y": 3.25},
-                {"x": 4.25, "y": 3.25},
-                {"x": 5.5, "y": 3, "w":1.25},
-                {"x": 6.75, "y": 3, "w":2.25},
-                {"x": 9, "y": 3, "w":1.25},
-                {"x": 10.25, "y": 3, "w":2.75},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3, "w":1.25}
+                {"matrix": [1, 6], "x": 0, "y": 0},
+                {"matrix": [0, 6], "x": 1, "y": 0},
+                {"matrix": [1, 5], "x": 2, "y": 0},
+
+                {"matrix": [0, 5], "x": 3.25, "y": 0},
+                {"matrix": [3, 4], "x": 4.25, "y": 0},
+                {"matrix": [1, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 4], "x": 6.25, "y": 0},
+                {"matrix": [1, 3], "x": 7.25, "y": 0},
+                {"matrix": [0, 3], "x": 8.25, "y": 0},
+                {"matrix": [1, 2], "x": 9.25, "y": 0},
+                {"matrix": [0, 2], "x": 10.25, "y": 0},
+                {"matrix": [1, 1], "x": 11.25, "y": 0},
+                {"matrix": [0, 1], "x": 12.25, "y": 0},
+                {"matrix": [1, 0], "x": 13.25, "y": 0},
+                {"matrix": [0, 0], "x": 14.25, "y": 0},
+
+                {"matrix": [3, 6], "x": 0, "y": 1},
+                {"matrix": [2, 6], "x": 1, "y": 1},
+                {"matrix": [3, 5], "x": 2, "y": 1},
+
+                {"matrix": [2, 5], "x": 3.25, "y": 1, "w": 1.5},
+                {"matrix": [5, 4], "x": 4.75, "y": 1},
+                {"matrix": [2, 4], "x": 5.75, "y": 1},
+                {"matrix": [3, 3], "x": 6.75, "y": 1},
+                {"matrix": [2, 3], "x": 7.75, "y": 1},
+                {"matrix": [3, 2], "x": 8.75, "y": 1},
+                {"matrix": [2, 2], "x": 9.75, "y": 1},
+                {"matrix": [3, 1], "x": 10.75, "y": 1},
+                {"matrix": [2, 1], "x": 11.75, "y": 1},
+                {"matrix": [3, 0], "x": 12.75, "y": 1},
+                {"matrix": [2, 0], "x": 13.75, "y": 1, "w": 1.5},
+
+                {"matrix": [5, 6], "x": 0, "y": 2},
+                {"matrix": [4, 6], "x": 1, "y": 2},
+                {"matrix": [5, 5], "x": 2, "y": 2},
+
+                {"matrix": [4, 5], "x": 3.25, "y": 2.25},
+
+                {"matrix": [7, 4], "x": 4.5, "y": 2},
+                {"matrix": [4, 4], "x": 5.5, "y": 2},
+                {"matrix": [5, 3], "x": 6.5, "y": 2},
+                {"matrix": [4, 3], "x": 7.5, "y": 2},
+                {"matrix": [5, 2], "x": 8.5, "y": 2},
+                {"matrix": [4, 2], "x": 9.5, "y": 2},
+                {"matrix": [5, 1], "x": 10.5, "y": 2},
+                {"matrix": [4, 1], "x": 11.5, "y": 2},
+                {"matrix": [5, 0], "x": 12.5, "y": 2},
+                {"matrix": [4, 0], "x": 13.5, "y": 2, "w": 1.75},
+
+                {"matrix": [7, 6], "x": 0, "y": 3},
+                {"matrix": [6, 6], "x": 1, "y": 3},
+
+                {"matrix": [7, 5], "x": 2.25, "y": 3.25},
+                {"matrix": [6, 5], "x": 3.25, "y": 3.25},
+                {"matrix": [6, 4], "x": 4.25, "y": 3.25},
+
+                {"matrix": [7, 3], "x": 5.5, "y": 3, "w": 1.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3, "w": 2.25},
+                {"matrix": [6, 2], "x": 9, "y": 3, "w": 1.25},
+                {"matrix": [6, 1], "x": 10.25, "y": 3, "w": 2.75},
+                {"matrix": [7, 0], "x": 13, "y": 3},
+                {"matrix": [6, 0], "x": 14, "y": 3, "w": 1.25}
             ]
         }
-
     }
 }
diff --git a/keyboards/rart/rartlite/rartlite.c b/keyboards/rart/rartlite/rartlite.c
index 1f431f928f..691c68253e 100644
--- a/keyboards/rart/rartlite/rartlite.c
+++ b/keyboards/rart/rartlite/rartlite.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 "rartlite.h"
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
   setPinOutput(B1);
diff --git a/keyboards/rart/rartlite/rartlite.h b/keyboards/rart/rartlite/rartlite.h
deleted file mode 100644
index a602de2240..0000000000
--- a/keyboards/rart/rartlite/rartlite.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-Copyright 2021 Alabahuy
-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_right_numpad( \
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K34, K05,  K15, K06, K16, \
-    K20,   K30, K21, K31, K22, K32, K23, K33, K24, K54,    K25,  K35, K26, K36, \
-    K40,     K50, K41, K51, K42, K52, K43, K53, K44, K74,  K45,  K55, K46, K56, \
-    K60,   K70,     K61,     K62,      K63,    K73,   K64, K65, K75,  K66, K76  \
-) \
-{ \
-    { K00,   K01,   K02,   K03,  K04,  K05,  K06 }, \
-    { K10,   K11,   K12,   K13,  K14,  K15,  K16 }, \
-    { K20,   K21,   K22,   K23,  K24,  K25,  K26 }, \
-    { K30,   K31,   K32,   K33,  K34,  K35,  K36 }, \
-    { K40,   K41,   K42,   K43,  K44,  K45,  K46 }, \
-    { K50,   K51,   K52,   K53,  K54,  K55,  K56 }, \
-    { K60,   K61,   K62,   K63,  K64,  K65,  K66 }, \
-    { K70,   KC_NO, KC_NO, K73,  K74,  K75,  K76 }, \
-}
-
-#define LAYOUT_left_numpad( \
-    K16, K06, K15,  K05, K34, K14, K04, K13, K03, K12, K02, K11, K01, K10, K00, \
-    K36, K26, K35,  K25,   K54, K24, K33, K23, K32, K22, K31,  K21, K30,   K20, \
-    K56, K46, K55,  K45,    K74, K44, K53, K43, K52, K42,  K51,  K41, K50, K40, \
-    K76, K66,  K75, K65, K64,      K73,     K63,      K62,   K61,    K70,  K60  \
-) \
-{ \
-    { K00,   K01,   K02,   K03,  K04,  K05,  K06 }, \
-    { K10,   K11,   K12,   K13,  K14,  K15,  K16 }, \
-    { K20,   K21,   K22,   K23,  K24,  K25,  K26 }, \
-    { K30,   K31,   K32,   K33,  K34,  K35,  K36 }, \
-    { K40,   K41,   K42,   K43,  K44,  K45,  K46 }, \
-    { K50,   K51,   K52,   K53,  K54,  K55,  K56 }, \
-    { K60,   K61,   K62,   K63,  K64,  K65,  K66 }, \
-    { K70,   KC_NO, KC_NO, K73,  K74,  K75,  K76 }, \
-}