diff options
Diffstat (limited to 'keyboards/kapcave')
20 files changed, 167 insertions, 411 deletions
diff --git a/keyboards/kapcave/arya/arya.c b/keyboards/kapcave/arya/arya.c deleted file mode 100644 index af5d19be4f..0000000000 --- a/keyboards/kapcave/arya/arya.c +++ /dev/null @@ -1,27 +0,0 @@ -/* -Copyright 2021 KapCave - -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 "arya.h" - -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) { return false; } - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - return true; -} diff --git a/keyboards/kapcave/arya/arya.h b/keyboards/kapcave/arya/arya.h deleted file mode 100644 index 38e4afaf05..0000000000 --- a/keyboards/kapcave/arya/arya.h +++ /dev/null @@ -1,38 +0,0 @@ -/* -Copyright 2021 KapCave - -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_alice_split_bs( \ - K81, K36, K37, K46, K47, K56, K57, K66, K67, K76, K77, K06, K07, K17, K26, K27, \ - K80, K34, K35, K44, K45, K54, K55, K64, K65, K75, K05, K15, K16, K25, K24, \ - K82, K32, K33, K43, K52, K53, K63, K73, K74, K03, K04, K13, K14, K23, \ - K31, K41, K42, K51, K61, K62, K71, K72, K01, K02, K11, K12, K21, K22, \ - K30, K40, K50, K60, K00, K10, K20 \ -) \ -{ \ - { K00 , K01 , K02 , K03 , K04 , K05 , K06 , K07 }, \ - { K10 , K11 , K12 , K13 , K14 , K15 , K16 , K17 }, \ - { K20 , K21 , K22 , K23 , K24 , K25 , K26 , K27 }, \ - { K30 , K31 , K32 , K33 , K34 , K35 , K36 , K37 }, \ - { K40 , K41 , K42 , K43 , K44 , K45 , K46 , K47 }, \ - { K50 , K51 , K52 , K53 , K54 , K55 , K56 , K57 }, \ - { K60 , K61 , K62 , K63 , K64 , K65 , K66 , K67 }, \ - { KC_NO , K71 , K72 , K73 , K74 , K75 , K76 , K77 }, \ - { K80 , K81 , K82 , KC_NO, KC_NO, KC_NO, KC_NO, KC_NO} \ -} diff --git a/keyboards/kapcave/arya/config.h b/keyboards/kapcave/arya/config.h index dd197f2338..282b98a978 100644 --- a/keyboards/kapcave/arya/config.h +++ b/keyboards/kapcave/arya/config.h @@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define MATRIX_COL_PINS { B0, B5, B4, B2, C13, F1, F0, A14} -#define MATRIX_ROW_PINS { B8, A13, B1, A15, B9, B10, B11, A0, A8 } -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/kapcave/arya/info.json b/keyboards/kapcave/arya/info.json index 54a1513f90..0bfc8cec3f 100644 --- a/keyboards/kapcave/arya/info.json +++ b/keyboards/kapcave/arya/info.json @@ -8,6 +8,11 @@ "pid": "0x4152", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B5", "B4", "B2", "C13", "F1", "F0", "A14"], + "rows": ["B8", "A13", "B1", "A15", "B9", "B10", "B11", "A0", "A8"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B12", "pin_b": "B13", "resolution": 2}, @@ -21,76 +26,80 @@ "layouts": { "LAYOUT_alice_split_bs": { "layout": [ - {"x":0.4, "y":0}, - {"x":1.55, "y":0.1}, - {"x":2.55, "y":0.1}, - {"x":3.55, "y":0}, - {"x":4.55, "y":0.1}, - {"x":5.55, "y":0.1}, - {"x":6.55, "y":0.1}, - {"x":7.55, "y":0.1}, - {"x":9.75, "y":0.1}, - {"x":10.75, "y":0.1}, - {"x":11.75, "y":0.1}, - {"x":12.75, "y":0.1}, - {"x":13.75, "y":0}, - {"x":14.75, "y":0.1}, - {"x":15.75, "y":0.1}, - {"x":16.75, "y":0.1}, + {"matrix": [8, 1], "x": 0.4, "y": 0}, + {"matrix": [3, 6], "x": 1.55, "y": 0.1}, + {"matrix": [3, 7], "x": 2.55, "y": 0.1}, + {"matrix": [4, 6], "x": 3.55, "y": 0}, + {"matrix": [4, 7], "x": 4.55, "y": 0.1}, + {"matrix": [5, 6], "x": 5.55, "y": 0.1}, + {"matrix": [5, 7], "x": 6.55, "y": 0.1}, + {"matrix": [6, 6], "x": 7.55, "y": 0.1}, + + {"matrix": [6, 7], "x": 9.75, "y": 0.1}, + {"matrix": [7, 6], "x": 10.75, "y": 0.1}, + {"matrix": [7, 7], "x": 11.75, "y": 0.1}, + {"matrix": [0, 6], "x": 12.75, "y": 0.1}, + {"matrix": [0, 7], "x": 13.75, "y": 0}, + {"matrix": [1, 7], "x": 14.75, "y": 0.1}, + {"matrix": [2, 6], "x": 15.75, "y": 0.1}, + {"matrix": [2, 7], "x": 16.75, "y": 0.1}, + + {"matrix": [8, 0], "x": 0.2, "y": 1}, + {"matrix": [3, 4], "x": 1.35, "y": 1.1, "w": 1.5}, + {"matrix": [3, 5], "x": 2.85, "y": 1.1}, + {"matrix": [4, 4], "x": 3.85, "y": 1.1}, + {"matrix": [4, 5], "x": 4.85, "y": 1.1}, + {"matrix": [5, 4], "x": 5.85, "y": 1.1}, + {"matrix": [5, 5], "x": 6.85, "y": 1.1}, + + {"matrix": [6, 4], "x": 9.45, "y": 1.1}, + {"matrix": [6, 5], "x": 10.45, "y": 1.1}, + {"matrix": [7, 5], "x": 11.45, "y": 1.1}, + {"matrix": [0, 5], "x": 12.45, "y": 1.1}, + {"matrix": [1, 5], "x": 13.45, "y": 1.1}, + {"matrix": [1, 6], "x": 14.45, "y": 1.1}, + {"matrix": [2, 5], "x": 15.45, "y": 1.1}, + {"matrix": [2, 4], "x": 16.45, "y": 1.1, "w": 1.5}, + + {"matrix": [8, 2], "x": 0, "y": 2}, + {"matrix": [3, 2], "x": 1.15, "y": 2.1, "w": 1.75}, + {"matrix": [3, 3], "x": 2.9, "y": 2.1}, + {"matrix": [4, 3], "x": 3.9, "y": 2.1}, + {"matrix": [5, 2], "x": 4.9, "y": 2.1}, + {"matrix": [5, 3], "x": 5.9, "y": 2.1}, + {"matrix": [6, 3], "x": 6.9, "y": 2.1}, - {"x":0.2, "y":1.0}, - {"x":1.35, "y":1.1, "w":1.5}, - {"x":2.85, "y":1.1}, - {"x":3.85, "y":1.1}, - {"x":4.85, "y":1.1}, - {"x":5.85, "y":1.1}, - {"x":6.85, "y":1.1}, - {"x":9.45, "y":1.1}, - {"x":10.45, "y":1.1}, - {"x":11.45, "y":1.1}, - {"x":12.45, "y":1.1}, - {"x":13.45, "y":1.1}, - {"x":14.45, "y":1.1}, - {"x":15.45, "y":1.1}, - {"x":16.45, "y":1.1, "w":1.5}, + {"matrix": [7, 3], "x": 9.9, "y": 2.1}, + {"matrix": [7, 4], "x": 10.9, "y": 2.1}, + {"matrix": [0, 3], "x": 11.9, "y": 2.1}, + {"matrix": [0, 4], "x": 12.9, "y": 2.1}, + {"matrix": [1, 3], "x": 13.9, "y": 2.1}, + {"matrix": [1, 4], "x": 14.9, "y": 2.1}, + {"matrix": [2, 3], "x": 15.9, "y": 2.1, "w": 2.25}, - {"x":0, "y":2.0}, - {"x":1.15, "y":2.1, "w":1.75}, - {"x":2.9, "y":2.1}, - {"x":3.9, "y":2.1}, - {"x":4.9, "y":2.1}, - {"x":5.9, "y":2.1}, - {"x":6.9, "y":2.1}, - {"x":9.9, "y":2.1}, - {"x":10.9, "y":2.1}, - {"x":11.9, "y":2.1}, - {"x":12.9, "y":2.1}, - {"x":13.9, "y":2.1}, - {"x":14.9, "y":2.1}, - {"x":15.9, "y":2.1, "w":2.25}, + {"matrix": [3, 1], "x": 0.95, "y": 3.1, "w": 2.25}, + {"matrix": [4, 1], "x": 3.2, "y": 3.1}, + {"matrix": [4, 2], "x": 4.2, "y": 3.1}, + {"matrix": [5, 1], "x": 5.2, "y": 3.1}, + {"matrix": [6, 1], "x": 6.2, "y": 3.1}, + {"matrix": [6, 2], "x": 7.2, "y": 3.1}, - {"x":0.95, "y":3.1, "w":2.25}, - {"x":3.2, "y":3.1}, - {"x":4.2, "y":3.1}, - {"x":5.2, "y":3.1}, - {"x":6.2, "y":3.1}, - {"x":7.2, "y":3.1}, - {"x":9.6, "y":3.1}, - {"x":10.6, "y":3.1}, - {"x":11.6, "y":3.1}, - {"x":12.6, "y":3.1}, - {"x":13.6, "y":3.1}, - {"x":14.6, "y":3.1}, - {"x":15.6, "y":3.1, "w":1.75}, - {"x":17.35, "y":3.1}, + {"matrix": [7, 1], "x": 9.6, "y": 3.1}, + {"matrix": [7, 2], "x": 10.6, "y": 3.1}, + {"matrix": [0, 1], "x": 11.6, "y": 3.1}, + {"matrix": [0, 2], "x": 12.6, "y": 3.1}, + {"matrix": [1, 1], "x": 13.6, "y": 3.1}, + {"matrix": [1, 2], "x": 14.6, "y": 3.1}, + {"matrix": [2, 1], "x": 15.6, "y": 3.1, "w": 1.75}, + {"matrix": [2, 2], "x": 17.35, "y": 3.1}, - {"x":0.95, "y":4.1, "w":1.5}, - {"x":3.85, "y":4.1, "w":1.5}, - {"x":5.35, "y":4.1, "w":2}, - {"x":7.35, "y":4.1, "w":1.25}, - {"x":9.6, "y":4.1, "w":2.75}, - {"x":12.35, "y":4.1, "w":1.5}, - {"x":16.65, "y":4.1, "w":1.5} + {"matrix": [3, 0], "x": 0.95, "y": 4.1, "w": 1.5}, + {"matrix": [4, 0], "x": 3.85, "y": 4.1, "w": 1.5}, + {"matrix": [5, 0], "x": 5.35, "y": 4.1, "w": 2}, + {"matrix": [6, 0], "x": 7.35, "y": 4.1, "w": 1.25}, + {"matrix": [0, 0], "x": 9.6, "y": 4.1, "w": 2.75}, + {"matrix": [1, 0], "x": 12.35, "y": 4.1, "w": 1.5}, + {"matrix": [2, 0], "x": 16.65, "y": 4.1, "w": 1.5} ] } } diff --git a/keyboards/kapcave/gskt00/config.h b/keyboards/kapcave/gskt00/config.h index 30a5aa6db2..dfeb9c44d1 100755 --- a/keyboards/kapcave/gskt00/config.h +++ b/keyboards/kapcave/gskt00/config.h @@ -16,14 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F1, D1, D2, D4, D6, F7, B0, F4 } -#define MATRIX_COL_PINS { F6, D7, F5, C7, B4, C6, B6, B5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kapcave/gskt00/gskt00.c b/keyboards/kapcave/gskt00/gskt00.c deleted file mode 100755 index c2c2d823f9..0000000000 --- a/keyboards/kapcave/gskt00/gskt00.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2021 KapCave - -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 "gskt00.h" - diff --git a/keyboards/kapcave/gskt00/gskt00.h b/keyboards/kapcave/gskt00/gskt00.h index d0ac51acd7..120e021ce3 100755 --- a/keyboards/kapcave/gskt00/gskt00.h +++ b/keyboards/kapcave/gskt00/gskt00.h @@ -46,7 +46,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. k30, k40, k50, k60, k00, k10, k20 \ ) { \ { k00, k01, k02, k03, k04, k05, k06, k07 }, \ - { XXX, k11, k12, k13, k14, k15, k16, k17 }, \ + { k10, k11, k12, k13, k14, k15, k16, k17 }, \ { k20, k21, XXX, k23, k24, k25, XXX, k27 }, \ { k30, k31, k32, k33, k34, k35, k36, k37 }, \ { k40, k41, k42, k43, k44, k45, k46, k47 }, \ diff --git a/keyboards/kapcave/gskt00/info.json b/keyboards/kapcave/gskt00/info.json index 94b0159176..a66772ef93 100644 --- a/keyboards/kapcave/gskt00/info.json +++ b/keyboards/kapcave/gskt00/info.json @@ -8,6 +8,11 @@ "pid": "0x6061", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "D7", "F5", "C7", "B4", "C6", "B6", "B5"], + "rows": ["F1", "D1", "D2", "D4", "D6", "F7", "B0", "F4"] + }, + "diode_direction": "COL2ROW", "bootmagic": { "matrix": [3, 6] }, diff --git a/keyboards/kapcave/gskt00/keymaps/default-poly/config.h b/keyboards/kapcave/gskt00/keymaps/default-poly/config.h index 2db5749cb5..64135cabcd 100644 --- a/keyboards/kapcave/gskt00/keymaps/default-poly/config.h +++ b/keyboards/kapcave/gskt00/keymaps/default-poly/config.h @@ -19,8 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define ENCODERS_PAD_A { D5 } #define ENCODERS_PAD_B { D3 } -#define RGB_DI_PIN D0 -#ifdef RGB_DI_PIN +#define WS2812_DI_PIN D0 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -35,5 +34,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 #define RGBLIGHT_VAL_STEP 12 -#endif - diff --git a/keyboards/kapcave/paladin64/config.h b/keyboards/kapcave/paladin64/config.h index 58fd5aff24..93d67ee100 100755 --- a/keyboards/kapcave/paladin64/config.h +++ b/keyboards/kapcave/paladin64/config.h @@ -72,21 +72,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #endif -/* key matrix pins */ -#define MATRIX_ROW_PINS { C6, B6, B5, B4, D7, D6, B0, D3 } -#define MATRIX_COL_PINS { C7, F7, F6, F5, F4, F1, F0, D1 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN D0 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -101,4 +92,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 #define RGBLIGHT_VAL_STEP 12 -#endif diff --git a/keyboards/kapcave/paladin64/info.json b/keyboards/kapcave/paladin64/info.json index f64fdc2a65..e280220217 100644 --- a/keyboards/kapcave/paladin64/info.json +++ b/keyboards/kapcave/paladin64/info.json @@ -8,6 +8,14 @@ "pid": "0x5036", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D0" + }, + "matrix_pins": { + "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "F0", "D1"], + "rows": ["C6", "B6", "B5", "B4", "D7", "D6", "B0", "D3"] + }, + "diode_direction": "COL2ROW", "bootmagic": { "matrix": [3, 6] }, diff --git a/keyboards/kapcave/paladin64/paladin64.c b/keyboards/kapcave/paladin64/paladin64.c deleted file mode 100755 index 88dd1fdff2..0000000000 --- a/keyboards/kapcave/paladin64/paladin64.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2021 KapCave - -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 "paladin64.h" - diff --git a/keyboards/kapcave/paladinpad/config.h b/keyboards/kapcave/paladinpad/config.h deleted file mode 100644 index 9676459af2..0000000000 --- a/keyboards/kapcave/paladinpad/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* -Copyright 2021 KapCave - -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 - - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/kapcave/paladinpad/info.json b/keyboards/kapcave/paladinpad/info.json index fcc6ba4941..245ef7066a 100644 --- a/keyboards/kapcave/paladinpad/info.json +++ b/keyboards/kapcave/paladinpad/info.json @@ -13,77 +13,81 @@ "layouts": { "LAYOUT_ortho_5x4": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3, "y":4} + {"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}, + + {"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}, + + {"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}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [4, 3], "x": 3, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 2], "x": 1, "y": 4}, + {"matrix": [4, 1], "x": 2, "y": 4}, + {"matrix": [3, 3], "x": 3, "y": 4} ] }, "LAYOUT_numpad_aek": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"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}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"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}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, - {"x":0, "y":4, "w":2}, - {"x":2, "y":4}, - {"x":3, "y":3, "h":2} + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 1], "x": 2, "y": 4}, + {"matrix": [3, 3], "x": 3, "y": 3, "h": 2} ] }, "LAYOUT_numpad_5x4": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":1, "h":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": 1, "h": 2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, - {"x":0, "y":4, "w":2}, - {"x":2, "y":4}, - {"x":3, "y":3, "h":2} + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 1], "x": 2, "y": 4}, + {"matrix": [3, 3], "x": 3, "y": 3, "h": 2} ] } } diff --git a/keyboards/kapcave/paladinpad/paladinpad.c b/keyboards/kapcave/paladinpad/paladinpad.c deleted file mode 100644 index 063e49c872..0000000000 --- a/keyboards/kapcave/paladinpad/paladinpad.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2021 KapCave - -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 "paladinpad.h" diff --git a/keyboards/kapcave/paladinpad/paladinpad.h b/keyboards/kapcave/paladinpad/paladinpad.h deleted file mode 100644 index 54b320c424..0000000000 --- a/keyboards/kapcave/paladinpad/paladinpad.h +++ /dev/null @@ -1,103 +0,0 @@ -/* -Copyright 2021 KapCave - -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" - -/* - * ┌─────┬─────┬─────┬─────┐ - * │Num1 │ Eq │Slsh │Star │ - * ├─────┼─────┼─────┼─────┤ - * │ 7 │ 8 │ 9 │ │ - * ├─────┼─────┼─────┤Plus │ - * │ 4 │ 5 │ 6 │ │ - * ├─────┼─────┼─────┼─────┤ - * │ 1 │ 2 │ 3 │ │ - * ├─────┴─────┼─────┤ Ent │ - * │ 0 │ . │ │ - * └───────────┴─────┴─────┘ - */ - -#define LAYOUT_numpad_5x4( \ - K_NUM1, K_SLSH, K_STAR, K_MINUS, \ - K_7, K_8, K_9, \ - K_4, K_5, K_6, K_PLUS, \ - K_1, K_2, K_3, \ - K_0, K_DOT, K_ENT \ -) { \ - { K_NUM1, K_SLSH, K_STAR, K_MINUS }, \ - { K_7, K_8, K_9, KC_NO }, \ - { K_4, K_5, K_6, K_PLUS }, \ - { K_1, K_2, K_3, K_ENT }, \ - { K_0, K_DOT, KC_NO, KC_NO } \ -} - -/* - * ┌─────┬─────┬─────┬─────┐ - * │Num1 │Eql │Slsh │Star │ - * ├─────┼─────┼─────┼─────┤ - * │ 7 │ 8 │ 9 │Minus│ - * ├─────┼─────┼─────┼─────┤ - * │ 4 │ 5 │ 6 │Plus │ - * ├─────┼─────┼─────┼─────┤ - * │ 1 │ 2 │ 3 │ │ - * ├─────┼─────┼─────┤ Ent │ - * │ 0 │ 10 │ . │ │ - * └─────┴─────┴─────┴─────┘ - */ - -#define LAYOUT_numpad_aek( \ - K_NUM1, K_EQ1, K_SLSH1, K_STAR1, \ - K_7, K_8, K_9, K_MINUS1, \ - K_4, K_5, K_6, K_PLUS, \ - K_1, K_2, K_3, \ - K_0, K_DOT1, K_ENT \ -) { \ - { K_NUM1, K_EQ1, K_SLSH1, K_STAR1 }, \ - { K_7, K_8, K_9, K_MINUS1 }, \ - { K_4, K_5, K_6, K_PLUS }, \ - { K_1, K_2, K_3, K_ENT }, \ - { K_0, K_DOT1, KC_NO, KC_NO } \ -} - -/* - * ┌─────┬─────┬─────┬─────┐ - * │Num1 │ Eq │Slsh │Star │ - * ├─────┼─────┼─────┼─────┤ - * │ 7 │ 8 │ 9 │Minus│ - * ├─────┼─────┼─────┼─────┤ - * │ 4 │ 5 │ 6 │Plus │ - * ├─────┼─────┼─────┼─────┤ - * │ 1 │ 2 │ 3 │ 11 │ - * ├─────┼─────┼─────┼─────┤ - * │ 0 │ 10 │ . │ Ent │ - * └─────┴─────┴─────┴─────┘ - */ - -#define LAYOUT_ortho_5x4( \ - K_NUM1, K_EQ1, K_SLSH1, K_STAR1, \ - K_7, K_8, K_9, K_MINUS1, \ - K_4, K_5, K_6, K_PLUS, \ - K_1, K_2, K_3, K_11, \ - K_0, K_10, K_DOT1, K_ENT \ -) { \ - { K_NUM1, K_EQ1, K_SLSH1, K_STAR1 }, \ - { K_7, K_8, K_9, K_MINUS1 }, \ - { K_4, K_5, K_6, K_PLUS }, \ - { K_1, K_2, K_3, K_ENT }, \ - { K_0, K_DOT1, K_10, K_11 } \ -} diff --git a/keyboards/kapcave/paladinpad/rev1/config.h b/keyboards/kapcave/paladinpad/rev1/config.h index 959d80429c..386e4b0a0c 100644 --- a/keyboards/kapcave/paladinpad/rev1/config.h +++ b/keyboards/kapcave/paladinpad/rev1/config.h @@ -16,14 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { C7, B6, B4, D7, D6 } -#define MATRIX_COL_PINS { D4, D5, D3, B7 } - -#define RGB_DI_PIN D0 - -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -38,4 +30,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 #define RGBLIGHT_VAL_STEP 12 -#endif diff --git a/keyboards/kapcave/paladinpad/rev1/info.json b/keyboards/kapcave/paladinpad/rev1/info.json index 90ac25f360..0fec9260a9 100644 --- a/keyboards/kapcave/paladinpad/rev1/info.json +++ b/keyboards/kapcave/paladinpad/rev1/info.json @@ -1,5 +1,13 @@ { "usb": { "device_version": "0.0.1" - } + }, + "ws2812": { + "pin": "D0" + }, + "matrix_pins": { + "cols": ["D4", "D5", "D3", "B7"], + "rows": ["C7", "B6", "B4", "D7", "D6"] + }, + "diode_direction": "COL2ROW" } diff --git a/keyboards/kapcave/paladinpad/rev2/config.h b/keyboards/kapcave/paladinpad/rev2/config.h index 3c769a530a..239a873384 100644 --- a/keyboards/kapcave/paladinpad/rev2/config.h +++ b/keyboards/kapcave/paladinpad/rev2/config.h @@ -16,16 +16,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F4, F6, D7, B4, D6 } -#define MATRIX_COL_PINS { F7, F5, D3, B7 } - #define AUDIO_PIN C6 -#define RGB_DI_PIN D0 - -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -40,5 +32,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 #define RGBLIGHT_VAL_STEP 12 -#endif - diff --git a/keyboards/kapcave/paladinpad/rev2/info.json b/keyboards/kapcave/paladinpad/rev2/info.json index e557e4d307..699cdde82d 100644 --- a/keyboards/kapcave/paladinpad/rev2/info.json +++ b/keyboards/kapcave/paladinpad/rev2/info.json @@ -1,5 +1,13 @@ { "usb": { "device_version": "0.0.2" - } + }, + "ws2812": { + "pin": "D0" + }, + "matrix_pins": { + "cols": ["F7", "F5", "D3", "B7"], + "rows": ["F4", "F6", "D7", "B4", "D6"] + }, + "diode_direction": "COL2ROW" } |