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

3 files changed, 73 insertions, 406 deletions

diff --git a/keyboards/toffee_studio/blueberry/blueberry.c b/keyboards/toffee_studio/blueberry/blueberry.c
deleted file mode 100644
index 6eac643fce..0000000000
--- a/keyboards/toffee_studio/blueberry/blueberry.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2023 Toffee Studio
- *
- * 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/>.
- */
-
-#include "blueberry.h"
diff --git a/keyboards/toffee_studio/blueberry/blueberry.h b/keyboards/toffee_studio/blueberry/blueberry.h
deleted file mode 100644
index b83481dca9..0000000000
--- a/keyboards/toffee_studio/blueberry/blueberry.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2023 Toffee Studio
- *
- * 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, K10, K05, K15, K04, K14, K03, K13, K02, K12, K01, K11, K06, K16, K07, \
-            K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, \
-            K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46,      K47, \
-    K70,    K60, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, K67, \
-            K80, K81, K82,           K83,           K84, K85,      K86, K56, K77 \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07   },\
-    { K10, K11, K12, K13, K14, K15, K16, KC_NO },\
-    { K20, K21, K22, K23, K24, K25, K26, K27   },\
-    { K30, K31, K32, K33, K34, K35, K36, KC_NO },\
-    { K40, K41, K42, K43, K44, K45, K46, K47   },\
-    { K50, K51, K52, K53, K54, K55, K56, KC_NO },\
-    { K60, K61, K62, K63, K64, K65, K66, K67   },\
-    { K70, K71, K72, K73, K74, K75, K76, K77   },\
-    { K80, K81, K82, K83, K84, K85, K86, KC_NO } \
-}
diff --git a/keyboards/toffee_studio/blueberry/info.json b/keyboards/toffee_studio/blueberry/info.json
index fb1fb56aad..d5870c8f02 100644
--- a/keyboards/toffee_studio/blueberry/info.json
+++ b/keyboards/toffee_studio/blueberry/info.json
@@ -21,358 +21,79 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {
-                    "label": "0,0",
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "label": "1,0",
-                    "x": 1,
-                    "y": 0
-                },
-                {
-                    "label": "0,5",
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "label": "1,5",
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "label": "0,4",
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "label": "1,4",
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "label": "0,3",
-                    "x": 6,
-                    "y": 0
-                },
-                {
-                    "label": "1,3",
-                    "x": 7,
-                    "y": 0
-                },
-                {
-                    "label": "0,2",
-                    "x": 8,
-                    "y": 0
-                },
-                {
-                    "label": "1,2",
-                    "x": 9,
-                    "y": 0
-                },
-                {
-                    "label": "0,1",
-                    "x": 10,
-                    "y": 0
-                },
-                {
-                    "label": "1,1",
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "label": "0,6",
-                    "x": 12,
-                    "y": 0
-                },
-                {
-                    "label": "0,7",
-                    "x": 13,
-                    "y": 0
-                },
-                {
-                    "label": "1,6",
-                    "x": 14,
-                    "y": 0
-                },
-                {
-                    "label": "2,0",
-                    "x": 0,
-                    "y": 1,
-                    "w": 1.5
-                },
-                {
-                    "label": "3,0",
-                    "x": 1.5,
-                    "y": 1
-                },
-                {
-                    "label": "2,1",
-                    "x": 2.5,
-                    "y": 1
-                },
-                {
-                    "label": "3,1",
-                    "x": 3.5,
-                    "y": 1
-                },
-                {
-                    "label": "2,2",
-                    "x": 4.5,
-                    "y": 1
-                },
-                {
-                    "label": "3,2",
-                    "x": 5.5,
-                    "y": 1
-                },
-                {
-                    "label": "2,3",
-                    "x": 6.5,
-                    "y": 1
-                },
-                {
-                    "label": "3,3",
-                    "x": 7.5,
-                    "y": 1
-                },
-                {
-                    "label": "2,4",
-                    "x": 8.5,
-                    "y": 1
-                },
-                {
-                    "label": "3,4",
-                    "x": 9.5,
-                    "y": 1
-                },
-                {
-                    "label": "2,5",
-                    "x": 10.5,
-                    "y": 1
-                },
-                {
-                    "label": "3,5",
-                    "x": 11.5,
-                    "y": 1
-                },
-                {
-                    "label": "2,6",
-                    "x": 12.5,
-                    "y": 1
-                },
-                {
-                    "label": "3,6",
-                    "x": 13.5,
-                    "y": 1,
-                    "w": 1.5
-                },
-                {
-                    "label": "2,7",
-                    "x": 15,
-                    "y": 1
-                },
-                {
-                    "label": "4,0",
-                    "x": 0,
-                    "y": 2,
-                    "w": 1.75
-                },
-                {
-                    "label": "5,0",
-                    "x": 1.75,
-                    "y": 2
-                },
-                {
-                    "label": "4,1",
-                    "x": 2.75,
-                    "y": 2
-                },
-                {
-                    "label": "5,1",
-                    "x": 3.75,
-                    "y": 2
-                },
-                {
-                    "label": "4,2",
-                    "x": 4.75,
-                    "y": 2
-                },
-                {
-                    "label": "5,2",
-                    "x": 5.75,
-                    "y": 2
-                },
-                {
-                    "label": "4,3",
-                    "x": 6.75,
-                    "y": 2
-                },
-                {
-                    "label": "5,3",
-                    "x": 7.75,
-                    "y": 2
-                },
-                {
-                    "label": "4,4",
-                    "x": 8.75,
-                    "y": 2
-                },
-                {
-                    "label": "5,4",
-                    "x": 9.75,
-                    "y": 2
-                },
-                {
-                    "label": "4,5",
-                    "x": 10.75,
-                    "y": 2
-                },
-                {
-                    "label": "5,5",
-                    "x": 11.75,
-                    "y": 2
-                },
-                {
-                    "label": "4,6",
-                    "x": 12.75,
-                    "y": 2,
-                    "w": 2.25
-                },
-                {
-                    "label": "4,7",
-                    "x": 15,
-                    "y": 2
-                },
-                {
-                    "label": "7,0",
-                    "x": 0,
-                    "y": 3,
-                    "w": 1.25
-                },
-                {
-                    "label": "6,0",
-                    "x": 1.25,
-                    "y": 3
-                },
-                {
-                    "label": "6,1",
-                    "x": 2.25,
-                    "y": 3
-                },
-                {
-                    "label": "7,1",
-                    "x": 3.25,
-                    "y": 3
-                },
-                {
-                    "label": "6,2",
-                    "x": 4.25,
-                    "y": 3
-                },
-                {
-                    "label": "7,2",
-                    "x": 5.25,
-                    "y": 3
-                },
-                {
-                    "label": "6,3",
-                    "x": 6.25,
-                    "y": 3
-                },
-                {
-                    "label": "7,3",
-                    "x": 7.25,
-                    "y": 3
-                },
-                {
-                    "label": "6,4",
-                    "x": 8.25,
-                    "y": 3
-                },
-                {
-                    "label": "7,4",
-                    "x": 9.25,
-                    "y": 3
-                },
-                {
-                    "label": "6,5",
-                    "x": 10.25,
-                    "y": 3
-                },
-                {
-                    "label": "7,5",
-                    "x": 11.25,
-                    "y": 3
-                },
-                {
-                    "label": "6,6",
-                    "x": 12.25,
-                    "y": 3,
-                    "w": 1.75
-                },
-                {
-                    "label": "7,6",
-                    "x": 14,
-                    "y": 3
-                },
-                {
-                    "label": "6,7",
-                    "x": 15,
-                    "y": 3
-                },
-                {
-                    "label": "8,0",
-                    "x": 0,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "8,1",
-                    "x": 1.25,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "8,2",
-                    "x": 2.5,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "8,3",
-                    "x": 3.75,
-                    "y": 4,
-                    "w": 6.25
-                },
-                {
-                    "label": "8,4",
-                    "x": 10,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "8,5",
-                    "x": 11.25,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "8,6",
-                    "x": 13,
-                    "y": 4
-                },
-                {
-                    "label": "5,6",
-                    "x": 14,
-                    "y": 4
-                },
-                {
-                    "label": "7,7",
-                    "x": 15,
-                    "y": 4
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 5], "x": 2, "y": 0},
+                {"matrix": [1, 5], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [1, 4], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 2], "x": 8, "y": 0},
+                {"matrix": [1, 2], "x": 9, "y": 0},
+                {"matrix": [0, 1], "x": 10, "y": 0},
+                {"matrix": [1, 1], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [0, 7], "x": 14, "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": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 7], "x": 15, "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": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 6], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [4, 7], "x": 15, "y": 2},
+
+                {"matrix": [7, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [6, 0], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
+                {"matrix": [6, 7], "x": 15, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [8, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"matrix": [8, 6], "x": 13, "y": 4},
+                {"matrix": [5, 6], "x": 14, "y": 4},
+                {"matrix": [7, 7], "x": 15, "y": 4}
             ]
         }
     }