diff options
Diffstat (limited to 'keyboards/kakunpc/suihankey')
-rw-r--r-- | keyboards/kakunpc/suihankey/alpha/alpha.c | 16 | ||||
-rw-r--r-- | keyboards/kakunpc/suihankey/alpha/alpha.h | 39 | ||||
-rw-r--r-- | keyboards/kakunpc/suihankey/alpha/config.h | 20 | ||||
-rw-r--r-- | keyboards/kakunpc/suihankey/alpha/info.json | 44 | ||||
-rw-r--r-- | keyboards/kakunpc/suihankey/rev1/config.h | 20 | ||||
-rw-r--r-- | keyboards/kakunpc/suihankey/rev1/info.json | 44 | ||||
-rw-r--r-- | keyboards/kakunpc/suihankey/rev1/rev1.c | 16 | ||||
-rw-r--r-- | keyboards/kakunpc/suihankey/rev1/rev1.h | 40 | ||||
-rw-r--r-- | keyboards/kakunpc/suihankey/split/alpha/alpha.c | 16 | ||||
-rw-r--r-- | keyboards/kakunpc/suihankey/split/alpha/alpha.h | 45 | ||||
-rw-r--r-- | keyboards/kakunpc/suihankey/split/alpha/config.h | 19 | ||||
-rw-r--r-- | keyboards/kakunpc/suihankey/split/alpha/info.json | 62 | ||||
-rw-r--r-- | keyboards/kakunpc/suihankey/split/info.json | 51 | ||||
-rw-r--r-- | keyboards/kakunpc/suihankey/split/rev1/config.h | 19 | ||||
-rw-r--r-- | keyboards/kakunpc/suihankey/split/rev1/info.json | 62 | ||||
-rw-r--r-- | keyboards/kakunpc/suihankey/split/rev1/rev1.c | 16 | ||||
-rw-r--r-- | keyboards/kakunpc/suihankey/split/rev1/rev1.h | 47 |
17 files changed, 177 insertions, 399 deletions
diff --git a/keyboards/kakunpc/suihankey/alpha/alpha.c b/keyboards/kakunpc/suihankey/alpha/alpha.c deleted file mode 100644 index 1c2936e157..0000000000 --- a/keyboards/kakunpc/suihankey/alpha/alpha.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 kakunpc - * - * 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 "alpha.h" diff --git a/keyboards/kakunpc/suihankey/alpha/alpha.h b/keyboards/kakunpc/suihankey/alpha/alpha.h deleted file mode 100644 index 02bba47104..0000000000 --- a/keyboards/kakunpc/suihankey/alpha/alpha.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2019 kakunpc - * - * 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 Leys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - L00, L01, L02, L03, L04, \ - L10, L11, L12, L13, L14, \ - L20, L21, L22, L23, L24, \ - L30, L31, L32 \ -) \ -{ \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { L30, L31, L32 }, \ -} diff --git a/keyboards/kakunpc/suihankey/alpha/config.h b/keyboards/kakunpc/suihankey/alpha/config.h index a2fcf4c628..09038071c2 100644 --- a/keyboards/kakunpc/suihankey/alpha/config.h +++ b/keyboards/kakunpc/suihankey/alpha/config.h @@ -17,25 +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 { F4, F5, F6, F7 } -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 18 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -52,7 +33,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kakunpc/suihankey/alpha/info.json b/keyboards/kakunpc/suihankey/alpha/info.json index 76c31631ff..b48aab8422 100644 --- a/keyboards/kakunpc/suihankey/alpha/info.json +++ b/keyboards/kakunpc/suihankey/alpha/info.json @@ -8,32 +8,40 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4"], + "rows": ["F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0.375}, - {"x": 1, "y": 0.125}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0.125}, - {"x": 4, "y": 0.25}, + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [0, 1], "x": 1, "y": 0.125}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.125}, + {"matrix": [0, 4], "x": 4, "y": 0.25}, - {"x": 0, "y": 1.375}, - {"x": 1, "y": 1.125}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1.125}, - {"x": 4, "y": 1.25}, + {"matrix": [1, 0], "x": 0, "y": 1.375}, + {"matrix": [1, 1], "x": 1, "y": 1.125}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.125}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, - {"x": 0, "y": 2.375}, - {"x": 1, "y": 2.125}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2.125}, - {"x": 4, "y": 2.25}, + {"matrix": [2, 0], "x": 0, "y": 2.375}, + {"matrix": [2, 1], "x": 1, "y": 2.125}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.125}, + {"matrix": [2, 4], "x": 4, "y": 2.25}, - {"x": 3.4, "y": 3.25}, - {"x": 4.4, "y": 3.55}, - {"x": 5.4, "y": 3.85} + {"matrix": [3, 0], "x": 3.4, "y": 3.25}, + {"matrix": [3, 1], "x": 4.4, "y": 3.55}, + {"matrix": [3, 2], "x": 5.4, "y": 3.85} ] } } diff --git a/keyboards/kakunpc/suihankey/rev1/config.h b/keyboards/kakunpc/suihankey/rev1/config.h index 9c2bb19be8..09038071c2 100644 --- a/keyboards/kakunpc/suihankey/rev1/config.h +++ b/keyboards/kakunpc/suihankey/rev1/config.h @@ -17,25 +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 { D4, C6, D7, E6, B4 } -#define MATRIX_COL_PINS { F4, F5, F6, F7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 18 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -52,7 +33,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kakunpc/suihankey/rev1/info.json b/keyboards/kakunpc/suihankey/rev1/info.json index 76c31631ff..4f5caa6c63 100644 --- a/keyboards/kakunpc/suihankey/rev1/info.json +++ b/keyboards/kakunpc/suihankey/rev1/info.json @@ -8,32 +8,40 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0.375}, - {"x": 1, "y": 0.125}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0.125}, - {"x": 4, "y": 0.25}, + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [1, 0], "x": 1, "y": 0.125}, + {"matrix": [2, 0], "x": 2, "y": 0}, + {"matrix": [3, 0], "x": 3, "y": 0.125}, + {"matrix": [4, 0], "x": 4, "y": 0.25}, - {"x": 0, "y": 1.375}, - {"x": 1, "y": 1.125}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1.125}, - {"x": 4, "y": 1.25}, + {"matrix": [0, 1], "x": 0, "y": 1.375}, + {"matrix": [1, 1], "x": 1, "y": 1.125}, + {"matrix": [2, 1], "x": 2, "y": 1}, + {"matrix": [3, 1], "x": 3, "y": 1.125}, + {"matrix": [4, 1], "x": 4, "y": 1.25}, - {"x": 0, "y": 2.375}, - {"x": 1, "y": 2.125}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2.125}, - {"x": 4, "y": 2.25}, + {"matrix": [0, 2], "x": 0, "y": 2.375}, + {"matrix": [1, 2], "x": 1, "y": 2.125}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [3, 2], "x": 3, "y": 2.125}, + {"matrix": [4, 2], "x": 4, "y": 2.25}, - {"x": 3.4, "y": 3.25}, - {"x": 4.4, "y": 3.55}, - {"x": 5.4, "y": 3.85} + {"matrix": [0, 3], "x": 3.4, "y": 3.25}, + {"matrix": [1, 3], "x": 4.4, "y": 3.55}, + {"matrix": [2, 3], "x": 5.4, "y": 3.85} ] } } diff --git a/keyboards/kakunpc/suihankey/rev1/rev1.c b/keyboards/kakunpc/suihankey/rev1/rev1.c deleted file mode 100644 index 40ff30e620..0000000000 --- a/keyboards/kakunpc/suihankey/rev1/rev1.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 kakunpc - * - * 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 "rev1.h" diff --git a/keyboards/kakunpc/suihankey/rev1/rev1.h b/keyboards/kakunpc/suihankey/rev1/rev1.h deleted file mode 100644 index cbc877abd5..0000000000 --- a/keyboards/kakunpc/suihankey/rev1/rev1.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2019 kakunpc - * - * 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 Leys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - L00, L01, L02, L03, L04, \ - L10, L11, L12, L13, L14, \ - L20, L21, L22, L23, L24, \ - L30, L31, L32 \ -) \ -{ \ - { L00, L10, L20, L30 }, \ - { L01, L11, L21, L31 }, \ - { L02, L12, L22, L32 }, \ - { L03, L13, L23, KC_NO }, \ - { L04, L14, L24, KC_NO }, \ -} diff --git a/keyboards/kakunpc/suihankey/split/alpha/alpha.c b/keyboards/kakunpc/suihankey/split/alpha/alpha.c deleted file mode 100644 index 1c2936e157..0000000000 --- a/keyboards/kakunpc/suihankey/split/alpha/alpha.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 kakunpc - * - * 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 "alpha.h" diff --git a/keyboards/kakunpc/suihankey/split/alpha/alpha.h b/keyboards/kakunpc/suihankey/split/alpha/alpha.h deleted file mode 100644 index ba93405ecc..0000000000 --- a/keyboards/kakunpc/suihankey/split/alpha/alpha.h +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright 2019 kakunpc - * - * 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 Leys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT_split_3x5_3( \ - L00, L01, L02, L03, L04, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, R24, R23, R22, R21, R20, \ - L30, L31, L32, R32, R31, R30 \ -) \ -{ \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { L30, L31, L32 }, \ - { R00, R01, R02, R03, R04 }, \ - { R10, R11, R12, R13, R14 }, \ - { R20, R21, R22, R23, R24 }, \ - { R30, R31, R32 }, \ -} - -#define LAYOUT LAYOUT_split_3x5_3 diff --git a/keyboards/kakunpc/suihankey/split/alpha/config.h b/keyboards/kakunpc/suihankey/split/alpha/config.h index f8fd8a6b5f..09befa3a58 100644 --- a/keyboards/kakunpc/suihankey/split/alpha/config.h +++ b/keyboards/kakunpc/suihankey/split/alpha/config.h @@ -17,35 +17,16 @@ 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 { F4, F5, F6, F7 } -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4 } #define USE_I2C -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define SPLIT_HAND_PIN D2 -#define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 18 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kakunpc/suihankey/split/alpha/info.json b/keyboards/kakunpc/suihankey/split/alpha/info.json new file mode 100644 index 0000000000..72aaf72967 --- /dev/null +++ b/keyboards/kakunpc/suihankey/split/alpha/info.json @@ -0,0 +1,62 @@ +{ + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4"], + "rows": ["F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", + "layout_aliases": { + "LAYOUT": "LAYOUT_split_3x5_3" + }, + "layouts": { + "LAYOUT_split_3x5_3": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [0, 1], "x": 1, "y": 0.125}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.125}, + {"matrix": [0, 4], "x": 4, "y": 0.25}, + + {"matrix": [4, 4], "x": 8.2, "y": 0.25}, + {"matrix": [4, 3], "x": 9.2, "y": 0.125}, + {"matrix": [4, 2], "x": 10.2, "y": 0}, + {"matrix": [4, 1], "x": 11.2, "y": 0.125}, + {"matrix": [4, 0], "x": 12.2, "y": 0.375}, + + {"matrix": [1, 0], "x": 0, "y": 1.375}, + {"matrix": [1, 1], "x": 1, "y": 1.125}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.125}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + + {"matrix": [5, 4], "x": 8.2, "y": 1.25}, + {"matrix": [5, 3], "x": 9.2, "y": 1.125}, + {"matrix": [5, 2], "x": 10.2, "y": 1}, + {"matrix": [5, 1], "x": 11.2, "y": 1.125}, + {"matrix": [5, 0], "x": 12.2, "y": 1.375}, + + {"matrix": [2, 0], "x": 0, "y": 2.375}, + {"matrix": [2, 1], "x": 1, "y": 2.125}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.125}, + {"matrix": [2, 4], "x": 4, "y": 2.25}, + + {"matrix": [6, 4], "x": 8.2, "y": 2.25}, + {"matrix": [6, 3], "x": 9.2, "y": 2.125}, + {"matrix": [6, 2], "x": 10.2, "y": 2}, + {"matrix": [6, 1], "x": 11.2, "y": 2.125}, + {"matrix": [6, 0], "x": 12.2, "y": 2.375}, + + {"matrix": [3, 0], "x": 3.4, "y": 3.25}, + {"matrix": [3, 1], "x": 4.4, "y": 3.55}, + {"matrix": [3, 2], "x": 5.4, "y": 3.85}, + + {"matrix": [7, 2], "x": 6.8, "y": 3.85}, + {"matrix": [7, 1], "x": 7.8, "y": 3.55}, + {"matrix": [7, 0], "x": 8.8, "y": 3.25} + ] + } + } +} diff --git a/keyboards/kakunpc/suihankey/split/info.json b/keyboards/kakunpc/suihankey/split/info.json index 4cab8c48f2..8f624aeb6c 100644 --- a/keyboards/kakunpc/suihankey/split/info.json +++ b/keyboards/kakunpc/suihankey/split/info.json @@ -13,54 +13,5 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", - "community_layouts": ["split_3x5_3"], - "layouts": { - "LAYOUT_split_3x5_3": { - "layout": [ - {"x": 0, "y": 0.375}, - {"x": 1, "y": 0.125}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0.125}, - {"x": 4, "y": 0.25}, - - {"x": 8.2, "y": 0.25}, - {"x": 9.2, "y": 0.125}, - {"x": 10.2, "y": 0}, - {"x": 11.2, "y": 0.125}, - {"x": 12.2, "y": 0.375}, - - {"x": 0, "y": 1.375}, - {"x": 1, "y": 1.125}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1.125}, - {"x": 4, "y": 1.25}, - - {"x": 8.2, "y": 1.25}, - {"x": 9.2, "y": 1.125}, - {"x": 10.2, "y": 1}, - {"x": 11.2, "y": 1.125}, - {"x": 12.2, "y": 1.375}, - - {"x": 0, "y": 2.375}, - {"x": 1, "y": 2.125}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2.125}, - {"x": 4, "y": 2.25}, - - {"x": 8.2, "y": 2.25}, - {"x": 9.2, "y": 2.125}, - {"x": 10.2, "y": 2}, - {"x": 11.2, "y": 2.125}, - {"x": 12.2, "y": 2.375}, - - {"x": 3.4, "y": 3.25}, - {"x": 4.4, "y": 3.55}, - {"x": 5.4, "y": 3.85}, - - {"x": 6.8, "y": 3.85}, - {"x": 7.8, "y": 3.55}, - {"x": 8.8, "y": 3.25} - ] - } - } + "community_layouts": ["split_3x5_3"] } diff --git a/keyboards/kakunpc/suihankey/split/rev1/config.h b/keyboards/kakunpc/suihankey/split/rev1/config.h index c05fe6d365..1398e13f82 100644 --- a/keyboards/kakunpc/suihankey/split/rev1/config.h +++ b/keyboards/kakunpc/suihankey/split/rev1/config.h @@ -17,28 +17,10 @@ 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 { D4, C6, D7, E6, B4 } -#define MATRIX_COL_PINS { F4, F5, F6, F7 } #define USE_I2C -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define SPLIT_HAND_PIN D2 -#define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 18 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -55,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kakunpc/suihankey/split/rev1/info.json b/keyboards/kakunpc/suihankey/split/rev1/info.json new file mode 100644 index 0000000000..2c414b3116 --- /dev/null +++ b/keyboards/kakunpc/suihankey/split/rev1/info.json @@ -0,0 +1,62 @@ +{ + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", + "layout_aliases": { + "LAYOUT": "LAYOUT_split_3x5_3" + }, + "layouts": { + "LAYOUT_split_3x5_3": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [1, 0], "x": 1, "y": 0.125}, + {"matrix": [2, 0], "x": 2, "y": 0}, + {"matrix": [3, 0], "x": 3, "y": 0.125}, + {"matrix": [4, 0], "x": 4, "y": 0.25}, + + {"matrix": [9, 0], "x": 8.2, "y": 0.25}, + {"matrix": [8, 0], "x": 9.2, "y": 0.125}, + {"matrix": [7, 0], "x": 10.2, "y": 0}, + {"matrix": [6, 0], "x": 11.2, "y": 0.125}, + {"matrix": [5, 0], "x": 12.2, "y": 0.375}, + + {"matrix": [0, 1], "x": 0, "y": 1.375}, + {"matrix": [1, 1], "x": 1, "y": 1.125}, + {"matrix": [2, 1], "x": 2, "y": 1}, + {"matrix": [3, 1], "x": 3, "y": 1.125}, + {"matrix": [4, 1], "x": 4, "y": 1.25}, + + {"matrix": [9, 1], "x": 8.2, "y": 1.25}, + {"matrix": [8, 1], "x": 9.2, "y": 1.125}, + {"matrix": [7, 1], "x": 10.2, "y": 1}, + {"matrix": [6, 1], "x": 11.2, "y": 1.125}, + {"matrix": [5, 1], "x": 12.2, "y": 1.375}, + + {"matrix": [0, 2], "x": 0, "y": 2.375}, + {"matrix": [1, 2], "x": 1, "y": 2.125}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [3, 2], "x": 3, "y": 2.125}, + {"matrix": [4, 2], "x": 4, "y": 2.25}, + + {"matrix": [9, 2], "x": 8.2, "y": 2.25}, + {"matrix": [8, 2], "x": 9.2, "y": 2.125}, + {"matrix": [7, 2], "x": 10.2, "y": 2}, + {"matrix": [6, 2], "x": 11.2, "y": 2.125}, + {"matrix": [5, 2], "x": 12.2, "y": 2.375}, + + {"matrix": [0, 3], "x": 3.4, "y": 3.25}, + {"matrix": [1, 3], "x": 4.4, "y": 3.55}, + {"matrix": [2, 3], "x": 5.4, "y": 3.85}, + + {"matrix": [7, 3], "x": 6.8, "y": 3.85}, + {"matrix": [6, 3], "x": 7.8, "y": 3.55}, + {"matrix": [5, 3], "x": 8.8, "y": 3.25} + ] + } + } +} diff --git a/keyboards/kakunpc/suihankey/split/rev1/rev1.c b/keyboards/kakunpc/suihankey/split/rev1/rev1.c deleted file mode 100644 index 40ff30e620..0000000000 --- a/keyboards/kakunpc/suihankey/split/rev1/rev1.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 kakunpc - * - * 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 "rev1.h" diff --git a/keyboards/kakunpc/suihankey/split/rev1/rev1.h b/keyboards/kakunpc/suihankey/split/rev1/rev1.h deleted file mode 100644 index 98618ba712..0000000000 --- a/keyboards/kakunpc/suihankey/split/rev1/rev1.h +++ /dev/null @@ -1,47 +0,0 @@ -/* Copyright 2019 kakunpc - * - * 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 Leys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT_split_3x5_3( \ - L00, L01, L02, L03, L04, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, R24, R23, R22, R21, R20, \ - L30, L31, L32, R32, R31, R30 \ -) \ -{ \ - { L00, L10, L20, L30 }, \ - { L01, L11, L21, L31 }, \ - { L02, L12, L22, L32 }, \ - { L03, L13, L23, KC_NO }, \ - { L04, L14, L24, KC_NO }, \ - { R00, R10, R20, R30 }, \ - { R01, R11, R21, R31 }, \ - { R02, R12, R22, R32 }, \ - { R03, R13, R23, KC_NO }, \ - { R04, R14, R24, KC_NO }, \ -} - -#define LAYOUT LAYOUT_split_3x5_3 |