Move single `LAYOUT_all`s to data driven (#20430)

2 files changed, 101 insertions, 126 deletions

diff --git a/keyboards/odelia/info.json b/keyboards/odelia/info.json
index d5deadbe53..65bcd0fa28 100644
--- a/keyboards/odelia/info.json
+++ b/keyboards/odelia/info.json
@@ -18,92 +18,107 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2.5, "y":0},
-                {"x":3.5, "y":0},
-                {"x":4.5, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.5, "y":0},
-                {"x":10.5, "y":0},
-                {"x":11.5, "y":0},
-                {"x":12.5, "y":0},
-                {"x":13.5, "y":0},
-                {"x":14.5, "y":0},
-                {"x":15.5, "y":0, "w":2},
-                {"x":17.5, "y":0},
-                {"x":19, "y":0},
-                {"x":20, "y":0},
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2.5, "y":1, "w":1.5},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":6, "y":1},
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":11, "y":1},
-                {"x":12, "y":1},
-                {"x":13, "y":1},
-                {"x":14, "y":1},
-                {"x":15, "y":1},
-                {"x":16, "y":1, "w":1.5},
-                {"x":17.5, "y":1},
-                {"x":19, "y":1},
-                {"x":20, "y":1},
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2.5, "y":2, "w":1.75},
-                {"x":4.25, "y":2},
-                {"x":5.25, "y":2},
-                {"x":6.25, "y":2},
-                {"x":7.25, "y":2},
-                {"x":8.25, "y":2},
-                {"x":9.25, "y":2},
-                {"x":10.25, "y":2},
-                {"x":11.25, "y":2},
-                {"x":12.25, "y":2},
-                {"x":13.25, "y":2},
-                {"x":14.25, "y":2},
-                {"x":15.25, "y":2, "w":2.25},
-                {"x":17.5, "y":2},
-                {"x":19, "y":2},
-                {"x":20, "y":2},
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2.5, "y":3, "w":2.25},
-                {"x":4.75, "y":3},
-                {"x":5.75, "y":3},
-                {"x":6.75, "y":3},
-                {"x":7.75, "y":3},
-                {"x":8.75, "y":3},
-                {"x":9.75, "y":3},
-                {"x":10.75, "y":3},
-                {"x":11.75, "y":3},
-                {"x":12.75, "y":3},
-                {"x":13.75, "y":3},
-                {"x":14.75, "y":3, "w":1.75},
-                {"x":16.5, "y":3},
-                {"x":17.5, "y":3},
-                {"x":19, "y":3},
-                {"x":20, "y":3},
-                {"x":0, "y":4},
-                {"x":1, "y":4},
-                {"x":2.5, "y":4, "w":1.5},
-                {"x":4, "y":4},
-                {"x":5, "y":4, "w":1.5},
-                {"x":6.5, "y":4, "w":7},
-                {"x":13.5, "y":4, "w":1.5},
-                {"x":15.5, "y":4},
-                {"x":16.5, "y":4},
-                {"x":17.5, "y":4},
-                {"x":19, "y":4},
-                {"x":20, "y":4}
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+
+                {"matrix": [1, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 1], "x": 3.5, "y": 0},
+                {"matrix": [1, 2], "x": 4.5, "y": 0},
+                {"matrix": [0, 2], "x": 5.5, "y": 0},
+                {"matrix": [1, 3], "x": 6.5, "y": 0},
+                {"matrix": [0, 3], "x": 7.5, "y": 0},
+                {"matrix": [1, 4], "x": 8.5, "y": 0},
+                {"matrix": [0, 4], "x": 9.5, "y": 0},
+                {"matrix": [1, 5], "x": 10.5, "y": 0},
+                {"matrix": [0, 5], "x": 11.5, "y": 0},
+                {"matrix": [1, 6], "x": 12.5, "y": 0},
+                {"matrix": [0, 6], "x": 13.5, "y": 0},
+                {"matrix": [1, 7], "x": 14.5, "y": 0},
+                {"matrix": [0, 7], "x": 15.5, "y": 0, "w": 2},
+                {"matrix": [1, 8], "x": 17.5, "y": 0},
+
+                {"matrix": [0, 8], "x": 19, "y": 0},
+                {"matrix": [1, 9], "x": 20, "y": 0},
+
+                {"matrix": [3, 0], "x": 0, "y": 1},
+                {"matrix": [2, 0], "x": 1, "y": 1},
+
+                {"matrix": [3, 1], "x": 2.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 1], "x": 4, "y": 1},
+                {"matrix": [3, 2], "x": 5, "y": 1},
+                {"matrix": [2, 2], "x": 6, "y": 1},
+                {"matrix": [3, 3], "x": 7, "y": 1},
+                {"matrix": [2, 3], "x": 8, "y": 1},
+                {"matrix": [3, 4], "x": 9, "y": 1},
+                {"matrix": [2, 4], "x": 10, "y": 1},
+                {"matrix": [3, 5], "x": 11, "y": 1},
+                {"matrix": [2, 5], "x": 12, "y": 1},
+                {"matrix": [3, 6], "x": 13, "y": 1},
+                {"matrix": [2, 6], "x": 14, "y": 1},
+                {"matrix": [3, 7], "x": 15, "y": 1},
+                {"matrix": [2, 7], "x": 16, "y": 1, "w": 1.5},
+                {"matrix": [3, 8], "x": 17.5, "y": 1},
+
+                {"matrix": [2, 8], "x": 19, "y": 1},
+                {"matrix": [3, 9], "x": 20, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1, "y": 2},
+
+                {"matrix": [4, 1], "x": 2.5, "y": 2, "w": 1.75},
+                {"matrix": [5, 1], "x": 4.25, "y": 2},
+                {"matrix": [4, 2], "x": 5.25, "y": 2},
+                {"matrix": [5, 2], "x": 6.25, "y": 2},
+                {"matrix": [4, 3], "x": 7.25, "y": 2},
+                {"matrix": [5, 3], "x": 8.25, "y": 2},
+                {"matrix": [4, 4], "x": 9.25, "y": 2},
+                {"matrix": [5, 4], "x": 10.25, "y": 2},
+                {"matrix": [4, 5], "x": 11.25, "y": 2},
+                {"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": [4, 7], "x": 15.25, "y": 2, "w": 2.25},
+                {"matrix": [5, 8], "x": 17.5, "y": 2},
+
+                {"matrix": [4, 8], "x": 19, "y": 2},
+                {"matrix": [5, 9], "x": 20, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [7, 0], "x": 1, "y": 3},
+
+                {"matrix": [6, 1], "x": 2.5, "y": 3, "w": 2.25},
+                {"matrix": [7, 1], "x": 4.75, "y": 3},
+                {"matrix": [6, 2], "x": 5.75, "y": 3},
+                {"matrix": [7, 2], "x": 6.75, "y": 3},
+                {"matrix": [6, 3], "x": 7.75, "y": 3},
+                {"matrix": [7, 3], "x": 8.75, "y": 3},
+                {"matrix": [6, 4], "x": 9.75, "y": 3},
+                {"matrix": [7, 4], "x": 10.75, "y": 3},
+                {"matrix": [6, 5], "x": 11.75, "y": 3},
+                {"matrix": [7, 5], "x": 12.75, "y": 3},
+                {"matrix": [6, 6], "x": 13.75, "y": 3},
+                {"matrix": [7, 6], "x": 14.75, "y": 3, "w": 1.75},
+                {"matrix": [6, 7], "x": 16.5, "y": 3},
+                {"matrix": [7, 8], "x": 17.5, "y": 3},
+
+                {"matrix": [6, 8], "x": 19, "y": 3},
+                {"matrix": [7, 9], "x": 20, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [9, 0], "x": 1, "y": 4},
+
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 1], "x": 4, "y": 4},
+                {"matrix": [8, 2], "x": 5, "y": 4, "w": 1.5},
+                {"matrix": [9, 3], "x": 6.5, "y": 4, "w": 7},
+                {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 6], "x": 15.5, "y": 4},
+                {"matrix": [8, 7], "x": 16.5, "y": 4},
+                {"matrix": [9, 8], "x": 17.5, "y": 4},
+
+                {"matrix": [8, 8], "x": 19, "y": 4},
+                {"matrix": [9, 9], "x": 20, "y": 4}
             ]
         }
     }
