diff options
Diffstat (limited to 'keyboards/rgbkb')
35 files changed, 270 insertions, 236 deletions
diff --git a/keyboards/rgbkb/mun/config.h b/keyboards/rgbkb/mun/config.h index 8f961078bd..5b411a8c52 100644 --- a/keyboards/rgbkb/mun/config.h +++ b/keyboards/rgbkb/mun/config.h @@ -9,10 +9,6 @@ #pragma once - -// Last pins reserved for encoder / touch encoder support -#define MATRIX_ROW_PINS { A1, A3, B3, A13, B15, NO_PIN, NO_PIN } -#define MATRIX_COL_PINS { A0, B11, B0, B10, B12, B2, A8 } #define MATRIX_IO_DELAY 5 #define BUSY_WAIT @@ -25,9 +21,6 @@ #define TOUCH_RESOLUTION 25 // sensitivity of swipes, lower=faster #define TOUCH_SEGMENTS 3 -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* CRC Configuration */ #define CRC8_OPTIMIZE_SPEED #define CRC8_USE_TABLE @@ -56,7 +49,6 @@ #define SPLIT_TRANSACTION_IDS_KB TOUCH_ENCODER_SYNC, RGB_MENU_SYNC /* RGB LED Configuration */ -#define RGB_DI_PIN B5 #define RGBLED_NUM 98 #define RGBLED_SPLIT { 49, 49 } #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/rgbkb/mun/rev1/info.json b/keyboards/rgbkb/mun/rev1/info.json index b68a1586c5..9d5bf972c1 100644 --- a/keyboards/rgbkb/mun/rev1/info.json +++ b/keyboards/rgbkb/mun/rev1/info.json @@ -8,6 +8,15 @@ "pid": "0x3505", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B5", + "driver": "pwm" + }, + "matrix_pins": { + "cols": ["A0", "B11", "B0", "B10", "B12", "B2", "A8"], + "rows": ["A1", "A3", "B3", "A13", "B15", null, null] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B8", "pin_b": "A14"}, diff --git a/keyboards/rgbkb/mun/rev1/rev1.c b/keyboards/rgbkb/mun/rev1/rev1.c index c7604510da..564ce4dfb9 100644 --- a/keyboards/rgbkb/mun/rev1/rev1.c +++ b/keyboards/rgbkb/mun/rev1/rev1.c @@ -37,15 +37,11 @@ const encodermap_t touch_encoder_map[NUMBER_OF_TOUCH_ENCODERS][TOUCH_ENCODER_OPT }; static void process_encoder_matrix(encodermap_t pos) { - action_exec((keyevent_t){ - .key = (keypos_t){.row = pos.r, .col = pos.c}, .pressed = true, .time = (timer_read() | 1) /* time should not be 0 */ - }); + action_exec(MAKE_KEYEVENT(pos.r, pos.c, true)); #if TAP_CODE_DELAY > 0 wait_ms(TAP_CODE_DELAY); #endif - action_exec((keyevent_t){ - .key = (keypos_t){.row = pos.r, .col = pos.c}, .pressed = false, .time = (timer_read() | 1) /* time should not be 0 */ - }); + action_exec(MAKE_KEYEVENT(pos.r, pos.c, false)); } bool encoder_update_kb(uint8_t index, bool clockwise) { diff --git a/keyboards/rgbkb/mun/rules.mk b/keyboards/rgbkb/mun/rules.mk index 0958dd2130..88f8890ce6 100644 --- a/keyboards/rgbkb/mun/rules.mk +++ b/keyboards/rgbkb/mun/rules.mk @@ -15,7 +15,6 @@ COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover AUDIO_ENABLE = no # Audio output -WS2812_DRIVER = pwm RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = WS2812 diff --git a/keyboards/rgbkb/pan/config.h b/keyboards/rgbkb/pan/config.h index 05d446d05d..f1b323bc17 100644 --- a/keyboards/rgbkb/pan/config.h +++ b/keyboards/rgbkb/pan/config.h @@ -29,9 +29,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_EFFECT_TWINKLE #define RGB_MATRIX_LED_COUNT RGBLED_NUM -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGBLIGHT_LIMIT_VAL 120 #define USB_MAX_POWER_CONSUMPTION 500 diff --git a/keyboards/rgbkb/pan/pan.c b/keyboards/rgbkb/pan/pan.c index fab3cac785..023c766de6 100644 --- a/keyboards/rgbkb/pan/pan.c +++ b/keyboards/rgbkb/pan/pan.c @@ -27,7 +27,6 @@ LED_TYPE rgb_matrix_ws2812_array[RGB_MATRIX_LED_COUNT]; static void init(void) {} static void flush(void) { - // Assumes use of RGB_DI_PIN ws2812_setleds(rgb_matrix_ws2812_array, RGB_MATRIX_LED_COUNT); } diff --git a/keyboards/rgbkb/pan/rev1/32a/config.h b/keyboards/rgbkb/pan/rev1/32a/config.h deleted file mode 100644 index 5e7c4babbd..0000000000 --- a/keyboards/rgbkb/pan/rev1/32a/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/*Copyright 2020 RGBKB - -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 - -#define MATRIX_ROW_PINS { D7, D1, D5, D6, C2 } -#define MATRIX_COL_PINS { C3, C4, C5, C6, C7, A7, A6, A5, A4, A3, A2, A1, A0 } - -#define RGB_DI_PIN B3 diff --git a/keyboards/rgbkb/pan/rev1/32a/info.json b/keyboards/rgbkb/pan/rev1/32a/info.json index 1f7ece37eb..e4ac3eeecb 100644 --- a/keyboards/rgbkb/pan/rev1/32a/info.json +++ b/keyboards/rgbkb/pan/rev1/32a/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"], + "rows": ["D7", "D1", "D5", "D6", "C2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32a", "bootloader": "usbasploader", "encoder": { @@ -6,5 +11,8 @@ {"pin_a": "B0", "pin_b": "B1"}, {"pin_a": "D0", "pin_b": "B2"} ] + }, + "ws2812": { + "pin": "B3" } } diff --git a/keyboards/rgbkb/pan/rev1/proton_c/config.h b/keyboards/rgbkb/pan/rev1/proton_c/config.h deleted file mode 100644 index f25713b2be..0000000000 --- a/keyboards/rgbkb/pan/rev1/proton_c/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/*Copyright 2020 RGBKB - -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 - -#define MATRIX_ROW_PINS { A15, B10, A14, A13, A7 } -#define MATRIX_COL_PINS { A8, A6, B0, B1, B2, B4, B5, A1, A2, B3, B9, A10, A9 } - -#define RGB_DI_PIN A3 diff --git a/keyboards/rgbkb/pan/rev1/proton_c/info.json b/keyboards/rgbkb/pan/rev1/proton_c/info.json index 5fd7124b9c..ff81cd1092 100644 --- a/keyboards/rgbkb/pan/rev1/proton_c/info.json +++ b/keyboards/rgbkb/pan/rev1/proton_c/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["A8", "A6", "B0", "B1", "B2", "B4", "B5", "A1", "A2", "B3", "B9", "A10", "A9"], + "rows": ["A15", "B10", "A14", "A13", "A7"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", @@ -7,5 +12,8 @@ {"pin_a": "B14", "pin_b": "B15"}, {"pin_a": "B11", "pin_b": "B12"} ] + }, + "ws2812": { + "pin": "A3" } } diff --git a/keyboards/rgbkb/pan/rules.mk b/keyboards/rgbkb/pan/rules.mk index 464dfecf6f..aecabfe157 100644 --- a/keyboards/rgbkb/pan/rules.mk +++ b/keyboards/rgbkb/pan/rules.mk @@ -10,7 +10,6 @@ NKRO_ENABLE = no # Enable N-Key Rollover AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = WS2812 -WS2812_DRIVER = bitbang ENCODER_ENABLE = yes OLED_ENABLE = yes OLED_DRIVER = SSD1306 diff --git a/keyboards/rgbkb/sol/config.h b/keyboards/rgbkb/sol/config.h index b2e5f2b0d3..5c327fd760 100644 --- a/keyboards/rgbkb/sol/config.h +++ b/keyboards/rgbkb/sol/config.h @@ -23,13 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define EE_HANDS -#define MATRIX_ROW_PINS { C6, B6, B5, B4, D7, E6} - -// wiring of each half -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7 } - -#define DIODE_DIRECTION COL2ROW - #ifdef IOS_DEVICE_ENABLE #define RGBLIGHT_LIMIT_VAL 40 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 40 diff --git a/keyboards/rgbkb/sol/rev1/config.h b/keyboards/rgbkb/sol/rev1/config.h index fcef317e1f..a41959a88b 100644 --- a/keyboards/rgbkb/sol/rev1/config.h +++ b/keyboards/rgbkb/sol/rev1/config.h @@ -18,9 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* ws2812 RGB LED */ -#define RGB_DI_PIN B3 - #ifdef LED_MIRRORED #define RGBLED_NUM 35 #else diff --git a/keyboards/rgbkb/sol/rev1/info.json b/keyboards/rgbkb/sol/rev1/info.json index eb742972b1..ae88231a49 100644 --- a/keyboards/rgbkb/sol/rev1/info.json +++ b/keyboards/rgbkb/sol/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7"], + "rows": ["C6", "B6", "B5", "B4", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D2", "pin_b": "D6"} @@ -16,6 +21,9 @@ "split": { "soft_serial_pin": "D3" }, + "ws2812": { + "pin": "B3" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "layouts": { diff --git a/keyboards/rgbkb/sol/rev1/rev1.h b/keyboards/rgbkb/sol/rev1/rev1.h deleted file mode 100644 index 6f70f09bee..0000000000 --- a/keyboards/rgbkb/sol/rev1/rev1.h +++ /dev/null @@ -1 +0,0 @@ -#pragma once diff --git a/keyboards/rgbkb/sol/rev2/config.h b/keyboards/rgbkb/sol/rev2/config.h index 874ec536b1..19680c84b3 100644 --- a/keyboards/rgbkb/sol/rev2/config.h +++ b/keyboards/rgbkb/sol/rev2/config.h @@ -18,9 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* ws2812 RGB LED */ -#define RGB_DI_PIN B7 - // Underglow / DIY Tent Glow are parallel to the top row leds, no separate define // Full Hand case adds 24 LEDs, Star Fighter case adds 38 LEDs // For mirrored LED control (each MCU controls half the LEDs), total LED counts are divided in half diff --git a/keyboards/rgbkb/sol/rev2/info.json b/keyboards/rgbkb/sol/rev2/info.json index 264f21d02b..97b7921464 100644 --- a/keyboards/rgbkb/sol/rev2/info.json +++ b/keyboards/rgbkb/sol/rev2/info.json @@ -8,9 +8,17 @@ "pid": "0x3060", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7"], + "rows": ["C6", "B6", "B5", "B4", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D3" }, + "ws2812": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "layouts": { diff --git a/keyboards/rgbkb/sol/rev2/rev2.h b/keyboards/rgbkb/sol/rev2/rev2.h deleted file mode 100644 index 6f70f09bee..0000000000 --- a/keyboards/rgbkb/sol/rev2/rev2.h +++ /dev/null @@ -1 +0,0 @@ -#pragma once diff --git a/keyboards/rgbkb/sol/sol.c b/keyboards/rgbkb/sol/sol.c deleted file mode 100644 index 5945cc60a4..0000000000 --- a/keyboards/rgbkb/sol/sol.c +++ /dev/null @@ -1 +0,0 @@ -#include "sol.h" diff --git a/keyboards/rgbkb/sol/sol.h b/keyboards/rgbkb/sol/sol.h index e885dc78c4..695dc6db61 100644 --- a/keyboards/rgbkb/sol/sol.h +++ b/keyboards/rgbkb/sol/sol.h @@ -1,12 +1,6 @@ #pragma once #include "quantum.h" -#ifdef KEYBOARD_rgbkb_sol_rev1 -#include "rev1.h" -#else -#include "rev2.h" -#endif - #define LAYOUT( \ L00, L01, L02, L03, L04, L05, L06, R06, R00, R01, R02, R03, R04, R05, \ diff --git a/keyboards/rgbkb/sol3/config.h b/keyboards/rgbkb/sol3/config.h index 727947ef0b..9cc0134249 100644 --- a/keyboards/rgbkb/sol3/config.h +++ b/keyboards/rgbkb/sol3/config.h @@ -9,13 +9,6 @@ #pragma once - -// Last pins reserved for encoder / touch encoder support -#define MATRIX_ROW_PINS { B15, A8, A15, B12, A3, NO_PIN } -#define MATRIX_ROW_PINS_RIGHT { B15, B14, A8, A13, A7, NO_PIN } -// Empty matrix entries used for encoder / touch encoder support -#define MATRIX_COL_PINS { A6, A7, B0, B2, B1, B9, B3, B4 } -#define MATRIX_COL_PINS_RIGHT { B9, B8, B4, A6, A3, B10, B12, B11 } #define MATRIX_IO_DELAY 5 #define BUSY_WAIT @@ -28,9 +21,6 @@ #define TOUCH_RESOLUTION 25 // sensitivity of swipes, lower=faster #define TOUCH_SEGMENTS 3 -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* CRC Configuration */ #define CRC8_OPTIMIZE_SPEED #define CRC8_USE_TABLE @@ -63,7 +53,6 @@ #define DIP_SWITCH_PINS_RIGHT { A14, B0 } /* RGB LED Configuration */ -#define RGB_DI_PIN B5 #define RGBLED_NUM 156 #define RGBLED_SPLIT { 78, 78 } #define RGBLIGHT_LIMIT_VAL 255 diff --git a/keyboards/rgbkb/sol3/rev1/info.json b/keyboards/rgbkb/sol3/rev1/info.json index 046a56f390..77116bb733 100644 --- a/keyboards/rgbkb/sol3/rev1/info.json +++ b/keyboards/rgbkb/sol3/rev1/info.json @@ -8,6 +8,15 @@ "pid": "0x3510", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B5", + "driver": "pwm" + }, + "matrix_pins": { + "cols": ["A6", "A7", "B0", "B2", "B1", "B9", "B3", "B4"], + "rows": ["B15", "A8", "A15", "B12", "A3", null] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "A1", "pin_b": "A2"}, @@ -25,6 +34,12 @@ {"pin_a": "B3", "pin_b": "B13"} ] } + }, + "matrix_pins": { + "right": { + "cols": ["B9", "B8", "B4", "A6", "A3", "B10", "B12", "B11"], + "rows": ["B15", "B14", "A8", "A13", "A7", null] + } } }, "processor": "STM32F303", diff --git a/keyboards/rgbkb/sol3/rev1/rev1.c b/keyboards/rgbkb/sol3/rev1/rev1.c index de5836e061..ff330a83d6 100644 --- a/keyboards/rgbkb/sol3/rev1/rev1.c +++ b/keyboards/rgbkb/sol3/rev1/rev1.c @@ -57,10 +57,7 @@ bool dip_switch_update_kb(uint8_t index, bool active) { } case 1: { // Handle RGB Encoder switch press - action_exec((keyevent_t){ - .key = (keypos_t){.row = isLeftHand ? 4 : 10, .col = 6}, - .pressed = active, .time = (timer_read() | 1) /* time should not be 0 */ - }); + action_exec(MAKE_KEYEVENT(isLeftHand ? 4 : 10, 6, active)); break; } } @@ -68,15 +65,11 @@ bool dip_switch_update_kb(uint8_t index, bool active) { } static void process_encoder_matrix(encodermap_t pos) { - action_exec((keyevent_t){ - .key = (keypos_t){.row = pos.r, .col = pos.c}, .pressed = true, .time = (timer_read() | 1) /* time should not be 0 */ - }); + action_exec(MAKE_KEYEVENT(pos.r, pos.c, true)); #if TAP_CODE_DELAY > 0 wait_ms(TAP_CODE_DELAY); #endif - action_exec((keyevent_t){ - .key = (keypos_t){.row = pos.r, .col = pos.c}, .pressed = false, .time = (timer_read() | 1) /* time should not be 0 */ - }); + action_exec(MAKE_KEYEVENT(pos.r, pos.c, false)); } bool encoder_update_kb(uint8_t index, bool clockwise) { diff --git a/keyboards/rgbkb/sol3/rules.mk b/keyboards/rgbkb/sol3/rules.mk index f761d71be2..336da6dd19 100644 --- a/keyboards/rgbkb/sol3/rules.mk +++ b/keyboards/rgbkb/sol3/rules.mk @@ -19,7 +19,6 @@ AUDIO_DRIVER = dac_additive DYNAMIC_MACRO_ENABLE = yes DIP_SWITCH_ENABLE = yes -WS2812_DRIVER = pwm RGBLIGHT_ENABLE = no RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = WS2812 diff --git a/keyboards/rgbkb/zen/rev1/config.h b/keyboards/rgbkb/zen/rev1/config.h index 327fe840c3..88951a1b44 100644 --- a/keyboards/rgbkb/zen/rev1/config.h +++ b/keyboards/rgbkb/zen/rev1/config.h @@ -17,22 +17,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { B2, B3, B1, F7, F6, D4, B6 } - -/* 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 -/* ws2812 RGB LED */ -#define RGB_DI_PIN D1 - #define RGBLED_NUM 16 // Number of LEDs /* diff --git a/keyboards/rgbkb/zen/rev1/info.json b/keyboards/rgbkb/zen/rev1/info.json index 33b8334958..013b56764f 100644 --- a/keyboards/rgbkb/zen/rev1/info.json +++ b/keyboards/rgbkb/zen/rev1/info.json @@ -8,9 +8,17 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "B3", "B1", "F7", "F6", "D4", "B6"], + "rows": ["C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D1" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/rgbkb/zen/rev1/rev1.c b/keyboards/rgbkb/zen/rev1/rev1.c deleted file mode 100644 index 520a869e57..0000000000 --- a/keyboards/rgbkb/zen/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "rev1.h" diff --git a/keyboards/rgbkb/zen/rev2/config.h b/keyboards/rgbkb/zen/rev2/config.h index 85b6a68b79..394fd1630b 100644 --- a/keyboards/rgbkb/zen/rev2/config.h +++ b/keyboards/rgbkb/zen/rev2/config.h @@ -17,16 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// Proton-C does pin conversion -#define MATRIX_ROW_PINS { C6, E6, B5, D7, B4 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B3, B1, B2 } - -#define RGB_DI_PIN B6 - -/* 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 */ diff --git a/keyboards/rgbkb/zen/rev2/info.json b/keyboards/rgbkb/zen/rev2/info.json index cc25a74b73..ef91fd30d1 100644 --- a/keyboards/rgbkb/zen/rev2/info.json +++ b/keyboards/rgbkb/zen/rev2/info.json @@ -8,6 +8,11 @@ "pid": "0x3061", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B3", "B1", "B2"], + "rows": ["C6", "E6", "B5", "D7", "B4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D4", "pin_b": "D2"} @@ -16,6 +21,9 @@ "split": { "soft_serial_pin": "D3" }, + "ws2812": { + "pin": "B6" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/rgbkb/zygomorph/rev1/config.h b/keyboards/rgbkb/zygomorph/rev1/config.h index df9875ed47..022e361de1 100644 --- a/keyboards/rgbkb/zygomorph/rev1/config.h +++ b/keyboards/rgbkb/zygomorph/rev1/config.h @@ -21,15 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* Select hand configuration */ #define EE_HANDS -#define MATRIX_ROW_PINS { F1, F5, F7, B5, B4 } - -// wiring of each half -#define MATRIX_COL_PINS { F4, F6, C7, C6, B6, D4 } - -#define DIODE_DIRECTION COL2ROW - -/* ws2812 RGB LED */ -#define RGB_DI_PIN B7 #ifndef RGBLIGHT_SPLIT_ENABLE #define RGBLED_NUM 30 #else diff --git a/keyboards/rgbkb/zygomorph/rev1/info.json b/keyboards/rgbkb/zygomorph/rev1/info.json index 7bf6fe4b0d..c85e9e0a9c 100644 --- a/keyboards/rgbkb/zygomorph/rev1/info.json +++ b/keyboards/rgbkb/zygomorph/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F6", "C7", "C6", "B6", "D4"], + "rows": ["F1", "F5", "F7", "B5", "B4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D2", "pin_b": "D7"} @@ -16,21 +21,204 @@ "split": { "soft_serial_pin": "D3" }, + "ws2812": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "community_layouts": ["ortho_4x12", "ortho_5x12"], "layouts": { "LAYOUT_ortho_5x12": { - "layout": [{"label":"`", "x":0, "y":0}, {"label":"1", "x":1, "y":0}, {"label":"2", "x":2, "y":0}, {"label":"3", "x":3, "y":0}, {"label":"4", "x":4, "y":0}, {"label":"5", "x":5, "y":0}, {"label":"6", "x":7, "y":0}, {"label":"7", "x":8, "y":0}, {"label":"8", "x":9, "y":0}, {"label":"9", "x":10, "y":0}, {"label":"0", "x":11, "y":0}, {"label":"BKSP", "x":12, "y":0}, {"label":"Tab", "x":0, "y":1}, {"label":"Q", "x":1, "y":1}, {"label":"W", "x":2, "y":1}, {"label":"E", "x":3, "y":1}, {"label":"R", "x":4, "y":1}, {"label":"T", "x":5, "y":1}, {"label":"Y", "x":7, "y":1}, {"label":"U", "x":8, "y":1}, {"label":"I", "x":9, "y":1}, {"label":"O", "x":10, "y":1}, {"label":"P", "x":11, "y":1}, {"label":"\\|", "x":12, "y":1}, {"label":"Esc", "x":0, "y":2}, {"label":"A", "x":1, "y":2}, {"label":"S", "x":2, "y":2}, {"label":"D", "x":3, "y":2}, {"label":"F", "x":4, "y":2}, {"label":"G", "x":5, "y":2}, {"label":"H", "x":7, "y":2}, {"label":"J", "x":8, "y":2}, {"label":"K", "x":9, "y":2}, {"label":"L", "x":10, "y":2}, {"label":";:", "x":11, "y":2}, {"label":"'\"", "x":12, "y":2}, {"label":"Shift", "x":0, "y":3}, {"label":"Z", "x":1, "y":3}, {"label":"X", "x":2, "y":3}, {"label":"C", "x":3, "y":3}, {"label":"V", "x":4, "y":3}, {"label":"B", "x":5, "y":3}, {"label":"N", "x":7, "y":3}, {"label":"M", "x":8, "y":3}, {"label":",<", "x":9, "y":3}, {"label":".>", "x":10, "y":3}, {"label":"/?", "x":11, "y":3}, {"label":"Enter", "x":12, "y":3}, {"label":"Ctrl", "x":0, "y":4}, {"label":"Alt", "x":1, "y":4}, {"label":"Super", "x":2, "y":4}, {"label":"RGB", "x":3, "y":4}, {"label":"⇓", "x":4, "y":4}, {"x":5, "y":4}, {"x":7, "y":4}, {"label":"FN", "x":8, "y":4}, {"label":"Left", "x":9, "y":4}, {"label":"Down", "x":10, "y":4}, {"label":"Up", "x":11, "y":4}, {"label":"Right", "x":12, "y":4}] + "layout": [ + {"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": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [5, 0], "x": 7, "y": 0}, + {"matrix": [5, 1], "x": 8, "y": 0}, + {"matrix": [5, 2], "x": 9, "y": 0}, + {"matrix": [5, 3], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 5], "x": 12, "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": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [6, 0], "x": 7, "y": 1}, + {"matrix": [6, 1], "x": 8, "y": 1}, + {"matrix": [6, 2], "x": 9, "y": 1}, + {"matrix": [6, 3], "x": 10, "y": 1}, + {"matrix": [6, 4], "x": 11, "y": 1}, + {"matrix": [6, 5], "x": 12, "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": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [7, 0], "x": 7, "y": 2}, + {"matrix": [7, 1], "x": 8, "y": 2}, + {"matrix": [7, 2], "x": 9, "y": 2}, + {"matrix": [7, 3], "x": 10, "y": 2}, + {"matrix": [7, 4], "x": 11, "y": 2}, + {"matrix": [7, 5], "x": 12, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [8, 0], "x": 7, "y": 3}, + {"matrix": [8, 1], "x": 8, "y": 3}, + {"matrix": [8, 2], "x": 9, "y": 3}, + {"matrix": [8, 3], "x": 10, "y": 3}, + {"matrix": [8, 4], "x": 11, "y": 3}, + {"matrix": [8, 5], "x": 12, "y": 3}, + |