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

2 files changed, 13 insertions, 40 deletions

diff --git a/keyboards/10bleoledhub/10bleoledhub.h b/keyboards/10bleoledhub/10bleoledhub.h
deleted file mode 100644
index ad73017e12..0000000000
--- a/keyboards/10bleoledhub/10bleoledhub.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2020 haierwangwei2005
- *
- * 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, \
-    K10, K11, K12,  \
-    K20, K21, K22,  \
-    K30, K31, K32   \
-) { \
-    { K00,   KC_NO,   KC_NO }, \
-    { K10,   K11,   K12 }, \
-    { K20,   K21,   K22 }, \
-    { K30,   K31,   K32 }  \
-}
diff --git a/keyboards/10bleoledhub/info.json b/keyboards/10bleoledhub/info.json
index 4f5cd9564a..f6db49b9e6 100644
--- a/keyboards/10bleoledhub/info.json
+++ b/keyboards/10bleoledhub/info.json
@@ -23,16 +23,19 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Num Lock", "x":0, "y":0, "w":0.8, "h":0.8},
-                {"label":"7", "x":0, "y":1},
-                {"label":"8", "x":1, "y":1},
-                {"label":"9", "x":2, "y":1},
-                {"label":"4", "x":0, "y":2},
-                {"label":"5", "x":1, "y":2},
-                {"label":"6", "x":2, "y":2},
-                {"label":"1", "x":0, "y":3},
-                {"label":"2", "x":1, "y":3},
-                {"label":"3", "x":2, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 0.8, "h": 0.8},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3}
             ]
         }
     }