diff --git a/keyboards/odelia/odelia.h b/keyboards/odelia/odelia.h
deleted file mode 100644
index e8d0d2c478..0000000000
--- a/keyboards/odelia/odelia.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2020 kb-elmo<mail@elmo.space>
- *
- * 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_all(\
-   k10, k00,   k11, k01, k12, k02, k13, k03, k14, k04, k15, k05, k16, k06, k17, k07, k18,   k08, k19, \
-   k30, k20,   k31, k21, k32, k22, k33, k23, k34, k24, k35, k25, k36, k26, k37, k27, k38,   k28, k39, \
-   k40, k50,   k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56,    k47,   k58,   k48, k59, \
-   k60, k70,      k61,   k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, k67, k78,   k68, k79, \
-   k80, k90,   k81, k91, k82,                k93,                     k86, k96, k87, k98,   k88, k99  \
-) { \
-   {k00, k01, k02, k03, k04, k05, k06, k07, k08, ___}, \
-   {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19}, \
-   {k20, k21, k22, k23, k24, k25, k26, k27, k28, ___}, \
-   {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39}, \
-   {k40, k41, k42, k43, k44, k45, k46, k47, k48, ___}, \
-   {k50, k51, k52, k53, k54, k55, k56, ___, k58, k59}, \
-   {k60, k61, k62, k63, k64, k65, k66, k67, k68, ___}, \
-   {k70, k71, k72, k73, k74, k75, k76, ___, k78, k79}, \
-   {k80, k81, k82, ___, ___, ___, k86, k87, k88, ___}, \
-   {k90, k91, ___, k93, ___, ___, k96, ___, k98, k99}  \
-}