summaryrefslogtreecommitdiff
path: root/keyboards/kbdfans/kbdpad/mk1
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/kbdfans/kbdpad/mk1')
-rw-r--r--keyboards/kbdfans/kbdpad/mk1/config.h6
-rw-r--r--keyboards/kbdfans/kbdpad/mk1/info.json136
-rw-r--r--keyboards/kbdfans/kbdpad/mk1/mk1.c17
-rw-r--r--keyboards/kbdfans/kbdpad/mk1/mk1.h71
-rw-r--r--keyboards/kbdfans/kbdpad/mk1/rules.mk1
5 files changed, 72 insertions, 159 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..3527370e4c 100644
--- a/keyboards/kbdfans/kbdpad/mk1/info.json
+++ b/keyboards/kbdfans/kbdpad/mk1/info.json
@@ -8,10 +8,18 @@
"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
},
+ "ws2812": {
+ "driver": "i2c"
+ },
"indicators": {
"num_lock": "D0"
},
@@ -21,93 +29,93 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":2, "y":0},
- {"x":3, "y":0},
+ {"matrix": [5, 2], "x": 2, "y": 0},
+ {"matrix": [5, 3], "x": 3, "y": 0},
- {"x":0, "y":1.25},
- {"x":1, "y":1.25},
- {"x":2, "y":1.25},
- {"x":3, "y":1.25},
+ {"matrix": [4, 0], "x": 0, "y": 1.25},
+ {"matrix": [4, 1], "x": 1, "y": 1.25},
+ {"matrix": [4, 2], "x": 2, "y": 1.25},
+ {"matrix": [4, 3], "x": 3, "y": 1.25},
- {"x":0, "y":2.25},
- {"x":1, "y":2.25},
- {"x":2, "y":2.25},
+ {"matrix": [3, 0], "x": 0, "y": 2.25},
+ {"matrix": [3, 1], "x": 1, "y": 2.25},
+ {"matrix": [3, 2], "x": 2, "y": 2.25},
- {"x":0, "y":3.25},
- {"x":1, "y":3.25},
- {"x":2, "y":3.25},
- {"x":3, "y":2.25, "h":2},
+ {"matrix": [2, 0], "x": 0, "y": 3.25},
+ {"matrix": [2, 1], "x": 1, "y": 3.25},
+ {"matrix": [2, 2], "x": 2, "y": 3.25},
+ {"matrix": [2, 3], "x": 3, "y": 2.25, "h": 2},
- {"x":0, "y":4.25},
- {"x":1, "y":4.25},
- {"x":2, "y":4.25},
+ {"matrix": [1, 0], "x": 0, "y": 4.25},
+ {"matrix": [1, 1], "x": 1, "y": 4.25},
+ {"matrix": [1, 2], "x": 2, "y": 4.25},
- {"x":0, "y":5.25, "w":2},
- {"x":2, "y":5.25},
- {"x":3, "y":4.25, "h":2}
+ {"matrix": [0, 0], "x": 0, "y": 5.25, "w": 2},
+ {"matrix": [0, 2], "x": 2, "y": 5.25},
+ {"matrix": [0, 3], "x": 3, "y": 4.25, "h": 2}
]
},
"LAYOUT_numpad_6x4": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
+ {"matrix": [5, 0], "x": 0, "y": 0},
+ {"matrix": [5, 1], "x": 1, "y": 0},
+ {"matrix": [5, 2], "x": 2, "y": 0},
+ {"matrix": [5, 3], "x": 3, "y": 0},
- {"x":0, "y":1.25},
- {"x":1, "y":1.25},
- {"x":2, "y":1.25},
- {"x":3, "y":1.25},
+ {"matrix": [4, 0], "x": 0, "y": 1.25},
+ {"matrix": [4, 1], "x": 1, "y": 1.25},
+ {"matrix": [4, 2], "x": 2, "y": 1.25},
+ {"matrix": [4, 3], "x": 3, "y": 1.25},
- {"x":0, "y":2.25},
- {"x":1, "y":2.25},
- {"x":2, "y":2.25},
+ {"matrix": [3, 0], "x": 0, "y": 2.25},
+ {"matrix": [3, 1], "x": 1, "y": 2.25},
+ {"matrix": [3, 2], "x": 2, "y": 2.25},
- {"x":0, "y":3.25},
- {"x":1, "y":3.25},
- {"x":2, "y":3.25},
- {"x":3, "y":2.25, "h":2},
+ {"matrix": [2, 0], "x": 0, "y": 3.25},
+ {"matrix": [2, 1], "x": 1, "y": 3.25},
+ {"matrix": [2, 2], "x": 2, "y": 3.25},
+ {"matrix": [2, 3], "x": 3, "y": 2.25, "h": 2},
- {"x":0, "y":4.25},
- {"x":1, "y":4.25},
- {"x":2, "y":4.25},
+ {"matrix": [1, 0], "x": 0, "y": 4.25},
+ {"matrix": [1, 1], "x": 1, "y": 4.25},
+ {"matrix": [1, 2], "x": 2, "y": 4.25},
- {"x":0, "y":5.25, "w":2},
- {"x":2, "y":5.25},
- {"x":3, "y":4.25, "h":2}
+ {"matrix": [0, 0], "x": 0, "y": 5.25, "w": 2},
+ {"matrix": [0, 2], "x": 2, "y": 5.25},
+ {"matrix": [0, 3], "x": 3, "y": 4.25, "h": 2}
]
},
"LAYOUT_ortho_6x4": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
+ {"matrix": [5, 0], "x": 0, "y": 0},
+ {"matrix": [5, 1], "x": 1, "y": 0},
+ {"matrix": [5, 2], "x": 2, "y": 0},
+ {"matrix": [5, 3], "x": 3, "y": 0},
- {"x":0, "y":1.25},
- {"x":1, "y":1.25},
- {"x":2, "y":1.25},
- {"x":3, "y":1.25},
+ {"matrix": [4, 0], "x": 0, "y": 1.25},
+ {"matrix": [4, 1], "x": 1, "y": 1.25},
+ {"matrix": [4, 2], "x": 2, "y": 1.25},
+ {"matrix": [4, 3], "x": 3, "y": 1.25},
- {"x":0, "y":2.25},
- {"x":1, "y":2.25},
- {"x":2, "y":2.25},
- {"x":3, "y":2.25},
+ {"matrix": [3, 0], "x": 0, "y": 2.25},
+ {"matrix": [3, 1], "x": 1, "y": 2.25},
+ {"matrix": [3, 2], "x": 2, "y": 2.25},
+ {"matrix": [3, 3], "x": 3, "y": 2.25},
- {"x":0, "y":3.25},
- {"x":1, "y":3.25},
- {"x":2, "y":3.25},
- {"x":3, "y":3.25},
+ {"matrix": [2, 0], "x": 0, "y": 3.25},
+ {"matrix": [2, 1], "x": 1, "y": 3.25},
+ {"matrix": [2, 2], "x": 2, "y": 3.25},
+ {"matrix": [2, 3], "x": 3, "y": 3.25},
- {"x":0, "y":4.25},
- {"x":1, "y":4.25},
- {"x":2, "y":4.25},
- {"x":3, "y":4.25},
+ {"matrix": [1, 0], "x": 0, "y": 4.25},
+ {"matrix": [1, 1], "x": 1, "y": 4.25},
+ {"matrix": [1, 2], "x": 2, "y": 4.25},
+ {"matrix": [1, 3], "x": 3, "y": 4.25},
- {"x":0, "y":5.25},
- {"x":1, "y":5.25},
- {"x":2, "y":5.25},
- {"x":3, "y":5.25}
+ {"matrix": [0, 0], "x": 0, "y": 5.25},
+ {"matrix": [0, 1], "x": 1, "y": 5.25},
+ {"matrix": [0, 2], "x": 2, "y": 5.25},
+ {"matrix": [0, 3], "x": 3, "y": 5.25}
]
}
}
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/mk1/mk1.h b/keyboards/kbdfans/kbdpad/mk1/mk1.h
deleted file mode 100644
index 36b0287278..0000000000
--- a/keyboards/kbdfans/kbdpad/mk1/mk1.h
+++ /dev/null
@@ -1,71 +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/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-// This is a shortcut to help you visually see your layout.
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-
-#define LAYOUT( \
- k52, k53, \
- k40, k41, k42, k43, \
- k30, k31, k32, \
- k20, k21, k22, k23, \
- k10, k11, k12, \
- k00, k02, k03 \
-) { \
- { k00, KC_NO, k02, k03 }, \
- { k10, k11, k12, KC_NO }, \
- { k20, k21, k22, k23 }, \
- { k30, k31, k32, KC_NO }, \
- { k40, k41, k42, k43 }, \
- { KC_NO, KC_NO, k52, k53 } \
-}
-
-#define LAYOUT_numpad_6x4( \
- k50, k51, k52, k53, \
- k40, k41, k42, k43, \
- k30, k31, k32, \
- k20, k21, k22, k23, \
- k10, k11, k12, \
- k00, k02, k03 \
-) { \
- { k00, KC_NO, k02, k03 }, \
- { k10, k11, k12, KC_NO }, \
- { k20, k21, k22, k23 }, \
- { k30, k31, k32, KC_NO }, \
- { k40, k41, k42, k43 }, \
- { k50, k51, k52, k53 } \
-}
-
-#define LAYOUT_ortho_6x4( \
- k50, k51, k52, k53, \
- k40, k41, k42, k43, \
- k30, k31, k32, k33, \
- k20, k21, k22, k23, \
- k10, k11, k12, k13, \
- k00, k01, k02, k03 \
-) { \
- { k00, k01, k02, k03 }, \
- { k10, k11, k12, k13 }, \
- { k20, k21, k22, k23 }, \
- { k30, k31, k32, k33 }, \
- { k40, k41, k42, k43 }, \
- { k50, k51, k52, k53 } \
-}
diff --git a/keyboards/kbdfans/kbdpad/mk1/rules.mk b/keyboards/kbdfans/kbdpad/mk1/rules.mk
index 98e6c70143..ae7a0b4e16 100644
--- a/keyboards/kbdfans/kbdpad/mk1/rules.mk
+++ b/keyboards/kbdfans/kbdpad/mk1/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no
COMMAND_ENABLE = no
BACKLIGHT_ENABLE = yes
RGBLIGHT_ENABLE = no # PCB has underglow LEDs, but case doesn't let them show.
-WS2812_DRIVER = i2c
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 08:32:09 +0000