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

2 files changed, 79 insertions, 39 deletions

diff --git a/keyboards/jc65/v32a/info.json b/keyboards/jc65/v32a/info.json
index b864754a8c..0c6413d587 100644
--- a/keyboards/jc65/v32a/info.json
+++ b/keyboards/jc65/v32a/info.json
@@ -26,7 +26,85 @@
   "bootloader": "bootloadhid",
   "layouts": {
     "LAYOUT": {
-      "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.75}, {"x":6.5, "y":4, "w":1.25}, {"x":7.75, "y":4, "w":2.25}, {"label":"Alt", "x":10, "y":4}, {"label":"Win", "x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]
+      "layout": [
+        {"matrix": [4, 0], "x": 0, "y": 0},
+        {"matrix": [4, 1], "x": 1, "y": 0},
+        {"matrix": [4, 2], "x": 2, "y": 0},
+        {"matrix": [4, 3], "x": 3, "y": 0},
+        {"matrix": [4, 4], "x": 4, "y": 0},
+        {"matrix": [4, 5], "x": 5, "y": 0},
+        {"matrix": [5, 1], "x": 6, "y": 0},
+        {"matrix": [5, 11], "x": 7, "y": 0},
+        {"matrix": [6, 11], "x": 8, "y": 0},
+        {"matrix": [6, 1], "x": 9, "y": 0},
+        {"matrix": [4, 10], "x": 10, "y": 0},
+        {"matrix": [4, 11], "x": 11, "y": 0},
+        {"matrix": [4, 12], "x": 12, "y": 0},
+        {"matrix": [4, 13], "x": 13, "y": 0},
+        {"matrix": [4, 14], "x": 14, "y": 0},
+        {"matrix": [0, 13], "x": 15, "y": 0},
+
+        {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [3, 1], "x": 1.5, "y": 1},
+        {"matrix": [3, 2], "x": 2.5, "y": 1},
+        {"matrix": [3, 3], "x": 3.5, "y": 1},
+        {"matrix": [3, 4], "x": 4.5, "y": 1},
+        {"matrix": [3, 5], "x": 5.5, "y": 1},
+        {"matrix": [5, 2], "x": 6.5, "y": 1},
+        {"matrix": [5, 12], "x": 7.5, "y": 1},
+        {"matrix": [6, 12], "x": 8.5, "y": 1},
+        {"matrix": [6, 2], "x": 9.5, "y": 1},
+        {"matrix": [3, 10], "x": 10.5, "y": 1},
+        {"matrix": [3, 11], "x": 11.5, "y": 1},
+        {"matrix": [3, 12], "x": 12.5, "y": 1},
+        {"matrix": [3, 13], "x": 13.5, "y": 1, "w": 1.5},
+        {"matrix": [6, 6], "x": 15, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [5, 3], "x": 6.75, "y": 2},
+        {"matrix": [5, 13], "x": 7.75, "y": 2},
+        {"matrix": [6, 13], "x": 8.75, "y": 2},
+        {"matrix": [6, 3], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 12], "x": 12.75, "y": 2},
+        {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+        {"matrix": [6, 8], "x": 15, "y": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 3, "w": 1.25},
+        {"matrix": [0, 3], "x": 1.25, "y": 3},
+        {"matrix": [1, 1], "x": 2.25, "y": 3},
+        {"matrix": [1, 2], "x": 3.25, "y": 3},
+        {"matrix": [1, 3], "x": 4.25, "y": 3},
+        {"matrix": [1, 4], "x": 5.25, "y": 3},
+        {"matrix": [1, 5], "x": 6.25, "y": 3},
+        {"matrix": [5, 4], "x": 7.25, "y": 3},
+        {"matrix": [5, 14], "x": 8.25, "y": 3},
+        {"matrix": [6, 14], "x": 9.25, "y": 3},
+        {"matrix": [6, 4], "x": 10.25, "y": 3},
+        {"matrix": [1, 10], "x": 11.25, "y": 3},
+        {"matrix": [1, 11], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [5, 8], "x": 14, "y": 3},
+        {"matrix": [6, 7], "x": 15, "y": 3},
+
+        {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [0, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [0, 4], "x": 3.75, "y": 4, "w": 2.75},
+        {"matrix": [5, 5], "x": 6.5, "y": 4, "w": 1.25},
+        {"matrix": [0, 5], "x": 7.75, "y": 4, "w": 2.25},
+        {"matrix": [6, 5], "x": 10, "y": 4},
+        {"matrix": [0, 11], "x": 11, "y": 4},
+        {"matrix": [0, 12], "x": 12, "y": 4},
+        {"matrix": [5, 9], "x": 13, "y": 4},
+        {"matrix": [5, 7], "x": 14, "y": 4},
+        {"matrix": [5, 6], "x": 15, "y": 4}
+      ]
     }
   }
 }
diff --git a/keyboards/jc65/v32a/v32a.h b/keyboards/jc65/v32a/v32a.h
deleted file mode 100644
index 91e6164ae2..0000000000
--- a/keyboards/jc65/v32a/v32a.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-
-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( \
-    k40, k41, k42, k43, k44, k45, k61, k6B, k7B, k71, k4A, k4B, k4C, k4D, k4E, k0D, \
-    k30, k31, k32, k33, k34, k35, k62, k6C, k7C, k72, k3A, k3B, k3C,      k3D, k76, \
-    k20, k21, k22, k23, k24, k25, k63, k6D, k7D, k73, k2A, k2B, k2C,      k2D, k78, \
-    k10, k03, k11, k12, k13, k14, k15, k64, k6E, k7E, k74, k1A,      k1B, k68, k77, \
-    k00, k01, k02,      k04, k65, k05,                k75, k0B, k0C, k69, k67, k66 \
-) { \
-    { k00, k01, k02, k03, k04, k05, XXX, XXX, XXX, XXX, XXX, k0B, k0C, k0D, XXX }, \
-    { k10, k11, k12, k13, k14, k15, XXX, XXX, XXX, XXX, k1A, k1B, XXX, XXX, XXX }, \
-    { k20, k21, k22, k23, k24, k25, XXX, XXX, XXX, XXX, k2A, k2B, k2C, k2D, XXX }, \
-    { k30, k31, k32, k33, k34, k35, XXX, XXX, XXX, XXX, k3A, k3B, k3C, k3D, XXX }, \
-    { k40, k41, k42, k43, k44, k45, XXX, XXX, XXX, XXX, k4A, k4B, k4C, k4D, k4E }, \
-    { XXX, k61, k62, k63, k64, k65, k66, k67, k68, k69, XXX, k6B, k6C, k6D, k6E }, \
-    { XXX, k71, k72, k73, k74, k75, k76, k77, k78, XXX, XXX, k7B, k7C, k7D, k7E } \
-}