summaryrefslogtreecommitdiff
path: root/keyboards/kbdfans/kbdpad
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/kbdfans/kbdpad')
-rw-r--r--keyboards/kbdfans/kbdpad/mk1/config.h6
-rw-r--r--keyboards/kbdfans/kbdpad/mk1/info.json5
-rw-r--r--keyboards/kbdfans/kbdpad/mk1/mk1.c17
-rw-r--r--keyboards/kbdfans/kbdpad/mk2/config.h17
-rw-r--r--keyboards/kbdfans/kbdpad/mk2/info.json5
-rw-r--r--keyboards/kbdfans/kbdpad/mk2/mk2.c16
-rw-r--r--keyboards/kbdfans/kbdpad/mk3/info.json40
7 files changed, 30 insertions, 76 deletions
diff --git a/keyboards/kbdfans/kbdpad/mk1/config.h b/keyboards/kbdfans/kbdpad/mk1/config.h
index acd78533ee..a3a9a993df 100644
--- a/keyboards/kbdfans/kbdpad/mk1/config.h
+++ b/keyboards/kbdfans/kbdpad/mk1/config.h
@@ -17,12 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3 }
-
-#define DIODE_DIRECTION COL2ROW
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kbdfans/kbdpad/mk1/info.json b/keyboards/kbdfans/kbdpad/mk1/info.json
index 97d4c827a1..e3dd95ace4 100644
--- a/keyboards/kbdfans/kbdpad/mk1/info.json
+++ b/keyboards/kbdfans/kbdpad/mk1/info.json
@@ -8,6 +8,11 @@
"pid": "0x422D",
"device_version": "2.0.0"
},
+ "matrix_pins": {
+ "cols": ["A0", "A1", "A2", "A3"],
+ "rows": ["B0", "B1", "B2", "B3", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "D4",
"breathing": true
diff --git a/keyboards/kbdfans/kbdpad/mk1/mk1.c b/keyboards/kbdfans/kbdpad/mk1/mk1.c
deleted file mode 100644
index 5635b0a589..0000000000
--- a/keyboards/kbdfans/kbdpad/mk1/mk1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * 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 "mk1.h"
diff --git a/keyboards/kbdfans/kbdpad/mk2/config.h b/keyboards/kbdfans/kbdpad/mk2/config.h
index ffc9d00e5f..a2a29bccf7 100644
--- a/keyboards/kbdfans/kbdpad/mk2/config.h
+++ b/keyboards/kbdfans/kbdpad/mk2/config.h
@@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { D3, D1, D2, C6, C7, B6 }
-#define MATRIX_COL_PINS { C4, C5, B3, B2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
#define RGB_DI_PIN B5
#ifdef RGB_DI_PIN
#define RGBLED_NUM 16
diff --git a/keyboards/kbdfans/kbdpad/mk2/info.json b/keyboards/kbdfans/kbdpad/mk2/info.json
index 54657e5c12..1472e876d0 100644
--- a/keyboards/kbdfans/kbdpad/mk2/info.json
+++ b/keyboards/kbdfans/kbdpad/mk2/info.json
@@ -8,6 +8,11 @@
"pid": "0x0006",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["C4", "C5", "B3", "B2"],
+ "rows": ["D3", "D1", "D2", "C6", "C7", "B6"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B7",
"levels": 5,
diff --git a/keyboards/kbdfans/kbdpad/mk2/mk2.c b/keyboards/kbdfans/kbdpad/mk2/mk2.c
deleted file mode 100644
index 2449724126..0000000000
--- a/keyboards/kbdfans/kbdpad/mk2/mk2.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Ryota Goto
- *
- * 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 "mk2.h"
diff --git a/keyboards/kbdfans/kbdpad/mk3/info.json b/keyboards/kbdfans/kbdpad/mk3/info.json
index a22c82c681..ec522cc82c 100644
--- a/keyboards/kbdfans/kbdpad/mk3/info.json
+++ b/keyboards/kbdfans/kbdpad/mk3/info.json
@@ -57,27 +57,27 @@
"layouts": {
"LAYOUT_numpad_6x4": {
"layout": [
- { "label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
- { "label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
- { "label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
- { "label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
- { "label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 1 },
- { "label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 1 },
- { "label": "K12", "matrix": [1, 2], "w": 1, "x": 2, "y": 1 },
- { "label": "K13", "matrix": [1, 3], "w": 1, "x": 3, "y": 1 },
- { "label": "K20", "matrix": [2, 0], "w": 1, "x": 0, "y": 2 },
- { "label": "K21", "matrix": [2, 1], "w": 1, "x": 1, "y": 2 },
- { "label": "K22", "matrix": [2, 2], "w": 1, "x": 2, "y": 2 },
- { "label": "K30", "matrix": [3, 0], "w": 1, "x": 0, "y": 3 },
- { "label": "K31", "matrix": [3, 1], "w": 1, "x": 1, "y": 3 },
- { "label": "K32", "matrix": [3, 2], "w": 1, "x": 2, "y": 3 },
- { "h": 2, "label": "K23", "matrix": [2, 3], "w": 1, "x": 3, "y": 2 },
- { "label": "K40", "matrix": [4, 0], "w": 1, "x": 0, "y": 4 },
- { "label": "K41", "matrix": [4, 1], "w": 1, "x": 1, "y": 4 },
- { "label": "K42", "matrix": [4, 2], "w": 1, "x": 2, "y": 4 },
+ { "label": "K00", "matrix": [0, 0], "x": 0, "y": 0 },
+ { "label": "K01", "matrix": [0, 1], "x": 1, "y": 0 },
+ { "label": "K02", "matrix": [0, 2], "x": 2, "y": 0 },
+ { "label": "K03", "matrix": [0, 3], "x": 3, "y": 0 },
+ { "label": "K10", "matrix": [1, 0], "x": 0, "y": 1 },
+ { "label": "K11", "matrix": [1, 1], "x": 1, "y": 1 },
+ { "label": "K12", "matrix": [1, 2], "x": 2, "y": 1 },
+ { "label": "K13", "matrix": [1, 3], "x": 3, "y": 1 },
+ { "label": "K20", "matrix": [2, 0], "x": 0, "y": 2 },
+ { "label": "K21", "matrix": [2, 1], "x": 1, "y": 2 },
+ { "label": "K22", "matrix": [2, 2], "x": 2, "y": 2 },
+ { "label": "K30", "matrix": [3, 0], "x": 0, "y": 3 },
+ { "label": "K31", "matrix": [3, 1], "x": 1, "y": 3 },
+ { "label": "K32", "matrix": [3, 2], "x": 2, "y": 3 },
+ { "h": 2, "label": "K23", "matrix": [2, 3], "x": 3, "y": 2 },
+ { "label": "K40", "matrix": [4, 0], "x": 0, "y": 4 },
+ { "label": "K41", "matrix": [4, 1], "x": 1, "y": 4 },
+ { "label": "K42", "matrix": [4, 2], "x": 2, "y": 4 },
{ "label": "K50", "matrix": [5, 0], "w": 2, "x": 0, "y": 5 },
- { "label": "K52", "matrix": [5, 2], "w": 1, "x": 2, "y": 5 },
- { "h": 2, "label": "K43", "matrix": [4, 3], "w": 1, "x": 3, "y": 4 }
+ { "label": "K52", "matrix": [5, 2], "x": 2, "y": 5 },
+ { "h": 2, "label": "K43", "matrix": [4, 3], "x": 3, "y": 4 }
]
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-11 05:02:02 +0000