Move `default` layouts to data driven (#20349)

2 files changed, 178 insertions, 225 deletions

diff --git a/keyboards/bacca70/bacca70.h b/keyboards/bacca70/bacca70.h
deleted file mode 100644
index 0583fd8043..0000000000
--- a/keyboards/bacca70/bacca70.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright 2022 keebnewb
- *
- * 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 ___ KC_NO
-
-#define LAYOUT_default( \
-    k00, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k17, \
-    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, \
-    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k67,  \
-    k80, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k96, k87,  \
-    ka0, ka1, ka3, kb5, ka7 \
-){ \
-    { k00, k01, k02, k03, k04, k05, k06, ___ }, \
-    { ___, k11, k12, k13, k14, k15, k16, k17 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27 }, \
-    { k30, k31, k32, k33, k34, k35, k36, ___ }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47 }, \
-    { k50, k51, k52, k53, k54, k55, ___, ___ }, \
-    { k60, k61, k62, k63, k64, k65, ___, k67 }, \
-    { k70, k71, k72, k73, k74, k75, ___, ___ }, \
-    { k80, k81, k82, k83, k84, k85, ___, k87 }, \
-    { ___, k91, k92, k93, k94, k95, k96, ___ }, \
-    { ka0, ka1, ___, ka3, ___, ___, ___, ka7 }, \
-    { ___, ___, ___, ___, ___, kb5, ___, ___ }  \
-}
-
-#define LAYOUT_debaccabean( \
-    k00, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k17, \
-    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, k56, k47,  \
-    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, k67,  \
-    k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86, k96, k87,  \
-    ka0, ka1, ka2, ka3, ka4, kb5, ka7 \
-){ \
-    { k00, k01, k02, k03, k04, k05, k06, ___ }, \
-    { ___, k11, k12, k13, k14, k15, k16, k17 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27 }, \
-    { k30, k31, k32, k33, k34, k35, k36, ___ }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47 }, \
-    { k50, k51, k52, k53, k54, k55, k56, ___ }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67 }, \
-    { k70, k71, k72, k73, k74, k75, k76, ___ }, \
-    { k80, k81, k82, k83, k84, k85, k86, k87 }, \
-    { k90, k91, k92, k93, k94, k95, k96, ___ }, \
-    { ka0, ka1, ka2, ka3, ka4, ___, ___, ka7 }, \
-    { ___, ___, ___, ___, ___, kb5, ___, ___ }  \
-}
diff --git a/keyboards/bacca70/info.json b/keyboards/bacca70/info.json
index 737ea0b4fd..143c19d987 100644
--- a/keyboards/bacca70/info.json
+++ b/keyboards/bacca70/info.json
@@ -17,167 +17,185 @@
     "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_default": {
-          "layout": [
-            {"x":0, "y":0},
-            {"x":1.25, "y":0},
-            {"x":2.25, "y":0},
-            {"x":3.25, "y":0},
-            {"x":4.25, "y":0},
-            {"x":5.5, "y":0},
-            {"x":6.5, "y":0},
-            {"x":7.5, "y":0},
-            {"x":8.5, "y":0},
-            {"x":9.75, "y":0},
-            {"x":10.75, "y":0},
-            {"x":11.75, "y":0},
-            {"x":12.75, "y":0},
-            {"x":14, "y":0},
-            {"x":0, "y":1.25},
-            {"x":1, "y":1.25},
-            {"x":2, "y":1.25},
-            {"x":3, "y":1.25},
-            {"x":4, "y":1.25},
-            {"x":5, "y":1.25},
-            {"x":6, "y":1.25},
-            {"x":7, "y":1.25},
-            {"x":8, "y":1.25},
-            {"x":9, "y":1.25},
-            {"x":10, "y":1.25},
-            {"x":11, "y":1.25},
-            {"x":12, "y":1.25},
-            {"x":13, "y":1.25},
-            {"x":14, "y":1.25},
-            {"x":0, "y":2.25, "w":1.5},
-            {"x":1.5, "y":2.25},
-            {"x":2.5, "y":2.25},
-            {"x":3.5, "y":2.25},
-            {"x":4.5, "y":2.25},
-            {"x":5.5, "y":2.25},
-            {"x":6.5, "y":2.25},
-            {"x":7.5, "y":2.25},
-            {"x":8.5, "y":2.25},
-            {"x":9.5, "y":2.25},
-            {"x":10.5, "y":2.25},
-            {"x":11.5, "y":2.25},
-            {"x":12.5, "y":2.25},
-            {"x":13.5, "y":2.25, "w":1.5},
-            {"x":0, "y":3.25, "w":1.75},
-            {"x":1.75, "y":3.25},
-            {"x":2.75, "y":3.25},
-            {"x":3.75, "y":3.25},
-            {"x":4.75, "y":3.25},
-            {"x":5.75, "y":3.25},
-            {"x":6.75, "y":3.25},
-            {"x":7.75, "y":3.25},
-            {"x":8.75, "y":3.25},
-            {"x":9.75, "y":3.25},
-            {"x":10.75, "y":3.25},
-            {"x":11.75, "y":3.25},
-            {"x":12.75, "y":3.25, "w":2.25},
-            {"x":0, "y":4.25, "w":2.25},
-            {"x":2.25, "y":4.25},
-            {"x":3.25, "y":4.25},
-            {"x":4.25, "y":4.25},
-            {"x":5.25, "y":4.25},
-            {"x":6.25, "y":4.25},
-            {"x":7.25, "y":4.25},
-            {"x":8.25, "y":4.25},
-            {"x":9.25, "y":4.25},
-            {"x":10.25, "y":4.25},
-            {"x":11.25, "y":4.25},
-            {"x":12.25, "y":4.25, "w":1.75},
-            {"x":14, "y":4.25},
-            {"x":0, "y":5.25, "w":1.5},
-            {"x":2.5, "y":5.25, "w":1.5},
-            {"x":4, "y":5.25, "w":7},
-            {"x":11, "y":5.25, "w":1.5},
-            {"x":13.5, "y":5.25, "w":1.5}
-          ]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [1, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [1, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 3], "x": 5.5, "y": 0},
+                {"matrix": [1, 3], "x": 6.5, "y": 0},
+                {"matrix": [0, 4], "x": 7.5, "y": 0},
+                {"matrix": [1, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 9.75, "y": 0},
+                {"matrix": [1, 5], "x": 10.75, "y": 0},
+                {"matrix": [0, 6], "x": 11.75, "y": 0},
+                {"matrix": [1, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [1, 7], "x": 14, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25},
+                {"matrix": [2, 7], "x": 14, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [4, 7], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 7], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [8, 7], "x": 14, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 3], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [11, 5], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 7], "x": 13.5, "y": 5.25, "w": 1.5}
+            ]
         },
         "LAYOUT_debaccabean": {
-          "layout": [
-            {"x":0, "y":0},
-            {"x":1.25, "y":0},
-            {"x":2.25, "y":0},
-            {"x":3.25, "y":0},
-            {"x":4.25, "y":0},
-            {"x":5.5, "y":0},
-            {"x":6.5, "y":0},
-            {"x":7.5, "y":0},
-            {"x":8.5, "y":0},
-            {"x":9.75, "y":0},
-            {"x":10.75, "y":0},
-            {"x":11.75, "y":0},
-            {"x":12.75, "y":0},
-            {"x":14, "y":0},
-            {"x":0, "y":1.25},
-            {"x":1, "y":1.25},
-            {"x":2, "y":1.25},
-            {"x":3, "y":1.25},
-            {"x":4, "y":1.25},
-            {"x":5, "y":1.25},
-            {"x":6, "y":1.25},
-            {"x":7, "y":1.25},
-            {"x":8, "y":1.25},
-            {"x":9, "y":1.25},
-            {"x":10, "y":1.25},
-            {"x":11, "y":1.25},
-            {"x":12, "y":1.25},
-            {"x":13, "y":1.25},
-            {"x":14, "y":1.25},
-            {"x":0, "y":2.25},
-            {"x":1, "y":2.25},
-            {"x":2, "y":2.25},
-            {"x":3, "y":2.25},
-            {"x":4, "y":2.25},
-            {"x":5, "y":2.25},
-            {"x":6, "y":2.25},
-            {"x":7, "y":2.25},
-            {"x":8, "y":2.25},
-            {"x":9, "y":2.25},
-            {"x":10, "y":2.25},
-            {"x":11, "y":2.25},
-            {"x":12, "y":2.25},
-            {"x":13, "y":2.25},
-            {"x":14, "y":2.25},
-            {"x":0, "y":3.25},
-            {"x":1, "y":3.25},
-            {"x":2, "y":3.25},
-            {"x":3, "y":3.25},
-            {"x":4, "y":3.25},
-            {"x":5, "y":3.25},
-            {"x":6, "y":3.25},
-            {"x":7, "y":3.25},
-            {"x":8, "y":3.25},
-            {"x":9, "y":3.25},
-            {"x":10, "y":3.25},
-            {"x":11, "y":3.25},
-            {"x":12, "y":3.25},
-            {"x":13, "y":3.25},
-            {"x":14, "y":3.25},
-            {"x":0, "y":4.25},
-            {"x":1, "y":4.25},
-            {"x":2, "y":4.25},
-            {"x":3, "y":4.25},
-            {"x":4, "y":4.25},
-            {"x":5, "y":4.25},
-            {"x":6, "y":4.25},
-            {"x":7, "y":4.25},
-            {"x":8, "y":4.25},
-            {"x":9, "y":4.25},
-            {"x":10, "y":4.25},
-            {"x":11, "y":4.25},
-            {"x":12, "y":4.25},
-            {"x":13, "y":4.25},
-            {"x":14, "y":4.25},
-            {"x":0, "y":5.25, "w":1.5},
-            {"x":2.5, "y":5.25, "w":1.5},
-            {"x":4, "y":5.25, "w":3},
-            {"x":7, "y":5.25},
-            {"x":8, "y":5.25, "w":3},
-            {"x":11, "y":5.25, "w":1.5},
-            {"x":13.5, "y":5.25, "w":1.5}
-          ]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [1, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [1, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 3], "x": 5.5, "y": 0},
+                {"matrix": [1, 3], "x": 6.5, "y": 0},
+                {"matrix": [0, 4], "x": 7.5, "y": 0},
+                {"matrix": [1, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 9.75, "y": 0},
+                {"matrix": [1, 5], "x": 10.75, "y": 0},
+                {"matrix": [0, 6], "x": 11.75, "y": 0},
+                {"matrix": [1, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [1, 7], "x": 14, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25},
+                {"matrix": [2, 7], "x": 14, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25},
+                {"matrix": [5, 0], "x": 1, "y": 2.25},
+                {"matrix": [4, 1], "x": 2, "y": 2.25},
+                {"matrix": [5, 1], "x": 3, "y": 2.25},
+                {"matrix": [4, 2], "x": 4, "y": 2.25},
+                {"matrix": [5, 2], "x": 5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6, "y": 2.25},
+                {"matrix": [5, 3], "x": 7, "y": 2.25},
+                {"matrix": [4, 4], "x": 8, "y": 2.25},
+                {"matrix": [5, 4], "x": 9, "y": 2.25},
+                {"matrix": [4, 5], "x": 10, "y": 2.25},
+                {"matrix": [5, 5], "x": 11, "y": 2.25},
+                {"matrix": [4, 6], "x": 12, "y": 2.25},
+                {"matrix": [5, 6], "x": 13, "y": 2.25},
+                {"matrix": [4, 7], "x": 14, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25},
+                {"matrix": [7, 0], "x": 1, "y": 3.25},
+                {"matrix": [6, 1], "x": 2, "y": 3.25},
+                {"matrix": [7, 1], "x": 3, "y": 3.25},
+                {"matrix": [6, 2], "x": 4, "y": 3.25},
+                {"matrix": [7, 2], "x": 5, "y": 3.25},
+                {"matrix": [6, 3], "x": 6, "y": 3.25},
+                {"matrix": [7, 3], "x": 7, "y": 3.25},
+                {"matrix": [6, 4], "x": 8, "y": 3.25},
+                {"matrix": [7, 4], "x": 9, "y": 3.25},
+                {"matrix": [6, 5], "x": 10, "y": 3.25},
+                {"matrix": [7, 5], "x": 11, "y": 3.25},
+                {"matrix": [6, 6], "x": 12, "y": 3.25},
+                {"matrix": [7, 6], "x": 13, "y": 3.25},
+                {"matrix": [6, 7], "x": 14, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25},
+                {"matrix": [9, 0], "x": 1, "y": 4.25},
+                {"matrix": [8, 1], "x": 2, "y": 4.25},
+                {"matrix": [9, 1], "x": 3, "y": 4.25},
+                {"matrix": [8, 2], "x": 4, "y": 4.25},
+                {"matrix": [9, 2], "x": 5, "y": 4.25},
+                {"matrix": [8, 3], "x": 6, "y": 4.25},
+                {"matrix": [9, 3], "x": 7, "y": 4.25},
+                {"matrix": [8, 4], "x": 8, "y": 4.25},
+                {"matrix": [9, 4], "x": 9, "y": 4.25},
+                {"matrix": [8, 5], "x": 10, "y": 4.25},
+                {"matrix": [9, 5], "x": 11, "y": 4.25},
+                {"matrix": [8, 6], "x": 12, "y": 4.25},
+                {"matrix": [9, 6], "x": 13, "y": 4.25},
+                {"matrix": [8, 7], "x": 14, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 2], "x": 4, "y": 5.25, "w": 3},
+                {"matrix": [10, 3], "x": 7, "y": 5.25},
+                {"matrix": [10, 4], "x": 8, "y": 5.25, "w": 3},
+                {"matrix": [11, 5], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 7], "x": 13.5, "y": 5.25, "w": 1.5}
+            ]
         }
-      }
+    }
 }