summaryrefslogtreecommitdiffstats
path: root/keyboards/doio/kb30
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-04-05 15:46:59 +1000
committerGitHub <noreply@github.com>2023-04-05 15:46:59 +1000
commit364c06d939134184838579d4e73880f8c2f83419 (patch)
treeb54be2d8a9a7ca5913774390bb0772e927d6523a /keyboards/doio/kb30
parent06c5c028046adc0a5501f6ac51953640e2015020 (diff)
Move small macropad-ish layouts to data driven (#20341)
Diffstat (limited to 'keyboards/doio/kb30')
-rw-r--r--keyboards/doio/kb30/info.json73
-rw-r--r--keyboards/doio/kb30/kb30.c2
-rw-r--r--keyboards/doio/kb30/kb30.h45
3 files changed, 40 insertions, 80 deletions
diff --git a/keyboards/doio/kb30/info.json b/keyboards/doio/kb30/info.json
index f4e43522d5..570d0d9ab0 100644
--- a/keyboards/doio/kb30/info.json
+++ b/keyboards/doio/kb30/info.json
@@ -25,46 +25,51 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"K00", "x":0, "y":0},
- {"label":"K01", "x":1, "y":0},
- {"label":"K02", "x":2, "y":0},
- {"label":"K03", "x":3, "y":0},
- {"label":"K04", "x":4.25, "y":0},
- {"label":"K05", "x":5.25, "y":0},
- {"label":"K06", "x":6.25, "y":0},
-
- {"label":"K10", "x":0, "y":1},
- {"label":"K11", "x":1, "y":1},
- {"label":"K12", "x":2, "y":1},
- {"label":"K13", "x":3, "y":1, "h":2},
- {"label":"K14", "x":4.25, "y":1},
- {"label":"K15", "x":5.25, "y":1},
- {"label":"K16", "x":6.25, "y":1},
+ {"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":8.25, "y":2},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
- {"label":"K20", "x":0, "y":2},
- {"label":"K21", "x":1, "y":2},
- {"label":"K22", "x":2, "y":2},
- {"label":"K23", "x":4.25, "y":2},
- {"label":"K24", "x":5.25, "y":2},
- {"label":"K25", "x":6.25, "y":2},
+ {"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, "h": 2},
- {"label":"Encoder 2", "x":11, "y":2},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
- {"label":"K30", "x":0, "y":3},
- {"label":"K31", "x":1, "y":3},
- {"label":"K32", "x":2, "y":3},
- {"label":"K33", "x":4.25, "y":3, "h":2},
- {"label":"K35", "x":5.25, "y":3},
+ {"matrix": [2, 0], "x": 8.25, "y": 2},
- {"label":"Encoder 3", "x":9, "y":4},
+ {"matrix": [2, 1], "x": 0, "y": 2},
+ {"matrix": [2, 2], "x": 1, "y": 2},
+ {"matrix": [2, 3], "x": 2, "y": 2},
- {"label":"K40", "x":0, "y":4, "w":2},
- {"label":"K41", "x":2, "y":4},
- {"label":"K42", "x":4.25, "y":4},
- {"label":"K43", "x":5.25, "y":4},
- {"label":"K44", "x":6.25, "y":4}
+ {"matrix": [2, 4], "x": 4.25, "y": 2},
+ {"matrix": [2, 5], "x": 5.25, "y": 2},
+ {"matrix": [3, 0], "x": 6.25, "y": 2},
+
+ {"matrix": [3, 1], "x": 11, "y": 2},
+
+ {"matrix": [3, 2], "x": 0, "y": 3},
+ {"matrix": [3, 3], "x": 1, "y": 3},
+ {"matrix": [3, 5], "x": 2, "y": 3},
+
+ {"matrix": [4, 0], "x": 4.25, "y": 3, "h": 2},
+ {"matrix": [4, 1], "x": 5.25, "y": 3},
+
+ {"matrix": [4, 2], "x": 9, "y": 4},
+
+ {"matrix": [4, 3], "x": 0, "y": 4, "w": 2},
+ {"matrix": [4, 4], "x": 2, "y": 4},
+
+ {"matrix": [5, 4], "x": 4.25, "y": 4},
+ {"matrix": [5, 5], "x": 5.25, "y": 4},
+ {"matrix": [5, 6], "x": 6.25, "y": 4}
]
}
}
diff --git a/keyboards/doio/kb30/kb30.c b/keyboards/doio/kb30/kb30.c
index 3272863ad1..53a4546e06 100644
--- a/keyboards/doio/kb30/kb30.c
+++ b/keyboards/doio/kb30/kb30.c
@@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "kb30.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/doio/kb30/kb30.h b/keyboards/doio/kb30/kb30.h
deleted file mode 100644
index 1a294c9735..0000000000
--- a/keyboards/doio/kb30/kb30.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright 2022 DOIO
- * Copyright 2022 DOIO2022 <https://github.com/DOIO2022>
- *
- * 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 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, K04, K05, K06, \
- K10, K11, K12, K13, K14, K15, K16, \
- K20, K21, K22, K23, K24, K25, \
- K30, K31, K32, K33, K35, \
- K40, K41, K42, K43, K44, \
- K54, K55, K56 \
-) { \
- { K00, K01, K02, K03, K04, K05, K06 }, \
- { K10, K11, K12, K13, K14, K15, K16 }, \
- { K20, K21, K22, K23, K24, K25, KC_NO}, \
- { K30, K31, K32, K33, KC_NO, K35, KC_NO}, \
- { K40, K41, K42, K43, K44, KC_NO, KC_NO}, \
- { KC_NO, KC_NO, KC_NO, KC_NO, K54, K55, K56 } \
-}