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

2 files changed, 139 insertions, 169 deletions

diff --git a/keyboards/handwired/swiftrax/the_galleon/info.json b/keyboards/handwired/swiftrax/the_galleon/info.json
index 751ec9eb00..c7e12db489 100644
--- a/keyboards/handwired/swiftrax/the_galleon/info.json
+++ b/keyboards/handwired/swiftrax/the_galleon/info.json
@@ -18,130 +18,145 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"0,0", "x":0, "y":0},
-                {"label":"1,0", "x":1.25, "y":0},
-                {"label":"0,1", "x":2.25, "y":0},
-                {"label":"1,1", "x":3.25, "y":0},
-                {"label":"0,2", "x":4.25, "y":0},
-                {"label":"1,2", "x":5.5, "y":0},
-                {"label":"0,3", "x":6.5, "y":0},
-                {"label":"1,3", "x":7.5, "y":0},
-                {"label":"0,4", "x":8.5, "y":0},
-                {"label":"1,4", "x":9.75, "y":0},
-                {"label":"0,5", "x":10.75, "y":0},
-                {"label":"1,5", "x":11.75, "y":0},
-                {"label":"0,6", "x":12.75, "y":0},
-                {"label":"0,7", "x":15.5, "y":0},
-                {"label":"1,7", "x":16.5, "y":0},
-                {"label":"0,8", "x":17.5, "y":0},
-                {"label":"1,8", "x":18.5, "y":0},
-
-                {"label":"2,0", "x":0, "y":1},
-                {"label":"3,0", "x":1.25, "y":1},
-                {"label":"2,1", "x":2.25, "y":1},
-                {"label":"3,1", "x":3.25, "y":1},
-                {"label":"2,2", "x":4.25, "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.75, "y":1},
-                {"label":"2,5", "x":10.75, "y":1},
-                {"label":"3,5", "x":11.75, "y":1},
-                {"label":"2,6", "x":12.75, "y":1},
-                {"label":"2,7", "x":15.5, "y":1},
-                {"label":"3,7", "x":16.5, "y":1},
-                {"label":"2,8", "x":17.5, "y":1},
-                {"label":"3,8", "x":18.5, "y":1},
-
-                {"label":"4,0", "x":0, "y":2.25},
-                {"label":"5,0", "x":1, "y":2.25},
-                {"label":"4,1", "x":2, "y":2.25},
-                {"label":"5,1", "x":3, "y":2.25},
-                {"label":"4,2", "x":4, "y":2.25},
-                {"label":"5,2", "x":5, "y":2.25},
-                {"label":"4,3", "x":6, "y":2.25},
-                {"label":"5,3", "x":7, "y":2.25},
-                {"label":"4,4", "x":8, "y":2.25},
-                {"label":"5,4", "x":9, "y":2.25},
-                {"label":"4,5", "x":10, "y":2.25},
-                {"label":"5,5", "x":11, "y":2.25},
-                {"label":"4,6", "x":12, "y":2.25},
-                {"label":"5,6", "x":13, "y":2.25},
-                {"label":"9,6", "x":14, "y":2.25},
-                {"label":"4,7", "x":15.5, "y":2.25},
-                {"label":"5,7", "x":16.5, "y":2.25},
-                {"label":"4,8", "x":17.5, "y":2.25},
-                {"label":"5,8", "x":18.5, "y":2.25},
-
-                {"label":"6,0", "x":0, "y":3.25, "w":1.5},
-                {"label":"7,0", "x":1.5, "y":3.25},
-                {"label":"6,1", "x":2.5, "y":3.25},
-                {"label":"7,1", "x":3.5, "y":3.25},
-                {"label":"6,2", "x":4.5, "y":3.25},
-                {"label":"7,2", "x":5.5, "y":3.25},
-                {"label":"6,3", "x":6.5, "y":3.25},
-                {"label":"7,3", "x":7.5, "y":3.25},
-                {"label":"6,4", "x":8.5, "y":3.25},
-                {"label":"7,4", "x":9.5, "y":3.25},
-                {"label":"6,5", "x":10.5, "y":3.25},
-                {"label":"7,5", "x":11.5, "y":3.25},
-                {"label":"6,6", "x":12.5, "y":3.25},
-                {"label":"7,6", "x":13.5, "y":3.25, "w":1.5},
-                {"label":"6,7", "x":15.5, "y":3.25},
-                {"label":"7,7", "x":16.5, "y":3.25},
-                {"label":"6,8", "x":17.5, "y":3.25},
-                {"label":"7,8", "x":18.5, "y":3.25},
-
-                {"label":"8,0", "x":0, "y":4.25, "w":1.75},
-                {"label":"9,0", "x":1.75, "y":4.25},
-                {"label":"8,1", "x":2.75, "y":4.25},
-                {"label":"9,1", "x":3.75, "y":4.25},
-                {"label":"8,2", "x":4.75, "y":4.25},
-                {"label":"9,2", "x":5.75, "y":4.25},
-                {"label":"8,3", "x":6.75, "y":4.25},
-                {"label":"9,3", "x":7.75, "y":4.25},
-                {"label":"8,4", "x":8.75, "y":4.25},
-                {"label":"9,4", "x":9.75, "y":4.25},
-                {"label":"8,5", "x":10.75, "y":4.25},
-                {"label":"9,5", "x":11.75, "y":4.25},
-                {"label":"8,6", "x":12.75, "y":4.25, "w":2.25},
-                {"label":"8,7", "x":15.5, "y":4.25},
-                {"label":"9,7", "x":16.5, "y":4.25},
-                {"label":"8,8", "x":17.5, "y":4.25},
-                {"label":"9,8", "x":18.5, "y":4.25},
-
-                {"label":"10,0", "x":0, "y":5.25, "w":2.25},
-                {"label":"11,0", "x":2.25, "y":5.25},
-                {"label":"10,1", "x":3.25, "y":5.25},
-                {"label":"11,1", "x":4.25, "y":5.25},
-                {"label":"10,2", "x":5.25, "y":5.25},
-                {"label":"11,2", "x":6.25, "y":5.25},
-                {"label":"10,3", "x":7.25, "y":5.25},
-                {"label":"11,3", "x":8.25, "y":5.25},
-                {"label":"10,4", "x":9.25, "y":5.25},
-                {"label":"11,4", "x":10.25, "y":5.25},
-                {"label":"10,5", "x":11.25, "y":5.25},
-                {"label":"10,6", "x":12.25, "y":5.25, "w":1.75},
-                {"label":"11,6", "x":14.25, "y":5.5},
-                {"label":"10,7", "x":15.5, "y":5.25},
-                {"label":"11,7", "x":16.5, "y":5.25},
-                {"label":"10,8", "x":17.5, "y":5.25},
-                {"label":"11,8", "x":18.5, "y":5.25},
-
-                {"label":"12,0", "x":0, "y":6.25, "w":1.25},
-                {"label":"13,0", "x":1.25, "y":6.25, "w":1.25},
-                {"label":"12,1", "x":2.5, "y":6.25, "w":1.25},
-                {"label":"12,2", "x":3.75, "y":6.25, "w":6.25},
-                {"label":"12,4", "x":10, "y":6.25},
-                {"label":"13,4", "x":11, "y":6.25},
-                {"label":"12,5", "x":12, "y":6.25},
-                {"label":"12,6", "x":13.25, "y":6.5},
-                {"label":"13,6", "x":14.25, "y":6.5},
-                {"label":"12,7", "x":15.25, "y":6.5},
-                {"label":"13,7", "x":16.5, "y":6.25},
-                {"label":"12,8", "x":17.5, "y":6.25},
-                {"label":"13,8", "x":18.5, "y":6.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [1, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [1, 4], "x": 9.75, "y": 0},
+                {"matrix": [0, 5], "x": 10.75, "y": 0},
+                {"matrix": [1, 5], "x": 11.75, "y": 0},
+                {"matrix": [0, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.5, "y": 0},
+                {"matrix": [1, 7], "x": 16.5, "y": 0},
+                {"matrix": [0, 8], "x": 17.5, "y": 0},
+                {"matrix": [1, 8], "x": 18.5, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+
+                {"matrix": [3, 0], "x": 1.25, "y": 1},
+                {"matrix": [2, 1], "x": 2.25, "y": 1},
+                {"matrix": [3, 1], "x": 3.25, "y": 1},
+                {"matrix": [2, 2], "x": 4.25, "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.75, "y": 1},
+                {"matrix": [2, 5], "x": 10.75, "y": 1},
+                {"matrix": [3, 5], "x": 11.75, "y": 1},
+                {"matrix": [2, 6], "x": 12.75, "y": 1},
+
+                {"matrix": [2, 7], "x": 15.5, "y": 1},
+                {"matrix": [3, 7], "x": 16.5, "y": 1},
+                {"matrix": [2, 8], "x": 17.5, "y": 1},
+                {"matrix": [3, 8], "x": 18.5, "y": 1},
+
+                {"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": [9, 6], "x": 14, "y": 2.25},
+
+                {"matrix": [4, 7], "x": 15.5, "y": 2.25},
+                {"matrix": [5, 7], "x": 16.5, "y": 2.25},
+                {"matrix": [4, 8], "x": 17.5, "y": 2.25},
+                {"matrix": [5, 8], "x": 18.5, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.5},
+                {"matrix": [7, 0], "x": 1.5, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.5, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.5, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.5, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.5, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.5, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.5, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.5, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.5, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.5, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.5, "y": 3.25},
+                {"matrix": [6, 6], "x": 12.5, "y": 3.25},
+                {"matrix": [7, 6], "x": 13.5, "y": 3.25, "w": 1.5},
+
+                {"matrix": [6, 7], "x": 15.5, "y": 3.25},
+                {"matrix": [7, 7], "x": 16.5, "y": 3.25},
+                {"matrix": [6, 8], "x": 17.5, "y": 3.25},
+                {"matrix": [7, 8], "x": 18.5, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 0], "x": 1.75, "y": 4.25},
+                {"matrix": [8, 1], "x": 2.75, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.75, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.75, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.75, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.75, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.75, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.75, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.75, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.75, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.75, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.75, "y": 4.25, "w": 2.25},
+
+                {"matrix": [8, 7], "x": 15.5, "y": 4.25},
+                {"matrix": [9, 7], "x": 16.5, "y": 4.25},
+                {"matrix": [8, 8], "x": 17.5, "y": 4.25},
+                {"matrix": [9, 8], "x": 18.5, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 2.25},
+                {"matrix": [11, 0], "x": 2.25, "y": 5.25},
+                {"matrix": [10, 1], "x": 3.25, "y": 5.25},
+                {"matrix": [11, 1], "x": 4.25, "y": 5.25},
+                {"matrix": [10, 2], "x": 5.25, "y": 5.25},
+                {"matrix": [11, 2], "x": 6.25, "y": 5.25},
+                {"matrix": [10, 3], "x": 7.25, "y": 5.25},
+                {"matrix": [11, 3], "x": 8.25, "y": 5.25},
+                {"matrix": [10, 4], "x": 9.25, "y": 5.25},
+                {"matrix": [11, 4], "x": 10.25, "y": 5.25},
+                {"matrix": [10, 5], "x": 11.25, "y": 5.25},
+                {"matrix": [10, 6], "x": 12.25, "y": 5.25, "w": 1.75},
+
+                {"matrix": [11, 6], "x": 14.25, "y": 5.5},
+
+                {"matrix": [10, 7], "x": 15.5, "y": 5.25},
+                {"matrix": [11, 7], "x": 16.5, "y": 5.25},
+                {"matrix": [10, 8], "x": 17.5, "y": 5.25},
+                {"matrix": [11, 8], "x": 18.5, "y": 5.25},
+
+                {"matrix": [12, 0], "x": 0, "y": 6.25, "w": 1.25},
+                {"matrix": [13, 0], "x": 1.25, "y": 6.25, "w": 1.25},
+                {"matrix": [12, 1], "x": 2.5, "y": 6.25, "w": 1.25},
+                {"matrix": [12, 2], "x": 3.75, "y": 6.25, "w": 6.25},
+                {"matrix": [12, 4], "x": 10, "y": 6.25},
+                {"matrix": [13, 4], "x": 11, "y": 6.25},
+                {"matrix": [12, 5], "x": 12, "y": 6.25},
+
+                {"matrix": [12, 6], "x": 13.25, "y": 6.5},
+                {"matrix": [13, 6], "x": 14.25, "y": 6.5},
+                {"matrix": [12, 7], "x": 15.25, "y": 6.5},
+
+                {"matrix": [13, 7], "x": 16.5, "y": 6.25},
+                {"matrix": [12, 8], "x": 17.5, "y": 6.25},
+                {"matrix": [13, 8], "x": 18.5, "y": 6.25}
             ]
         }
     }
diff --git a/keyboards/handwired/swiftrax/the_galleon/the_galleon.h b/keyboards/handwired/swiftrax/the_galleon/the_galleon.h
deleted file mode 100644
index b3e2eba9fd..0000000000
--- a/keyboards/handwired/swiftrax/the_galleon/the_galleon.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright 2021 swiftrax
- *
- * 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 XXX KC_NO
-
-#define LAYOUT_all( \
-    k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06,              k07, k17, k08, k18, \
-    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26,              k27, k37, k28, k38, \
-    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k96,    k47, k57, k48, k58, \
-    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76,         k67, k77, k68, k78, \
-    k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86,              k87, k97, k88, k98, \
-    ka0, kb0, ka1, kb1, ka2, kb2, ka3, kb3, ka4, kb4, ka5, ka6,            kb6,   ka7, kb7, ka8, kb8, \
-    kc0, kd0, kc1,           kc2,                kc4, kd4, kc5,       kc6, kd6, kc7,   kd7, kc8, kd8  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
-    { k10, k11, k12, k13, k14, k15, XXX, k17, k18 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
-    { k30, k31, k32, k33, k34, k35, XXX, k37, k38 }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68 }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77, k78 }, \
-    { k80, k81, k82, k83, k84, k85, k86, k87, k88 }, \
-    { k90, k91, k92, k93, k94, k95, k96, k97, k98 }, \
-    { ka0, ka1, ka2, ka3, ka4, ka5, ka6, ka7, ka8 }, \
-    { kb0, kb1, kb2, kb3, kb4, XXX, kb6, kb7, kb8 }, \
-    { kc0, kc1, kc2, XXX, kc4, kc5, kc6, kc7, kc8 }, \
-    { kd0, XXX, XXX, XXX, kd4, XXX, kd6, kd7, kd8 }  \
-}