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

2 files changed, 20 insertions, 65 deletions

diff --git a/keyboards/lizard_trick/tenkey_plusplus/info.json b/keyboards/lizard_trick/tenkey_plusplus/info.json
index d2eb93b0fd..a14dcbdee7 100644
--- a/keyboards/lizard_trick/tenkey_plusplus/info.json
+++ b/keyboards/lizard_trick/tenkey_plusplus/info.json
@@ -25,31 +25,31 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "Mute", "x": 0, "y": 0, "w": 1.3},
-                {"label": "MDPL", "x": 1.3, "y": 0, "w": 1.4},
-                {"label": "MDNX", "x": 2.7, "y": 0, "w": 1.3},
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.3},
+                {"matrix": [0, 1], "x": 1.3, "y": 0, "w": 1.4},
+                {"matrix": [0, 3], "x": 2.7, "y": 0, "w": 1.3},
 
-                {"label": "Num Lock", "x": 0, "y": 1},
-                {"label": "/", "x": 1, "y": 1},
-                {"label": "*", "x": 2, "y": 1},
-                {"label": "-", "x": 3, "y": 1},
+                {"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},
 
-                {"label": "7", "x": 0, "y": 2},
-                {"label": "8", "x": 1, "y": 2},
-                {"label": "9", "x": 2, "y": 2},
-                {"label": "+", "x": 3, "y": 2, "h": 2},
+                {"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, "h": 2},
 
-                {"label": "4", "x": 0, "y": 3},
-                {"label": "5", "x": 1, "y": 3},
-                {"label": "6", "x": 2, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
 
-                {"label": "1", "x": 0, "y": 4},
-                {"label": "2", "x": 1, "y": 4},
-                {"label": "3", "x": 2, "y": 4},
-                {"label": "Enter", "x": 3, "y": 4, "h" :2},
+                {"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, "h": 2},
 
-                {"label": "0", "x": 0, "y": 5, "w": 2},
-                {"label": ".", "x": 2, "y": 5}
+                {"matrix": [5, 1], "x": 0, "y": 5, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5}
             ]
         }
     }
diff --git a/keyboards/lizard_trick/tenkey_plusplus/tenkey_plusplus.h b/keyboards/lizard_trick/tenkey_plusplus/tenkey_plusplus.h
deleted file mode 100644
index 72f3880652..0000000000
--- a/keyboards/lizard_trick/tenkey_plusplus/tenkey_plusplus.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-Copyright 2020 Jonathon Carstens jonathon@lizardtrick.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"
-
-/* 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,      K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32,      \
-    K40, K41, K42, K43, \
-         K51, K52       \
-) { \
-    { K00,   K01,   KC_NO, K03    }, \
-    { K10,   K11,   K12,   K13    }, \
-    { K20,   K21,   K22,   K23    }, \
-    { K30,   K31,   K32,   KC_NO  }, \
-    { K40,   K41,   K42,   K43    }, \
-    { KC_NO, K51,   K52,   KC_NO  }  \
-}