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

2 files changed, 44 insertions, 76 deletions

diff --git a/keyboards/handwired/croxsplit44/croxsplit44.h b/keyboards/handwired/croxsplit44/croxsplit44.h
deleted file mode 100644
index c94124f9ee..0000000000
--- a/keyboards/handwired/croxsplit44/croxsplit44.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2021 Samux6146
- *
- * 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( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
-	            K302, K303, K304, K305, K306, K307, K308, K309  \
-) \
-{ \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211 }, \
-	{ KC_NO, KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  KC_NO, KC_NO }  \
-}
diff --git a/keyboards/handwired/croxsplit44/info.json b/keyboards/handwired/croxsplit44/info.json
index 817f2fe85a..399dae6c33 100644
--- a/keyboards/handwired/croxsplit44/info.json
+++ b/keyboards/handwired/croxsplit44/info.json
@@ -21,57 +21,57 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0.375},
-                {"x":1, "y":0.375},
-                {"x":2, "y":0.125},
-                {"x":3, "y":0},
-                {"x":4, "y":0.125},
-                {"x":5, "y":0.25},
+                {"matrix": [0, 0], "x": 0, "y": 0.375},
+                {"matrix": [0, 1], "x": 1, "y": 0.375},
+                {"matrix": [0, 2], "x": 2, "y": 0.125},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.125},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
 
-                {"x":7, "y":0.25},
-                {"x":8, "y":0.125},
-                {"x":9, "y":0},
-                {"x":10, "y":0.125},
-                {"x":11, "y":0.375},
-                {"x":12, "y":0.375},
+                {"matrix": [0, 6], "x": 7, "y": 0.25},
+                {"matrix": [0, 7], "x": 8, "y": 0.125},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0.125},
+                {"matrix": [0, 10], "x": 11, "y": 0.375},
+                {"matrix": [0, 11], "x": 12, "y": 0.375},
 
-                {"x":0, "y":1.375},
-                {"x":1, "y":1.375},
-                {"x":2, "y":1.125},
-                {"x":3, "y":1},
-                {"x":4, "y":1.125},
-                {"x":5, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.375},
+                {"matrix": [1, 1], "x": 1, "y": 1.375},
+                {"matrix": [1, 2], "x": 2, "y": 1.125},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.125},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
 
-                {"x":7, "y":1.25},
-                {"x":8, "y":1.125},
-                {"x":9, "y":1},
-                {"x":10, "y":1.125},
-                {"x":11, "y":1.375},
-                {"x":12, "y":1.375},
+                {"matrix": [1, 6], "x": 7, "y": 1.25},
+                {"matrix": [1, 7], "x": 8, "y": 1.125},
+                {"matrix": [1, 8], "x": 9, "y": 1},
+                {"matrix": [1, 9], "x": 10, "y": 1.125},
+                {"matrix": [1, 10], "x": 11, "y": 1.375},
+                {"matrix": [1, 11], "x": 12, "y": 1.375},
 
-                {"x":0, "y":2.375},
-                {"x":1, "y":2.375},
-                {"x":2, "y":2.125},
-                {"x":3, "y":2},
-                {"x":4, "y":2.125},
-                {"x":5, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.375},
+                {"matrix": [2, 1], "x": 1, "y": 2.375},
+                {"matrix": [2, 2], "x": 2, "y": 2.125},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.125},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
 
-                {"x":7, "y":2.25},
-                {"x":8, "y":2.125},
-                {"x":9, "y":2},
-                {"x":10, "y":2.125},
-                {"x":11, "y":2.375},
-                {"x":12, "y":2.375},
+                {"matrix": [2, 6], "x": 7, "y": 2.25},
+                {"matrix": [2, 7], "x": 8, "y": 2.125},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2.125},
+                {"matrix": [2, 10], "x": 11, "y": 2.375},
+                {"matrix": [2, 11], "x": 12, "y": 2.375},
 
-                {"x":2, "y":3.125},
-                {"x":3, "y":3},
-                {"x":4, "y":3.5},
-                {"x":5, "y":3.75},
+                {"matrix": [3, 2], "x": 2, "y": 3.125},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.5},
+                {"matrix": [3, 5], "x": 5, "y": 3.75},
 
-                {"x":7, "y":3.75},
-                {"x":8, "y":3.5},
-                {"x":9, "y":3},
-                {"x":10, "y":3.125}
+                {"matrix": [3, 6], "x": 7, "y": 3.75},
+                {"matrix": [3, 7], "x": 8, "y": 3.5},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3.125}
             ]
         }
     }