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

4 files changed, 39 insertions, 84 deletions

diff --git a/keyboards/doio/kb16/kb16.c b/keyboards/doio/kb16/kb16.c
index c0f7f96b9e..34b315a87b 100644
--- a/keyboards/doio/kb16/kb16.c
+++ b/keyboards/doio/kb16/kb16.c
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "kb16.h"
+#include "quantum.h"
 
 // OLED animation
 #include "./lib/logo.h"
diff --git a/keyboards/doio/kb16/kb16.h b/keyboards/doio/kb16/kb16.h
deleted file mode 100644
index 6e6ab2f7f4..0000000000
--- a/keyboards/doio/kb16/kb16.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright 2022 DOIO
- * Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
- *
- * 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 XXX KC_NO
-
-/* ┌───┬───┬───┬───┐  ┌───┐ ┌───┐
- * │00 │01 │02 │03 │  │04 │ │14 │
- * ├───┼───┼───┼───┤  └───┘ └───┘
- * │10 │11 │12 │13 │
- * ├───┼───┼───┼───┤
- * │20 │21 │22 │23 │     ┌───┐
- * ├───┼───┼───┼───┤     │24 │
- * │30 │31 │32 │33 │     └───┘
- * └───┴───┴───┴───┘
- */
-
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, \
-    K10, K11, K12, K13, K14, \
-    K20, K21, K22, K23, K24, \
-    K30, K31, K32, K33       \
-) { \
-    { K00, K01, K02, K03, K04 }, \
-    { K10, K11, K12, K13, K14 }, \
-    { K20, K21, K22, K23, K24 }, \
-    { K30, K31, K32, K33, XXX }  \
-}
diff --git a/keyboards/doio/kb16/rev1/info.json b/keyboards/doio/kb16/rev1/info.json
index 03deae0cbc..7cc263246c 100644
--- a/keyboards/doio/kb16/rev1/info.json
+++ b/keyboards/doio/kb16/rev1/info.json
@@ -25,31 +25,31 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"1!", "x":0, "y":0},
-                {"label":"2@", "x":1, "y":0},
-                {"label":"3#", "x":2, "y":0},
-                {"label":"4$", "x":3, "y":0},
+                {"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},
 
-                {"label":"Encoder 1", "x":4.75, "y":0},
+                {"matrix": [0, 4], "x": 4.75, "y": 0},
 
-                {"label":"5%", "x":0, "y":1},
-                {"label":"6^", "x":1, "y":1},
-                {"label":"7&", "x":2, "y":1},
-                {"label":"8*", "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":"Encoder 2", "x":6, "y":0},
+                {"matrix": [1, 4], "x": 6, "y": 0},
 
-                {"label":"9(", "x":0, "y":2},
-                {"label":"0)", "x":1, "y":2},
-                {"label":"\u2191", "x":2, "y":2},
-                {"label":"Enter", "x":3, "y":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},
 
-                {"label":"Encoder 3", "x":5.375, "y":2.5},
+                {"matrix": [2, 4], "x": 5.375, "y": 2.5},
 
-                {"label":"Fn", "x":0, "y":3},
-                {"label":"\u2190", "x":1, "y":3},
-                {"label":"\u2193", "x":2, "y":3},
-                {"label":"\u2192", "x":3, "y":3}
+                {"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}
             ]
         }
     }
diff --git a/keyboards/doio/kb16/rev2/info.json b/keyboards/doio/kb16/rev2/info.json
index 6e90528e0f..839708ada0 100644
--- a/keyboards/doio/kb16/rev2/info.json
+++ b/keyboards/doio/kb16/rev2/info.json
@@ -25,31 +25,31 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"1!", "x":0, "y":0},
-                {"label":"2@", "x":1, "y":0},
-                {"label":"3#", "x":2, "y":0},
-                {"label":"4$", "x":3, "y":0},
+                {"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},
 
-                {"label":"Encoder 1", "x":4.75, "y":0},
+                {"matrix": [0, 4], "x": 4.75, "y": 0},
 
-                {"label":"5%", "x":0, "y":1},
-                {"label":"6^", "x":1, "y":1},
-                {"label":"7&", "x":2, "y":1},
-                {"label":"8*", "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":"Encoder 2", "x":6, "y":0},
+                {"matrix": [1, 4], "x": 6, "y": 0},
 
-                {"label":"9(", "x":0, "y":2},
-                {"label":"0)", "x":1, "y":2},
-                {"label":"\u2191", "x":2, "y":2},
-                {"label":"Enter", "x":3, "y":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},
 
-                {"label":"Encoder 3", "x":5.375, "y":2.5},
+                {"matrix": [2, 4], "x": 5.375, "y": 2.5},
 
-                {"label":"Fn", "x":0, "y":3},
-                {"label":"\u2190", "x":1, "y":3},
-                {"label":"\u2193", "x":2, "y":3},
-                {"label":"\u2192", "x":3, "y":3}
+                {"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}
             ]
         }
     }