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

2 files changed, 66 insertions, 108 deletions

diff --git a/keyboards/handwired/ibm_wheelwriter/ibm_wheelwriter.h b/keyboards/handwired/ibm_wheelwriter/ibm_wheelwriter.h
deleted file mode 100644
index 55d54580aa..0000000000
--- a/keyboards/handwired/ibm_wheelwriter/ibm_wheelwriter.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2021 andresteare
- *
- * 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( \
-                                                                                                \
-    K22,    K24, K34, K35, K36, K37, K27, K28, K38, K39, K3A, K3B, K2B, K29, K2C,        K3C,   \
-    K41,    K42,    K44, K45, K46, K47, K57, K58, K48, K49, K4A, K4B, K5B, K59,  K6C,    K4C,   \
-    K52,    K62,     K14, K15, K16, K17, K07, K08, K18, K19, K1A, K1B, K0B, K6B,         K1C,   \
-    K12,    K73,   K74, K64, K65, K66, K67, K77, K78, K68, K69, K6A, K7B,                K61,   \
-    K01,                    K70,            K71,             K72,                        K7C    \
-    ) { \
-    { KC_NO, K01,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K07,   K08,   KC_NO, KC_NO, K0B,   KC_NO }, \
-    { KC_NO, KC_NO, K12,   KC_NO, K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C   }, \
-    { KC_NO, KC_NO, K22,   KC_NO, K24,   KC_NO, KC_NO, K27,   K28,   K29,   KC_NO, K2B,   K2C   }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C   }, \
-    { KC_NO, K41,   K42,   KC_NO, K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C   }, \
-    { KC_NO, KC_NO, K52,   KC_NO, KC_NO, KC_NO, KC_NO, K57,   K58,   K59,   KC_NO, K5B,   KC_NO }, \
-    { KC_NO, K61,   K62,   KC_NO, K64,   K65,   K66,   K67,   K68,   K69,   K6A,   K6B,   K6C   }, \
-    { K70,   K71,   K72,   K73,   K74,   KC_NO, KC_NO, K77,   K78,   KC_NO, KC_NO, K7B,   K7C   }, \
-}
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/handwired/ibm_wheelwriter/info.json b/keyboards/handwired/ibm_wheelwriter/info.json
index 792f6b8aea..4ec01887e1 100644
--- a/keyboards/handwired/ibm_wheelwriter/info.json
+++ b/keyboards/handwired/ibm_wheelwriter/info.json
@@ -18,87 +18,85 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0, "w":1.5},
+                {"matrix": [2, 2], "x": 0, "y": 0, "w": 1.5},
 
