diff options
Diffstat (limited to 'keyboards/kbdfans/bounce/pad')
| -rw-r--r-- | keyboards/kbdfans/bounce/pad/config.h | 4 | ||||
| -rw-r--r-- | keyboards/kbdfans/bounce/pad/info.json | 47 | ||||
| -rw-r--r-- | keyboards/kbdfans/bounce/pad/pad.c | 16 | ||||
| -rw-r--r-- | keyboards/kbdfans/bounce/pad/pad.h | 35 |
4 files changed, 26 insertions, 76 deletions
diff --git a/keyboards/kbdfans/bounce/pad/config.h b/keyboards/kbdfans/bounce/pad/config.h index 84271aed5f..0aae477dc1 100644 --- a/keyboards/kbdfans/bounce/pad/config.h +++ b/keyboards/kbdfans/bounce/pad/config.h @@ -16,9 +16,5 @@ #pragma once -#define MATRIX_ROW_PINS { C7, B7, B6, B0, B1, B2 } -#define MATRIX_COL_PINS { B5, B4, D0, C2 } -#define DIODE_DIRECTION COL2ROW - #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE diff --git a/keyboards/kbdfans/bounce/pad/info.json b/keyboards/kbdfans/bounce/pad/info.json index 894bd0ed70..e75747f2ea 100644 --- a/keyboards/kbdfans/bounce/pad/info.json +++ b/keyboards/kbdfans/bounce/pad/info.json @@ -7,6 +7,11 @@ "pid": "0x7002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "B4", "D0", "C2"], + "rows": ["C7", "B7", "B6", "B0", "B1", "B2"] + }, + "diode_direction": "COL2ROW", "indicators": { "num_lock": "C6" }, @@ -16,32 +21,32 @@ "layouts": { "LAYOUT_numpad_6x4": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"Ctrl", "x":1, "y":0}, - {"label":"Alt", "x":2, "y":0}, - {"label":"Backspace", "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":"Num Lock", "x":0, "y":1.25}, - {"label":"/", "x":1, "y":1.25}, - {"label":"*", "x":2, "y":1.25}, - {"label":"-", "x":3, "y":1.25}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, - {"label":"7", "x":0, "y":2.25}, - {"label":"8", "x":1, "y":2.25}, - {"label":"9", "x":2, "y":2.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25}, + {"matrix": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "y": 2.25}, - {"label":"4", "x":0, "y":3.25}, - {"label":"5", "x":1, "y":3.25}, - {"label":"6", "x":2, "y":3.25}, - {"label":"+", "x":3, "y":2.25, "h":2}, + {"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": 2.25, "h": 2}, - {"label":"1", "x":0, "y":4.25}, - {"label":"2", "x":1, "y":4.25}, - {"label":"3", "x":2, "y":4.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}, - {"label":"0", "x":0, "y":5.25, "w":2}, - {"label":".", "x":2, "y":5.25}, - {"label":"Enter", "x":3, "y":4.25, "h":2} + {"matrix": [5, 1], "x": 0, "y": 5.25, "w": 2}, + {"matrix": [5, 2], "x": 2, "y": 5.25}, + {"matrix": [5, 3], "x": 3, "y": 4.25, "h": 2} ] } } diff --git a/keyboards/kbdfans/bounce/pad/pad.c b/keyboards/kbdfans/bounce/pad/pad.c deleted file mode 100644 index 18c18838ca..0000000000 --- a/keyboards/kbdfans/bounce/pad/pad.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2022 DZTECH <moyi4681@Live.cn> - * - * 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/>. - */ -#include "pad.h"
\ No newline at end of file diff --git a/keyboards/kbdfans/bounce/pad/pad.h b/keyboards/kbdfans/bounce/pad/pad.h deleted file mode 100644 index a4bf9af55b..0000000000 --- a/keyboards/kbdfans/bounce/pad/pad.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2022 DZTECH <moyi4681@Live.cn> - * - * 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_numpad_6x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, \ - K30, K31, K32, K33, \ - K40, K41, K42, \ - K51, K52, K53 \ -) \ -{ \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, KC_NO }, \ - { K30, K31, K32, K33 }, \ - { K40, K41, K42, KC_NO }, \ - { KC_NO,K51, K52, K53 } \ -} |