diff options
Diffstat (limited to 'keyboards/yushakobo/navpad/10_helix_r')
4 files changed, 16 insertions, 47 deletions
diff --git a/keyboards/yushakobo/navpad/10_helix_r/10_helix_r.c b/keyboards/yushakobo/navpad/10_helix_r/10_helix_r.c deleted file mode 100644 index 8be5220d56..0000000000 --- a/keyboards/yushakobo/navpad/10_helix_r/10_helix_r.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 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 "10_helix_r.h" diff --git a/keyboards/yushakobo/navpad/10_helix_r/config.h b/keyboards/yushakobo/navpad/10_helix_r/config.h index 5b0e667cc9..00a59e57cb 100644 --- a/keyboards/yushakobo/navpad/10_helix_r/config.h +++ b/keyboards/yushakobo/navpad/10_helix_r/config.h @@ -17,38 +17,15 @@ 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, F4 } -#define MATRIX_ROW_PINS_RIGHT { D4, C6, D7, E6, B4 } -#define MATRIX_COL_PINS { F5, F6, B2, B3, B1, F7, NO_PIN } -#define MATRIX_COL_PINS_RIGHT { F4, F5, F6, F7, B1, B3, B2 } - #define EE_HANDS -#ifdef RGB_DI_PIN -# define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 8, 7, \//navpad side - 9, 10, 11, 12, 13, 14, \//helix side +# define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 8, 7, \ + 9, 10, 11, 12, 13, 14, \ 20, 19, 18, 17, 16, 15, \ 21, 22, 23, 24, 25, 26, \ 33, 32, 31, 30, 29, 28, 27, \ 34, 35, 36, 37, 38, 39, 40 } -#endif - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW -#define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN # define RGBLED_NUM 9+32 # define RGBLED_SPLIT { 9, 32 } # define RGBLIGHT_HUE_STEP 8 @@ -65,7 +42,6 @@ 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 -#endif /* disable action features */ //#define NO_ACTION_LAYER diff --git a/keyboards/yushakobo/navpad/10_helix_r/info.json b/keyboards/yushakobo/navpad/10_helix_r/info.json index 19b8c31efb..bb2a7669e0 100644 --- a/keyboards/yushakobo/navpad/10_helix_r/info.json +++ b/keyboards/yushakobo/navpad/10_helix_r/info.json @@ -8,6 +8,11 @@ "pid": "0x0008", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "F6", "B2", "B3", "B1", "F7", null], + "rows": ["D4", "C6", "D7", "E6", "B4", "F4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B5", "pin_b": "B6"} @@ -21,8 +26,17 @@ {"pin_a": "B6", "pin_b": "B5"} ] } + }, + "matrix_pins": { + "right": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + } } }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/config.h b/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/config.h index b4d2122ab4..10ba897cce 100644 --- a/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/config.h +++ b/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/config.h @@ -17,9 +17,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#ifdef RGB_DI_PIN - #define RGBLIGHT_LAYERS #define RGBLIGHT_MAX_LAYERS 6 - -#endif |