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

2 files changed, 78 insertions, 102 deletions

diff --git a/keyboards/cozykeys/speedo/v3/info.json b/keyboards/cozykeys/speedo/v3/info.json
index 0632dfd52d..d368fd25fc 100644
--- a/keyboards/cozykeys/speedo/v3/info.json
+++ b/keyboards/cozykeys/speedo/v3/info.json
@@ -21,72 +21,84 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        { "label": "k01", "x":  0.695, "y":     0, "r":  10 },
-        { "label": "k02", "x":  1.679, "y": 0.174, "r":  10 },
-        { "label": "k03", "x":  2.692, "y": 0.192, "r":  10 },
-        { "label": "k04", "x":  3.722, "y": 0.107, "r":  10 },
-        { "label": "k05", "x":  4.652, "y": 0.591, "r":  10 },
-        { "label": "k06", "x":  5.591, "y": 1.023, "r":  10 },
-        { "label": "k07", "x":  9.457, "y": 1.023, "r": -10 },
-        { "label": "k08", "x": 10.396, "y": 0.591, "r": -10 },
-        { "label": "k09", "x": 11.326, "y": 0.107, "r": -10 },
-        { "label": "k10", "x": 12.356, "y": 0.192, "r": -10 },
-        { "label": "k11", "x": 13.369, "y": 0.174, "r": -10 },
-        { "label": "k12", "x": 14.353, "y":     0, "r": -10 },
-        { "label": "k13", "x":  0.521, "y": 0.985, "r":  10 },
-        { "label": "k14", "x":  1.506, "y": 1.158, "r":  10 },
-        { "label": "k15", "x":  2.518, "y": 1.177, "r":  10 },
-        { "label": "k16", "x":  3.548, "y": 1.092, "r":  10 },
-        { "label": "k17", "x":  4.478, "y": 1.576, "r":  10 },
-        { "label": "k18", "x":  5.418, "y": 2.008, "r":  10 },
-        { "label": "k19", "x":  7.524, "y": 3.305, "r":   0 },
-        { "label": "k20", "x":   9.63, "y": 2.008, "r": -10 },
-        { "label": "k21", "x":  10.57, "y": 1.576, "r": -10 },
-        { "label": "k22", "x":   11.5, "y": 1.092, "r": -10 },
-        { "label": "k23", "x":  12.53, "y": 1.177, "r": -10 },
-        { "label": "k24", "x": 13.542, "y": 1.158, "r": -10 },
-        { "label": "k25", "x": 14.527, "y": 0.985, "r": -10 },
-        { "label": "k26", "x":  0.347, "y":  1.97, "r":  10 },
-        { "label": "k27", "x":  1.332, "y": 2.143, "r":  10 },
-        { "label": "k28", "x":  2.344, "y": 2.162, "r":  10 },
-        { "label": "k29", "x":  3.375, "y": 2.077, "r":  10 },
-        { "label": "k30", "x":  4.305, "y": 2.561, "r":  10 },
-        { "label": "k31", "x":  5.244, "y": 2.993, "r":  10 },
-        { "label": "k32", "x":  6.524, "y": 3.805, "r":   0 },
-        { "label": "k33", "x":  8.524, "y": 3.805, "r":   0 },
-        { "label": "k34", "x":  9.804, "y": 2.993, "r": -10 },
-        { "label": "k35", "x": 10.743, "y": 2.561, "r": -10 },
-        { "label": "k36", "x": 11.673, "y": 2.077, "r": -10 },
-        { "label": "k37", "x": 12.704, "y": 2.162, "r": -10 },
-        { "label": "k38", "x": 13.716, "y": 2.143, "r": -10 },
-        { "label": "k39", "x": 14.701, "y":  1.97, "r": -10 },
-        { "label": "k40", "x":  0.174, "y": 2.954, "r":  10 },
-        { "label": "k41", "x":  1.158, "y": 3.128, "r":  10 },
-        { "label": "k42", "x":  2.171, "y": 3.147, "r":  10 },
-        { "label": "k43", "x":  3.201, "y": 3.062, "r":  10 },
-        { "label": "k44", "x":  4.131, "y": 3.546, "r":  10 },
-        { "label": "k45", "x":   5.07, "y": 3.978, "r":  10 },
-        { "label": "k46", "x":  7.524, "y": 4.305, "r":   0 },
-        { "label": "k47", "x":  9.978, "y": 3.978, "r": -10 },
-        { "label": "k48", "x": 10.917, "y": 3.546, "r": -10 },
-        { "label": "k49", "x": 11.847, "y": 3.062, "r": -10 },
-        { "label": "k50", "x": 12.877, "y": 3.147, "r": -10 },
-        { "label": "k51", "x":  13.89, "y": 3.128, "r": -10 },
-        { "label": "k52", "x": 14.874, "y": 2.954, "r": -10 },
-        { "label": "k53", "x":      0, "y": 3.939, "r":  10 },
-        { "label": "k54", "x":  0.985, "y": 4.113, "r":  10 },
-        { "label": "k55", "x":  1.997, "y": 4.131, "r":  10 },
-        { "label": "k56", "x":  3.027, "y": 4.047, "r":  10 },
-        { "label": "k57", "x":  3.957, "y":  4.53, "r":  10 },
-        { "label": "k58", "x":  4.897, "y": 4.963, "r":  10 },
-        { "label": "k59", "x":  5.881, "y": 5.136, "r":  10 },
-        { "label": "k60", "x":  9.166, "y": 5.136, "r": -10 },
-        { "label": "k61", "x": 10.151, "y": 4.963, "r": -10 },
-        { "label": "k62", "x":  11.09, "y":  4.53, "r": -10 },
-        { "label": "k63", "x": 12.021, "y": 4.047, "r": -10 },
-        { "label": "k64", "x": 13.051, "y": 4.131, "r": -10 },
-        { "label": "k65", "x": 14.063, "y": 4.113, "r": -10 },
-        { "label": "k66", "x": 15.048, "y": 3.939, "r": -10 }
+        {"matrix": [0, 0], "x": 0.695, "y": 0, "r": 10},
+        {"matrix": [0, 1], "x": 1.679, "y": 0.174, "r": 10},
+        {"matrix": [0, 2], "x": 2.692, "y": 0.192, "r": 10},
+        {"matrix": [0, 3], "x": 3.722, "y": 0.107, "r": 10},
+        {"matrix": [0, 4], "x": 4.652, "y": 0.591, "r": 10},
+        {"matrix": [0, 5], "x": 5.591, "y": 1.023, "r": 10},
+
+        {"matrix": [0, 8], "x": 9.457, "y": 1.023, "r": -10},
+        {"matrix": [0, 9], "x": 10.396, "y": 0.591, "r": -10},
+        {"matrix": [0, 10], "x": 11.326, "y": 0.107, "r": -10},
+        {"matrix": [0, 11], "x": 12.356, "y": 0.192, "r": -10},
+        {"matrix": [0, 12], "x": 13.369, "y": 0.174, "r": -10},
+        {"matrix": [0, 13], "x": 14.353, "y": 0, "r": -10},
+
+        {"matrix": [1, 0], "x": 0.521, "y": 0.985, "r": 10},
+        {"matrix": [1, 1], "x": 1.506, "y": 1.158, "r": 10},
+        {"matrix": [1, 2], "x": 2.518, "y": 1.177, "r": 10},
+        {"matrix": [1, 3], "x": 3.548, "y": 1.092, "r": 10},
+        {"matrix": [1, 4], "x": 4.478, "y": 1.576, "r": 10},
+        {"matrix": [1, 5], "x": 5.418, "y": 2.008, "r": 10},
+
+        {"matrix": [2, 7], "x": 7.524, "y": 3.305, "r": 0},
+
+        {"matrix": [1, 8], "x": 9.63, "y": 2.008, "r": -10},
+        {"matrix": [1, 9], "x": 10.57, "y": 1.576, "r": -10},
+        {"matrix": [1, 10], "x": 11.5, "y": 1.092, "r": -10},
+        {"matrix": [1, 11], "x": 12.53, "y": 1.177, "r": -10},
+        {"matrix": [1, 12], "x": 13.542, "y": 1.158, "r": -10},
+        {"matrix": [1, 13], "x": 14.527, "y": 0.985, "r": -10},
+
+        {"matrix": [2, 0], "x": 0.347, "y": 1.97, "r": 10},
+        {"matrix": [2, 1], "x": 1.332, "y": 2.143, "r": 10},
+        {"matrix": [2, 2], "x": 2.344, "y": 2.162, "r": 10},
+        {"matrix": [2, 3], "x": 3.375, "y": 2.077, "r": 10},
+        {"matrix": [2, 4], "x": 4.305, "y": 2.561, "r": 10},
+        {"matrix": [2, 5], "x": 5.244, "y": 2.993, "r": 10},
+
+        {"matrix": [2, 6], "x": 6.524, "y": 3.805, "r": 0},
+        {"matrix": [3, 7], "x": 8.524, "y": 3.805, "r": 0},
+
+        {"matrix": [2, 8], "x": 9.804, "y": 2.993, "r": -10},
+        {"matrix": [2, 9], "x": 10.743, "y": 2.561, "r": -10},
+        {"matrix": [2, 10], "x": 11.673, "y": 2.077, "r": -10},
+        {"matrix": [2, 11], "x": 12.704, "y": 2.162, "r": -10},
+        {"matrix": [2, 12], "x": 13.716, "y": 2.143, "r": -10},
+        {"matrix": [2, 13], "x": 14.701, "y": 1.97, "r": -10},
+
+        {"matrix": [3, 0], "x": 0.174, "y": 2.954, "r": 10},
+        {"matrix": [3, 1], "x": 1.158, "y": 3.128, "r": 10},
+        {"matrix": [3, 2], "x": 2.171, "y": 3.147, "r": 10},
+        {"matrix": [3, 3], "x": 3.201, "y": 3.062, "r": 10},
+        {"matrix": [3, 4], "x": 4.131, "y": 3.546, "r": 10},
+        {"matrix": [3, 5], "x": 5.07, "y": 3.978, "r": 10},
+
+        {"matrix": [3, 6], "x": 7.524, "y": 4.305, "r": 0},
+
+        {"matrix": [3, 8], "x": 9.978, "y": 3.978, "r": -10},
+        {"matrix": [3, 9], "x": 10.917, "y": 3.546, "r": -10},
+        {"matrix": [3, 10], "x": 11.847, "y": 3.062, "r": -10},
+        {"matrix": [3, 11], "x": 12.877, "y": 3.147, "r": -10},
+        {"matrix": [3, 12], "x": 13.89, "y": 3.128, "r": -10},
+        {"matrix": [3, 13], "x": 14.874, "y": 2.954, "r": -10},
+
+        {"matrix": [4, 0], "x": 0, "y": 3.939, "r": 10},
+        {"matrix": [4, 1], "x": 0.985, "y": 4.113, "r": 10},
+        {"matrix": [4, 2], "x": 1.997, "y": 4.131, "r": 10},
+        {"matrix": [4, 3], "x": 3.027, "y": 4.047, "r": 10},
+        {"matrix": [4, 4], "x": 3.957, "y": 4.53, "r": 10},
+        {"matrix": [4, 5], "x": 4.897, "y": 4.963, "r": 10},
+        {"matrix": [4, 6], "x": 5.881, "y": 5.136, "r": 10},
+
+        {"matrix": [4, 7], "x": 9.166, "y": 5.136, "r": -10},
+        {"matrix": [4, 8], "x": 10.151, "y": 4.963, "r": -10},
+        {"matrix": [4, 9], "x": 11.09, "y": 4.53, "r": -10},
+        {"matrix": [4, 10], "x": 12.021, "y": 4.047, "r": -10},
+        {"matrix": [4, 11], "x": 13.051, "y": 4.131, "r": -10},
+        {"matrix": [4, 12], "x": 14.063, "y": 4.113, "r": -10},
+        {"matrix": [4, 13], "x": 15.048, "y": 3.939, "r": -10}
       ]
     }
   }
