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

2 files changed, 46 insertions, 79 deletions

diff --git a/keyboards/handwired/carpolly/carpolly.h b/keyboards/handwired/carpolly/carpolly.h
deleted file mode 100644
index ddcf98fcdb..0000000000
--- a/keyboards/handwired/carpolly/carpolly.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2021 Paul Enrico N. Viola
- *
- * 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( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1C, \
-    K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
-    K30, K31, K32, K36, K3A, K3B, K3C  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, XXX }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, XXX, K1C }, \
-    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \
-    { K30, K31, K32, XXX, XXX, XXX, K36, XXX, XXX, XXX, K3A, K3B, K3C }, \
-}
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/handwired/carpolly/info.json b/keyboards/handwired/carpolly/info.json
index 3cac934d6e..a0f28d3eeb 100644
--- a/keyboards/handwired/carpolly/info.json
+++ b/keyboards/handwired/carpolly/info.json
@@ -18,49 +18,52 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "label": "K00 (B0,F0)", "x": 0, "y": 0 },
-                { "label": "K01 (B0,F1)", "x": 1, "y": 0 },
-                { "label": "K02 (B0,F4)", "x": 2, "y": 0 },
-                { "label": "K03 (B0,F5)", "x": 3, "y": 0 },
-                { "label": "K04 (B0,F6)", "x": 4, "y": 0 },
-                { "label": "K05 (B0,B6)", "x": 5, "y": 0 },
-                { "label": "K06 (B0,B5)", "x": 6, "y": 0 },
-                { "label": "K07 (B0,B4)", "x": 7, "y": 0 },
-                { "label": "K08 (B0,D7)", "x": 8, "y": 0 },
-                { "label": "K09 (B0,D6)", "x": 9, "y": 0 },
-                { "label": "K0A (B0,D4)", "x": 10, "y": 0 },
-                { "label": "K0B (B0,D5)", "x": 11, "y": 0, "w": 1.75 },
-                { "label": "K10 (B1,F0)", "x": 0, "y": 1, "w": 1.25 },
-                { "label": "K11 (B1,F1)", "x": 1.25, "y": 1 },
-                { "label": "K12 (B1,F4)", "x": 2.25, "y": 1 },
-                { "label": "K13 (B1,F5)", "x": 3.25, "y": 1 },
-                { "label": "K14 (B1,F6)", "x": 4.25, "y": 1 },
-                { "label": "K15 (B1,B6)", "x": 5.25, "y": 1 },
-                { "label": "K16 (B1,B5)", "x": 6.25, "y": 1 },
-                { "label": "K17 (B1,B4)", "x": 7.25, "y": 1 },
-                { "label": "K18 (B1,D7)", "x": 8.25, "y": 1 },
-                { "label": "K19 (B1,D6)", "x": 9.25, "y": 1 },
-                { "label": "K1A (B1,D4)", "x": 10.25, "y": 1 },
-                { "label": "K1C (B1,C7)", "x": 11.25, "y": 1, "w": 1.5 },
-                { "label": "K20 (B2,F0)", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "K22 (B2,F4)", "x": 1.75, "y": 2 },
-                { "label": "K23 (B2,F5)", "x": 2.75, "y": 2 },
-                { "label": "K24 (B2,F6)", "x": 3.75, "y": 2 },
-                { "label": "K25 (B2,B6)", "x": 4.75, "y": 2 },
-                { "label": "K26 (B2,B5)", "x": 5.75, "y": 2 },
-                { "label": "K27 (B2,B4)", "x": 6.75, "y": 2 },
-                { "label": "K28 (B2,D7)", "x": 7.75, "y": 2 },
-                { "label": "K29 (B2,D6)", "x": 8.75, "y": 2 },
-                { "label": "K2A (B2,D4)", "x": 9.75, "y": 2 },
-                { "label": "K2B (B2,D5)", "x": 10.75, "y": 2 },
-                { "label": "K2C (B2,C7)", "x": 11.75, "y": 2 },
-                { "label": "K30 (B3,F0)", "x": 0, "y": 3, "w": 1.25 },
-                { "label": "K31 (B3,F1)", "x": 1.25, "y": 3 },
-                { "label": "K32 (B3,F4)", "x": 2.25, "y": 3, "w": 1.25 },
-                { "label": "K36 (B3,B5)", "x": 3.5, "y": 3, "w": 6.25 },
-                { "label": "K3A (B3,D4)", "x": 9.75, "y": 3 },
-                { "label": "K3B (B3,D5)", "x": 10.75, "y": 3 },
-                { "label": "K3C (B3,C7)", "x": 11.75, "y": 3 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "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, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.75},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 6], "x": 3.5, "y": 3, "w": 6.25},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3}
             ]
         }
     }