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

2 files changed, 31 insertions, 69 deletions

diff --git a/keyboards/contender/contender.h b/keyboards/contender/contender.h
deleted file mode 100644
index 4dd71a5d24..0000000000
--- a/keyboards/contender/contender.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2020 sotoba
- *
- * 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"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-      k00, k01, k02, k03, \
-      k10, k11, k12, k13, \
-      k20, k21, k22, k23, \
-    k30, k31, k32, k33, k34, \
-    k40, k41, k42, k43, k44, \
-    k50, k51, k52, k53 \
-) { \
-    { KC_NO, k00, k01, k02, k03 }, \
-    { KC_NO, k10, k11, k12, k13 }, \
-    { KC_NO, k20, k21, k22, k23 }, \
-    { k30, k31, k32, k33, k34 }, \
-    { k40, k41, k42, k43, k44 }, \
-    { k50, k51, k52, k53, KC_NO } \
-}
diff --git a/keyboards/contender/info.json b/keyboards/contender/info.json
index 385aad6e0e..14692509ec 100644
--- a/keyboards/contender/info.json
+++ b/keyboards/contender/info.json
@@ -18,32 +18,37 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-              {"label":"Esc", "x":1, "y":0},
-              {"label":"Tab", "x":2, "y":0},
-              {"label":"Shift", "x":3, "y":0},
-              {"label":"Back", "x":4, "y":0},
-              {"label":"Num", "x":1, "y":1.25},
-              {"label":"/", "x":2, "y":1.25},
-              {"label":"*", "x":3, "y":1.25},
-              {"label":"=", "x":4, "y":1.25},
-              {"label":"7", "x":1, "y":2.25},
-              {"label":"8", "x":2, "y":2.25},
-              {"label":"9", "x":3, "y":2.25},
-              {"label":"-", "x":4, "y":2.25},
-              {"label":"fn","x":0, "y":3.25},
-              {"label":"4", "x":1, "y":3.25},
-              {"label":"5", "x":2, "y":3.25},
-              {"label":"6", "x":3, "y":3.25},
-              {"label":"+", "x":4, "y":3.25},
-              {"label":"RGB","x":0, "y":4.25},
-              {"label":"1", "x":1, "y":4.25},
-              {"label":"2", "x":2, "y":4.25},
-              {"label":"3", "x":3, "y":4.25},
-              {"label":"Enter", "x":4, "y":4.25, "h":2},
-              {"label":"TG","x":0, "y":5.25},
-              {"label":"0", "x":1, "y":5.25},
-              {"label":"00", "x":2, "y":5.25},
-              {"label":".", "x":3, "y":5.25}
+                {"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, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
+                {"matrix": [2, 4], "x": 4, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.25},
+                {"matrix": [3, 4], "x": 4, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+                {"matrix": [4, 3], "x": 3, "y": 4.25},
+                {"matrix": [4, 4], "x": 4, "y": 4.25, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1, "y": 5.25},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 5.25}
             ]
         }
     }