Move small macropad-ish layouts to data driven (#20341)

2 files changed, 29 insertions, 58 deletions

diff --git a/keyboards/winry/winry25tc/info.json b/keyboards/winry/winry25tc/info.json
index 0391d278b9..afdc9f62e4 100644
--- a/keyboards/winry/winry25tc/info.json
+++ b/keyboards/winry/winry25tc/info.json
@@ -18,31 +18,35 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00 (E6,F5)", "x":0, "y":0},
-                {"label":"K01 (E6,C7)", "x":1, "y":0},
-                {"label":"K02 (E6,B7)", "x":2, "y":0},
-                {"label":"K03 (E6,B2)", "x":3, "y":0},
-                {"label":"K04 (E6,B4)", "x":4, "y":0},
-                {"label":"K10 (F0,F5)", "x":0, "y":1},
-                {"label":"K11 (F0,C7)", "x":1, "y":1},
-                {"label":"K12 (F0,B7)", "x":2, "y":1},
-                {"label":"K13 (F0,B2)", "x":3, "y":1},
-                {"label":"K14 (F0,B4)", "x":4, "y":1},
-                {"label":"K20 (D6,F5)", "x":0, "y":2},
-                {"label":"K21 (D6,C7)", "x":1, "y":2},
-                {"label":"K22 (D6,B7)", "x":2, "y":2},
-                {"label":"K23 (D6,B2)", "x":3, "y":2},
-                {"label":"K24 (D6,B4)", "x":4, "y":2},
-                {"label":"K30 (D2,F5)", "x":0, "y":3},
-                {"label":"K31 (D2,C7)", "x":1, "y":3},
-                {"label":"K32 (D2,B7)", "x":2, "y":3},
-                {"label":"K33 (D2,B2)", "x":3, "y":3},
-                {"label":"K34 (D2,B4)", "x":4, "y":3},
-                {"label":"K40 (B6,F5)", "x":0, "y":4},
-                {"label":"K41 (B6,C7)", "x":1, "y":4},
-                {"label":"K42 (B6,B7)", "x":2, "y":4},
-                {"label":"K43 (B6,B2)", "x":3, "y":4},
-                {"label":"K44 (B6,B4)", "x":4, "y":4}
+                {"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": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4}
             ]
         }
     }
diff --git a/keyboards/winry/winry25tc/winry25tc.h b/keyboards/winry/winry25tc/winry25tc.h
deleted file mode 100644
index 5498dd8d6b..0000000000
--- a/keyboards/winry/winry25tc/winry25tc.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 Andrzej Ressel (andrzej.ressel@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 LAYOUT( \
-    K00, K01, K02, K03, K04,   \
-    K10, K11, K12, K13, K14,   \
-    K20, K21, K22, K23, K24,   \
-    K30, K31, K32, K33, K34,   \
-    K40, K41, K42, K43, K44    \
-) { \
-    { K00,   K01,   K02,   K03,   K04   }, \
-    { K10,   K11,   K12,   K13,   K14   }, \
-    { K20,   K21,   K22,   K23,   K24   }, \
-    { K30,   K31,   K32,   K33,   K34   }, \
-    { K40,   K41,   K42,   K43,   K44   }, \
-}