-                {"x":1.75, "y":0},
-                {"x":2.75, "y":0},
-                {"x":3.75, "y":0},
-                {"x":4.75, "y":0},
-                {"x":5.75, "y":0},
-                {"x":6.75, "y":0},
-                {"x":7.75, "y":0},
-                {"x":8.75, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":13.75, "y":0},
-                {"x":14.75, "y":0, "w":2},
+                {"matrix": [2, 4], "x": 1.75, "y": 0},
+                {"matrix": [3, 4], "x": 2.75, "y": 0},
+                {"matrix": [3, 5], "x": 3.75, "y": 0},
+                {"matrix": [3, 6], "x": 4.75, "y": 0},
+                {"matrix": [3, 7], "x": 5.75, "y": 0},
+                {"matrix": [2, 7], "x": 6.75, "y": 0},
+                {"matrix": [2, 8], "x": 7.75, "y": 0},
+                {"matrix": [3, 8], "x": 8.75, "y": 0},
+                {"matrix": [3, 9], "x": 9.75, "y": 0},
+                {"matrix": [3, 10], "x": 10.75, "y": 0},
+                {"matrix": [3, 11], "x": 11.75, "y": 0},
+                {"matrix": [2, 11], "x": 12.75, "y": 0},
+                {"matrix": [2, 9], "x": 13.75, "y": 0},
+                {"matrix": [2, 12], "x": 14.75, "y": 0, "w": 2},
 
-                {"x":17, "y":0, "w":1.5},
+                {"matrix": [3, 12], "x": 17, "y": 0, "w": 1.5},
 
-                {"x":0, "y":1, "w":1.5},
+                {"matrix": [4, 1], "x": 0, "y": 1, "w": 1.5},
 
-                {"x":1.75, "y":1, "w":1.5},
-                {"x":3.25, "y":1},
-                {"x":4.25, "y":1},
-                {"x":5.25, "y":1},
-                {"x":6.25, "y":1},
-                {"x":7.25, "y":1},
-                {"x":8.25, "y":1},
-                {"x":9.25, "y":1},
-                {"x":10.25, "y":1},
-                {"x":11.25, "y":1},
-                {"x":12.25, "y":1},
-                {"x":13.25, "y":1},
-                {"x":14.25, "y":1},
-                {"x":15.5, "y":1, "w":1.25, "h":2},
+                {"matrix": [4, 2], "x": 1.75, "y": 1, "w": 1.5},
+                {"matrix": [4, 4], "x": 3.25, "y": 1},
+                {"matrix": [4, 5], "x": 4.25, "y": 1},
+                {"matrix": [4, 6], "x": 5.25, "y": 1},
+                {"matrix": [4, 7], "x": 6.25, "y": 1},
+                {"matrix": [5, 7], "x": 7.25, "y": 1},
+                {"matrix": [5, 8], "x": 8.25, "y": 1},
+                {"matrix": [4, 8], "x": 9.25, "y": 1},
+                {"matrix": [4, 9], "x": 10.25, "y": 1},
+                {"matrix": [4, 10], "x": 11.25, "y": 1},
+                {"matrix": [4, 11], "x": 12.25, "y": 1},
+                {"matrix": [5, 11], "x": 13.25, "y": 1},
+                {"matrix": [5, 9], "x": 14.25, "y": 1},
+                {"matrix": [6, 12], "x": 15.5, "y": 1, "w": 1.25, "h": 2},
 
-                {"x":17, "y":1, "w":1.5},
+                {"matrix": [4, 12], "x": 17, "y": 1, "w": 1.5},
 
-                {"x":0, "y":2, "w":1.5},
+                {"matrix": [5, 2], "x": 0, "y": 2, "w": 1.5},
 
-                {"x":1.75, "y":2, "w":1.25},
-                {"x":3.5, "y":2},
-                {"x":4.5, "y":2},
-                {"x":5.5, "y":2},
-                {"x":6.5, "y":2},
-                {"x":7.5, "y":2},
-                {"x":8.5, "y":2},
-                {"x":9.5, "y":2},
-                {"x":10.5, "y":2},
-                {"x":11.5, "y":2},
-                {"x":12.5, "y":2},
-                {"x":13.5, "y":2},
-                {"x":14.5, "y":2},
+                {"matrix": [6, 2], "x": 1.75, "y": 2, "w": 1.25},
+                {"matrix": [1, 4], "x": 3.5, "y": 2},
+                {"matrix": [1, 5], "x": 4.5, "y": 2},
+                {"matrix": [1, 6], "x": 5.5, "y": 2},
+                {"matrix": [1, 7], "x": 6.5, "y": 2},
+                {"matrix": [0, 7], "x": 7.5, "y": 2},
+                {"matrix": [0, 8], "x": 8.5, "y": 2},
+                {"matrix": [1, 8], "x": 9.5, "y": 2},
+                {"matrix": [1, 9], "x": 10.5, "y": 2},
+                {"matrix": [1, 10], "x": 11.5, "y": 2},
+                {"matrix": [1, 11], "x": 12.5, "y": 2},
+                {"matrix": [0, 11], "x": 13.5, "y": 2},
+                {"matrix": [6, 11], "x": 14.5, "y": 2},
 
-                {"x":17, "y":2, "w":1.5},
+                {"matrix": [1, 12], "x": 17, "y": 2, "w": 1.5},
 
-                {"x":0, "y":3, "w":1.5},
+                {"matrix": [1, 2], "x": 0, "y": 3, "w": 1.5},
 
-                {"x":1.75, "y":3, "w":1.25},
-                {"x":3, "y":3},
-                {"x":4, "y":3},
-                {"x":5, "y":3},
-                {"x":6, "y":3},
-                {"x":7, "y":3},
-                {"x":8, "y":3},
-                {"x":9, "y":3},
-                {"x":10, "y":3},
-                {"x":11, "y":3},
-                {"x":12, "y":3},
-                {"x":13, "y":3},
+                {"matrix": [7, 3], "x": 1.75, "y": 3, "w": 1.25},
+                {"matrix": [7, 4], "x": 3, "y": 3},
+                {"matrix": [6, 4], "x": 4, "y": 3},
+                {"matrix": [6, 5], "x": 5, "y": 3},
+                {"matrix": [6, 6], "x": 6, "y": 3},
+                {"matrix": [6, 7], "x": 7, "y": 3},
+                {"matrix": [7, 7], "x": 8, "y": 3},
+                {"matrix": [7, 8], "x": 9, "y": 3},
+                {"matrix": [6, 8], "x": 10, "y": 3},
+                {"matrix": [6, 9], "x": 11, "y": 3},
+                {"matrix": [6, 10], "x": 12, "y": 3},
+                {"matrix": [7, 11], "x": 13, "y": 3},
+                {"matrix": [6, 1], "x": 17, "y": 3, "w": 1.5},
 
-                {"x":17, "y":3, "w":1.5},
+                {"matrix": [0, 1], "x": 0, "y": 4, "w": 1.5},
 
-                {"x":0, "y":4, "w":1.5},
+                {"matrix": [7, 0], "x": 4.25, "y": 4, "w": 2.75},
+                {"matrix": [7, 1], "x": 7, "y": 4, "w": 7.25},
+                {"matrix": [7, 2], "x": 15.25, "y": 4, "w": 1.5},
 
-                {"x":4.25, "y":4, "w":2.75},
-                {"x":7, "y":4, "w":7.25},
-
-                {"x":15.25, "y":4, "w":1.5},
-
-                {"x":17, "y":4, "w":1.5}
+                {"matrix": [7, 12], "x": 17, "y": 4, "w": 1.5}
             ]
         }
     }