diff --git a/keyboards/cozykeys/speedo/v3/v3.h b/keyboards/cozykeys/speedo/v3/v3.h
deleted file mode 100644
index a8623c0f95..0000000000
--- a/keyboards/cozykeys/speedo/v3/v3.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-Copyright 2020 Paul Ewing
-
-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( \
-    k01, k02, k03, k04, k05, k06,                k07, k08, k09, k10, k11, k12, \
-    k13, k14, k15, k16, k17, k18,      k19,      k20, k21, k22, k23, k24, k25, \
-    k26, k27, k28, k29, k30, k31, k32,      k33, k34, k35, k36, k37, k38, k39, \
-    k40, k41, k42, k43, k44, k45,      k46,      k47, k48, k49, k50, k51, k52, \
-    k53, k54, k55, k56, k57, k58, k59,      k60, k61, k62, k63, k64, k65, k66 \
-) \
-{ \
-    { k01, k02, k03, k04, k05, k06, ___, ___, k07, k08, k09, k10, k11, k12 }, \
-    { k13, k14, k15, k16, k17, k18, ___, ___, k20, k21, k22, k23, k24, k25 }, \
-    { k26, k27, k28, k29, k30, k31, k32, k19, k34, k35, k36, k37, k38, k39 }, \
-    { k40, k41, k42, k43, k44, k45, k46, k33, k47, k48, k49, k50, k51, k52 }, \
-    { k53, k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66 } \
-}