diff options
Diffstat (limited to 'keyboards/yushakobo')
-rw-r--r-- | keyboards/yushakobo/navpad/10/config.h | 30 | ||||
-rw-r--r-- | keyboards/yushakobo/navpad/10/info.json | 7 | ||||
-rw-r--r-- | keyboards/yushakobo/navpad/10/rev0/config.h | 5 | ||||
-rw-r--r-- | keyboards/yushakobo/navpad/10/rev1/config.h | 5 | ||||
-rw-r--r-- | keyboards/yushakobo/navpad/10/rules.mk | 6 | ||||
-rw-r--r-- | keyboards/yushakobo/navpad/10_helix_r/config.h | 36 | ||||
-rw-r--r-- | keyboards/yushakobo/navpad/10_helix_r/info.json | 17 | ||||
-rw-r--r-- | keyboards/yushakobo/navpad/10_helix_r/rules.mk | 6 | ||||
-rw-r--r-- | keyboards/yushakobo/navpad/navpad_prefs.h | 2 | ||||
-rw-r--r-- | keyboards/yushakobo/quick17/config.h | 36 | ||||
-rw-r--r-- | keyboards/yushakobo/quick17/info.json | 7 | ||||
-rw-r--r-- | keyboards/yushakobo/quick17/rules.mk | 6 | ||||
-rw-r--r-- | keyboards/yushakobo/quick7/config.h | 73 | ||||
-rw-r--r-- | keyboards/yushakobo/quick7/info.json | 27 | ||||
-rw-r--r-- | keyboards/yushakobo/quick7/quick7.c | 17 | ||||
-rw-r--r-- | keyboards/yushakobo/quick7/quick7.h | 38 | ||||
-rw-r--r-- | keyboards/yushakobo/quick7/rules.mk | 6 |
17 files changed, 58 insertions, 266 deletions
diff --git a/keyboards/yushakobo/navpad/10/config.h b/keyboards/yushakobo/navpad/10/config.h index 6d631ac32d..7f1153299c 100644 --- a/keyboards/yushakobo/navpad/10/config.h +++ b/keyboards/yushakobo/navpad/10/config.h @@ -17,19 +17,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" - -#define ENCODERS_PAD_A { B5 } -#define ENCODERS_PAD_B { B6 } - /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* - * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. - */ -#define SOFT_SERIAL_PIN D2 // or D0, D1, D3, E6 - #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN # define RGBLED_NUM 9 @@ -47,31 +37,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //# define RGBLIGHT_EFFECT_STATIC_GRADIENT # define RGBLIGHT_EFFECT_RGB_TEST //# define RGBLIGHT_EFFECT_ALTERNATING -/*== customize breathing effect ==*/ -/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ -//# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 -/*==== use exp() and sin() ====*/ -//# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 -//# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 - #endif -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - /* disable action features */ //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT -/* Bootmagic Lite key configuration */ -//#define BOOTMAGIC_LITE_ROW 0 -//#define BOOTMAGIC_LITE_COLUMN 0 - - -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 132 #define TAPPING_LAYER_TERM 90 diff --git a/keyboards/yushakobo/navpad/10/info.json b/keyboards/yushakobo/navpad/10/info.json index 095b6b39eb..a6b946367f 100644 --- a/keyboards/yushakobo/navpad/10/info.json +++ b/keyboards/yushakobo/navpad/10/info.json @@ -7,6 +7,13 @@ "vid": "0x3265", "pid": "0x0008" }, + "encoder": { + "rotary": [ + {"pin_a": "B5", "pin_b": "B6"} + ] + }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/yushakobo/navpad/10/rev0/config.h b/keyboards/yushakobo/navpad/10/rev0/config.h index 4f25909730..3e65349c87 100644 --- a/keyboards/yushakobo/navpad/10/rev0/config.h +++ b/keyboards/yushakobo/navpad/10/rev0/config.h @@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 7 /* * Keyboard Matrix Assignments diff --git a/keyboards/yushakobo/navpad/10/rev1/config.h b/keyboards/yushakobo/navpad/10/rev1/config.h index f5244c4bc3..d2e7829323 100644 --- a/keyboards/yushakobo/navpad/10/rev1/config.h +++ b/keyboards/yushakobo/navpad/10/rev1/config.h @@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 6 /* * Keyboard Matrix Assignments diff --git a/keyboards/yushakobo/navpad/10/rules.mk b/keyboards/yushakobo/navpad/10/rules.mk index 53fb0ec174..61cbbf351d 100644 --- a/keyboards/yushakobo/navpad/10/rules.mk +++ b/keyboards/yushakobo/navpad/10/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/yushakobo/navpad/10_helix_r/config.h b/keyboards/yushakobo/navpad/10_helix_r/config.h index 41389c6b36..5b0e667cc9 100644 --- a/keyboards/yushakobo/navpad/10_helix_r/config.h +++ b/keyboards/yushakobo/navpad/10_helix_r/config.h @@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 12 -#define MATRIX_COLS 7 /* * Keyboard Matrix Assignments @@ -49,20 +44,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. 34, 35, 36, 37, 38, 39, 40 } #endif -#define ENCODERS_PAD_A { B5 } -#define ENCODERS_PAD_B { B6 } - -#define ENCODERS_PAD_A_RIGHT { B6 } -#define ENCODERS_PAD_B_RIGHT { B5 } - /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* - * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. - */ -#define SOFT_SERIAL_PIN D2 // or D0, D1, D3, E6 - #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN # define RGBLED_NUM 9+32 @@ -81,31 +65,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //# define RGBLIGHT_EFFECT_STATIC_GRADIENT # define RGBLIGHT_EFFECT_RGB_TEST //# define RGBLIGHT_EFFECT_ALTERNATING -/*== customize breathing effect ==*/ -/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ -//# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 -/*==== use exp() and sin() ====*/ -//# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 -//# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 - #endif -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - /* disable action features */ //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT -/* Bootmagic Lite key configuration */ -//#define BOOTMAGIC_LITE_ROW 0 -//#define BOOTMAGIC_LITE_COLUMN 0 - - -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 132 #define TAPPING_LAYER_TERM 90 diff --git a/keyboards/yushakobo/navpad/10_helix_r/info.json b/keyboards/yushakobo/navpad/10_helix_r/info.json index e2c44de4da..19b8c31efb 100644 --- a/keyboards/yushakobo/navpad/10_helix_r/info.json +++ b/keyboards/yushakobo/navpad/10_helix_r/info.json @@ -8,6 +8,23 @@ "pid": "0x0008", "device_version": "0.0.1" }, + "encoder": { + "rotary": [ + {"pin_a": "B5", "pin_b": "B6"} + ] + }, + "split": { + "soft_serial_pin": "D2", + "encoder": { + "right": { + "rotary": [ + {"pin_a": "B6", "pin_b": "B5"} + ] + } + } + }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/yushakobo/navpad/10_helix_r/rules.mk b/keyboards/yushakobo/navpad/10_helix_r/rules.mk index 54598940df..aa146fa1d2 100644 --- a/keyboards/yushakobo/navpad/10_helix_r/rules.mk +++ b/keyboards/yushakobo/navpad/10_helix_r/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/yushakobo/navpad/navpad_prefs.h b/keyboards/yushakobo/navpad/navpad_prefs.h index 866b137c81..d9d2286e5b 100644 --- a/keyboards/yushakobo/navpad/navpad_prefs.h +++ b/keyboards/yushakobo/navpad/navpad_prefs.h @@ -19,7 +19,7 @@ #include "quantum.h" enum custom_keycodes { - TAP_00 = SAFE_RANGE + TAP_00 = QK_KB_0 }; enum layer_name { diff --git a/keyboards/yushakobo/quick17/config.h b/keyboards/yushakobo/quick17/config.h index f4d5b167e2..3df5c25081 100644 --- a/keyboards/yushakobo/quick17/config.h +++ b/keyboards/yushakobo/quick17/config.h @@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 3 -#define MATRIX_COLS 6 /* * Keyboard Matrix Assignments @@ -39,15 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* - * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. - */ -//#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 - -//#define BACKLIGHT_PIN B7 -//#define BACKLIGHT_LEVELS 3 -//#define BACKLIGHT_BREATHING - #define RGB_DI_PIN D2 #define RGBLED_NUM 18 @@ -93,35 +79,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. # define RGBLIGHT_EFFECT_STATIC_GRADIENT # define RGBLIGHT_EFFECT_RGB_TEST //# define RGBLIGHT_EFFECT_ALTERNATING -/*== customize breathing effect ==*/ -/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ -//# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 -/*==== use exp() and sin() ====*/ -//# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 -//# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 #define RGBLIGHT_LAYERS #define RGBLIGHT_MAX_LAYERS 8 #endif -#ifdef ENCODER_ENABLE -#define ENCODERS_PAD_A { B4 } -#define ENCODERS_PAD_B { B5 } -#endif - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - - /* disable action features */ //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT - -/* Bootmagic Lite key configuration */ -//#define BOOTMAGIC_LITE_ROW 0 -//#define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/yushakobo/quick17/info.json b/keyboards/yushakobo/quick17/info.json index 07798a2649..7d062aef16 100644 --- a/keyboards/yushakobo/quick17/info.json +++ b/keyboards/yushakobo/quick17/info.json @@ -8,6 +8,13 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "encoder": { + "rotary": [ + {"pin_a": "B4", "pin_b": "B5"} + ] + }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/yushakobo/quick17/rules.mk b/keyboards/yushakobo/quick17/rules.mk index 297d482f35..a73ebf1d09 100644 --- a/keyboards/yushakobo/quick17/rules.mk +++ b/keyboards/yushakobo/quick17/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/yushakobo/quick7/config.h b/keyboards/yushakobo/quick7/config.h index 8548dc61e6..96656f70c8 100644 --- a/keyboards/yushakobo/quick7/config.h +++ b/keyboards/yushakobo/quick7/config.h @@ -17,37 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 3 -#define MATRIX_COLS 3 - -/* - * 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 DIRECT_PINS { \ - { D2, D4, F4 }, \ - { D7, B1, B3 }, \ - { E6, B4, B2 }, \ -} - -#define ENCODERS_PAD_A { D1, F5 } -#define ENCODERS_PAD_B { D0, F6 } - - - - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #ifdef RGBLIGHT_ENABLE # define RGB_DI_PIN D3 # define RGBLED_NUM 13 @@ -65,51 +34,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. # define RGBLIGHT_EFFECT_STATIC_GRADIENT # define RGBLIGHT_EFFECT_RGB_TEST //# define RGBLIGHT_EFFECT_ALTERNATING -/*== customize breathing effect ==*/ - /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ -# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 - /*==== use exp() and sin() ====*/ -// # define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 -// # define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 #endif -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - /* 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 -/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. - * This is userful for the Windows task manager shortcut (ctrl+shift+esc). - */ -// #define GRAVE_ESC_CTRL_OVERRIDE - -/* - * Force NKRO - * - * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved - * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the - * makefile for this to work.) - * - * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) - * until the next keyboard reset. - * - * NKRO may prevent your keystrokes from being detected in the BIOS, but it is - * fully operational during normal computer usage. - * - * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) - * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by - * bootmagic, NKRO mode will always be enabled until it is toggled again during a - * power-up. - * - */ -//#define FORCE_NKRO - /* * Feature disable options * These options are also useful to firmware size reduction. @@ -125,7 +56,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT - -/* Bootmagic Lite key configuration */ -// #define BOOTMAGIC_LITE_ROW 0 -// #define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/yushakobo/quick7/info.json b/keyboards/yushakobo/quick7/info.json index 58afeb97de..4413c06def 100644 --- a/keyboards/yushakobo/quick7/info.json +++ b/keyboards/yushakobo/quick7/info.json @@ -8,12 +8,33 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "encoder": { + "rotary": [ + {"pin_a": "D1", "pin_b": "D0"}, + {"pin_a": "F5", "pin_b": "F6"} + ] + }, + "processor": "atmega32u4", + "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["D2", "D4", "F4"], + ["D7", "B1", "B3"], + ["E6", "B4", "B2"] + ] + }, "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, - {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, - {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2} + {"x":0, "y":0, "matrix": [0, 0]}, + {"x":1, "y":0, "matrix": [0, 1]}, + {"x":2, "y":0, "matrix": [0, 2]}, + {"x":0, "y":1, "matrix": [1, 0]}, + {"x":1, "y":1, "matrix": [1, 1]}, + {"x":2, "y":1, "matrix": [1, 2]}, + {"x":0, "y":2, "matrix": [2, 0]}, + {"x":1, "y":2, "matrix": [2, 1]}, + {"x":2, "y":2, "matrix": [2, 2]} ] } } diff --git a/keyboards/yushakobo/quick7/quick7.c b/keyboards/yushakobo/quick7/quick7.c deleted file mode 100644 index 632bcf1ae5..0000000000 --- a/keyboards/yushakobo/quick7/quick7.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 yushakobo - * - * 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 "quick7.h" diff --git a/keyboards/yushakobo/quick7/quick7.h b/keyboards/yushakobo/quick7/quick7.h deleted file mode 100644 index 2e86487c7f..0000000000 --- a/keyboards/yushakobo/quick7/quick7.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2020 yushakobo - * - * 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 representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k00, k01, k02, \ - k10, k11, k12, \ - k20, k21, k22 \ -) \ -{ \ - { k00, k01, k02 }, \ - { k10, k11, k12 }, \ - { k20, k21, k22 } \ -} diff --git a/keyboards/yushakobo/quick7/rules.mk b/keyboards/yushakobo/quick7/rules.mk index c1bb970bac..2bec6222a2 100644 --- a/keyboards/yushakobo/quick7/rules.mk +++ b/keyboards/yushakobo/quick7/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # |