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

2 files changed, 118 insertions, 136 deletions

diff --git a/keyboards/kbdfans/odin/v2/info.json b/keyboards/kbdfans/odin/v2/info.json
index 4fc091358b..ec7ef06d10 100644
--- a/keyboards/kbdfans/odin/v2/info.json
+++ b/keyboards/kbdfans/odin/v2/info.json
@@ -26,106 +26,124 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 2, "y": 0 },
-                { "label": "F2", "x": 3, "y": 0 },
-                { "label": "F3", "x": 4, "y": 0 },
-                { "label": "F4", "x": 5, "y": 0 },
-                { "label": "F5", "x": 6.5, "y": 0 },
-                { "label": "F6", "x": 7.5, "y": 0 },
-                { "label": "F7", "x": 8.5, "y": 0 },
-                { "label": "F8", "x": 9.5, "y": 0 },
-                { "label": "F9", "x": 11, "y": 0 },
-                { "label": "F10", "x": 12, "y": 0 },
-                { "label": "F11", "x": 13, "y": 0 },
-                { "label": "F12", "x": 14, "y": 0 },
-                { "label": "Scroll Lock", "x": 15.25, "y": 0 },
-                { "x": 16.5, "y": 0 },
-                { "x": 17.5, "y": 0 },
-                { "x": 18.5, "y": 0 },
-                { "x": 19.5, "y": 0 },
-                { "label": "~", "x": 0, "y": 1.5 },
-                { "label": "!", "x": 1, "y": 1.5 },
-                { "label": "@", "x": 2, "y": 1.5 },
-                { "label": "#", "x": 3, "y": 1.5 },
-                { "label": "$", "x": 4, "y": 1.5 },
-                { "label": "%", "x": 5, "y": 1.5 },
-                { "label": "^", "x": 6, "y": 1.5 },
-                { "label": "&", "x": 7, "y": 1.5 },
-                { "label": "*", "x": 8, "y": 1.5 },
-                { "label": "(", "x": 9, "y": 1.5 },
-                { "label": ")", "x": 10, "y": 1.5 },
-                { "label": "_", "x": 11, "y": 1.5 },
-                { "label": "+", "x": 12, "y": 1.5 },
-                { "label": "Backspace", "w": 2, "x": 13, "y": 1.5 },
-                { "label": "Insert", "x": 15.25, "y": 1.5 },
-                { "label": "Num Lock", "x": 16.5, "y": 1.5 },
-                { "label": "/", "x": 17.5, "y": 1.5 },
-                { "label": "*", "x": 18.5, "y": 1.5 },
-                { "label": "-", "x": 19.5, "y": 1.5 },
-                { "label": "Tab", "w": 1.5, "x": 0, "y": 2.5 },
-                { "label": "Q", "x": 1.5, "y": 2.5 },
-                { "label": "W", "x": 2.5, "y": 2.5 },
-                { "label": "E", "x": 3.5, "y": 2.5 },
-                { "label": "R", "x": 4.5, "y": 2.5 },
-                { "label": "T", "x": 5.5, "y": 2.5 },
-                { "label": "Y", "x": 6.5, "y": 2.5 },
-                { "label": "U", "x": 7.5, "y": 2.5 },
-                { "label": "I", "x": 8.5, "y": 2.5 },
-                { "label": "O", "x": 9.5, "y": 2.5 },
-                { "label": "P", "x": 10.5, "y": 2.5 },
-                { "label": "{", "x": 11.5, "y": 2.5 },
-                { "label": "}", "x": 12.5, "y": 2.5 },
-                { "label": "|", "w": 1.5, "x": 13.5, "y": 2.5 },
-                { "label": "Delete", "x": 15.25, "y": 2.5 },
-                { "label": "7", "x": 16.5, "y": 2.5 },
-                { "label": "8", "x": 17.5, "y": 2.5 },
-                { "label": "9", "x": 18.5, "y": 2.5 },
-                { "h": 2, "label": "+", "x": 19.5, "y": 2.5 },
-                { "label": "Caps Lock", "w": 1.75, "x": 0, "y": 3.5 },
-                { "label": "A", "x": 1.75, "y": 3.5 },
-                { "label": "S", "x": 2.75, "y": 3.5 },
-                { "label": "D", "x": 3.75, "y": 3.5 },
-                { "label": "F", "x": 4.75, "y": 3.5 },
-                { "label": "G", "x": 5.75, "y": 3.5 },
-                { "label": "H", "x": 6.75, "y": 3.5 },
-                { "label": "J", "x": 7.75, "y": 3.5 },
-                { "label": "K", "x": 8.75, "y": 3.5 },
-                { "label": "L", "x": 9.75, "y": 3.5 },
-                { "label": ":", "x": 10.75, "y": 3.5 },
-                { "label": "\"", "x": 11.75, "y": 3.5 },
-                { "label": "Enter", "w": 2.25, "x": 12.75, "y": 3.5 },
-                { "label": "4", "x": 16.5, "y": 3.5 },
-                { "label": "5", "x": 17.5, "y": 3.5 },
-                { "label": "6", "x": 18.5, "y": 3.5 },
-                { "label": "Shift", "w": 2.25, "x": 0, "y": 4.5 },
-                { "label": "Z", "x": 2.25, "y": 4.5 },
-                { "label": "X", "x": 3.25, "y": 4.5 },
-                { "label": "C", "x": 4.25, "y": 4.5 },
-                { "label": "V", "x": 5.25, "y": 4.5 },
-                { "label": "B", "x": 6.25, "y": 4.5 },
-                { "label": "N", "x": 7.25, "y": 4.5 },
-                { "label": "M", "x": 8.25, "y": 4.5 },
-                { "label": "<", "x": 9.25, "y": 4.5 },
-                { "label": ">", "x": 10.25, "y": 4.5 },
-                { "label": "?", "x": 11.25, "y": 4.5 },
-                { "label": "Shift", "w": 2.75, "x": 12.25, "y": 4.5 },
-                { "label": "\u2191", "x": 15.25, "y": 4.75 },
-                { "label": "1", "x": 16.5, "y": 4.5 },
-                { "label": "2", "x": 17.5, "y": 4.5 },
-                { "label": "3", "x": 18.5, "y": 4.5 },
-                { "h": 2, "label": "Enter", "x": 19.5, "y": 4.5 },
-                { "label": "Ctrl", "w": 1.25, "x": 0, "y": 5.5 },
-                { "label": "Win", "w": 1.25, "x": 1.25, "y": 5.5 },
-                { "label": "Alt", "w": 1.25, "x": 2.5, "y": 5.5 },
-                { "w": 7, "x": 3.75, "y": 5.5 },
-                { "label": "Alt", "w": 1.5, "x": 10.75, "y": 5.5 },
-                { "label": "Win", "w": 1.5, "x": 12.25, "y": 5.5 },
-                { "label": "\u2190", "x": 14.25, "y": 5.75 },
-                { "label": "\u2193", "x": 15.25, "y": 5.75 },
-                { "label": "\u2192", "x": 16.25, "y": 5.75 },
-                { "label": "0", "x": 17.5, "y": 5.5 },
-                { "label": ".", "x": 18.5, "y": 5.5 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+
+                {"matrix": [0, 16], "x": 16.5, "y": 0},
+                {"matrix": [0, 17], "x": 17.5, "y": 0},
+                {"matrix": [0, 18], "x": 18.5, "y": 0},
+                {"matrix": [0, 19], "x": 19.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1.5},
+
+                {"matrix": [1, 16], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 17], "x": 17.5, "y": 1.5},
+                {"matrix": [1, 18], "x": 18.5, "y": 1.5},
+                {"matrix": [1, 19], "x": 19.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 15], "x": 15.25, "y": 2.5},
+
+                {"matrix": [2, 16], "x": 16.5, "y": 2.5},
+                {"matrix": [2, 17], "x": 17.5, "y": 2.5},
+                {"matrix": [2, 18], "x": 18.5, "y": 2.5},
+                {"matrix": [2, 19], "x": 19.5, "y": 2.5, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [3, 16], "x": 16.5, "y": 3.5},
+                {"matrix": [3, 17], "x": 17.5, "y": 3.5},
+                {"matrix": [3, 18], "x": 18.5, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 15.25, "y": 4.75},
+
+                {"matrix": [4, 16], "x": 16.5, "y": 4.5},
+                {"matrix": [4, 17], "x": 17.5, "y": 4.5},
+                {"matrix": [4, 18], "x": 18.5, "y": 4.5},
+
+                {"matrix": [4, 19], "x": 19.5, "y": 4.5, "h": 2},
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 7},
+                {"matrix": [5, 11], "x": 10.75, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 13], "x": 12.25, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 14.25, "y": 5.75},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.75},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.75},
+
+                {"matrix": [5, 17], "x": 17.5, "y": 5.5},
+                {"matrix": [5, 18], "x": 18.5, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/kbdfans/odin/v2/v2.h b/keyboards/kbdfans/odin/v2/v2.h
deleted file mode 100644
index 9e183e4498..0000000000
--- a/keyboards/kbdfans/odin/v2/v2.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2022 lexbrugman
- *
- * 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,      k02, k03, k04, k05,      k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, k0I, k0J, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,      k1F, k1G, k1H, k1I, k1J, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,      k2F, k2G, k2H, k2I, k2J, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D,           k3G, k3H, k3I,      \
-    k40,      k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B,      k4D,      k4F, k4G, k4H, k4I, k4J, \
-    k50, k51, k52,                k56,                     k5B,      k5D, k5E, k5F, k5G, k5H, k5I       \
-) \
-{ \
-    {k00, KC_NO, k02, k03,   k04,   k05,   KC_NO, k07,   k08,   k09,   k0A,   k0B, k0C,   k0D, k0E,   k0F,   k0G, k0H, k0I, k0J  }, \
-    {k10, k11,   k12, k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1A,   k1B, k1C,   k1D, KC_NO, k1F,   k1G, k1H, k1I, k1J  }, \
-    {k20, k21,   k22, k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2A,   k2B, k2C,   k2D, KC_NO, k2F,   k2G, k2H, k2I, k2J  }, \
-    {k30, k31,   k32, k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3A,   k3B, KC_NO, k3D, KC_NO, KC_NO, k3G, k3H, k3I, KC_NO}, \
-    {k40, KC_NO, k42, k43,   k44,   k45,   k46,   k47,   k48,   k49,   k4A,   k4B, KC_NO, k4D, KC_NO, k4F,   k4G, k4H, k4I, k4J  }, \
-    {k50, k51,   k52, KC_NO, KC_NO, KC_NO, k56,   KC_NO, KC_NO, KC_NO, KC_NO, k5B, KC_NO, k5D, k5E,   k5F,   k5G, k5H, k5I, KC_NO}  \
-}