diff options
Diffstat (limited to 'keyboards/keychron')
394 files changed, 3597 insertions, 4305 deletions
diff --git a/keyboards/keychron/common/keychron_common.c b/keyboards/keychron/common/keychron_common.c index a6250966f3..9c7fc3ace5 100644 --- a/keyboards/keychron/common/keychron_common.c +++ b/keyboards/keychron/common/keychron_common.c @@ -14,8 +14,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include QMK_KEYBOARD_H #include "keychron_common.h" +#include "sync_timer.h" bool is_siri_active = false; uint32_t siri_timer = 0; diff --git a/keyboards/keychron/common/keychron_common.h b/keyboards/keychron/common/keychron_common.h index 5e56a828c8..648a5d3371 100644 --- a/keyboards/keychron/common/keychron_common.h +++ b/keyboards/keychron/common/keychron_common.h @@ -16,10 +16,14 @@ #pragma once -#include "stdint.h" +#include <stdint.h> +#include <stdbool.h> +#include "action.h" + #ifdef VIA_ENABLE # include "via.h" #endif + #include "quantum_keycodes.h" enum custom_keycodes { diff --git a/keyboards/keychron/q0/config.h b/keyboards/keychron/q0/config.h index 28e942da07..c0366b1ed8 100644 --- a/keyboards/keychron/q0/config.h +++ b/keyboards/keychron/q0/config.h @@ -16,14 +16,8 @@ #pragma once -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - #define CKLED2001_CURRENT_TUNE { 0xFF, 0xFF, 0x70, 0xFF, 0xFF, 0x70, 0xFF, 0xFF, 0x70, 0xFF, 0xFF, 0x70 } -/* NKRO */ -#define FORCE_NKRO - /* turn off effects when suspended */ #define RGB_DISABLE_WHEN_USB_SUSPENDED @@ -31,54 +25,5 @@ #define WEAR_LEVELING_LOGICAL_SIZE 2048 #define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2) -// RGB Matrix Animation modes. Explicitly enabled -// For full list of effects, see: -// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects -// #define ENABLE_RGB_MATRIX_ALPHAS_MODS -// #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN -// #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT -#define ENABLE_RGB_MATRIX_BREATHING -// #define ENABLE_RGB_MATRIX_BAND_SAT -// #define ENABLE_RGB_MATRIX_BAND_VAL -// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT -// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL -// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT -#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL -#define ENABLE_RGB_MATRIX_CYCLE_ALL -#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT -#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN -#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON -#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN -#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL -#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL -#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL -#define ENABLE_RGB_MATRIX_DUAL_BEACON -#define ENABLE_RGB_MATRIX_RAINBOW_BEACON -// #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS -// #define ENABLE_RGB_MATRIX_RAINDROPS -#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS -// #define ENABLE_RGB_MATRIX_HUE_BREATHING -// #define ENABLE_RGB_MATRIX_HUE_PENDULUM -// #define ENABLE_RGB_MATRIX_HUE_WAVE -#define ENABLE_RGB_MATRIX_PIXEL_RAIN -// #define ENABLE_RGB_MATRIX_PIXEL_FLOW -// #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL -// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined -#define ENABLE_RGB_MATRIX_TYPING_HEATMAP -#define ENABLE_RGB_MATRIX_DIGITAL_RAIN -// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE -// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE -// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE -// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS -// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS -// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS -#define ENABLE_RGB_MATRIX_SPLASH -// #define ENABLE_RGB_MATRIX_MULTISPLASH -#define ENABLE_RGB_MATRIX_SOLID_SPLASH -// #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH - #define RGB_MATRIX_KEYPRESSES -#define RGB_MATRIX_FRAMEBUFFER_EFFECTS +#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
\ No newline at end of file diff --git a/keyboards/keychron/q0/rev_0130/config.h b/keyboards/keychron/q0/rev_0130/config.h index 80a2e150af..12ecfe1356 100644 --- a/keyboards/keychron/q0/rev_0130/config.h +++ b/keyboards/keychron/q0/rev_0130/config.h @@ -16,10 +16,6 @@ #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS { B5, B4, B3, A15, A14, A13 } -#define MATRIX_COL_PINS { A5, A6, A7, B0 } - /* RGB Matrix Driver Configuration */ #define DRIVER_COUNT 1 #define DRIVER_ADDR_1 0b1110100 @@ -28,7 +24,5 @@ #define DRIVER_1_LED_TOTAL 21 #define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL -#define RGB_MATRIX_CENTER { 56, 16 } - /* Enable num-lock LED */ #define NUM_LOCK_LED_INDEX 4 diff --git a/keyboards/keychron/q0/rev_0130/info.json b/keyboards/keychron/q0/rev_0130/info.json index 334f879d3b..38ea8592aa 100644 --- a/keyboards/keychron/q0/rev_0130/info.json +++ b/keyboards/keychron/q0/rev_0130/info.json @@ -6,39 +6,112 @@ "usb": { "vid": "0x3434", "pid": "0x0130", - "device_version": "1.0.2" + "device_version": "1.0.2", + "force_nkro": true }, + "matrix_pins": { + "cols": ["A5", "A6", "A7", "B0"], + "rows": ["B5", "B4", "B3", "A15", "A14", "A13"] + }, + "features": { + "audio": false, + "backlight": false, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true, + "rgblight": false + }, + "diode_direction": "ROW2COL", "processor": "STM32L432", "bootloader": "stm32-dfu", + "rgb_matrix": { + "driver": "CKLED2001", + "animations": { + "band_spiral_val": true, + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "rainbow_moving_chevron": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "dual_beacon": true, + "rainbow_beacon": true, + "jellybean_raindrops": true, + "pixel_rain": true, + "typing_heatmap": true, + "digital_rain": true, + "solid_reactive_simple": true, + "solid_reactive_multiwide": true, + "solid_reactive_multinexus": true, + "splash": true, + "solid_splash": true + }, + "center_point": [56, 16], + "layout": [ + {"flags": 1, "matrix":[0, 0], "x":0, "y":0}, + {"flags": 1, "matrix":[0, 1], "x":37, "y":0}, + {"flags": 1, "matrix":[0, 2], "x":75, "y":0}, + {"flags": 1, "matrix":[0, 3], "x":112, "y":0}, + + {"flags": 9, "matrix":[1, 0], "x":0, "y":6}, + {"flags": 4, "matrix":[1, 1], "x":37, "y":6}, + {"flags": 4, "matrix":[1, 2], "x":75, "y":6}, + {"flags": 4, "matrix":[1, 3], "x":112, "y":6}, + + {"flags": 4, "matrix":[2, 0], "x":0, "y":13}, + {"flags": 4, "matrix":[2, 1], "x":37, "y":13}, + {"flags": 4, "matrix":[2, 2], "x":75, "y":13}, + + {"flags": 4, "matrix":[3, 0], "x":0, "y":19}, + {"flags": 4, "matrix":[3, 1], "x":37, "y":19}, + {"flags": 4, "matrix":[3, 2], "x":75, "y":19}, + {"flags": 4, "matrix":[2, 3], "x":112, "y":16}, + + {"flags": 4, "matrix":[4, 0], "x":0, "y":25}, + {"flags": 4, "matrix":[4, 1], "x":37, "y":25}, + {"flags": 4, "matrix":[4, 2], "x":75, "y":25}, + + {"flags": 4, "matrix":[5, 0], "x":18, "y":32}, + {"flags": 4, "matrix":[5, 2], "x":75, "y":32}, + {"flags": 1, "matrix":[4, 3], "x":112, "y":29} + ] + }, "layouts": { "LAYOUT_numpad_6x4": { "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":[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":[3,0], "x":0, "y":3}, - {"matrix":[3,1], "x":1, "y":3}, - {"matrix":[3,2], "x":2, "y":3}, - {"matrix":[2,3], "x":3, "y":2, "h":2}, - - {"matrix":[4,0], "x":0, "y":4}, - {"matrix":[4,1], "x":1, "y":4}, - {"matrix":[4,2], "x":2, "y":4}, - - {"matrix":[5,0], "x":0, "y":5, "w":2}, - {"matrix":[5,2], "x":2, "y":5}, - {"matrix":[4,3], "x":3, "y":4, "h":2} + {"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":[3, 0], "x":0, "y":3}, + {"matrix":[3, 1], "x":1, "y":3}, + {"matrix":[3, 2], "x":2, "y":3}, + {"matrix":[2, 3], "x":3, "y":2, "h":2}, + + {"matrix":[4, 0], "x":0, "y":4}, + {"matrix":[4, 1], "x":1, "y":4}, + {"matrix":[4, 2], "x":2, "y":4}, + + {"matrix":[5, 0], "x":0, "y":5, "w":2}, + {"matrix":[5, 2], "x":2, "y":5}, + {"matrix":[4, 3], "x":3, "y":4, "h":2} ] } } diff --git a/keyboards/keychron/q0/rev_0130/keymaps/keychron/rules.mk b/keyboards/keychron/q0/rev_0130/keymaps/keychron/rules.mk index 9cf1a9b56c..495e8907b4 100644 --- a/keyboards/keychron/q0/rev_0130/keymaps/keychron/rules.mk +++ b/keyboards/keychron/q0/rev_0130/keymaps/keychron/rules.mk @@ -1,5 +1,4 @@ VIA_ENABLE = yes -ENCODER_MAP_ENABLE = yes VPATH += keyboards/keychron/common SRC += keychron_common.c diff --git a/keyboards/keychron/q0/rev_0130/rev_0130.c b/keyboards/keychron/q0/rev_0130/rev_0130.c index b968361c7e..ffe82a6d8c 100644 --- a/keyboards/keychron/q0/rev_0130/rev_0130.c +++ b/keyboards/keychron/q0/rev_0130/rev_0130.c @@ -54,37 +54,4 @@ const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = { {0, L_1, J_1, K_1}, // 19 {0, C_2, A_2, B_2}, // 20 }; - -#define __ NO_LED - -led_config_t g_led_config = { - { - // Key Matrix to LED Index - { 0, 1, 2, 3 }, - { 4, 5, 6, 7 }, - { 8, 9, 10, 14 }, - { 11, 12, 13, __ }, - { 15, 16, 17, 20 }, - { 18, __, 19, __ } - }, - { - // LED Index to Physical Position - {0,0}, {37,0}, {75,0}, {112,0}, - {0,6}, {37,6}, {75,6}, {112,6}, - {0,13}, {37,13}, {75,13}, - {0,19}, {37,19}, {75,19}, {112,16}, - {0,25}, {37,25}, {75,25}, - {18,32}, {75,32}, {112,29}, - }, - { - // LED Index to Flag - 1, 1, 1, 1, - 9, 4, 4, 4, - 4, 4, 4, - 4, 4, 4, 4, - 4, 4, 4, - 4, 4, 1 - } -}; - #endif // RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q0/rev_0130/rules.mk b/keyboards/keychron/q0/rev_0130/rules.mk index 3a31dbc81a..4eebc33437 100644 --- a/keyboards/keychron/q0/rev_0130/rules.mk +++ b/keyboards/keychron/q0/rev_0130/rules.mk @@ -1,19 +1,3 @@ -# Build Options -# change yes to no to disable. -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -DIP_SWITCH_ENABLE = no -RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 -LTO_ENABLE = yes EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/q0/rev_0131/config.h b/keyboards/keychron/q0/rev_0131/config.h index f94517ebb4..e4c5c2d3fc 100644 --- a/keyboards/keychron/q0/rev_0131/config.h +++ b/keyboards/keychron/q0/rev_0131/config.h @@ -16,10 +16,6 @@ #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS { B5, B4, B3, A15, A14, A13 } -#define MATRIX_COL_PINS { C14, C15, A0, A1, A2 } - /* RGB Matrix Driver Configuration */ #define DRIVER_COUNT 1 #define DRIVER_ADDR_1 0b1110111 diff --git a/keyboards/keychron/q0/rev_0131/info.json b/keyboards/keychron/q0/rev_0131/info.json index 94808bd9c4..8736a937d5 100644 --- a/keyboards/keychron/q0/rev_0131/info.json +++ b/keyboards/keychron/q0/rev_0131/info.json @@ -6,8 +6,27 @@ "usb": { "vid": "0x3434", "pid": "0x0131", - "device_version": "1.0.0" + "device_version": "1.0.0", + "force_nkro": true }, + "matrix_pins": { + "cols": ["C14", "C15", "A0", "A1", "A2"], + "rows": ["B5", "B4", "B3", "A15", "A14", "A13"] + }, + "features": { + "audio": false, + "backlight": false, + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true, + "rgblight": false + }, + "diode_direction": "ROW2COL", "encoder": { "rotary": [ {"pin_a": "A3", "pin_b": "A4"} @@ -18,41 +37,100 @@ }, "processor": "STM32L432", "bootloader": "stm32-dfu", + "rgb_matrix": { + "driver": "CKLED2001", + "animations": { + "band_spiral_val": true, + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "rainbow_moving_chevron": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "dual_beacon": true, + "rainbow_beacon": true, + "jellybean_raindrops": true, + "pixel_rain": true, + "typing_heatmap": true, + "digital_rain": true, + "solid_reactive_simple": true, + "solid_reactive_multiwide": true, + "solid_reactive_multinexus": true, + "splash": true, + "solid_splash": true + }, + "layout": [ + {"flags": 1, "matrix":[0, 1], "x":56, "y":0}, + {"flags": 1, "matrix":[0, 2], "x":112, "y":0}, + {"flags": 1, "matrix":[0, 3], "x":168, "y":0}, + {"flags": 1, "matrix":[0, 4], "x":224, "y":0}, + + {"flags": 4, "matrix":[1, 0], "x":0, "y":15}, + {"flags": 8, "matrix":[1, 1], "x":56, "y":15}, + {"flags": 4, "matrix":[1, 2], "x":112, "y":15}, + {"flags": 4, "matrix":[1, 3], "x":168, "y":15}, + {"flags": 4, "matrix":[1, 4], "x":224, "y":15}, + + {"flags": 4, "matrix":[2, 0], "x":0, "y":27}, + {"flags": 4, "matrix":[2, 1], "x":56, "y":27}, + {"flags": 4, "matrix":[2, 2], "x":112, "y":27}, + {"flags": 4, "matrix":[2, 3], "x":168, "y":27}, + {"flags": 4, "matrix":[2, 4], "x":224, "y":34}, + + {"flags": 4, "matrix":[3, 0], "x":0, "y":40}, + {"flags": 4, "matrix":[3, 1], "x":56, "y":40}, + {"flags": 4, "matrix":[3, 2], "x":112, "y":40}, + {"flags": 4, "matrix":[3, 3], "x":168, "y":40}, + + {"flags": 4, "matrix":[4, 0], "x":0, "y":52}, + {"flags": 4, "matrix":[4, 1], "x":56, "y":52}, + {"flags": 4, "matrix":[4, 2], "x":112, "y":52}, + {"flags": 4, "matrix":[4, 3], "x":168, "y":52}, + {"flags": 4, "matrix":[4, 4], "x":224, "y":58}, + + {"flags": 4, "matrix":[5, 0], "x":0, "y":64}, + {"flags": 4, "matrix":[5, 1], "x":84, "y":64}, + {"flags": 1, "matrix":[5, 3], "x":168, "y":64} + ] + }, "layouts": { "LAYOUT_numpad_6x5": { "layout": [ - {"matrix":[0,0], "x":0, "y":0}, - {"matrix":[0,1], "x":1.25, "y":0}, - {"matrix":[0,2], "x":2.25, "y":0}, - {"matrix":[0,3], "x":3.25, "y":0}, - {"matrix":[0,4], "x":4.25, "y":0}, - - {"matrix":[1,0], "x":0, "y":1.25}, - {"matrix":[1,1], "x":1.25, "y":1.25}, - {"matrix":[1,2], "x":2.25, "y":1.25}, - {"matrix":[1,3], "x":3.25, "y":1.25}, - {"matrix":[1,4], "x":4.25, "y":1.25}, - - {"matrix":[2,0], "x":0, "y":2.25}, - {"matrix":[2,1], "x":1.25, "y":2.25}, - {"matrix":[2,2], "x":2.25, "y":2.25}, - {"matrix":[2,3], "x":3.25, "y":2.25}, - {"matrix":[2,4], "x":4.25, "y":2.25, "h":2}, - - {"matrix":[3,0], "x":0, "y":3.25}, - {"matrix":[3,1], "x":1.25, "y":3.25}, - {"matrix":[3,2], "x":2.25, "y":3.25}, - {"matrix":[3,3], "x":3.25, "y":3.25}, - - {"matrix":[4,0], "x":0, "y":4.25}, - {"matrix":[4,1], "x":1.25, "y":4.25}, - {"matrix":[4,2], "x":2.25, "y":4.25}, - {"matrix":[4,3], "x":3.25, "y":4.25}, - {"matrix":[4,4], "x":4.25, "y":4.25, "h":2}, - - {"matrix":[5,0], "x":0, "y":5.25}, - {"matrix":[5,1], "x":1.25, "y":5.25, "w":2}, - {"matrix":[5,3], "x":3.25, "y":5.25} + {"matrix":[0, 0], "x":0, "y":0}, + {"matrix":[0, 1], "x":1.25, "y":0}, + {"matrix":[0, 2], "x":2.25, "y":0}, + {"matrix":[0, 3], "x":3.25, "y":0}, + {"matrix":[0, 4], "x":4.25, "y":0}, + + {"matrix":[1, 0], "x":0, "y":1.25}, + {"matrix":[1, 1], "x":1.25, "y":1.25}, + {"matrix":[1, 2], "x":2.25, "y":1.25}, + {"matrix":[1, 3], "x":3.25, "y":1.25}, + {"matrix":[1, 4], "x":4.25, "y":1.25}, + + {"matrix":[2, 0], "x":0, "y":2.25}, + {"matrix":[2, 1], "x":1.25, "y":2.25}, + {"matrix":[2, 2], "x":2.25, "y":2.25}, + {"matrix":[2, 3], "x":3.25, "y":2.25}, + {"matrix":[2, 4], "x":4.25, "y":2.25, "h":2}, + + {"matrix":[3, 0], "x":0, "y":3.25}, + {"matrix":[3, 1], "x":1.25, "y":3.25}, + {"matrix":[3, 2], "x":2.25, "y":3.25}, + {"matrix":[3, 3], "x":3.25, "y":3.25}, + + {"matrix":[4, 0], "x":0, "y":4.25}, + {"matrix":[4, 1], "x":1.25, "y":4.25}, + {"matrix":[4, 2], "x":2.25, "y":4.25}, + {"matrix":[4, 3], "x":3.25, "y":4.25}, + {"matrix":[4, 4], "x":4.25, "y":4.25, "h":2}, + + {"matrix":[5, 0], "x":0, "y":5.25}, + {"matrix":[5, 1], "x":1.25, "y":5.25, "w":2}, + {"matrix":[5, 3], "x":3.25, "y":5.25} ] } } diff --git a/keyboards/keychron/q0/rev_0131/keymaps/default/keymap.c b/keyboards/keychron/q0/rev_0131/keymaps/default/keymap.c index f92d6b8362..4e281d4d7d 100644 --- a/keyboards/keychron/q0/rev_0131/keymaps/default/keymap.c +++ b/keyboards/keychron/q0/rev_0131/keymaps/default/keymap.c @@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [FUNC] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, }; diff --git a/keyboards/keychron/q0/rev_0131/keymaps/keychron/keymap.c b/keyboards/keychron/q0/rev_0131/keymaps/keychron/keymap.c index fc618cdba9..795c275543 100644 --- a/keyboards/keychron/q0/rev_0131/keymaps/keychron/keymap.c +++ b/keyboards/keychron/q0/rev_0131/keymaps/keychron/keymap.c @@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [FUNC] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [L2] = { ENCODER_CCW_CW(_______, _______) }, diff --git a/keyboards/keychron/q0/rev_0131/keymaps/via/keymap.c b/keyboards/keychron/q0/rev_0131/keymaps/via/keymap.c index 91b838d3f2..935d3edb76 100644 --- a/keyboards/keychron/q0/rev_0131/keymaps/via/keymap.c +++ b/keyboards/keychron/q0/rev_0131/keymaps/via/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [FUNC] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [L2] = { ENCODER_CCW_CW(_______, _______) }, diff --git a/keyboards/keychron/q0/rev_0131/rev_0131.c b/keyboards/keychron/q0/rev_0131/rev_0131.c index c67a460557..282c511ce2 100644 --- a/keyboards/keychron/q0/rev_0131/rev_0131.c +++ b/keyboards/keychron/q0/rev_0131/rev_0131.c @@ -59,37 +59,4 @@ const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = { {0, F_7, D_7, E_7}, {0, F_9, D_9, E_9}, }; - -#define __ NO_LED - -led_config_t g_led_config = { - { - // Key Matrix to LED Index - { __, 0, 1, 2, 3 }, - { 4, 5, 6, 7, 8 }, - { 9, 10, 11, 12, 13 }, - { 14, 15, 16, 17, __ }, - { 18, 19, 20, 21, 22 }, - { 23, 24, __, 25, __ }, - }, - { - // LED Index to Physical Position - {56,0}, {112,0}, {168,0}, {224,0}, - {0,15}, {56,15}, {112,15}, {168,15}, {224,15}, - {0,27}, {56,27}, {112,27}, {168,27}, {224,34}, - {0,40}, {56,40}, {112,40}, {168,40}, - {0,52}, {56,52}, {112,52}, {168,52}, {224,58}, - {0,64}, {84,64}, {168,64}, - }, - { - // LED Index to Flag - 1, 1, 1, 1, - 4, 8, 4, 4, 4, - 4, 4, 4, 4, 4, - 4, 4, 4, 4, - 4, 4, 4, 4, 4, - 4, 4, 1, - } -}; - #endif // RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q0/rev_0131/rules.mk b/keyboards/keychron/q0/rev_0131/rules.mk index d5f04c34d2..4eebc33437 100644 --- a/keyboards/keychron/q0/rev_0131/rules.mk +++ b/keyboards/keychron/q0/rev_0131/rules.mk @@ -1,19 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable encoder -DIP_SWITCH_ENABLE = no -RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/q1/ansi/ansi.c b/keyboards/keychron/q1/ansi/ansi.c index fc22d1aff3..ee586fef93 100644 --- a/keyboards/keychron/q1/ansi/ansi.c +++ b/keyboards/keychron/q1/ansi/ansi.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "ansi.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q1/ansi/ansi.h b/keyboards/keychron/q1/ansi/ansi.h deleted file mode 100644 index db52563dc4..0000000000 --- a/keyboards/keychron/q1/ansi/ansi.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.com) - * - * 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" diff --git a/keyboards/keychron/q1/ansi/config.h b/keyboards/keychron/q1/ansi/config.h index 0a30f7d82d..c6d4e44c87 100644 --- a/keyboards/keychron/q1/ansi/config.h +++ b/keyboards/keychron/q1/ansi/config.h @@ -16,10 +16,6 @@ #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS { D3, D2, B3, B2, B1, B0 } -#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 } - /* RGB Matrix Configuration */ #define DRIVER_1_LED_TOTAL 59 #define DRIVER_2_LED_TOTAL 23 diff --git a/keyboards/keychron/q1/ansi/info.json b/keyboards/keychron/q1/ansi/info.json index 63602d71c5..e41ab1086a 100644 --- a/keyboards/keychron/q1/ansi/info.json +++ b/keyboards/keychron/q1/ansi/info.json @@ -4,10 +4,19 @@ "url": "https://github.com/Keychron", "maintainer": "lalalademaxiya1", "usb": { - "vid": "0x3434", - "pid": "0x0100", - "device_version": "1.0.0" + "vid": "0x3434", + "pid": "0x0100", + "device_version": "1.0.0", + "force_nkro": true }, + "rgb_matrix": { + "driver": "IS31FL3733" + }, + "matrix_pins": { + "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["D3", "D2", "B3", "B2", "B1", "B0"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { @@ -22,12 +31,12 @@ {"matrix":[0, 7], "x":6.5, "y":0}, {"matrix":[0, 8], "x":7.5, "y":0}, {"matrix":[0, 9], "x":8.5, "y":0}, - {"matrix":[0,10], "x":9.75, "y":0}, - {"matrix":[0,11], "x":10.75, "y":0}, - {"matrix":[0,12], "x":11.75, "y":0}, - {"matrix":[0,13], "x":12.75, "y":0}, - {"matrix":[4,14], "x":14, "y":0}, - {"matrix":[0,14], "x":15.25, "y":0}, + {"matrix":[0, 10], "x":9.75, "y":0}, + {"matrix":[0, 11], "x":10.75, "y":0}, + {"matrix":[0, 12], "x":11.75, "y":0}, + {"matrix":[0, 13], "x":12.75, "y":0}, + {"matrix":[4, 14], "x":14, "y":0}, + {"matrix":[0, 14], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1}, {"matrix":[1, 1], "x":1, "y":1}, @@ -39,11 +48,11 @@ {"matrix":[1, 7], "x":7, "y":1}, {"matrix":[1, 8], "x":8, "y":1}, {"matrix":[1, 9], "x":9, "y":1}, - {"matrix":[1,10], "x":10, "y":1}, - {"matrix":[1,11], "x":11, "y":1}, - {"matrix":[1,12], "x":12, "y":1}, - {"matrix":[1,13], "x":13, "y":1, "w":2}, - {"matrix":[1,14], "x":15.25, "y":1}, + {"matrix":[1, 10], "x":10, "y":1}, + {"matrix":[1, 11], "x":11, "y":1}, + {"matrix":[1, 12], "x":12, "y":1}, + {"matrix":[1, 13], "x":13, "y":1, "w":2}, + {"matrix":[1, 14], "x":15.25, "y":1}, {"matrix":[2, 0], "x":0, "y":2, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2}, @@ -55,11 +64,11 @@ {"matrix":[2, 7], "x":7.5, "y":2}, {"matrix":[2, 8], "x":8.5, "y":2}, {"matrix":[2, 9], "x":9.5, "y":2}, - {"matrix":[2,10], "x":10.5, "y":2}, - {"matrix":[2,11], "x":11.5, "y":2}, - {"matrix":[2,12], "x":12.5, "y":2}, - {"matrix":[2,13], "x":13.5, "y":2, "w":1.5}, - {"matrix":[2,14], "x":15.25, "y":2}, + {"matrix":[2, 10], "x":10.5, "y":2}, + {"matrix":[2, 11], "x":11.5, "y":2}, + {"matrix":[2, 12], "x":12.5, "y":2}, + {"matrix":[2, 13], "x":13.5, "y":2, "w":1.5}, + {"matrix":[2, 14], "x":15.25, "y":2}, {"matrix":[3, 0], "x":0, "y":3, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3}, @@ -71,10 +80,10 @@ {"matrix":[3, 7], "x":7.75, "y":3}, {"matrix":[3, 8], "x":8.75, "y":3}, {"matrix":[3, 9], "x":9.75, "y":3}, - {"matrix":[3,10], "x":10.75, "y":3}, - {"matrix":[3,11], "x":11.75, "y":3}, - {"matrix":[3,13], "x":12.75, "y":3, "w":2.25}, - {"matrix":[3,14], "x":15.25, "y":3}, + {"matrix":[3, 10], "x":10.75, "y":3}, + {"matrix":[3, 11], "x":11.75, "y":3}, + {"matrix":[3, 13], "x":12.75, "y":3, "w":2.25}, + {"matrix":[3, 14], "x":15.25, "y":3}, {"matrix":[4, 0], "x":0, "y":4, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4}, @@ -85,21 +94,21 @@ {"matrix":[4, 7], "x":7.25, "y":4}, {"matrix":[4, 8], "x":8.25, "y":4}, {"matrix":[4, 9], "x":9.25, "y":4}, - {"matrix":[4,10], "x":10.25, "y":4}, - {"matrix":[4,11], "x":11.25, "y":4}, - {"matrix":[4,13], "x":12.25, "y":4, "w":1.75}, - {"matrix":[3,12], "x":14.25, "y":4.25}, + {"matrix":[4, 10], "x":10.25, "y":4}, + {"matrix":[4, 11], "x":11.25, "y":4}, + {"matrix":[4, 13], "x":12.25, "y":4, "w":1.75}, + {"matrix":[3, 12], "x":14.25, "y":4.25}, {"matrix":[5, 0], "x":0, "y":5, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5, "w":1.25}, {"matrix":[5, 2], "x":2.5, "y":5, "w":1.25}, - {"matrix":[5, 6], "x":3.75,"y":5, "w":6.25}, - {"matrix":[5,10], "x":10, "y":5}, - {"matrix":[5,11], "x":11, "y":5}, - {"matrix":[5,12], "x":12, "y":5}, - {"matrix":[5,13], "x":13.25, "y":5.25}, - {"matrix":[4,12], "x":14.25, "y":5.25}, - {"matrix":[5,14], "x":15.25, "y":5.25} + {"matrix":[5, 6], "x":3.75, "y":5, "w":6.25}, + {"matrix":[5, 10], "x":10, "y":5}, + {"matrix":[5, 11], "x":11, "y":5}, + {"matrix":[5, 12], "x":12, "y":5}, + {"matrix":[5, 13], "x":13.25, "y":5.25}, + {"matrix":[4, 12], "x":14.25, "y":5.25}, + {"matrix":[5, 14], "x":15.25, "y":5.25} ] } } diff --git a/keyboards/keychron/q1/ansi/rules.mk b/keyboards/keychron/q1/ansi/rules.mk index 395b661685..0379fdb94c 100644 --- a/keyboards/keychron/q1/ansi/rules.mk +++ b/keyboards/keychron/q1/ansi/rules.mk @@ -12,5 +12,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = IS31FL3733 LTO_ENABLE = yes diff --git a/keyboards/keychron/q1/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q1/ansi_encoder/ansi_encoder.c index 5909b993e3..bc559b3541 100644 --- a/keyboards/keychron/q1/ansi_encoder/ansi_encoder.c +++ b/keyboards/keychron/q1/ansi_encoder/ansi_encoder.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "ansi_encoder.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { diff --git a/keyboards/keychron/q1/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q1/ansi_encoder/ansi_encoder.h deleted file mode 100644 index db52563dc4..0000000000 --- a/keyboards/keychron/q1/ansi_encoder/ansi_encoder.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.com) - * - * 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" diff --git a/keyboards/keychron/q1/ansi_encoder/config.h b/keyboards/keychron/q1/ansi_encoder/config.h index a41976d560..28bbea9087 100644 --- a/keyboards/keychron/q1/ansi_encoder/config.h +++ b/keyboards/keychron/q1/ansi_encoder/config.h @@ -16,10 +16,6 @@ #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS { D3, D2, B3, B2, B1, B0 } -#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 } - /* RGB Matrix Configuration */ #define DRIVER_1_LED_TOTAL 59 #define DRIVER_2_LED_TOTAL 23 diff --git a/keyboards/keychron/q1/ansi_encoder/info.json b/keyboards/keychron/q1/ansi_encoder/info.json index 1dcefeb7f4..3946625f3c 100644 --- a/keyboards/keychron/q1/ansi_encoder/info.json +++ b/keyboards/keychron/q1/ansi_encoder/info.json @@ -6,8 +6,17 @@ "usb": { "vid": "0x3434", "pid": "0x0101", - "device_version": "1.0.0" + "device_version": "1.0.0", + "force_nkro": true }, + "rgb_matrix": { + "driver": "IS31FL3733" + }, + "matrix_pins": { + "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["D3", "D2", "B3", "B2", "B1", "B0"] + }, + "diode_direction": "ROW2COL", "encoder": { "rotary": [ {"pin_a": "E6", "pin_b": "B7"} @@ -27,12 +36,12 @@ {"matrix":[0, 7], "x":6.5, "y":0}, {"matrix":[0, 8], "x":7.5, "y":0}, {"matrix":[0, 9], "x":8.5, "y":0}, - {"matrix":[0,10], "x":9.75, "y":0}, - {"matrix":[0,11], "x":10.75, "y":0}, - {"matrix":[0,12], "x":11.75, "y":0}, - {"matrix":[0,13], "x":12.75, "y":0}, - {"matrix":[4,14], "x":14, "y":0}, - {"matrix":[0,14], "x":15.25, "y":0}, + {"matrix":[0, 10], "x":9.75, "y":0}, + {"matrix":[0, 11], "x":10.75, "y":0}, + {"matrix":[0, 12], "x":11.75, "y":0}, + {"matrix":[0, 13], "x":12.75, "y":0}, + {"matrix":[4, 14], "x":14, "y":0}, + {"matrix":[0, 14], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1}, {"matrix":[1, 1], "x":1, "y":1}, @@ -44,11 +53,11 @@ {"matrix":[1, 7], "x":7, "y":1}, {"matrix":[1, 8], "x":8, "y":1}, {"matrix":[1, 9], "x":9, "y":1}, - {"matrix":[1,10], "x":10, "y":1}, - {"matrix":[1,11], "x":11, "y":1}, - {"matrix":[1,12], "x":12, "y":1}, - {"matrix":[1,13], "x":13, "y":1, "w":2}, - {"matrix":[1,14], "x":15.25, "y":1}, + {"matrix":[1, 10], "x":10, "y":1}, + {"matrix":[1, 11], "x":11, "y":1}, + {"matrix":[1, 12], "x":12, "y":1}, + {"matrix":[1, 13], "x":13, "y":1, "w":2}, + {"matrix":[1, 14], "x":15.25, "y":1}, {"matrix":[2, 0], "x":0, "y":2, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2}, @@ -60,11 +69,11 @@ {"matrix":[2, 7], "x":7.5, "y":2}, {"matrix":[2, 8], "x":8.5, "y":2}, {"matrix":[2, 9], "x":9.5, "y":2}, - {"matrix":[2,10], "x":10.5, "y":2}, - {"matrix":[2,11], "x":11.5, "y":2}, - {"matrix":[2,12], "x":12.5, "y":2}, - {"matrix":[2,13], "x":13.5, "y":2, "w":1.5}, - {"matrix":[2,14], "x":15.25, "y":2}, + {"matrix":[2, 10], "x":10.5, "y":2}, + {"matrix":[2, 11], "x":11.5, "y":2}, + {"matrix":[2, 12], "x":12.5, "y":2}, + {"matrix":[2, 13], "x":13.5, "y":2, "w":1.5}, + {"matrix":[2, 14], "x":15.25, "y":2}, {"matrix":[3, 0], "x":0, "y":3, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3}, @@ -76,10 +85,10 @@ {"matrix":[3, 7], "x":7.75, "y":3}, {"matrix":[3, 8], "x":8.75, "y":3}, {"matrix":[3, 9], "x":9.75, "y":3}, - {"matrix":[3,10], "x":10.75, "y":3}, - {"matrix":[3,11], "x":11.75, "y":3}, - {"matrix":[3,13], "x":12.75, "y":3, "w":2.25}, - {"matrix":[3,14], "x":15.25, "y":3}, + {"matrix":[3, 10], "x":10.75, "y":3}, + {"matrix":[3, 11], "x":11.75, "y":3}, + {"matrix":[3, 13], "x":12.75, "y":3, "w":2.25}, + {"matrix":[3, 14], "x":15.25, "y":3}, {"matrix":[4, 0], "x":0, "y":4, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4}, @@ -90,21 +99,21 @@ {"matrix":[4, 7], "x":7.25, "y":4}, {"matrix":[4, 8], "x":8.25, "y":4}, {"matrix":[4, 9], "x":9.25, "y":4}, - {"matrix":[4,10], "x":10.25, "y":4}, - {"matrix":[4,11], "x":11.25, "y":4}, - {"matrix":[4,13], "x":12.25, "y":4, "w":1.75}, - {"matrix":[3,12], "x":14.25, "y":4.25}, + {"matrix":[4, 10], "x":10.25, "y":4}, + {"matrix":[4, 11], "x":11.25, "y":4}, + {"matrix":[4, 13], "x":12.25, "y":4, "w":1.75}, + {"matrix":[3, 12], "x":14.25, "y":4.25}, {"matrix":[5, 0], "x":0, "y":5, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5, "w":1.25}, {"matrix":[5, 2], "x":2.5, "y":5, "w":1.25}, - {"matrix":[5, 6], "x":3.75,"y":5, "w":6.25}, - {"matrix":[5,10], "x":10, "y":5}, - {"matrix":[5,11], "x":11, "y":5}, - {"matrix":[5,12], "x":12, "y":5}, - {"matrix":[5,13], "x":13.25, "y":5.25}, - {"matrix":[4,12], "x":14.25, "y":5.25}, - {"matrix":[5,14], "x":15.25, "y":5.25} + {"matrix":[5, 6], "x":3.75, "y":5, "w":6.25}, + {"matrix":[5, 10], "x":10, "y":5}, + {"matrix":[5, 11], "x":11, "y":5}, + {"matrix":[5, 12], "x":12, "y":5}, + {"matrix":[5, 13], "x":13.25, "y":5.25}, + {"matrix":[4, 12], "x":14.25, "y":5.25}, + {"matrix":[5, 14], "x":15.25, "y":5.25} ] } } diff --git a/keyboards/keychron/q1/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q1/ansi_encoder/keymaps/default/keymap.c index 36cc7a50f8..a4febc93c7 100644 --- a/keyboards/keychron/q1/ansi_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/q1/ansi_encoder/keymaps/default/keymap.c @@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q1/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q1/ansi_encoder/keymaps/keychron/keymap.c index 510287acec..88d0b49efd 100644 --- a/keyboards/keychron/q1/ansi_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/q1/ansi_encoder/keymaps/keychron/keymap.c @@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q1/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q1/ansi_encoder/keymaps/via/keymap.c index e63091e616..9372a1d814 100644 --- a/keyboards/keychron/q1/ansi_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/q1/ansi_encoder/keymaps/via/keymap.c @@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q1/ansi_encoder/rules.mk b/keyboards/keychron/q1/ansi_encoder/rules.mk index f67fe2bf03..d60167579e 100644 --- a/keyboards/keychron/q1/ansi_encoder/rules.mk +++ b/keyboards/keychron/q1/ansi_encoder/rules.mk @@ -13,5 +13,4 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = IS31FL3733 LTO_ENABLE = yes diff --git a/keyboards/keychron/q1/config.h b/keyboards/keychron/q1/config.h index a49ec41a06..c78453dc5f 100644 --- a/keyboards/keychron/q1/config.h +++ b/keyboards/keychron/q1/config.h @@ -16,9 +16,6 @@ #pragma once -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* RGB Matrix Driver Configuration */ #define DRIVER_COUNT 2 #define DRIVER_ADDR_1 0b1010000 @@ -30,9 +27,6 @@ /* Disable DIP switch in matrix data */ #define MATRIX_MASKED -/* NKRO */ -#define FORCE_NKRO - /* Disable RGB lighting when PC is in suspend */ #define RGB_DISABLE_WHEN_USB_SUSPENDED diff --git a/keyboards/keychron/q1/iso/config.h b/keyboards/keychron/q1/iso/config.h index b9b33cf320..cb7b05560a 100644 --- a/keyboards/keychron/q1/iso/config.h +++ b/keyboards/keychron/q1/iso/config.h @@ -16,10 +16,6 @@ #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS { D3, D2, B3, B2, B1, B0 } -#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 } - /* RGB Matrix Configuration */ #define DRIVER_1_LED_TOTAL 59 #define DRIVER_2_LED_TOTAL 24 diff --git a/keyboards/keychron/q1/iso/info.json b/keyboards/keychron/q1/iso/info.json index d8f5205f5f..28a3e38c77 100644 --- a/keyboards/keychron/q1/iso/info.json +++ b/keyboards/keychron/q1/iso/info.json @@ -6,8 +6,17 @@ "usb": { "vid": "0x3434", "pid": "0x0102", - "device_version": "1.0.0" + "device_version": "1.0.0", + "force_nkro": true }, + "rgb_matrix": { + "driver": "IS31FL3733" + }, + "matrix_pins": { + "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["D3", "D2", "B3", "B2", "B1", "B0"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { @@ -22,12 +31,12 @@ {"matrix":[0, 7], "x":6.5, "y":0}, {"matrix":[0, 8], "x":7.5, "y":0}, {"matrix":[0, 9], "x":8.5, "y":0}, - {"matrix":[0,10], "x":9.75, "y":0}, - {"matrix":[0,11], "x":10.75, "y":0}, - {"matrix":[0,12], "x":11.75, "y":0}, - {"matrix":[0,13], "x":12.75, "y":0}, - {"matrix":[4,14], "x":14, "y":0}, - {"matrix":[0,14], "x":15.25, "y":0}, + {"matrix":[0, 10], "x":9.75, "y":0}, + {"matrix":[0, 11], "x":10.75, "y":0}, + {"matrix":[0, 12], "x":11.75, "y":0}, + {"matrix":[0, 13], "x":12.75, "y":0}, + {"matrix":[4, 14], "x":14, "y":0}, + {"matrix":[0, 14], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -39,11 +48,11 @@ {"matrix":[1, 7], "x":7, "y":1.25}, {"matrix":[1, 8], "x":8, "y":1.25}, {"matrix":[1, 9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25, "w":2}, - {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10, "y":1.25}, + {"matrix":[1, 11], "x":11, "y":1.25}, + {"matrix":[1, 12], "x":12, "y":1.25}, + {"matrix":[1, 13], "x":13, "y":1.25, "w":2}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -55,10 +64,10 @@ {"matrix":[2, 7], "x":7.5, "y":2.25}, {"matrix":[2, 8], "x":8.5, "y":2.25}, {"matrix":[2, 9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,14], "x":15.25, "y":2.25}, + {"matrix":[2, 10], "x":10.5, "y":2.25}, + {"matrix":[2, 11], "x":11.5, "y":2.25}, + {"matrix":[2, 12], "x":12.5, "y":2.25}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -70,11 +79,11 @@ {"matrix":[3, 7], "x":7.75, "y":3.25}, {"matrix":[3, 8], "x":8.75, "y":3.25}, {"matrix":[3, 9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, - {"matrix":[3,14], "x":15.25, "y":3.25}, + {"matrix":[3, 10], "x":10.75, "y":3.25}, + {"matrix":[3, 11], "x":11.75, "y":3.25}, + {"matrix":[3, 13], "x":12.75, "y":3.25}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3, 14], "x":15.25, "y":3.25}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25}, @@ -86,21 +95,21 @@ {"matrix":[4, 7], "x":7.25, "y":4.25}, {"matrix":[4, 8], "x":8.25, "y":4.25}, {"matrix":[4, 9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,13], "x":12.25, "y":4.25, "w":1.75}, - {"matrix":[3,12], "x":14.25, "y":4.5}, + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 13], "x":12.25, "y":4.25, "w":1.75}, + {"matrix":[3, 12], "x":14.25, "y":4.5}, {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25}, {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25}, - {"matrix":[5,10], "x":10, "y":5.25}, - {"matrix":[5,11], "x":11, "y":5.25}, - {"matrix":[5,12], "x":12, "y":5.25}, - {"matrix":[5,13], "x":13.25, "y":5.5}, - {"matrix":[4,12], "x":14.25, "y":5.5}, - {"matrix":[5,14], "x":15.25, "y":5.5} + {"matrix":[5, 10], "x":10, "y":5.25}, + {"matrix":[5, 11], "x":11, "y":5.25}, + {"matrix":[5, 12], "x":12, "y":5.25}, + {"matrix":[5, 13], "x":13.25, "y":5.5}, + {"matrix":[4, 12], "x":14.25, "y":5.5}, + {"matrix":[5, 14], "x":15.25, "y":5.5} ] } } diff --git a/keyboards/keychron/q1/iso/iso.c b/keyboards/keychron/q1/iso/iso.c index c8e3165bd3..619d89dffc 100644 --- a/keyboards/keychron/q1/iso/iso.c +++ b/keyboards/keychron/q1/iso/iso.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "iso.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { diff --git a/keyboards/keychron/q1/iso/iso.h b/keyboards/keychron/q1/iso/iso.h deleted file mode 100644 index db52563dc4..0000000000 --- a/keyboards/keychron/q1/iso/iso.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.com) - * - * 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" diff --git a/keyboards/keychron/q1/iso/rules.mk b/keyboards/keychron/q1/iso/rules.mk index 395b661685..0379fdb94c 100644 --- a/keyboards/keychron/q1/iso/rules.mk +++ b/keyboards/keychron/q1/iso/rules.mk @@ -12,5 +12,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = IS31FL3733 LTO_ENABLE = yes diff --git a/keyboards/keychron/q1/iso_encoder/config.h b/keyboards/keychron/q1/iso_encoder/config.h index b52fb88383..c1e84e44d3 100644 --- a/keyboards/keychron/q1/iso_encoder/config.h +++ b/keyboards/keychron/q1/iso_encoder/config.h @@ -16,10 +16,6 @@ #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS { D3, D2, B3, B2, B1, B0 } -#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 } - /* DIP switch */ #define DIP_SWITCH_MATRIX_GRID { {0,1} } diff --git a/keyboards/keychron/q1/iso_encoder/info.json b/keyboards/keychron/q1/iso_encoder/info.json index e4dce374c8..d8e1751de3 100644 --- a/keyboards/keychron/q1/iso_encoder/info.json +++ b/keyboards/keychron/q1/iso_encoder/info.json @@ -6,8 +6,17 @@ "usb": { "vid": "0x3434", "pid": "0x0103", - "device_version": "1.0.2" + "device_version": "1.0.2", + "force_nkro": true }, + "rgb_matrix": { + "driver": "IS31FL3733" + }, + "matrix_pins": { + "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["D3", "D2", "B3", "B2", "B1", "B0"] + }, + "diode_direction": "ROW2COL", "encoder": { "rotary": [ {"pin_a": "E6", "pin_b": "B7"} @@ -27,12 +36,12 @@ {"matrix":[0, 7], "x":6.5, "y":0}, {"matrix":[0, 8], "x":7.5, "y":0}, {"matrix":[0, 9], "x":8.5, "y":0}, - {"matrix":[0,10], "x":9.75, "y":0}, - {"matrix":[0,11], "x":10.75, "y":0}, - {"matrix":[0,12], "x":11.75, "y":0}, - {"matrix":[0,13], "x":12.75, "y":0}, - {"matrix":[4,14], "x":14, "y":0}, - {"matrix":[0,14], "x":15.25, "y":0}, + {"matrix":[0, 10], "x":9.75, "y":0}, + {"matrix":[0, 11], "x":10.75, "y":0}, + {"matrix":[0, 12], "x":11.75, "y":0}, + {"matrix":[0, 13], "x":12.75, "y":0}, + {"matrix":[4, 14], "x":14, "y":0}, + {"matrix":[0, 14], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -44,11 +53,11 @@ {"matrix":[1, 7], "x":7, "y":1.25}, {"matrix":[1, 8], "x":8, "y":1.25}, {"matrix":[1, 9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25, "w":2}, - {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10, "y":1.25}, + {"matrix":[1, 11], "x":11, "y":1.25}, + {"matrix":[1, 12], "x":12, "y":1.25}, + {"matrix":[1, 13], "x":13, "y":1.25, "w":2}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -60,10 +69,10 @@ {"matrix":[2, 7], "x":7.5, "y":2.25}, {"matrix":[2, 8], "x":8.5, "y":2.25}, {"matrix":[2, 9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,14], "x":15.25, "y":2.25}, + {"matrix":[2, 10], "x":10.5, "y":2.25}, + {"matrix":[2, 11], "x":11.5, "y":2.25}, + {"matrix":[2, 12], "x":12.5, "y":2.25}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -75,11 +84,11 @@ {"matrix":[3, 7], "x":7.75, "y":3.25}, {"matrix":[3, 8], "x":8.75, "y":3.25}, {"matrix":[3, 9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, - {"matrix":[3,14], "x":15.25, "y":3.25}, + {"matrix":[3, 10], "x":10.75, "y":3.25}, + {"matrix":[3, 11], "x":11.75, "y":3.25}, + {"matrix":[3, 13], "x":12.75, "y":3.25}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3, 14], "x":15.25, "y":3.25}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25}, @@ -91,21 +100,21 @@ {"matrix":[4, 7], "x":7.25, "y":4.25}, {"matrix":[4, 8], "x":8.25, "y":4.25}, {"matrix":[4, 9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,13], "x":12.25, "y":4.25, "w":1.75}, - {"matrix":[3,12], "x":14.25, "y":4.5}, + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 13], "x":12.25, "y":4.25, "w":1.75}, + {"matrix":[3, 12], "x":14.25, "y":4.5}, {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25}, {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25}, - {"matrix":[5,10], "x":10, "y":5.25}, - {"matrix":[5,11], "x":11, "y":5.25}, - {"matrix":[5,12], "x":12, "y":5.25}, - {"matrix":[5,13], "x":13.25, "y":5.5}, - {"matrix":[4,12], "x":14.25, "y":5.5}, - {"matrix":[5,14], "x":15.25, "y":5.5} + {"matrix":[5, 10], "x":10, "y":5.25}, + {"matrix":[5, 11], "x":11, "y":5.25}, + {"matrix":[5, 12], "x":12, "y":5.25}, + {"matrix":[5, 13], "x":13.25, "y":5.5}, + {"matrix":[4, 12], "x":14.25, "y":5.5}, + {"matrix":[5, 14], "x":15.25, "y":5.5} ] } } diff --git a/keyboards/keychron/q1/iso_encoder/iso_encoder.c b/keyboards/keychron/q1/iso_encoder/iso_encoder.c index c6563ad318..c6b091fff1 100644 --- a/keyboards/keychron/q1/iso_encoder/iso_encoder.c +++ b/keyboards/keychron/q1/iso_encoder/iso_encoder.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "iso_encoder.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q1/iso_encoder/iso_encoder.h b/keyboards/keychron/q1/iso_encoder/iso_encoder.h deleted file mode 100644 index d62d707b4a..0000000000 --- a/keyboards/keychron/q1/iso_encoder/iso_encoder.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.com) - * - * 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"
\ No newline at end of file diff --git a/keyboards/keychron/q1/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/q1/iso_encoder/keymaps/default/keymap.c index 840db80a5b..237d9a3f1e 100644 --- a/keyboards/keychron/q1/iso_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/q1/iso_encoder/keymaps/default/keymap.c @@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q1/iso_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q1/iso_encoder/keymaps/keychron/keymap.c index d78878d5e9..b007e56fba 100644 --- a/keyboards/keychron/q1/iso_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/q1/iso_encoder/keymaps/keychron/keymap.c @@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q1/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/q1/iso_encoder/keymaps/via/keymap.c index 052fe8c58a..47f04d8a29 100644 --- a/keyboards/keychron/q1/iso_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/q1/iso_encoder/keymaps/via/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q1/iso_encoder/rules.mk b/keyboards/keychron/q1/iso_encoder/rules.mk index 3eea458e72..d994ac1fad 100644 --- a/keyboards/keychron/q1/iso_encoder/rules.mk +++ b/keyboards/keychron/q1/iso_encoder/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = IS31FL3733 RAW_ENABLE = yes LTO_ENABLE = yes diff --git a/keyboards/keychron/q1/q1.c b/keyboards/keychron/q1/q1.c index aa0789e852..3df62c4339 100644 --- a/keyboards/keychron/q1/q1.c +++ b/keyboards/keychron/q1/q1.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "q1.h" +#include "quantum.h" const matrix_row_t matrix_mask[] = { 0b0111111111111101, diff --git a/keyboards/keychron/q1/q1.h b/keyboards/keychron/q1/q1.h deleted file mode 100644 index d706779910..0000000000 --- a/keyboards/keychron/q1/q1.h +++ /dev/null @@ -1,29 +0,0 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.com) - * - * 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" - -#if defined(KEYBOARD_keychron_q1_ansi) -# include "ansi.h" -#elif defined(KEYBOARD_keychron_q1_ansi_encoder) -# include "ansi_encoder.h" -#elif defined(KEYBOARD_keychron_q1_iso) -# include "iso.h" -#elif defined(KEYBOARD_keychron_q1_iso_encoder) -# include "iso_encoder.h" -#endif diff --git a/keyboards/keychron/q10/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q10/ansi_encoder/ansi_encoder.h deleted file mode 100644 index db52563dc4..0000000000 --- a/keyboards/keychron/q10/ansi_encoder/ansi_encoder.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.com) - * - * 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" diff --git a/keyboards/keychron/q10/ansi_encoder/info.json b/keyboards/keychron/q10/ansi_encoder/info.json index 9814da0c26..5a14a6fb2b 100644 --- a/keyboards/keychron/q10/ansi_encoder/info.json +++ b/keyboards/keychron/q10/ansi_encoder/info.json @@ -8,6 +8,9 @@ "pid": "0x01A1", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "encoder": { "rotary": [ {"pin_a": "A10", "pin_b": "A8"} @@ -31,12 +34,12 @@ {"matrix":[0, 7], "x":8.25, "y":0}, {"matrix":[0, 8], "x":11, "y":0}, {"matrix":[0, 9], "x":12, "y":0}, - {"matrix":[0,10], "x":13.25, "y":0}, - {"matrix":[0,11], "x":14.25, "y":0}, - {"matrix":[0,12], "x":15.25, "y":0}, - {"matrix":[0,13], "x":16.25, "y":0}, - {"matrix":[0,14], "x":17.5, "y":0}, - {"matrix":[0,15], "x":18.75, "y":0}, + {"matrix":[0, 10], "x":13.25, "y":0}, + {"matrix":[0, 11], "x":14.25, "y":0}, + {"matrix":[0, 12], "x":15.25, "y":0}, + {"matrix":[0, 13], "x":16.25, "y":0}, + {"matrix":[0, 14], "x":17.5, "y":0}, + {"matrix":[0, 15], "x":18.75, "y":0}, {"matrix":[1, 0], "x":0.75, "y":1.25}, {"matrix":[1, 1], "x":2.25, "y":1.25}, @@ -48,12 +51,12 @@ {"matrix":[1, 7], "x":8.25, "y":1.25}, {"matrix":[1, 8], "x":10.5, "y":1.25}, {"matrix":[1, 9], "x":11.5, "y":1.25}, - {"matrix":[1,10], "x":12.5, "y":1.25}, - {"matrix":[1,11], "x":13.5, "y":1.25}, - {"matrix":[1,12], "x":14.5, "y":1.25}, - {"matrix":[1,13], "x":15.5, "y":1.25}, - {"matrix":[1,14], "x":16.5, "y":1.25, "w":2}, - {"matrix":[1,15], "x":19, "y":1.25}, + {"matrix":[1, 10], "x":12.5, "y":1.25}, + {"matrix":[1, 11], "x":13.5, "y":1.25}, + {"matrix":[1, 12], "x":14.5, "y":1.25}, + {"matrix":[1, 13], "x":15.5, "y":1.25}, + {"matrix":[1, 14], "x":16.5, "y":1.25, "w":2}, + {"matrix":[1, 15], "x":19, "y":1.25}, {"matrix":[2, 0], "x":0.5, "y":2.25}, {"matrix":[2, 1], "x":1.75, "y":2.25, "w":1.5}, @@ -65,12 +68,12 @@ {"matrix":[2, 7], "x":10, "y":2.25}, {"matrix":[2, 8], "x":11, "y":2.25}, {"matrix":[2, 9], "x":12, "y":2.25}, - {"matrix":[2,10], "x":13, "y":2.25}, - {"matrix":[2,11], "x":14, "y":2.25}, - {"matrix":[2,12], "x":15.25, "y":2.25}, - {"matrix":[2,13], "x":16.25, "y":2.25}, - {"matrix":[2,14], "x":17.25, "y":2.25, "w":1.5}, - {"matrix":[2,15], "x":19.25, "y":2.25}, + {"matrix":[2, 10], "x":13, "y":2.25}, + {"matrix":[2, 11], "x":14, "y":2.25}, + {"matrix":[2, 12], "x":15.25, "y":2.25}, + {"matrix":[2, 13], "x":16.25, "y":2.25}, + {"matrix":[2, 14], "x":17.25, "y":2.25, "w":1.5}, + {"matrix":[2, 15], "x":19.25, "y":2.25}, {"matrix":[3, 0], "x":0.25, "y":3.25}, {"matrix":[3, 1], "x":1.5, "y":3.25, "w":1.75}, @@ -81,12 +84,12 @@ {"matrix":[3, 6], "x":7.5, "y":3.25}, {"matrix":[3, 8], "x":10.25, "y":3.25}, {"matrix":[3, 9], "x":11.25, "y":3.25}, - {"matrix":[3,10], "x":12.25, "y":3.25}, - {"matrix":[3,11], "x":13.25, "y":3.25}, - {"matrix":[3,12], "x":14.75, "y":3.25}, - {"matrix":[3,13], "x":15.75, "y":3.25}, - {"matrix":[3,14], "x":16.75, "y":3.25, "w":2.25}, - {"matrix":[3,15], "x":19.5, "y":3.25}, + {"matrix":[3, 10], "x":12.25, "y":3.25}, + {"matrix":[3, 11], "x":13.25, "y":3.25}, + {"matrix":[3, 12], "x":14.75, "y":3.25}, + {"matrix":[3, 13], "x":15.75, "y":3.25}, + {"matrix":[3, 14], "x":16.75, "y":3.25, "w":2.25}, + {"matrix":[3, 15], "x":19.5, "y":3.25}, {"matrix":[4, 0], "x":0, "y":4.25}, {"matrix":[4, 1], "x":1.5, "y":4.25, "w":2.25}, @@ -97,12 +100,12 @@ {"matrix":[4, 7], "x":7.75, "y":4.25}, {"matrix":[4, 8], "x":9.5, "y":4.25}, {"matrix":[4, 9], "x":10.5, "y":4.25}, - {"matrix":[4,10], "x":11.5, "y":4.25}, - {"matrix":[4,11], "x":12.5, "y":4.25}, - {"matrix":[4,12], "x":13.5, "y":4.25}, - {"matrix":[4,13], "x":15.25, "y":4.25}, - {"matrix":[4,14], "x":16.25, "y":4.25, "w":1.75}, - {"matrix":[4,15], "x":18.25, "y":4.5}, + {"matrix":[4, 10], "x":11.5, "y":4.25}, + {"matrix":[4, 11], "x":12.5, "y":4.25}, + {"matrix":[4, 12], "x":13.5, "y":4.25}, + {"matrix":[4, 13], "x":15.25, "y":4.25}, + {"matrix":[4, 14], "x":16.25, "y":4.25, "w":1.75}, + {"matrix":[4, 15], "x":18.25, "y":4.5}, {"matrix":[5, 0], "x":0, "y":5.25}, {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, @@ -112,9 +115,9 @@ {"matrix":[5, 7], "x":8.25, "y":5.25}, {"matrix":[5, 8], "x":9.5, "y":5.25, "w":2.75}, {"matrix":[5, 9], "x":12.25, "y":5.25}, - {"matrix":[5,13], "x":17.25, "y":5.5}, - {"matrix":[5,14], "x":18.25, "y":5.5}, - {"matrix":[5,15], "x":19.25, "y":5.5} + {"matrix":[5, 13], "x":17.25, "y":5.5}, + {"matrix":[5, 14], "x":18.25, "y":5.5}, + {"matrix":[5, 15], "x":19.25, "y":5.5} ] } } diff --git a/keyboards/keychron/q10/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q10/ansi_encoder/keymaps/default/keymap.c index 59a4773771..915ad3aa2a 100644 --- a/keyboards/keychron/q10/ansi_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/q10/ansi_encoder/keymaps/default/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q10/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q10/ansi_encoder/keymaps/keychron/keymap.c index 538f13d786..78ef658d2d 100644 --- a/keyboards/keychron/q10/ansi_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/q10/ansi_encoder/keymaps/keychron/keymap.c @@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q10/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q10/ansi_encoder/keymaps/via/keymap.c index eead42e5a9..c0927dcb13 100644 --- a/keyboards/keychron/q10/ansi_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/q10/ansi_encoder/keymaps/via/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q10/ansi_encoder/rules.mk b/keyboards/keychron/q10/ansi_encoder/rules.mk index ef55047753..5df3cbccaf 100644 --- a/keyboards/keychron/q10/ansi_encoder/rules.mk +++ b/keyboards/keychron/q10/ansi_encoder/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/q10/iso_encoder/info.json b/keyboards/keychron/q10/iso_encoder/info.json index 8580bd98df..19fd30e0f3 100644 --- a/keyboards/keychron/q10/iso_encoder/info.json +++ b/keyboards/keychron/q10/iso_encoder/info.json @@ -8,6 +8,9 @@ "pid": "0x01A3", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "encoder": { "rotary": [ {"pin_a": "A10", "pin_b": "A8"} @@ -31,12 +34,12 @@ {"matrix":[0, 7], "x":8.25, "y":0}, {"matrix":[0, 8], "x":11, "y":0}, {"matrix":[0, 9], "x":12, "y":0}, - {"matrix":[0,10], "x":13.25, "y":0}, - {"matrix":[0,11], "x":14.25, "y":0}, - {"matrix":[0,12], "x":15.25, "y":0}, - {"matrix":[0,13], "x":16.25, "y":0}, - {"matrix":[0,14], "x":17.5, "y":0}, - {"matrix":[0,15], "x":18.75, "y":0}, + {"matrix":[0, 10], "x":13.25, "y":0}, + {"matrix":[0, 11], "x":14.25, "y":0}, + {"matrix":[0, 12], "x":15.25, "y":0}, + {"matrix":[0, 13], "x":16.25, "y":0}, + {"matrix":[0, 14], "x":17.5, "y":0}, + {"matrix":[0, 15], "x":18.75, "y":0}, {"matrix":[1, 0], "x":0.75, "y":1.25}, {"matrix":[1, 1], "x":2.25, "y":1.25}, @@ -48,12 +51,12 @@ {"matrix":[1, 7], "x":8.25, "y":1.25}, {"matrix":[1, 8], "x":10.5, "y":1.25}, {"matrix":[1, 9], "x":11.5, "y":1.25}, - {"matrix":[1,10], "x":12.5, "y":1.25}, - {"matrix":[1,11], "x":13.5, "y":1.25}, - {"matrix":[1,12], "x":14.5, "y":1.25}, - {"matrix":[1,13], "x":15.5, "y":1.25}, - {"matrix":[1,14], "x":16.5, "y":1.25, "w":2}, - {"matrix":[1,15], "x":19, "y":1.25}, + {"matrix":[1, 10], "x":12.5, "y":1.25}, + {"matrix":[1, 11], "x":13.5, "y":1.25}, + {"matrix":[1, 12], "x":14.5, "y":1.25}, + {"matrix":[1, 13], "x":15.5, "y":1.25}, + {"matrix":[1, 14], "x":16.5, "y":1.25, "w":2}, + {"matrix":[1, 15], "x":19, "y":1.25}, {"matrix":[2, 0], "x":0.5, "y":2.25}, {"matrix":[2, 1], "x":1.75, "y":2.25, "w":1.5}, @@ -65,11 +68,11 @@ {"matrix":[2, 7], "x":10, "y":2.25}, {"matrix":[2, 8], "x":11, "y":2.25}, {"matrix":[2, 9], "x":12, "y":2.25}, - {"matrix":[2,10], "x":13, "y":2.25}, - {"matrix":[2,11], "x":14, "y":2.25}, - {"matrix":[2,12], "x":15.25, "y":2.25}, - {"matrix":[2,13], "x":16.25, "y":2.25}, - {"matrix":[2,15], "x":19.25, "y":2.25}, + {"matrix":[2, 10], "x":13, "y":2.25}, + {"matrix":[2, 11], "x":14, "y":2.25}, + {"matrix":[2, 12], "x":15.25, "y":2.25}, + {"matrix":[2, 13], "x":16.25, "y":2.25}, + {"matrix":[2, 15], "x":19.25, "y":2.25}, {"matrix":[3, 0], "x":0.25, "y":3.25}, {"matrix":[3, 1], "x":1.5, "y":3.25, "w":1.75}, @@ -80,13 +83,13 @@ {"matrix":[3, 6], "x":7.5, "y":3.25}, {"matrix":[3, 8], "x":10.25, "y":3.25}, {"matrix":[3, 9], "x":11.25, "y":3.25}, - {"matrix":[3,10], "x":12.25, "y":3.25}, - {"matrix":[3,11], "x":13.25, "y":3.25}, - {"matrix":[3,12], "x":14.75, "y":3.25}, - {"matrix":[3,13], "x":15.75, "y":3.25}, - {"matrix":[3,14], "x":16.75, "y":3.25}, - {"matrix":[2,14], "x":17.75, "y":2.25, "w":1.25, "h":2}, - {"matrix":[3,15], "x":19.5, "y":3.25}, + {"matrix":[3, 10], "x":12.25, "y":3.25}, + {"matrix":[3, 11], "x":13.25, "y":3.25}, + {"matrix":[3, 12], "x":14.75, "y":3.25}, + {"matrix":[3, 13], "x":15.75, "y":3.25}, + {"matrix":[3, 14], "x":16.75, "y":3.25}, + {"matrix":[2, 14], "x":17.75, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3, 15], "x":19.5, "y":3.25}, {"matrix":[4, 0], "x":0, "y":4.25}, {"matrix":[4, 1], "x":1.5, "y":4.25}, @@ -98,12 +101,12 @@ {"matrix":[4, 7], "x":7.75, "y":4.25}, {"matrix":[4, 8], "x":9.5, "y":4.25}, {"matrix":[4, 9], "x":10.5, "y":4.25}, - {"matrix":[4,10], "x":11.5, "y":4.25}, - {"matrix":[4,11], "x":12.5, "y":4.25}, - {"matrix":[4,12], "x":13.5, "y":4.25}, - {"matrix":[4,13], "x":15.25, "y":4.25}, - {"matrix":[4,14], "x":16.25, "y":4.25, "w":1.75}, - {"matrix":[4,15], "x":18.25, "y":4.5}, + {"matrix":[4, 10], "x":11.5, "y":4.25}, + {"matrix":[4, 11], "x":12.5, "y":4.25}, + {"matrix":[4, 12], "x":13.5, "y":4.25}, + {"matrix":[4, 13], "x":15.25, "y":4.25}, + {"matrix":[4, 14], "x":16.25, "y":4.25, "w":1.75}, + {"matrix":[4, 15], "x":18.25, "y":4.5}, {"matrix":[5, 0], "x":0, "y":5.25}, {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, @@ -113,9 +116,9 @@ {"matrix":[5, 7], "x":8.25, "y":5.25}, {"matrix":[5, 8], "x":9.5, "y":5.25, "w":2.75}, {"matrix":[5, 9], "x":12.25, "y":5.25}, - {"matrix":[5,13], "x":17.25, "y":5.5}, - {"matrix":[5,14], "x":18.25, "y":5.5}, - {"matrix":[5,15], "x":19.25, "y":5.5} + {"matrix":[5, 13], "x":17.25, "y":5.5}, + {"matrix":[5, 14], "x":18.25, "y":5.5}, + {"matrix":[5, 15], "x":19.25, "y":5.5} ] } } diff --git a/keyboards/keychron/q10/iso_encoder/iso_encoder.h b/keyboards/keychron/q10/iso_encoder/iso_encoder.h deleted file mode 100644 index db52563dc4..0000000000 --- a/keyboards/keychron/q10/iso_encoder/iso_encoder.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.com) - * - * 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" diff --git a/keyboards/keychron/q10/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/q10/iso_encoder/keymaps/default/keymap.c index 68bc5e0954..77a26f1e99 100644 --- a/keyboards/keychron/q10/iso_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/q10/iso_encoder/keymaps/default/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q10/iso_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q10/iso_encoder/keymaps/keychron/keymap.c index a62d880370..6e024df8b7 100644 --- a/keyboards/keychron/q10/iso_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/q10/iso_encoder/keymaps/keychron/keymap.c @@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q10/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/q10/iso_encoder/keymaps/via/keymap.c index 24c39fee4e..338bd34b31 100644 --- a/keyboards/keychron/q10/iso_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/q10/iso_encoder/keymaps/via/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q10/iso_encoder/rules.mk b/keyboards/keychron/q10/iso_encoder/rules.mk index ef55047753..5df3cbccaf 100644 --- a/keyboards/keychron/q10/iso_encoder/rules.mk +++ b/keyboards/keychron/q10/iso_encoder/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/q10/q10.c b/keyboards/keychron/q10/q10.c index c823e6939f..455a2a25f2 100644 --- a/keyboards/keychron/q10/q10.c +++ b/keyboards/keychron/q10/q10.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "q10.h" +#include "quantum.h" const matrix_row_t matrix_mask[] = { 0b1111111111111111, diff --git a/keyboards/keychron/q10/q10.h b/keyboards/keychron/q10/q10.h deleted file mode 100644 index 80e747aca3..0000000000 --- a/keyboards/keychron/q10/q10.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.com) - * - * 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" - -#if defined(KEYBOARD_keychron_q10_ansi_encoder) -# include "ansi_encoder.h" -#elif defined(KEYBOARD_keychron_q10_iso_encoder) -# include "iso_encoder.h" -#endif diff --git a/keyboards/keychron/q11/ansi_encoder/info.json b/keyboards/keychron/q11/ansi_encoder/info.json index 50d1260a09..d602ed5786 100755 --- a/keyboards/keychron/q11/ansi_encoder/info.json +++ b/keyboards/keychron/q11/ansi_encoder/info.json @@ -64,102 +64,102 @@ "layouts": { "LAYOUT_ansi_91": { "layout": [ - {"matrix":[0,0], "x":0, "y":0}, - {"matrix":[0,1], "x":1.25, "y":0}, - {"matrix":[0,2], "x":2.25, "y":0}, - {"matrix":[0,3], "x":3.25, "y":0}, - {"matrix":[0,4], "x":4.25, "y":0}, - {"matrix":[0,5], "x":5.25, "y":0}, - {"matrix":[0,6], "x":6.25, "y":0}, - {"matrix":[0,7], "x":7.25, "y":0}, - {"matrix":[6,0], "x":8.25, "y":0}, - {"matrix":[6,1], "x":9.25, "y":0}, - {"matrix":[6,2], "x":10.25, "y":0}, - {"matrix":[6,3], "x":11.25, "y":0}, - {"matrix":[6,4], "x":12.25, "y":0}, - {"matrix":[6,5], "x":13.25, "y":0}, - {"matrix":[6,6], "x":14.25, "y":0}, - {"matrix":[6,7], "x":15.25, "y":0}, - {"matrix":[6,8], "x":16.5, "y":0}, + {"matrix":[0, 0], "x":0, "y":0}, + {"matrix":[0, 1], "x":1.25, "y":0}, + {"matrix":[0, 2], "x":2.25, "y":0}, + {"matrix":[0, 3], "x":3.25, "y":0}, + {"matrix":[0, 4], "x":4.25, "y":0}, + {"matrix":[0, 5], "x":5.25, "y":0}, + {"matrix":[0, 6], "x":6.25, "y":0}, + {"matrix":[0, 7], "x":7.25, "y":0}, + {"matrix":[6, 0], "x":8.25, "y":0}, + {"matrix":[6, 1], "x":9.25, "y":0}, + {"matrix":[6, 2], "x":10.25, "y":0}, + {"matrix":[6, 3], "x":11.25, "y":0}, + {"matrix":[6, 4], "x":12.25, "y":0}, + {"matrix":[6, 5], "x":13.25, "y":0}, + {"matrix":[6, 6], "x":14.25, "y":0}, + {"matrix":[6, 7], "x":15.25, "y":0}, + {"matrix":[6, 8], "x":16.5, "y":0}, - {"matrix":[1,0], "x":0, "y":1.25}, - {"matrix":[1,1], "x":1.25, "y":1.25}, - {"matrix":[1,2], "x":2.25, "y":1.25}, - {"matrix":[1,3], "x":3.25, "y":1.25}, - {"matrix":[1,4], "x":4.25, "y":1.25}, - {"matrix":[1,5], "x":5.25, "y":1.25}, - {"matrix":[1,6], "x":6.25, "y":1.25}, - {"matrix":[1,7], "x":7.25, "y":1.25}, - {"matrix":[7,0], "x":8.25, "y":1.25}, - {"matrix":[7,1], "x":9.25, "y":1.25}, - {"matrix":[7,2], "x":10.25, "y":1.25}, - {"matrix":[7,3], "x":11.25, "y":1.25}, - {"matrix":[7,4], "x":12.25, "y":1.25}, - {"matrix":[7,5], "x":13.25, "y":1.25}, - {"matrix":[7,6], "x":14.25, "y":1.25, "w":2}, - {"matrix":[7,8], "x":16.5, "y":1.25}, + {"matrix":[1, 0], "x":0, "y":1.25}, + {"matrix":[1, 1], "x":1.25, "y":1.25}, + {"matrix":[1, 2], "x":2.25, "y":1.25}, + {"matrix":[1, 3], "x":3.25, "y":1.25}, + {"matrix":[1, 4], "x":4.25, "y":1.25}, + {"matrix":[1, 5], "x":5.25, "y":1.25}, + {"matrix":[1, 6], "x":6.25, "y":1.25}, + {"matrix":[1, 7], "x":7.25, "y":1.25}, + {"matrix":[7, 0], "x":8.25, "y":1.25}, + {"matrix":[7, 1], "x":9.25, "y":1.25}, + {"matrix":[7, 2], "x":10.25, "y":1.25}, + {"matrix":[7, 3], "x":11.25, "y":1.25}, + {"matrix":[7, 4], "x":12.25, "y":1.25}, + {"matrix":[7, 5], "x":13.25, "y":1.25}, + {"matrix":[7, 6], "x":14.25, "y":1.25, "w":2}, + {"matrix":[7, 8], "x":16.5, "y":1.25}, - {"matrix":[2,0], "x":0, "y":2.25}, - {"matrix":[2,1], "x":1.25, "y":2.25, "w":1.5}, - {"matrix":[2,2], "x":2.75, "y":2.25}, - {"matrix":[2,3], "x":3.75, "y":2.25}, - {"matrix":[2,4], "x":4.75, "y":2.25}, - {"matrix":[2,6], "x":5.75, "y":2.25}, - {"matrix":[2,7], "x":6.75, "y":2.25}, - {"matrix":[8,0], "x":7.75, "y":2.25}, - {"matrix":[8,1], "x":8.75, "y":2.25}, - {"matrix":[8,2], "x":9.75, "y":2.25}, - {"matrix":[8,3], "x":10.75, "y":2.25}, - {"matrix":[8,4], "x":11.75, "y":2.25}, - {"matrix":[8,5], "x":12.75, "y":2.25}, - {"matrix":[8,6], "x":13.75, "y":2.25}, - {"matrix":[8,7], "x":14.75, "y":2.25, "w":1.5}, - {"matrix":[8,8], "x":16.5, "y":2.25}, + {"matrix":[2, 0], "x":0, "y":2.25}, + {"matrix":[2, 1], "x":1.25, "y":2.25, "w":1.5}, + {"matrix":[2, 2], "x":2.75, "y":2.25}, + {"matrix":[2, 3], "x":3.75, "y":2.25}, + {"matrix":[2, 4], "x":4.75, "y":2.25}, + {"matrix":[2, 6], "x":5.75, "y":2.25}, + {"matrix":[2, 7], "x":6.75, "y":2.25}, + {"matrix":[8, 0], "x":7.75, "y":2.25}, + {"matrix":[8, 1], "x":8.75, "y":2.25}, + {"matrix":[8, 2], "x":9.75, "y":2.25}, + {"matrix":[8, 3], "x":10.75, "y":2.25}, + {"matrix":[8, 4], "x":11.75, "y":2.25}, + {"matrix":[8, 5], "x":12.75, "y":2.25}, + {"matrix":[8, 6], "x":13.75, "y":2.25}, + {"matrix":[8, 7], "x":14.75, "y":2.25, "w":1.5}, + {"matrix":[8, 8], "x":16.5, "y":2.25}, - {"matrix":[3,0], "x":0, "y":3.25}, - {"matrix":[3,1], "x":1.25, "y":3.25, "w":1.75}, - {"matrix":[3,2], "x":3, "y":3.25}, - {"matrix":[3,3], "x":4, "y":3.25}, - {"matrix":[3,4], "x":5, "y":3.25}, - {"matrix":[3,5], "x":6, "y":3.25}, - {"matrix":[3,6], "x":7, "y":3.25}, - {"matrix":[9,0], "x":8, "y":3.25}, - {"matrix":[9,1], "x":9, "y":3.25}, - {"matrix":[9,2], "x":10, "y":3.25}, - {"matrix":[9,3], "x":11, "y":3.25}, - {"matrix":[9,4], "x":12, "y":3.25}, - {"matrix":[9,5], "x":13, "y":3.25}, - {"matrix":[9,7], "x":14, "y":3.25, "w":2.25}, - {"matrix":[9,8], "x":16.5, "y":3.25}, + {"matrix":[3, 0], "x":0, "y":3.25}, + {"matrix":[3, 1], "x":1.25, "y":3.25, "w":1.75}, + {"matrix":[3, 2], "x":3, "y":3.25}, + {"matrix":[3, 3], "x":4, "y":3.25}, + {"matrix":[3, 4], "x":5, "y":3.25}, + {"matrix":[3, 5], "x":6, "y":3.25}, + {"matrix":[3, 6], "x":7, "y":3.25}, + {"matrix":[9, 0], "x":8, "y":3.25}, + {"matrix":[9, 1], "x":9, "y":3.25}, + {"matrix":[9, 2], "x":10, "y":3.25}, + {"matrix":[9, 3], "x":11, "y":3.25}, + {"matrix":[9, 4], "x":12, "y":3.25}, + {"matrix":[9, 5], "x":13, "y":3.25}, + {"matrix":[9, 7], "x":14, "y":3.25, "w":2.25}, + {"matrix":[9, 8], "x":16.5, "y":3.25}, - {"matrix":[4,0], "x":0, "y":4.25}, - {"matrix":[4,2], "x":1.25, "y":4.25, "w":2.25}, - {"matrix":[4,3], "x":3.5, "y":4.25}, - {"matrix":[4,4], "x":4.5, "y":4.25}, - {"matrix":[4,5], "x":5.5, "y":4.25}, - {"matrix":[4,6], "x":6.5, "y":4.25}, - {"matrix":[4,7], "x":7.5, "y":4.25}, - {"matrix":[10,0], "x":8.5, "y":4.25}, - {"matrix":[10,1], "x":9.5, "y":4.25}, - {"matrix":[10,2], "x":10.5, "y":4.25}, - {"matrix":[10,3], "x":11.5, "y":4.25}, - {"matrix":[10,4], "x":12.5, "y":4.25}, - {"matrix":[10,5], "x":13.5, "y":4.25, "w":1.75}, - {"matrix":[10,7], "x":15.5, "y":4.25}, + {"matrix":[4, 0], "x":0, "y":4.25}, + {"matrix":[4, 2], "x":1.25, "y":4.25, "w":2.25}, + {"matrix":[4, 3], "x":3.5, "y":4.25}, + {"matrix":[4, 4], "x":4.5, "y":4.25}, + {"matrix":[4, 5], "x":5.5, "y":4.25}, + {"matrix":[4, 6], "x":6.5, "y":4.25}, + {"matrix":[4, 7], "x":7.5, "y":4.25}, + {"matrix":[10, 0], "x":8.5, "y":4.25}, + {"matrix":[10, 1], "x":9.5, "y":4.25}, + {"matrix":[10, 2], "x":10.5, "y":4.25}, + {"matrix":[10, 3], "x":11.5, "y":4.25}, + {"matrix":[10, 4], "x":12.5, "y":4.25}, + {"matrix":[10, 5], "x":13.5, "y":4.25, "w":1.75}, + {"matrix":[10, 7], "x":15.5, "y":4.25}, - {"matrix":[5,0], "x":0, "y":5.25}, - {"matrix":[5,1], "x":1.25, "y":5.25, "w":1.25}, - {"matrix":[5,2], "x":2.5, "y":5.25, "w":1.25}, - {"matrix":[5,3], "x":3.75, "y":5.25, "w":1.25}, - {"matrix":[5,4], "x":5, "y":5.25, "w":1.25}, - {"matrix":[5,6], "x":6.25, "y":5.25, "w":2.25}, - {"matrix":[11,1], "x":8.5, "y":5.25, "w":2.75}, - {"matrix":[11,2], "x":11.25, "y":5.25}, - {"matrix":[11,3], "x":12.25, "y":5.25}, - {"matrix":[11,4], "x":13.25, "y":5.25}, - {"matrix":[11,6], "x":14.5, "y":5.25}, - {"matrix":[11,7], "x":15.5, "y":5.25}, - {"matrix":[11,8], "x":16.5, "y":5.25} + {"matrix":[5, 0], "x":0, "y":5.25}, + {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, + {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25}, + {"matrix":[5, 3], "x":3.75, "y":5.25, "w":1.25}, + {"matrix":[5, 4], "x":5, "y":5.25, "w":1.25}, + {"matrix":[5, 6], "x":6.25, "y":5.25, "w":2.25}, + {"matrix":[11, 1], "x":8.5, "y":5.25, "w":2.75}, + {"matrix":[11, 2], "x":11.25, "y":5.25}, + {"matrix":[11, 3], "x":12.25, "y":5.25}, + {"matrix":[11, 4], "x":13.25, "y":5.25}, + {"matrix":[11, 6], "x":14.5, "y":5.25}, + {"matrix":[11, 7], "x":15.5, "y":5.25}, + {"matrix":[11, 8], "x":16.5, "y":5.25} ] } } diff --git a/keyboards/keychron/q11/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q11/ansi_encoder/keymaps/default/keymap.c index b2c3ec24c0..3378ce7df9 100755 --- a/keyboards/keychron/q11/ansi_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/q11/ansi_encoder/keymaps/default/keymap.c @@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q11/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q11/ansi_encoder/keymaps/keychron/keymap.c index 7102922323..852f34def9 100755 --- a/keyboards/keychron/q11/ansi_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/q11/ansi_encoder/keymaps/keychron/keymap.c @@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, diff --git a/keyboards/keychron/q11/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q11/ansi_encoder/keymaps/via/keymap.c index 7ba9886ef8..0452eccec2 100755 --- a/keyboards/keychron/q11/ansi_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/q11/ansi_encoder/keymaps/via/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q12/ansi_encoder/info.json b/keyboards/keychron/q12/ansi_encoder/info.json index 0e3179708a..0314c80224 100644 --- a/keyboards/keychron/q12/ansi_encoder/info.json +++ b/keyboards/keychron/q12/ansi_encoder/info.json @@ -8,6 +8,9 @@ "pid": "0x01D1", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "encoder": { "rotary": [ {"pin_a": "A2", "pin_b": "C14"} @@ -18,114 +21,114 @@ "layouts": { "LAYOUT_ansi_103": { "layout": [ - {"matrix":[0,15], "x":0, "y":0}, - {"matrix":[0,16], "x":1, "y":0}, - {"matrix":[0,17], "x":2, "y":0}, - {"matrix":[5,16], "x":3, "y":0}, - {"matrix":[0,0], "x":4.25, "y":0}, - {"matrix":[0,1], "x":5.5, "y":0}, - {"matrix":[0,2], "x":6.5, "y":0}, - {"matrix":[0,3], "x":7.5, "y":0}, - {"matrix":[0,4], "x":8.5, "y":0}, - {"matrix":[0,5], "x":9.75, "y":0}, - {"matrix":[0,6], "x":10.75, "y":0}, - {"matrix":[0,7], "x":11.75, "y":0}, - {"matrix":[0,8], "x":12.75, "y":0}, - {"matrix":[0,9], "x":14, "y":0}, - {"matrix":[0,10], "x":15, "y":0}, - {"matrix":[0,11], "x":16, "y":0}, - {"matrix":[0,12], "x":17, "y":0}, - {"matrix":[0,13], "x":18.25, "y":0}, - {"matrix":[0,14], "x":19.5, "y":0}, + {"matrix":[0, 15], "x":0, "y":0}, + {"matrix":[0, 16], "x":1, "y":0}, + {"matrix":[0, 17], "x":2, "y":0}, + {"matrix":[5, 16], "x":3, "y":0}, + {"matrix":[0, 0], "x":4.25, "y":0}, + {"matrix":[0, 1], "x":5.5, "y":0}, + {"matrix":[0, 2], "x":6.5, "y":0}, + {"matrix":[0, 3], "x":7.5, "y":0}, + {"matrix":[0, 4], "x":8.5, "y":0}, + {"matrix":[0, 5], "x":9.75, "y":0}, + {"matrix":[0, 6], "x":10.75, "y":0}, + {"matrix":[0, 7], "x":11.75, "y":0}, + {"matrix":[0, 8], "x":12.75, "y":0}, + {"matrix":[0, 9], "x":14, "y":0}, + {"matrix":[0, 10], "x":15, "y":0}, + {"matrix":[0, 11], "x":16, "y":0}, + {"matrix":[0, 12], "x":17, "y":0}, + {"matrix":[0, 13], "x":18.25, "y":0}, + {"matrix":[0, 14], "x":19.5, "y":0}, - {"matrix":[1,15], "x":0, "y":1.25}, - {"matrix":[1,16], "x":1, "y":1.25}, - {"matrix":[1,17], "x":2, "y":1.25}, - {"matrix":[5,5], "x":3, "y":1.25}, - {"matrix":[1,0], "x":4.25, "y":1.25}, - {"matrix":[1,1], "x":5.25, "y":1.25}, - {"matrix":[1,2], "x":6.25, "y":1.25}, - {"matrix":[1,3], "x":7.25, "y":1.25}, - {"matrix":[1,4], "x":8.25, "y":1.25}, - {"matrix":[1,5], "x":9.25, "y":1.25}, - {"matrix":[1,6], "x":10.25, "y":1.25}, - {"matrix":[1,7], "x":11.25, "y":1.25}, - {"matrix":[1,8], "x":12.25, "y":1.25}, - {"matrix":[1,9], "x":13.25, "y":1.25}, - {"matrix":[1,10], "x":14.25, "y":1.25}, - {"matrix":[1,11], "x":15.25, "y":1.25}, - {"matrix":[1,12], "x":16.25, "y":1.25}, - {"matrix":[1,13], "x":17.25, "y":1.25, "w":2}, - {"matrix":[1,14], "x":19.5, "y":1.25}, + {"matrix":[1, 15], "x":0, "y":1.25}, + {"matrix":[1, 16], "x":1, "y":1.25}, + {"matrix":[1, 17], "x":2, "y":1.25}, + {"matrix":[5, 5], "x":3, "y":1.25}, + {"matrix":[1, 0], "x":4.25, "y":1.25}, + {"matrix":[1, 1], "x":5.25, "y":1.25}, + {"matrix":[1, 2], "x":6.25, "y":1.25}, + {"matrix":[1, 3], "x":7.25, "y":1.25}, + {"matrix":[1, 4], "x":8.25, "y":1.25}, + {"matrix":[1, 5], "x":9.25, "y":1.25}, + {"matrix":[1, 6], "x":10.25, "y":1.25}, + {"matrix":[1, 7], "x":11.25, "y":1.25}, + {"matrix":[1, 8], "x":12.25, "y":1.25}, + {"matrix":[1, 9], "x":13.25, "y":1.25}, + {"matrix":[1, 10], "x":14.25, "y":1.25}, + {"matrix":[1, 11], "x":15.25, "y":1.25}, + {"matrix":[1, 12], "x":16.25, "y":1.25}, + {"matrix":[1, 13], "x":17.25, "y":1.25, "w":2}, + {"matrix":[1, 14], "x":19.5, "y":1.25}, - {"matrix":[2,15], "x":0, "y":2.25}, - {"matrix":[2,16], "x":1, "y":2.25}, - {"matrix":[2,17], "x":2, "y":2.25}, - {"matrix":[5,7], "x":3, "y":2.25, "h":2}, - {"matrix":[2,0], "x":4.25, "y":2.25, "w":1.5}, - {"matrix":[2,1], "x":5.75, "y":2.25}, - {"matrix":[2,2], "x":6.75, "y":2.25}, - {"matrix":[2,3], "x":7.75, "y":2.25}, - {"matrix":[2,4], "x":8.75, "y":2.25}, - {"matrix":[2,5], "x":9.75, "y":2.25}, - {"matrix":[2,6], "x":10.75, "y":2.25}, - {"matrix":[2,7], "x":11.75, "y":2.25}, - {"matrix":[2,8], "x":12.75, "y":2.25}, - {"matrix":[2,9], "x":13.75, "y":2.25}, - {"matrix":[2,10], "x":14.75, "y":2.25}, - {"matrix":[2,11], "x":15.75, "y":2.25}, - {"matrix":[2,12], "x":16.75, "y":2.25}, - {"matrix":[2,13], "x":17.75, "y":2.25, "w":1.5}, - {"matrix":[2,14], "x":19.5, "y":2.25}, + {"matrix":[2, 15], "x":0, "y":2.25}, + {"matrix":[2, 16], "x":1, "y":2.25}, + {"matrix":[2, 17], "x":2, "y":2.25}, + {"matrix":[5, 7], "x":3, "y":2.25, "h":2}, + {"matrix":[2, 0], "x":4.25, "y":2.25, "w":1.5}, + {"matrix":[2, 1], "x":5.75, "y":2.25}, + {"matrix":[2, 2], "x":6.75, "y":2.25}, + {"matrix":[2, 3], "x":7.75, "y":2.25}, + {"matrix":[2, 4], "x":8.75, "y":2.25}, + {"matrix":[2, 5], "x":9.75, "y":2.25}, + {"matrix":[2, 6], "x":10.75, "y":2.25}, + {"matrix":[2, 7], "x":11.75, "y":2.25}, + {"matrix":[2, 8], "x":12.75, "y":2.25}, + {"matrix":[2, 9], "x":13.75, "y":2.25}, + {"matrix":[2, 10], "x":14.75, "y":2.25}, + {"matrix":[2, 11], "x":15.75, "y":2.25}, + {"matrix":[2, 12], "x":16.75, "y":2.25}, + {"matrix":[2, 13], "x":17.75, "y":2.25, "w":1.5}, + {"matrix":[2, 14], "x":19.5, "y":2.25}, - {"matrix":[3,15], "x":0, "y":3.25}, - {"matrix":[3,16], "x":1, "y":3.25}, - {"matrix":[3,17], "x":2, "y":3.25}, - {"matrix":[3,0], "x":4.25, "y":3.25, "w":1.75}, - {"matrix":[3,1], "x":6, "y":3.25}, - {"matrix":[3,2], "x":7, "y":3.25}, - {"matrix":[3,3], "x":8, "y":3.25}, - {"matrix":[3,4], "x":9, "y":3.25}, - {"matrix":[3,5], "x":10, "y":3.25}, - {"matrix":[3,6], "x":11, "y":3.25}, - {"matrix":[3,7], "x":12, "y":3.25}, - {"matrix":[3,8], "x":13, "y":3.25}, - {"matrix":[3,9], "x":14, "y":3.25}, - {"matrix":[3,10], "x":15, "y":3.25}, - {"matrix":[3,11], "x":16, "y":3.25}, - {"matrix":[3,13], "x":17, "y":3.25, "w":2.25}, - {"matrix":[3,14], "x":19.5, "y":3.25}, + {"matrix":[3, 15], "x":0, "y":3.25}, + {"matrix":[3, 16], "x":1, "y":3.25}, + {"matrix":[3, 17], "x":2, "y":3.25}, + {"matrix":[3, 0], "x":4.25, "y":3.25, "w":1.75}, + {"matrix":[3, 1], "x":6, "y":3.25}, + {"matrix":[3, 2], "x":7, "y":3.25}, + {"matrix":[3, 3], "x":8, "y":3.25}, + {"matrix":[3, 4], "x":9, "y":3.25}, + {"matrix":[3, 5], "x":10, "y":3.25}, + {"matrix":[3, 6], "x":11, "y":3.25}, + {"matrix":[3, 7], "x":12, "y":3.25}, + {"matrix":[3, 8], "x":13, "y":3.25}, + {"matrix":[3, 9], "x":14, "y":3.25}, + {"matrix":[3, 10], "x":15, "y":3.25}, + {"matrix":[3, 11], "x":16, "y":3.25}, + {"matrix":[3, 13], "x":17, "y":3.25, "w":2.25}, + {"matrix":[3, 14], "x":19.5, "y":3.25}, - {"matrix":[4,15], "x":0, "y":4.25}, - {"matrix":[4,16], "x":1, "y":4.25}, - {"matrix":[4,17], "x":2, "y":4.25}, - {"matrix":[3,12], "x":3, "y":4.25, "h":2}, - {"matrix":[4,0], "x":4.25, "y":4.25, "w":2.25}, - {"matrix":[4,2], "x":6.5, "y":4.25}, - {"matrix":[4,3], "x":7.5, "y":4.25}, - {"matrix":[4,4], "x":8.5, "y":4.25}, - {"matrix":[4,5], "x":9.5, "y":4.25}, - {"matrix":[4,6], "x":10.5, "y":4.25}, - {"matrix":[4,7], "x":11.5, "y":4.25}, - {"matrix":[4,8], "x":12.5, "y":4.25}, - {"matrix":[4,9], "x":13.5, "y":4.25}, - {"matrix":[4,10], "x":14.5, "y":4.25}, - {"matrix":[4,11], "x":15.5, "y":4.25}, - {"matrix":[4,13], "x":16.5, "y":4.25, "w":1.75}, - {"matrix":[4,14], "x":18.5, "y":4.5}, + {"matrix":[4, 15], "x":0, "y":4.25}, + {"matrix":[4, 16], "x":1, "y":4.25}, + {"matrix":[4, 17], "x":2, "y":4.25}, + {"matrix":[3, 12], "x":3, "y":4.25, "h":2}, + {"matrix":[4, 0], "x":4.25, "y":4.25, "w":2.25}, + {"matrix":[4, 2], "x":6.5, "y":4.25}, + {"matrix":[4, 3], "x":7.5, "y":4.25}, + {"matrix":[4, 4], "x":8.5, "y":4.25}, + {"matrix":[4, 5], "x":9.5, "y":4.25}, + {"matrix":[4, 6], "x":10.5, "y":4.25}, + {"matrix":[4, 7], "x":11.5, "y":4.25}, + {"matrix":[4, 8], "x":12.5, "y":4.25}, + {"matrix":[4, 9], "x":13.5, "y":4.25}, + {"matrix":[4, 10], "x":14.5, "y":4.25}, + {"matrix":[4, 11], "x":15.5, "y":4.25}, + {"matrix":[4, 13], "x":16.5, "y":4.25, "w":1.75}, + {"matrix":[4, 14], "x":18.5, "y":4.5}, - {"matrix":[5,15], "x":0, "y":5.25, "w":2}, - {"matrix":[5,17], "x":2, "y":5.25}, - {"matrix":[5,0], "x":4.25, "y":5.25, "w":1.25}, - {"matrix":[5,1], "x":5.5, "y":5.25, "w":1.25}, - {"matrix":[5,2], "x":6.75, "y":5.25, "w":1.25}, - {"matrix":[5,6], "x":8, "y":5.25, "w":6.25}, - {"matrix":[5,9], "x":14.25, "y":5.25}, - {"matrix":[5,10], "x":15.25, "y":5.25}, - {"matrix":[5,11], "x":16.25, "y":5.25}, - {"matrix":[5,12], "x":17.5, "y":5.5}, - {"matrix":[5,13], "x":18.5, "y":5.5}, - {"matrix":[5,14], "x":19.5, "y":5.5} + {"matrix":[5, 15], "x":0, "y":5.25, "w":2}, + {"matrix":[5, 17], "x":2, "y":5.25}, + {"matrix":[5, 0], "x":4.25, "y":5.25, "w":1.25}, + {"matrix":[5, 1], "x":5.5, "y":5.25, "w":1.25}, + {"matrix":[5, 2], "x":6.75, "y":5.25, "w":1.25}, + {"matrix":[5, 6], "x":8, "y":5.25, "w":6.25}, + {"matrix":[5, 9], "x":14.25, "y":5.25}, + {"matrix":[5, 10], "x":15.25, "y":5.25}, + {"matrix":[5, 11], "x":16.25, "y":5.25}, + {"matrix":[5, 12], "x":17.5, "y":5.5}, + {"matrix":[5, 13], "x":18.5, "y":5.5}, + {"matrix":[5, 14], "x":19.5, "y":5.5} ] } } diff --git a/keyboards/keychron/q12/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q12/ansi_encoder/keymaps/default/keymap.c index 9c9ee41ef6..a2234c1d4f 100644 --- a/keyboards/keychron/q12/ansi_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/q12/ansi_encoder/keymaps/default/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q12/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q12/ansi_encoder/keymaps/keychron/keymap.c index abd259d1d1..b6349894f5 100644 --- a/keyboards/keychron/q12/ansi_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/q12/ansi_encoder/keymaps/keychron/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format on #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q12/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q12/ansi_encoder/keymaps/via/keymap.c index 9c9ee41ef6..a2234c1d4f 100644 --- a/keyboards/keychron/q12/ansi_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/q12/ansi_encoder/keymaps/via/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q12/ansi_encoder/rules.mk b/keyboards/keychron/q12/ansi_encoder/rules.mk index bf60bb7d7d..9958a466f6 100644 --- a/keyboards/keychron/q12/ansi_encoder/rules.mk +++ b/keyboards/keychron/q12/ansi_encoder/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/q12/iso_encoder/info.json b/keyboards/keychron/q12/iso_encoder/info.json index c945fbc771..1b1a687642 100644 --- a/keyboards/keychron/q12/iso_encoder/info.json +++ b/keyboards/keychron/q12/iso_encoder/info.json @@ -8,6 +8,9 @@ "pid": "0x01D3", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "encoder": { "rotary": [ {"pin_a": "A2", "pin_b": "C14"} @@ -18,115 +21,115 @@ "layouts": { "LAYOUT_iso_104": { "layout": [ - {"matrix":[0,15], "x":0, "y":0}, - {"matrix":[0,16], "x":1, "y":0}, - {"matrix":[0,17], "x":2, "y":0}, - {"matrix":[5,16], "x":3, "y":0}, - {"matrix":[0,0], "x":4.25, "y":0}, - {"matrix":[0,1], "x":5.5, "y":0}, - {"matrix":[0,2], "x":6.5, "y":0}, - {"matrix":[0,3], "x":7.5, "y":0}, - {"matrix":[0,4], "x":8.5, "y":0}, - {"matrix":[0,5], "x":9.75, "y":0}, - {"matrix":[0,6], "x":10.75, "y":0}, - {"matrix":[0,7], "x":11.75, "y":0}, - {"matrix":[0,8], "x":12.75, "y":0}, - {"matrix":[0,9], "x":14, "y":0}, - {"matrix":[0,10], "x":15, "y":0}, - {"matrix":[0,11], "x":16, "y":0}, - {"matrix":[0,12], "x":17, "y":0}, - {"matrix":[0,13], "x":18.25, "y":0}, - {"matrix":[0,14], "x":19.5, "y":0}, + {"matrix":[0, 15], "x":0, "y":0}, + {"matrix":[0, 16], "x":1, "y":0}, + {"matrix":[0, 17], "x":2, "y":0}, + {"matrix":[5, 16], "x":3, "y":0}, + {"matrix":[0, 0], "x":4.25, "y":0}, + {"matrix":[0, 1], "x":5.5, "y":0}, + {"matrix":[0, 2], "x":6.5, "y":0}, + {"matrix":[0, 3], "x":7.5, "y":0}, + {"matrix":[0, 4], "x":8.5, "y":0}, + {"matrix":[0, 5], "x":9.75, "y":0}, + {"matrix":[0, 6], "x":10.75, "y":0}, + {"matrix":[0, 7], "x":11.75, "y":0}, + {"matrix":[0, 8], "x":12.75, "y":0}, + {"matrix":[0, 9], "x":14, "y":0}, + {"matrix":[0, 10], "x":15, "y":0}, + {"matrix":[0, 11], "x":16, "y":0}, + {"matrix":[0, 12], "x":17, "y":0}, + {"matrix":[0, 13], "x":18.25, "y":0}, + {"matrix":[0, 14], "x":19.5, "y":0}, - {"matrix":[1,15], "x":0, "y":1.25}, - {"matrix":[1,16], "x":1, "y":1.25}, - {"matrix":[1,17], "x":2, "y":1.25}, - {"matrix":[5,5], "x":3, "y":1.25}, - {"matrix":[1,0], "x":4.25, "y":1.25}, - {"matrix":[1,1], "x":5.25, "y":1.25}, - {"matrix":[1,2], "x":6.25, "y":1.25}, - {"matrix":[1,3], "x":7.25, "y":1.25}, - {"matrix":[1,4], "x":8.25, "y":1.25}, - {"matrix":[1,5], "x":9.25, "y":1.25}, - {"matrix":[1,6], "x":10.25, "y":1.25}, - {"matrix":[1,7], "x":11.25, "y":1.25}, - {"matrix":[1,8], "x":12.25, "y":1.25}, - {"matrix":[1,9], "x":13.25, "y":1.25}, - {"matrix":[1,10], "x":14.25, "y":1.25}, - {"matrix":[1,11], "x":15.25, "y":1.25}, - {"matrix":[1,12], "x":16.25, "y":1.25}, - {"matrix":[1,13], "x":17.25, "y":1.25, "w":2}, - {"matrix":[1,14], "x":19.5, "y":1.25}, + {"matrix":[1, 15], "x":0, "y":1.25}, + {"matrix":[1, 16], "x":1, "y":1.25}, + {"matrix":[1, 17], "x":2, "y":1.25}, + {"matrix":[5, 5], "x":3, "y":1.25}, + {"matrix":[1, 0], "x":4.25, "y":1.25}, + {"matrix":[1, 1], "x":5.25, "y":1.25}, + {"matrix":[1, 2], "x":6.25, "y":1.25}, + {"matrix":[1, 3], "x":7.25, "y":1.25}, + {"matrix":[1, 4], "x":8.25, "y":1.25}, + {"matrix":[1, 5], "x":9.25, "y":1.25}, + {"matrix":[1, 6], "x":10.25, "y":1.25}, + {"matrix":[1, 7], "x":11.25, "y":1.25}, + {"matrix":[1, 8], "x":12.25, "y":1.25}, + {"matrix":[1, 9], "x":13.25, "y":1.25}, + {"matrix":[1, 10], "x":14.25, "y":1.25}, + {"matrix":[1, 11], "x":15.25, "y":1.25}, + {"matrix":[1, 12], "x":16.25, "y":1.25}, + {"matrix":[1, 13], "x":17.25, "y":1.25, "w":2}, + {"matrix":[1, 14], "x":19.5, "y":1.25}, - {"matrix":[2,15], "x":0, "y":2.25}, - {"matrix":[2,16], "x":1, "y":2.25}, - {"matrix":[2,17], "x":2, "y":2.25}, - {"matrix":[5,7], "x":3, "y":2.25, "h":2}, - {"matrix":[2,0], "x":4.25, "y":2.25, "w":1.5}, - {"matrix":[2,1], "x":5.75, "y":2.25}, - {"matrix":[2,2], "x":6.75, "y":2.25}, - {"matrix":[2,3], "x":7.75, "y":2.25}, - {"matrix":[2,4], "x":8.75, "y":2.25}, - {"matrix":[2,5], "x":9.75, "y":2.25}, - {"matrix":[2,6], "x":10.75, "y":2.25}, - {"matrix":[2,7], "x":11.75, "y":2.25}, - {"matrix":[2,8], "x":12.75, "y":2.25}, - {"matrix":[2,9], "x":13.75, "y":2.25}, - {"matrix":[2,10], "x":14.75, "y":2.25}, - {"matrix":[2,11], "x":15.75, "y":2.25}, - {"matrix":[2,12], "x":16.75, "y":2.25}, - {"matrix":[2,14], "x":19.5, "y":2.25}, + {"matrix":[2, 15], "x":0, "y":2.25}, + {"matrix":[2, 16], "x":1, "y":2.25}, + {"matrix":[2, 17], "x":2, "y":2.25}, + {"matrix":[5, 7], "x":3, "y":2.25, "h":2}, + {"matrix":[2, 0], "x":4.25, "y":2.25, "w":1.5}, + {"matrix":[2, 1], "x":5.75, "y":2.25}, + {"matrix":[2, 2], "x":6.75, "y":2.25}, + {"matrix":[2, 3], "x":7.75, "y":2.25}, + {"matrix":[2, 4], "x":8.75, "y":2.25}, + {"matrix":[2, 5], "x":9.75, "y":2.25}, + {"matrix":[2, 6], "x":10.75, "y":2.25}, + {"matrix":[2, 7], "x":11.75, "y":2.25}, + {"matrix":[2, 8], "x":12.75, "y":2.25}, + {"matrix":[2, 9], "x":13.75, "y":2.25}, + {"matrix":[2, 10], "x":14.75, "y":2.25}, + {"matrix":[2, 11], "x":15.75, "y":2.25}, + {"matrix":[2, 12], "x":16.75, "y":2.25}, + {"matrix":[2, 14], "x":19.5, "y":2.25}, - {"matrix":[3,15], "x":0, "y":3.25}, - {"matrix":[3,16], "x":1, "y":3.25}, - {"matrix":[3,17], "x":2, "y":3.25}, - {"matrix":[3,0], "x":4.25, "y":3.25, "w":1.75}, - {"matrix":[3,1], "x":6, "y":3.25}, - {"matrix":[3,2], "x":7, "y":3.25}, - {"matrix":[3,3], "x":8, "y":3.25}, - {"matrix":[3,4], "x":9, "y":3.25}, - {"matrix":[3,5], "x":10, "y":3.25}, - {"matrix":[3,6], "x":11, "y":3.25}, - {"matrix":[3,7], "x":12, "y":3.25}, - {"matrix":[3,8], "x":13, "y":3.25}, - {"matrix":[3,9], "x":14, "y":3.25}, - {"matrix":[3,10], "x":15, "y":3.25}, - {"matrix":[3,11], "x":16, "y":3.25}, - {"matrix":[3,13], "x":17, "y":3.25}, - {"matrix":[2,13], "x":18, "y":2.25, "w":1.25, "h":2}, - {"matrix":[3,14], "x":19.5, "y":3.25}, + {"matrix":[3, 15], "x":0, "y":3.25}, + {"matrix":[3, 16], "x":1, "y":3.25}, + {"matrix":[3, 17], "x":2, "y":3.25}, + {"matrix":[3, 0], "x":4.25, "y":3.25, "w":1.75}, + {"matrix":[3, 1], "x":6, "y":3.25}, + {"matrix":[3, 2], "x":7, "y":3.25}, + {"matrix":[3, 3], "x":8, "y":3.25}, + {"matrix":[3, 4], "x":9, "y":3.25}, + {"matrix":[3, 5], "x":10, "y":3.25}, + {"matrix":[3, 6], "x":11, "y":3.25}, + {"matrix":[3, 7], "x":12, "y":3.25}, + {"matrix":[3, 8], "x":13, "y":3.25}, + {"matrix":[3, 9], "x":14, "y":3.25}, + {"matrix":[3, 10], "x":15, "y":3.25}, + {"matrix":[3, 11], "x":16, "y":3.25}, + {"matrix":[3, 13], "x":17, "y":3.25}, + {"matrix":[2, 13], "x":18, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3, 14], "x":19.5, "y":3.25}, - {"matrix":[4,15], "x":0, "y":4.25}, - {"matrix":[4,16], "x":1, "y":4.25}, - {"matrix":[4,17], "x":2, "y":4.25}, - {"matrix":[3,12], "x":3, "y":4.25, "h":2}, - {"matrix":[4,0], "x":4.25, "y":4.25, "w":1.25}, - {"matrix":[4,1], "x":5.5, "y":4.25}, - {"matrix":[4,2], "x":6.5, "y":4.25}, - {"matrix":[4,3], "x":7.5, "y":4.25}, - {"matrix":[4,4], "x":8.5, "y":4.25}, - {"matrix":[4,5], "x":9.5, "y":4.25}, - {"matrix":[4,6], "x":10.5, "y":4.25}, - {"matrix":[4,7], "x":11.5, "y":4.25}, - {"matrix":[4,8], "x":12.5, "y":4.25}, - {"matrix":[4,9], "x":13.5, "y":4.25}, - {"matrix":[4,10], "x":14.5, "y":4.25}, - {"matrix":[4,11], "x":15.5, "y":4.25}, - {"matrix":[4,13], "x":16.5, "y":4.25, "w":1.75}, - {"matrix":[4,14], "x":18.5, "y":4.5}, + {"matrix":[4, 15], "x":0, "y":4.25}, + {"matrix":[4, 16], "x":1, "y":4.25}, + {"matrix":[4, 17], "x":2, "y":4.25}, + {"matrix":[3, 12], "x":3, "y":4.25, "h":2}, + {"matrix":[4, 0], "x":4.25, "y":4.25, "w":1.25}, + {"matrix":[4, 1], "x":5.5, "y":4.25}, + {"matrix":[4, 2], "x":6.5, "y":4.25}, + {"matrix":[4, 3], "x":7.5, "y":4.25}, + {"matrix":[4, 4], "x":8.5, "y":4.25}, + {"matrix":[4, 5], "x":9.5, "y":4.25}, + {"matrix":[4, 6], "x":10.5, "y":4.25}, + {"matrix":[4, 7], "x":11.5, "y":4.25}, + {"matrix":[4, 8], "x":12.5, "y":4.25}, + {"matrix":[4, 9], "x":13.5, "y":4.25}, + {"matrix":[4, 10], "x":14.5, "y":4.25}, + {"matrix":[4, 11], "x":15.5, "y":4.25}, + {"matrix":[4, 13], "x":16.5, "y":4.25, "w":1.75}, + {"matrix":[4, 14], "x":18.5, "y":4.5}, - {"matrix":[5,15], "x":0, "y":5.25, "w":2}, - {"matrix":[5,17], "x":2, "y":5.25}, - {"matrix":[5,0], "x":4.25, "y":5.25, "w":1.25}, - {"matrix":[5,1], "x":5.5, "y":5.25, "w":1.25}, - {"matrix":[5,2], "x":6.75, "y":5.25, "w":1.25}, - {"matrix":[5,6], "x":8, "y":5.25, "w":6.25}, - {"matrix":[5,9], "x":14.25, "y":5.25}, - {"matrix":[5,10], "x":15.25, "y":5.25}, - {"matrix":[5,11], "x":16.25, "y":5.25}, - {"matrix":[5,12], "x":17.5, "y":5.5}, - {"matrix":[5,13], "x":18.5, "y":5.5}, - {"matrix":[5,14], "x":19.5, "y":5.5} + {"matrix":[5, 15], "x":0, "y":5.25, "w":2}, + {"matrix":[5, 17], "x":2, "y":5.25}, + {"matrix":[5, 0], "x":4.25, "y":5.25, "w":1.25}, + {"matrix":[5, 1], "x":5.5, "y":5.25, "w":1.25}, + {"matrix":[5, 2], "x":6.75, "y":5.25, "w":1.25}, + {"matrix":[5, 6], "x":8, "y":5.25, "w":6.25}, + {"matrix":[5, 9], "x":14.25, "y":5.25}, + {"matrix":[5, 10], "x":15.25, "y":5.25}, + {"matrix":[5, 11], "x":16.25, "y":5.25}, + {"matrix":[5, 12], "x":17.5, "y":5.5}, + {"matrix":[5, 13], "x":18.5, "y":5.5}, + {"matrix":[5, 14], "x":19.5, "y":5.5} ] } } diff --git a/keyboards/keychron/q12/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/q12/iso_encoder/keymaps/default/keymap.c index 93c94fc13b..7cad0672f2 100644 --- a/keyboards/keychron/q12/iso_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/q12/iso_encoder/keymaps/default/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q12/iso_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q12/iso_encoder/keymaps/keychron/keymap.c index ff4d369757..9c79f73d79 100644 --- a/keyboards/keychron/q12/iso_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/q12/iso_encoder/keymaps/keychron/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format on #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q12/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/q12/iso_encoder/keymaps/via/keymap.c index 93c94fc13b..7cad0672f2 100644 --- a/keyboards/keychron/q12/iso_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/q12/iso_encoder/keymaps/via/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q12/iso_encoder/rules.mk b/keyboards/keychron/q12/iso_encoder/rules.mk index f76ec9b08d..df920055a0 100644 --- a/keyboards/keychron/q12/iso_encoder/rules.mk +++ b/keyboards/keychron/q12/iso_encoder/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/q2/ansi/ansi.c b/keyboards/keychron/q2/ansi/ansi.c index 5c5acb3fd8..28f91269c4 100644 --- a/keyboards/keychron/q2/ansi/ansi.c +++ b/keyboards/keychron/q2/ansi/ansi.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "ansi.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = { diff --git a/keyboards/keychron/q2/ansi/ansi.h b/keyboards/keychron/q2/ansi/ansi.h deleted file mode 100644 index db52563dc4..0000000000 --- a/keyboards/keychron/q2/ansi/ansi.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.com) - * - * 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" diff --git a/keyboards/keychron/q2/ansi/info.json b/keyboards/keychron/q2/ansi/info.json index 054786185a..f6e367d2c9 100644 --- a/keyboards/keychron/q2/ansi/info.json +++ b/keyboards/keychron/q2/ansi/info.json @@ -8,6 +8,14 @@ "pid": "0x0110", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, + "matrix_pins": { + "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], + "rows": ["B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { @@ -23,11 +31,11 @@ {"matrix":[0, 7], "x":7, "y":0.25}, {"matrix":[0, 8], "x":8, "y":0.25}, {"matrix":[0, 9], "x":9, "y":0.25}, - {"matrix":[0,10], "x":10, "y":0.25}, - {"matrix":[0,11], "x":11, "y":0.25}, - {"matrix":[0,12], "x":12, "y":0.25}, - {"matrix":[0,13], "x":13, "y":0.25, "w":2}, - {"matrix":[0,14], "x":15.25, "y":0}, + {"matrix":[0, 10], "x":10, "y":0.25}, + {"matrix":[0, 11], "x":11, "y":0.25}, + {"matrix":[0, 12], "x":12, "y":0.25}, + {"matrix":[0, 13], "x":13, "y":0.25, "w":2}, + {"matrix":[0, 14], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":1.5, "y":1.25}, @@ -39,11 +47,11 @@ {"matrix":[1, 7], "x":7.5, "y":1.25}, {"matrix":[1, 8], "x":8.5, "y":1.25}, {"matrix":[1, 9], "x":9.5, "y":1.25}, - {"matrix":[1,10], "x":10.5, "y":1.25}, - {"matrix":[1,11], "x":11.5, "y":1.25}, - {"matrix":[1,12], "x":12.5, "y":1.25}, - {"matrix":[1,13], "x":13.5, "y":1.25, "w":1.5}, - {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10.5, "y":1.25}, + {"matrix":[1, 11], "x":11.5, "y":1.25}, + {"matrix":[1, 12], "x":12.5, "y":1.25}, + {"matrix":[1, 13], "x":13.5, "y":1.25, "w":1.5}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":1.75, "y":2.25}, @@ -55,10 +63,10 @@ {"matrix":[2, 7], "x":7.75, "y":2.25}, {"matrix":[2, 8], "x":8.75, "y":2.25}, {"matrix":[2, 9], "x":9.75, "y":2.25}, - {"matrix":[2,10], "x":10.75, "y":2.25}, - {"matrix":[2,11], "x":11.75, "y":2.25}, - {"matrix":[2,13], "x":12.75, "y":2.25, "w":2.25}, - {"matrix":[2,14], "x":15.25, "y":2.25}, + {"matrix":[2, 10], "x":10.75, "y":2.25}, + {"matrix":[2, 11], "x":11.75, "y":2.25}, + {"matrix":[2, 13], "x":12.75, "y":2.25, "w":2.25}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25}, {"matrix":[3, 2], "x":2.25, "y":3.25}, @@ -69,21 +77,21 @@ {"matrix":[3, 7], "x":7.25, "y":3.25}, {"matrix":[3, 8], "x":8.25, "y":3.25}, {"matrix":[3, 9], "x":9.25, "y":3.25}, - {"matrix":[3,10], "x":10.25, "y":3.25}, - {"matrix":[3,11], "x":11.25, "y":3.25}, - {"matrix":[3,13], "x":12.25, "y":3.25, "w":1.75}, - {"matrix":[3,14], "x":14.25, "y":3.5}, + {"matrix":[3, 10], "x":10.25, "y":3.25}, + {"matrix":[3, 11], "x":11.25, "y":3.25}, + {"matrix":[3, 13], "x":12.25, "y":3.25, "w":1.75}, + {"matrix":[3, 14], "x":14.25, "y":3.5}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25}, {"matrix":[4, 2], "x":2.5, "y":4.25, "w":1.25}, {"matrix":[4, 6], "x":3.75, "y":4.25, "w":6.25}, - {"matrix":[4,10], "x":10, "y":4.25}, - {"matrix":[4,11], "x":11, "y":4.25}, - {"matrix":[4,12], "x":12, "y":4.25}, - {"matrix":[4,13], "x":13.25, "y":4.5}, - {"matrix":[2,12], "x":14.25, "y":4.5}, - {"matrix":[4,14], "x":15.25, "y":4.5} + {"matrix":[4, 10], "x":10, "y":4.25}, + {"matrix":[4, 11], "x":11, "y":4.25}, + {"matrix":[4, 12], "x":12, "y":4.25}, + {"matrix":[4, 13], "x":13.25, "y":4.5}, + {"matrix":[2, 12], "x":14.25, "y":4.5}, + {"matrix":[4, 14], "x":15.25, "y":4.5} ] } } diff --git a/keyboards/keychron/q2/ansi/rules.mk b/keyboards/keychron/q2/ansi/rules.mk index 6c675518ee..bc7a0e0ff3 100644 --- a/keyboards/keychron/q2/ansi/rules.mk +++ b/keyboards/keychron/q2/ansi/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = no # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/q2/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q2/ansi_encoder/ansi_encoder.c index c926a5bf75..28f91269c4 100644 --- a/keyboards/keychron/q2/ansi_encoder/ansi_encoder.c +++ b/keyboards/keychron/q2/ansi_encoder/ansi_encoder.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "ansi_encoder.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = { diff --git a/keyboards/keychron/q2/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q2/ansi_encoder/ansi_encoder.h deleted file mode 100644 index db52563dc4..0000000000 --- a/keyboards/keychron/q2/ansi_encoder/ansi_encoder.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.com) - * - * 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" diff --git a/keyboards/keychron/q2/ansi_encoder/info.json b/keyboards/keychron/q2/ansi_encoder/info.json index a2a12dc39c..7278109b7c 100644 --- a/keyboards/keychron/q2/ansi_encoder/info.json +++ b/keyboards/keychron/q2/ansi_encoder/info.json @@ -8,6 +8,14 @@ "pid": "0x0111", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, + "matrix_pins": { + "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], + "rows": ["B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "encoder": { "rotary": [ {"pin_a": "A10", "pin_b": "B5"} @@ -28,11 +36,11 @@ {"matrix":[0, 7], "x":7, "y":0.25}, {"matrix":[0, 8], "x":8, "y":0.25}, {"matrix":[0, 9], "x":9, "y":0.25}, - {"matrix":[0,10], "x":10, "y":0.25}, - {"matrix":[0,11], "x":11, "y":0.25}, - {"matrix":[0,12], "x":12, "y":0.25}, - {"matrix":[0,13], "x":13, "y":0.25, "w":2}, - {"matrix":[0,14], "x":15.25, "y":0}, + {"matrix":[0, 10], "x":10, "y":0.25}, + {"matrix":[0, 11], "x":11, "y":0.25}, + {"matrix":[0, 12], "x":12, "y":0.25}, + {"matrix":[0, 13], "x":13, "y":0.25, "w":2}, + {"matrix":[0, 14], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":1.5, "y":1.25}, @@ -44,11 +52,11 @@ {"matrix":[1, 7], "x":7.5, "y":1.25}, {"matrix":[1, 8], "x":8.5, "y":1.25}, {"matrix":[1, 9], "x":9.5, "y":1.25}, - {"matrix":[1,10], "x":10.5, "y":1.25}, - {"matrix":[1,11], "x":11.5, "y":1.25}, - {"matrix":[1,12], "x":12.5, "y":1.25}, - {"matrix":[1,13], "x":13.5, "y":1.25, "w":1.5}, - {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10.5, "y":1.25}, + {"matrix":[1, 11], "x":11.5, "y":1.25}, + {"matrix":[1, 12], "x":12.5, "y":1.25}, + {"matrix":[1, 13], "x":13.5, "y":1.25, "w":1.5}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":1.75, "y":2.25}, @@ -60,10 +68,10 @@ {"matrix":[2, 7], "x":7.75, "y":2.25}, {"matrix":[2, 8], "x":8.75, "y":2.25}, {"matrix":[2, 9], "x":9.75, "y":2.25}, - {"matrix":[2,10], "x":10.75, "y":2.25}, - {"matrix":[2,11], "x":11.75, "y":2.25}, - {"matrix":[2,13], "x":12.75, "y":2.25, "w":2.25}, - {"matrix":[2,14], "x":15.25, "y":2.25}, + {"matrix":[2, 10], "x":10.75, "y":2.25}, + {"matrix":[2, 11], "x":11.75, "y":2.25}, + {"matrix":[2, 13], "x":12.75, "y":2.25, "w":2.25}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25}, {"matrix":[3, 2], "x":2.25, "y":3.25}, @@ -74,21 +82,21 @@ {"matrix":[3, 7], "x":7.25, "y":3.25}, {"matrix":[3, 8], "x":8.25, "y":3.25}, {"matrix":[3, 9], "x":9.25, "y":3.25}, - {"matrix":[3,10], "x":10.25, "y":3.25}, - {"matrix":[3,11], "x":11.25, "y":3.25}, - {"matrix":[3,13], "x":12.25, "y":3.25, "w":1.75}, - {"matrix":[3,14], "x":14.25, "y":3.5}, + {"matrix":[3, 10], "x":10.25, "y":3.25}, + {"matrix":[3, 11], "x":11.25, "y":3.25}, + {"matrix":[3, 13], "x":12.25, "y":3.25, "w":1.75}, + {"matrix":[3, 14], "x":14.25, "y":3.5}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25}, {"matrix":[4, 2], "x":2.5, "y":4.25, "w":1.25}, {"matrix":[4, 6], "x":3.75, "y":4.25, "w":6.25}, - {"matrix":[4,10], "x":10, "y":4.25}, - {"matrix":[4,11], "x":11, "y":4.25}, - {"matrix":[4,12], "x":12, "y":4.25}, - {"matrix":[4,13], "x":13.25, "y":4.5}, - {"matrix":[2,12], "x":14.25, "y":4.5}, - {"matrix":[4,14], "x":15.25, "y":4.5} + {"matrix":[4, 10], "x":10, "y":4.25}, + {"matrix":[4, 11], "x":11, "y":4.25}, + {"matrix":[4, 12], "x":12, "y":4.25}, + {"matrix":[4, 13], "x":13.25, "y":4.5}, + {"matrix":[2, 12], "x":14.25, "y":4.5}, + {"matrix":[4, 14], "x":15.25, "y":4.5} ] } } diff --git a/keyboards/keychron/q2/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q2/ansi_encoder/keymaps/default/keymap.c index 31ac33f1b7..5c20bda031 100644 --- a/keyboards/keychron/q2/ansi_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/q2/ansi_encoder/keymaps/default/keymap.c @@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_FN1] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, diff --git a/keyboards/keychron/q2/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q2/ansi_encoder/keymaps/keychron/keymap.c index f4c43ef1f7..db560b8ea3 100644 --- a/keyboards/keychron/q2/ansi_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/q2/ansi_encoder/keymaps/keychron/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_FN1] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, diff --git a/keyboards/keychron/q2/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q2/ansi_encoder/keymaps/via/keymap.c index 3f56548c70..f4ae8c1cc0 100644 --- a/keyboards/keychron/q2/ansi_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/q2/ansi_encoder/keymaps/via/keymap.c @@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_FN1] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, diff --git a/keyboards/keychron/q2/ansi_encoder/rules.mk b/keyboards/keychron/q2/ansi_encoder/rules.mk index 0e909ff6f8..3de172c6e3 100644 --- a/keyboards/keychron/q2/ansi_encoder/rules.mk +++ b/keyboards/keychron/q2/ansi_encoder/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/q2/config.h b/keyboards/keychron/q2/config.h index e421906a68..63e31cd01d 100644 --- a/keyboards/keychron/q2/config.h +++ b/keyboards/keychron/q2/config.h @@ -16,18 +16,11 @@ #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS { B4, B3, A15, A14, A13 } -#define MATRIX_COL_PINS { C14, C15, A0, A1, A2, A3, A4, A5, A6, A7, B0, B1, A8, A9, H3 } - #define MATRIX_UNSELECT_DRIVE_HIGH /* DIP switch */ #define DIP_SWITCH_MATRIX_GRID { {4, 4} } -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* RGB Matrix Driver Configuration */ #define DRIVER_COUNT 2 #define DRIVER_ADDR_1 0b1110111 diff --git a/keyboards/keychron/q2/iso/info.json b/keyboards/keychron/q2/iso/info.json index e295fcef18..f77a07c463 100644 --- a/keyboards/keychron/q2/iso/info.json +++ b/keyboards/keychron/q2/iso/info.json @@ -8,6 +8,14 @@ "pid": "0x0112", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, + "matrix_pins": { + "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], + "rows": ["B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { @@ -23,11 +31,11 @@ {"matrix":[0, 7], "x":7, "y":0.25}, {"matrix":[0, 8], "x":8, "y":0.25}, {"matrix":[0, 9], "x":9, "y":0.25}, - {"matrix":[0,10], "x":10, "y":0.25}, - {"matrix":[0,11], "x":11, "y":0.25}, - {"matrix":[0,12], "x":12, "y":0.25}, - {"matrix":[0,13], "x":13, "y":0.25, "w":2}, - {"matrix":[0,14], "x":15.25, "y":0}, + {"matrix":[0, 10], "x":10, "y":0.25}, + {"matrix":[0, 11], "x":11, "y":0.25}, + {"matrix":[0, 12], "x":12, "y":0.25}, + {"matrix":[0, 13], "x":13, "y":0.25, "w":2}, + {"matrix":[0, 14], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":1.5, "y":1.25}, @@ -39,10 +47,10 @@ {"matrix":[1, 7], "x":7.5, "y":1.25}, {"matrix":[1, 8], "x":8.5, "y":1.25}, {"matrix":[1, 9], "x":9.5, "y":1.25}, - {"matrix":[1,10], "x":10.5, "y":1.25}, - {"matrix":[1,11], "x":11.5, "y":1.25}, - {"matrix":[1,12], "x":12.5, "y":1.25}, - {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10.5, "y":1.25}, + {"matrix":[1, 11], "x":11.5, "y":1.25}, + {"matrix":[1, 12], "x":12.5, "y":1.25}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":1.75, "y":2.25}, @@ -54,11 +62,11 @@ {"matrix":[2, 7], "x":7.75, "y":2.25}, {"matrix":[2, 8], "x":8.75, "y":2.25}, {"matrix":[2, 9], "x":9.75, "y":2.25}, - {"matrix":[2,10], "x":10.75, "y":2.25}, - {"matrix":[2,11], "x":11.75, "y":2.25}, - {"matrix":[2,13], "x":12.75, "y":2.25}, - {"matrix":[1,13], "x":13.75, "y":1.25, "w":1.25, "h":2}, - {"matrix":[2,14], "x":15.25, "y":2.25}, + {"matrix":[2, 10], "x":10.75, "y":2.25}, + {"matrix":[2, 11], "x":11.75, "y":2.25}, + {"matrix":[2, 13], "x":12.75, "y":2.25}, + {"matrix":[1, 13], "x":13.75, "y":1.25, "w":1.25, "h":2}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.25}, {"matrix":[3, 1], "x":1.25, "y":3.25}, @@ -70,21 +78,21 @@ {"matrix":[3, 7], "x":7.25, "y":3.25}, {"matrix":[3, 8], "x":8.25, "y":3.25}, {"matrix":[3, 9], "x":9.25, "y":3.25}, - {"matrix":[3,10], "x":10.25, "y":3.25}, - {"matrix":[3,11], "x":11.25, "y":3.25}, - {"matrix":[3,13], "x":12.25, "y":3.25, "w":1.75}, - {"matrix":[3,14], "x":14.25, "y":3.5}, + {"matrix":[3, 10], "x":10.25, "y":3.25}, + {"matrix":[3, 11], "x":11.25, "y":3.25}, + {"matrix":[3, 13], "x":12.25, "y":3.25, "w":1.75}, + {"matrix":[3, 14], "x":14.25, "y":3.5}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25}, {"matrix":[4, 2], "x":2.5, "y":4.25, "w":1.25}, {"matrix":[4, 6], "x":3.75, "y":4.25, "w":6.25}, - {"matrix":[4,10], "x":10, "y":4.25}, - {"matrix":[4,11], "x":11, "y":4.25}, - {"matrix":[4,12], "x":12, "y":4.25}, - {"matrix":[4,13], "x":13.25, "y":4.5}, - {"matrix":[2,12], "x":14.25, "y":4.5}, - {"matrix":[4,14], "x":15.25, "y":4.5} + {"matrix":[4, 10], "x":10, "y":4.25}, + {"matrix":[4, 11], "x":11, "y":4.25}, + {"matrix":[4, 12], "x":12, "y":4.25}, + {"matrix":[4, 13], "x":13.25, "y":4.5}, + {"matrix":[2, 12], "x":14.25, "y":4.5}, + {"matrix":[4, 14], "x":15.25, "y":4.5} ] } } diff --git a/keyboards/keychron/q2/iso/iso.c b/keyboards/keychron/q2/iso/iso.c index 7f8d388b0e..1f2c76468e 100644 --- a/keyboards/keychron/q2/iso/iso.c +++ b/keyboards/keychron/q2/iso/iso.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "iso.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = { diff --git a/keyboards/keychron/q2/iso/iso.h b/keyboards/keychron/q2/iso/iso.h deleted file mode 100644 index db52563dc4..0000000000 --- a/keyboards/keychron/q2/iso/iso.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.com) - * - * 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" diff --git a/keyboards/keychron/q2/iso/rules.mk b/keyboards/keychron/q2/iso/rules.mk index 57b7516f4c..f4aca09af8 100644 --- a/keyboards/keychron/q2/iso/rules.mk +++ b/keyboards/keychron/q2/iso/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = no # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/q2/iso_encoder/info.json b/keyboards/keychron/q2/iso_encoder/info.json index 028522c259..c783a990e7 100644 --- a/keyboards/keychron/q2/iso_encoder/info.json +++ b/keyboards/keychron/q2/iso_encoder/info.json @@ -8,6 +8,14 @@ "pid": "0x0113", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, + "matrix_pins": { + "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], + "rows": ["B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "encoder": { "rotary": [ {"pin_a": "A10", "pin_b": "B5"} @@ -28,11 +36,11 @@ {"matrix":[0, 7], "x":7, "y":0.25}, {"matrix":[0, 8], "x":8, "y":0.25}, {"matrix":[0, 9], "x":9, "y":0.25}, - {"matrix":[0,10], "x":10, "y":0.25}, - {"matrix":[0,11], "x":11, "y":0.25}, - {"matrix":[0,12], "x":12, "y":0.25}, - {"matrix":[0,13], "x":13, "y":0.25, "w":2}, - {"matrix":[0,14], "x":15.25, "y":0}, + {"matrix":[0, 10], "x":10, "y":0.25}, + {"matrix":[0, 11], "x":11, "y":0.25}, + {"matrix":[0, 12], "x":12, "y":0.25}, + {"matrix":[0, 13], "x":13, "y":0.25, "w":2}, + {"matrix":[0, 14], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":1.5, "y":1.25}, @@ -44,10 +52,10 @@ {"matrix":[1, 7], "x":7.5, "y":1.25}, {"matrix":[1, 8], "x":8.5, "y":1.25}, {"matrix":[1, 9], "x":9.5, "y":1.25}, - {"matrix":[1,10], "x":10.5, "y":1.25}, - {"matrix":[1,11], "x":11.5, "y":1.25}, - {"matrix":[1,12], "x":12.5, "y":1.25}, - {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10.5, "y":1.25}, + {"matrix":[1, 11], "x":11.5, "y":1.25}, + {"matrix":[1, 12], "x":12.5, "y":1.25}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":1.75, "y":2.25}, @@ -59,11 +67,11 @@ {"matrix":[2, 7], "x":7.75, "y":2.25}, {"matrix":[2, 8], "x":8.75, "y":2.25}, {"matrix":[2, 9], "x":9.75, "y":2.25}, - {"matrix":[2,10], "x":10.75, "y":2.25}, - {"matrix":[2,11], "x":11.75, "y":2.25}, - {"matrix":[2,13], "x":12.75, "y":2.25}, - {"matrix":[1,13], "x":13.75, "y":1.25, "w":1.25, "h":2}, - {"matrix":[2,14], "x":15.25, "y":2.25}, + {"matrix":[2, 10], "x":10.75, "y":2.25}, + {"matrix":[2, 11], "x":11.75, "y":2.25}, + {"matrix":[2, 13], "x":12.75, "y":2.25}, + {"matrix":[1, 13], "x":13.75, "y":1.25, "w":1.25, "h":2}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.25}, {"matrix":[3, 1], "x":1.25, "y":3.25}, @@ -75,21 +83,21 @@ {"matrix":[3, 7], "x":7.25, "y":3.25}, {"matrix":[3, 8], "x":8.25, "y":3.25}, {"matrix":[3, 9], "x":9.25, "y":3.25}, - {"matrix":[3,10], "x":10.25, "y":3.25}, - {"matrix":[3,11], "x":11.25, "y":3.25}, - {"matrix":[3,13], "x":12.25, "y":3.25, "w":1.75}, - {"matrix":[3,14], "x":14.25, "y":3.5}, + {"matrix":[3, 10], "x":10.25, "y":3.25}, + {"matrix":[3, 11], "x":11.25, "y":3.25}, + {"matrix":[3, 13], "x":12.25, "y":3.25, "w":1.75}, + {"matrix":[3, 14], "x":14.25, "y":3.5}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25}, {"matrix":[4, 2], "x":2.5, "y":4.25, "w":1.25}, {"matrix":[4, 6], "x":3.75, "y":4.25, "w":6.25}, - {"matrix":[4,10], "x":10, "y":4.25}, - {"matrix":[4,11], "x":11, "y":4.25}, - {"matrix":[4,12], "x":12, "y":4.25}, - {"matrix":[4,13], "x":13.25, "y":4.5}, - {"matrix":[2,12], "x":14.25, "y":4.5}, - {"matrix":[4,14], "x":15.25, "y":4.5} + {"matrix":[4, 10], "x":10, "y":4.25}, + {"matrix":[4, 11], "x":11, "y":4.25}, + {"matrix":[4, 12], "x":12, "y":4.25}, + {"matrix":[4, 13], "x":13.25, "y":4.5}, + {"matrix":[2, 12], "x":14.25, "y":4.5}, + {"matrix":[4, 14], "x":15.25, "y":4.5} ] } } diff --git a/keyboards/keychron/q2/iso_encoder/iso_encoder.c b/keyboards/keychron/q2/iso_encoder/iso_encoder.c index af7b818149..1f2c76468e 100644 --- a/keyboards/keychron/q2/iso_encoder/iso_encoder.c +++ b/keyboards/keychron/q2/iso_encoder/iso_encoder.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "iso_encoder.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = { diff --git a/keyboards/keychron/q2/iso_encoder/iso_encoder.h b/keyboards/keychron/q2/iso_encoder/iso_encoder.h deleted file mode 100644 index db52563dc4..0000000000 --- a/keyboards/keychron/q2/iso_encoder/iso_encoder.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.com) - * - * 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" diff --git a/keyboards/keychron/q2/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/q2/iso_encoder/keymaps/default/keymap.c index 61ace12361..5cbe605de4 100644 --- a/keyboards/keychron/q2/iso_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/q2/iso_encoder/keymaps/default/keymap.c @@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_FN1] = { ENCODER_CCW_CW(_______, _______) }, diff --git a/keyboards/keychron/q2/iso_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q2/iso_encoder/keymaps/keychron/keymap.c index f2da1cb57b..eb485917b3 100644 --- a/keyboards/keychron/q2/iso_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/q2/iso_encoder/keymaps/keychron/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_FN1] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, diff --git a/keyboards/keychron/q2/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/q2/iso_encoder/keymaps/via/keymap.c index ba7dfb331d..244eb8b482 100644 --- a/keyboards/keychron/q2/iso_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/q2/iso_encoder/keymaps/via/keymap.c @@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_FN1] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, diff --git a/keyboards/keychron/q2/iso_encoder/rules.mk b/keyboards/keychron/q2/iso_encoder/rules.mk index 987db28ad5..33a50c67f7 100644 --- a/keyboards/keychron/q2/iso_encoder/rules.mk +++ b/keyboards/keychron/q2/iso_encoder/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/q2/jis/info.json b/keyboards/keychron/q2/jis/info.json index d41bf49cb2..6c9cb2d634 100644 --- a/keyboards/keychron/q2/jis/info.json +++ b/keyboards/keychron/q2/jis/info.json @@ -8,6 +8,14 @@ "pid": "0x0114", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, + "matrix_pins": { + "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], + "rows": ["B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { @@ -23,12 +31,12 @@ {"matrix":[0, 7], "x":7, "y":0.25}, {"matrix":[0, 8], "x":8, "y":0.25}, {"matrix":[0, 9], "x":9, "y":0.25}, - {"matrix":[0,10], "x":10, "y":0.25}, - {"matrix":[0,11], "x":11, "y":0.25}, - {"matrix":[0,12], "x":12, "y":0.25}, - {"matrix":[0,13], "x":13, "y":0.25}, + {"matrix":[0, 10], "x":10, "y":0.25}, + {"matrix":[0, 11], "x":11, "y":0.25}, + {"matrix":[0, 12], "x":12, "y":0.25}, + {"matrix":[0, 13], "x":13, "y":0.25}, {"matrix":[3, 1], "x":14, "y":0.25}, - {"matrix":[0,14], "x":15.25, "y":0}, + {"matrix":[0, 14], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":1.5, "y":1.25}, @@ -40,10 +48,10 @@ {"matrix":[1, 7], "x":7.5, "y":1.25}, {"matrix":[1, 8], "x":8.5, "y":1.25}, {"matrix":[1, 9], "x":9.5, "y":1.25}, - {"matrix":[1,10], "x":10.5, "y":1.25}, - {"matrix":[1,11], "x":11.5, "y":1.25}, - {"matrix":[1,12], "x":12.5, "y":1.25}, - {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10.5, "y":1.25}, + {"matrix":[1, 11], "x":11.5, "y":1.25}, + {"matrix":[1, 12], "x":12.5, "y":1.25}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":1.75, "y":2.25}, @@ -55,11 +63,11 @@ {"matrix":[2, 7], "x":7.75, "y":2.25}, {"matrix":[2, 8], "x":8.75, "y":2.25}, {"matrix":[2, 9], "x":9.75, "y":2.25}, - {"matrix":[2,10], "x":10.75, "y":2.25}, - {"matrix":[2,11], "x":11.75, "y":2.25}, - {"matrix":[2,13], "x":12.75, "y":2.25}, - {"matrix":[1,13], "x":13.75, "y":1.25, "w":1.25, "h":2}, - {"matrix":[2,14], "x":15.25, "y":2.25}, + {"matrix":[2, 10], "x":10.75, "y":2.25}, + {"matrix":[2, 11], "x":11.75, "y":2.25}, + {"matrix":[2, 13], "x":12.75, "y":2.25}, + {"matrix":[1, 13], "x":13.75, "y":1.25, "w":1.25, "h":2}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25}, {"matrix":[3, 2], "x":2.25, "y":3.25}, @@ -70,11 +78,11 @@ {"matrix":[3, 7], "x":7.25, "y":3.25}, {"matrix":[3, 8], "x":8.25, "y":3.25}, {"matrix":[3, 9], "x":9.25, "y":3.25}, - {"matrix":[3,10], "x":10.25, "y":3.25}, - {"matrix":[3,11], "x":11.25, "y":3.25}, - {"matrix":[3,12], "x":12.25, "y":3.25}, - {"matrix":[3,13], "x":13.25, "y":3.25}, - {"matrix":[3,14], "x":14.25, "y":3.25}, + {"matrix":[3, 10], "x":10.25, "y":3.25}, + {"matrix":[3, 11], "x":11.25, "y":3.25}, + {"matrix":[3, 12], "x":12.25, "y":3.25}, + {"matrix":[3, 13], "x":13.25, "y":3.25}, + {"matrix":[3, 14], "x":14.25, "y":3.25}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25}, @@ -82,12 +90,12 @@ {"matrix":[4, 3], "x":3.5, "y":4.25}, {"matrix":[4, 6], "x":4.5, "y":4.25, "w":4.5}, {"matrix":[4, 9], "x":9, "y":4.25, "w":1.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,12], "x":12.25, "y":4.25}, - {"matrix":[4,13], "x":13.25, "y":4.25}, - {"matrix":[2,12], "x":14.25, "y":4.25}, - {"matrix":[4,14], "x":15.25, "y":4.25} + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 12], "x":12.25, "y":4.25}, + {"matrix":[4, 13], "x":13.25, "y":4.25}, + {"matrix":[2, 12], "x":14.25, "y":4.25}, + {"matrix":[4, 14], "x":15.25, "y":4.25} ] } } diff --git a/keyboards/keychron/q2/jis/rules.mk b/keyboards/keychron/q2/jis/rules.mk index 345807d824..2b4a67b1ee 100644 --- a/keyboards/keychron/q2/jis/rules.mk +++ b/keyboards/keychron/q2/jis/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/q2/jis_encoder/info.json b/keyboards/keychron/q2/jis_encoder/info.json index 18e800703b..9f3d73d3ef 100644 --- a/keyboards/keychron/q2/jis_encoder/info.json +++ b/keyboards/keychron/q2/jis_encoder/info.json @@ -8,6 +8,14 @@ "pid": "0x0115", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, + "matrix_pins": { + "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], + "rows": ["B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "encoder": { "rotary": [ {"pin_a": "A10", "pin_b": "B5"} @@ -28,12 +36,12 @@ {"matrix":[0, 7], "x":7, "y":0.25}, {"matrix":[0, 8], "x":8, "y":0.25}, {"matrix":[0, 9], "x":9, "y":0.25}, - {"matrix":[0,10], "x":10, "y":0.25}, - {"matrix":[0,11], "x":11, "y":0.25}, - {"matrix":[0,12], "x":12, "y":0.25}, - {"matrix":[0,13], "x":13, "y":0.25}, + {"matrix":[0, 10], "x":10, "y":0.25}, + {"matrix":[0, 11], "x":11, "y":0.25}, + {"matrix":[0, 12], "x":12, "y":0.25}, + {"matrix":[0, 13], "x":13, "y":0.25}, {"matrix":[3, 1], "x":14, "y":0.25}, - {"matrix":[0,14], "x":15.25, "y":0}, + {"matrix":[0, 14], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":1.5, "y":1.25}, @@ -45,10 +53,10 @@ {"matrix":[1, 7], "x":7.5, "y":1.25}, {"matrix":[1, 8], "x":8.5, "y":1.25}, {"matrix":[1, 9], "x":9.5, "y":1.25}, - {"matrix":[1,10], "x":10.5, "y":1.25}, - {"matrix":[1,11], "x":11.5, "y":1.25}, - {"matrix":[1,12], "x":12.5, "y":1.25}, - {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10.5, "y":1.25}, + {"matrix":[1, 11], "x":11.5, "y":1.25}, + {"matrix":[1, 12], "x":12.5, "y":1.25}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":1.75, "y":2.25}, @@ -60,11 +68,11 @@ {"matrix":[2, 7], "x":7.75, "y":2.25}, {"matrix":[2, 8], "x":8.75, "y":2.25}, {"matrix":[2, 9], "x":9.75, "y":2.25}, - {"matrix":[2,10], "x":10.75, "y":2.25}, - {"matrix":[2,11], "x":11.75, "y":2.25}, - {"matrix":[2,13], "x":12.75, "y":2.25}, - {"matrix":[1,13], "x":13.75, "y":1.25, "w":1.25, "h":2}, - {"matrix":[2,14], "x":15.25, "y":2.25}, + {"matrix":[2, 10], "x":10.75, "y":2.25}, + {"matrix":[2, 11], "x":11.75, "y":2.25}, + {"matrix":[2, 13], "x":12.75, "y":2.25}, + {"matrix":[1, 13], "x":13.75, "y":1.25, "w":1.25, "h":2}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25}, {"matrix":[3, 2], "x":2.25, "y":3.25}, @@ -75,11 +83,11 @@ {"matrix":[3, 7], "x":7.25, "y":3.25}, {"matrix":[3, 8], "x":8.25, "y":3.25}, {"matrix":[3, 9], "x":9.25, "y":3.25}, - {"matrix":[3,10], "x":10.25, "y":3.25}, - {"matrix":[3,11], "x":11.25, "y":3.25}, - {"matrix":[3,12], "x":12.25, "y":3.25}, - {"matrix":[3,13], "x":13.25, "y":3.25}, - {"matrix":[3,14], "x":14.25, "y":3.25}, + {"matrix":[3, 10], "x":10.25, "y":3.25}, + {"matrix":[3, 11], "x":11.25, "y":3.25}, + {"matrix":[3, 12], "x":12.25, "y":3.25}, + {"matrix":[3, 13], "x":13.25, "y":3.25}, + {"matrix":[3, 14], "x":14.25, "y":3.25}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25}, @@ -87,12 +95,12 @@ {"matrix":[4, 3], "x":3.5, "y":4.25}, {"matrix":[4, 6], "x":4.5, "y":4.25, "w":4.5}, {"matrix":[4, 9], "x":9, "y":4.25, "w":1.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,12], "x":12.25, "y":4.25}, - {"matrix":[4,13], "x":13.25, "y":4.25}, - {"matrix":[2,12], "x":14.25, "y":4.25}, - {"matrix":[4,14], "x":15.25, "y":4.25} + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 12], "x":12.25, "y":4.25}, + {"matrix":[4, 13], "x":13.25, "y":4.25}, + {"matrix":[2, 12], "x":14.25, "y":4.25}, + {"matrix":[4, 14], "x":15.25, "y":4.25} ] } } diff --git a/keyboards/keychron/q2/jis_encoder/keymaps/default/keymap.c b/keyboards/keychron/q2/jis_encoder/keymaps/default/keymap.c index e513ceba0d..33b3698616 100644 --- a/keyboards/keychron/q2/jis_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/q2/jis_encoder/keymaps/default/keymap.c @@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [_FN1] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, diff --git a/keyboards/keychron/q2/jis_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q2/jis_encoder/keymaps/keychron/keymap.c index 5a52f4ff15..a1c155e6e6 100644 --- a/keyboards/keychron/q2/jis_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/q2/jis_encoder/keymaps/keychron/keymap.c @@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format on #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [_FN1] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, diff --git a/keyboards/keychron/q2/jis_encoder/keymaps/via/keymap.c b/keyboards/keychron/q2/jis_encoder/keymaps/via/keymap.c index e513ceba0d..33b3698616 100644 --- a/keyboards/keychron/q2/jis_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/q2/jis_encoder/keymaps/via/keymap.c @@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [_FN1] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, diff --git a/keyboards/keychron/q2/jis_encoder/rules.mk b/keyboards/keychron/q2/jis_encoder/rules.mk index 5240004b8c..6a772965ff 100644 --- a/keyboards/keychron/q2/jis_encoder/rules.mk +++ b/keyboards/keychron/q2/jis_encoder/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/q2/q2.c b/keyboards/keychron/q2/q2.c index 13b2238d17..7ff85556de 100644 --- a/keyboards/keychron/q2/q2.c +++ b/keyboards/keychron/q2/q2.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "q2.h" +#include "quantum.h" const matrix_row_t matrix_mask[] = { 0b1111111111111111, diff --git a/keyboards/keychron/q2/q2.h b/keyboards/keychron/q2/q2.h deleted file mode 100644 index a256ceae6a..0000000000 --- a/keyboards/keychron/q2/q2.h +++ /dev/null @@ -1,29 +0,0 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.com) - * - * 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" - -#if defined(KEYBOARD_keychron_q2_ansi) -# include "ansi.h" -#elif defined(KEYBOARD_keychron_q2_ansi_encoder) -# include "ansi_encoder.h" -#elif defined(KEYBOARD_keychron_q2_iso) -# include "iso.h" -#elif defined(KEYBOARD_keychron_q2_iso_encoder) -# include "iso_encoder.h" -#endif diff --git a/keyboards/keychron/q3/ansi/ansi.c b/keyboards/keychron/q3/ansi/ansi.c index beff3bc5ec..432a914058 100644 --- a/keyboards/keychron/q3/ansi/ansi.c +++ b/keyboards/keychron/q3/ansi/ansi.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "ansi.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q3/ansi/ansi.h b/keyboards/keychron/q3/ansi/ansi.h deleted file mode 100644 index de5b0aedb1..0000000000 --- a/keyboards/keychron/q3/ansi/ansi.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.com) - * - * 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" diff --git a/keyboards/keychron/q3/ansi/info.json b/keyboards/keychron/q3/ansi/info.json index 1ebffbff45..5e22787974 100644 --- a/keyboards/keychron/q3/ansi/info.json +++ b/keyboards/keychron/q3/ansi/info.json @@ -8,6 +8,9 @@ "pid": "0x0120", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { @@ -23,12 +26,12 @@ {"matrix":[0, 7], "x":8.5, "y":0}, {"matrix":[0, 8], "x":9.5, "y":0}, {"matrix":[0, 9], "x":11, "y":0}, - {"matrix":[0,10], "x":12, "y":0}, - {"matrix":[0,11], "x":13, "y":0}, - {"matrix":[0,12], "x":14, "y":0}, - {"matrix":[0,14], "x":15.25, "y":0}, - {"matrix":[0,15], "x":16.25, "y":0}, - {"matrix":[3,14], "x":17.25, "y":0}, + {"matrix":[0, 10], "x":12, "y":0}, + {"matrix":[0, 11], "x":13, "y":0}, + {"matrix":[0, 12], "x":14, "y":0}, + {"matrix":[0, 14], "x":15.25, "y":0}, + {"matrix":[0, 15], "x":16.25, "y":0}, + {"matrix":[3, 14], "x":17.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -40,13 +43,13 @@ {"matrix":[1, 7], "x":7, "y":1.25}, {"matrix":[1, 8], "x":8, "y":1.25}, {"matrix":[1, 9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25, "w":2}, - {"matrix":[1,14], "x":15.25, "y":1.25}, - {"matrix":[1,15], "x":16.25, "y":1.25}, - {"matrix":[3,15], "x":17.25, "y":1.25}, + {"matrix":[1, 10], "x":10, "y":1.25}, + {"matrix":[1, 11], "x":11, "y":1.25}, + {"matrix":[1, 12], "x":12, "y":1.25}, + {"matrix":[1, 13], "x":13, "y":1.25, "w":2}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, + {"matrix":[1, 15], "x":16.25, "y":1.25}, + {"matrix":[3, 15], "x":17.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -58,13 +61,13 @@ {"matrix":[2, 7], "x":7.5, "y":2.25}, {"matrix":[2, 8], "x":8.5, "y":2.25}, {"matrix":[2, 9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5}, - {"matrix":[2,14], "x":15.25, "y":2.25}, - {"matrix":[2,15], "x":16.25, "y":2.25}, - {"matrix":[3,12], "x":17.25, "y":2.25}, + {"matrix":[2, 10], "x":10.5, "y":2.25}, + {"matrix":[2, 11], "x":11.5, "y":2.25}, + {"matrix":[2, 12], "x":12.5, "y":2.25}, + {"matrix":[2, 13], "x":13.5, "y":2.25, "w":1.5}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, + {"matrix":[2, 15], "x":16.25, "y":2.25}, + {"matrix":[3, 12], "x":17.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -76,9 +79,9 @@ {"matrix":[3, 7], "x":7.75, "y":3.25}, {"matrix":[3, 8], "x":8.75, "y":3.25}, {"matrix":[3, 9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25}, + {"matrix":[3, 10], "x":10.75, "y":3.25}, + {"matrix":[3, 11], "x":11.75, "y":3.25}, + {"matrix":[3, 13], "x":12.75, "y":3.25, "w":2.25}, {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4.25}, @@ -89,22 +92,22 @@ {"matrix":[4, 7], "x":7.25, "y":4.25}, {"matrix":[4, 8], "x":8.25, "y":4.25}, {"matrix":[4, 9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75}, - {"matrix":[4,15], "x":16.25, "y":4.25}, + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 13], "x":12.25, "y":4.25, "w":2.75}, + {"matrix":[4, 15], "x":16.25, "y":4.25}, {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25}, {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25}, - {"matrix":[5,10], "x":10, "y":5.25, "w":1.25}, - {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25}, - {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25}, - {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25}, - {"matrix":[5,14], "x":15.25, "y":5.25}, - {"matrix":[5,15], "x":16.25, "y":5.25}, - {"matrix":[4,14], "x":17.25, "y":5.25} + {"matrix":[5, 10], "x":10, "y":5.25, "w":1.25}, + {"matrix":[5, 11], "x":11.25, "y":5.25, "w":1.25}, + {"matrix":[5, 12], "x":12.5, "y":5.25, "w":1.25}, + {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25}, + {"matrix":[5, 14], "x":15.25, "y":5.25}, + {"matrix":[5, 15], "x":16.25, "y":5.25}, + {"matrix":[4, 14], "x":17.25, "y":5.25} ] } } diff --git a/keyboards/keychron/q3/ansi/rules.mk b/keyboards/keychron/q3/ansi/rules.mk index 8669178c4c..566c476585 100644 --- a/keyboards/keychron/q3/ansi/rules.mk +++ b/keyboards/keychron/q3/ansi/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 LTO_ENABLE = yes EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/q3/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q3/ansi_encoder/ansi_encoder.c index 13f6c26d2d..f873f77d12 100644 --- a/keyboards/keychron/q3/ansi_encoder/ansi_encoder.c +++ b/keyboards/keychron/q3/ansi_encoder/ansi_encoder.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "ansi_encoder.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q3/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q3/ansi_encoder/ansi_encoder.h deleted file mode 100644 index de5b0aedb1..0000000000 --- a/keyboards/keychron/q3/ansi_encoder/ansi_encoder.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.com) - * - * 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" diff --git a/keyboards/keychron/q3/ansi_encoder/info.json b/keyboards/keychron/q3/ansi_encoder/info.json index 3bd5a9d59a..f1e293824d 100644 --- a/keyboards/keychron/q3/ansi_encoder/info.json +++ b/keyboards/keychron/q3/ansi_encoder/info.json @@ -8,6 +8,9 @@ "pid": "0x0121", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "encoder": { "rotary": [ {"pin_a": "A10", "pin_b": "A8"} @@ -28,13 +31,13 @@ {"matrix":[0, 7], "x":7.5, "y":0}, {"matrix":[0, 8], "x":8.5, "y":0}, {"matrix":[0, 9], "x":9.75, "y":0}, - {"matrix":[0,10], "x":10.75, "y":0}, - {"matrix":[0,11], "x":11.75, "y":0}, - {"matrix":[0,12], "x":12.75, "y":0}, - {"matrix":[0,13], "x":14, "y":0}, - {"matrix":[0,14], "x":15.25, "y":0}, - {"matrix":[0,15], "x":16.25, "y":0}, - {"matrix":[3,14], "x":17.25, "y":0}, + {"matrix":[0, 10], "x":10.75, "y":0}, + {"matrix":[0, 11], "x":11.75, "y":0}, + {"matrix":[0, 12], "x":12.75, "y":0}, + {"matrix":[0, 13], "x":14, "y":0}, + {"matrix":[0, 14], "x":15.25, "y":0}, + {"matrix":[0, 15], "x":16.25, "y":0}, + {"matrix":[3, 14], "x":17.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -46,13 +49,13 @@ {"matrix":[1, 7], "x":7, "y":1.25}, {"matrix":[1, 8], "x":8, "y":1.25}, {"matrix":[1, 9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25, "w":2}, - {"matrix":[1,14], "x":15.25, "y":1.25}, - {"matrix":[1,15], "x":16.25, "y":1.25}, - {"matrix":[3,15], "x":17.25, "y":1.25}, + {"matrix":[1, 10], "x":10, "y":1.25}, + {"matrix":[1, 11], "x":11, "y":1.25}, + {"matrix":[1, 12], "x":12, "y":1.25}, + {"matrix":[1, 13], "x":13, "y":1.25, "w":2}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, + {"matrix":[1, 15], "x":16.25, "y":1.25}, + {"matrix":[3, 15], "x":17.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -64,13 +67,13 @@ {"matrix":[2, 7], "x":7.5, "y":2.25}, {"matrix":[2, 8], "x":8.5, "y":2.25}, {"matrix":[2, 9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5}, - {"matrix":[2,14], "x":15.25, "y":2.25}, - {"matrix":[2,15], "x":16.25, "y":2.25}, - {"matrix":[3,12], "x":17.25, "y":2.25}, + {"matrix":[2, 10], "x":10.5, "y":2.25}, + {"matrix":[2, 11], "x":11.5, "y":2.25}, + {"matrix":[2, 12], "x":12.5, "y":2.25}, + {"matrix":[2, 13], "x":13.5, "y":2.25, "w":1.5}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, + {"matrix":[2, 15], "x":16.25, "y":2.25}, + {"matrix":[3, 12], "x":17.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -82,9 +85,9 @@ {"matrix":[3, 7], "x":7.75, "y":3.25}, {"matrix":[3, 8], "x":8.75, "y":3.25}, {"matrix":[3, 9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25}, + {"matrix":[3, 10], "x":10.75, "y":3.25}, + {"matrix":[3, 11], "x":11.75, "y":3.25}, + {"matrix":[3, 13], "x":12.75, "y":3.25, "w":2.25}, {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4.25}, @@ -95,22 +98,22 @@ {"matrix":[4, 7], "x":7.25, "y":4.25}, {"matrix":[4, 8], "x":8.25, "y":4.25}, {"matrix":[4, 9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75}, - {"matrix":[4,15], "x":16.25, "y":4.25}, + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 13], "x":12.25, "y":4.25, "w":2.75}, + {"matrix":[4, 15], "x":16.25, "y":4.25}, {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25}, {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25}, - {"matrix":[5,10], "x":10, "y":5.25, "w":1.25}, - {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25}, - {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25}, - {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25}, - {"matrix":[5,14], "x":15.25, "y":5.25}, - {"matrix":[5,15], "x":16.25, "y":5.25}, - {"matrix":[4,14], "x":17.25, "y":5.25} + {"matrix":[5, 10], "x":10, "y":5.25, "w":1.25}, + {"matrix":[5, 11], "x":11.25, "y":5.25, "w":1.25}, + {"matrix":[5, 12], "x":12.5, "y":5.25, "w":1.25}, + {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25}, + {"matrix":[5, 14], "x":15.25, "y":5.25}, + {"matrix":[5, 15], "x":16.25, "y":5.25}, + {"matrix":[4, 14], "x":17.25, "y":5.25} ] } } diff --git a/keyboards/keychron/q3/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q3/ansi_encoder/keymaps/default/keymap.c index b154fa935a..832234c997 100644 --- a/keyboards/keychron/q3/ansi_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/q3/ansi_encoder/keymaps/default/keymap.c @@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][1][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q3/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q3/ansi_encoder/keymaps/keychron/keymap.c index 5cd33b38e6..7a6944ff42 100644 --- a/keyboards/keychron/q3/ansi_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/q3/ansi_encoder/keymaps/keychron/keymap.c @@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][1][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q3/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q3/ansi_encoder/keymaps/via/keymap.c index 9369b6a60c..80230dae4b 100644 --- a/keyboards/keychron/q3/ansi_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/q3/ansi_encoder/keymaps/via/keymap.c @@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][1][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q3/ansi_encoder/rules.mk b/keyboards/keychron/q3/ansi_encoder/rules.mk index a8eaf50f9a..95a153f689 100644 --- a/keyboards/keychron/q3/ansi_encoder/rules.mk +++ b/keyboards/keychron/q3/ansi_encoder/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 LTO_ENABLE = yes EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/q3/iso/info.json b/keyboards/keychron/q3/iso/info.json index b50fffd3a2..f9f04430c9 100644 --- a/keyboards/keychron/q3/iso/info.json +++ b/keyboards/keychron/q3/iso/info.json @@ -8,6 +8,9 @@ "pid": "0x0122", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { @@ -23,12 +26,12 @@ {"matrix":[0, 7], "x":8.5, "y":0}, {"matrix":[0, 8], "x":9.5, "y":0}, {"matrix":[0, 9], "x":11, "y":0}, - {"matrix":[0,10], "x":12, "y":0}, - {"matrix":[0,11], "x":13, "y":0}, - {"matrix":[0,12], "x":14, "y":0}, - {"matrix":[0,14], "x":15.25, "y":0}, - {"matrix":[0,15], "x":16.25, "y":0}, - {"matrix":[3,14], "x":17.25, "y":0}, + {"matrix":[0, 10], "x":12, "y":0}, + {"matrix":[0, 11], "x":13, "y":0}, + {"matrix":[0, 12], "x":14, "y":0}, + {"matrix":[0, 14], "x":15.25, "y":0}, + {"matrix":[0, 15], "x":16.25, "y":0}, + {"matrix":[3, 14], "x":17.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -40,13 +43,13 @@ {"matrix":[1, 7], "x":7, "y":1.25}, {"matrix":[1, 8], "x":8, "y":1.25}, {"matrix":[1, 9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25, "w":2}, - {"matrix":[1,14], "x":15.25, "y":1.25}, - {"matrix":[1,15], "x":16.25, "y":1.25}, - {"matrix":[3,15], "x":17.25, "y":1.25}, + {"matrix":[1, 10], "x":10, "y":1.25}, + {"matrix":[1, 11], "x":11, "y":1.25}, + {"matrix":[1, 12], "x":12, "y":1.25}, + {"matrix":[1, 13], "x":13, "y":1.25, "w":2}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, + {"matrix":[1, 15], "x":16.25, "y":1.25}, + {"matrix":[3, 15], "x":17.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -58,12 +61,12 @@ {"matrix":[2, 7], "x":7.5, "y":2.25}, {"matrix":[2, 8], "x":8.5, "y":2.25}, {"matrix":[2, 9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,14], "x":15.25, "y":2.25}, - {"matrix":[2,15], "x":16.25, "y":2.25}, - {"matrix":[3,12], "x":17.25, "y":2.25}, + {"matrix":[2, 10], "x":10.5, "y":2.25}, + {"matrix":[2, 11], "x":11.5, "y":2.25}, + {"matrix":[2, 12], "x":12.5, "y":2.25}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, + {"matrix":[2, 15], "x":16.25, "y":2.25}, + {"matrix":[3, 12], "x":17.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -75,10 +78,10 @@ {"matrix":[3, 7], "x":7.75, "y":3.25}, {"matrix":[3, 8], "x":8.75, "y":3.25}, {"matrix":[3, 9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3, 10], "x":10.75, "y":3.25}, + {"matrix":[3, 11], "x":11.75, "y":3.25}, + {"matrix":[3, 13], "x":12.75, "y":3.25}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25}, @@ -90,22 +93,22 @@ {"matrix":[4, 7], "x":7.25, "y":4.25}, {"matrix":[4, 8], "x":8.25, "y":4.25}, {"matrix":[4, 9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75}, - {"matrix":[4,15], "x":16.25, "y":4.25}, + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 13], "x":12.25, "y":4.25, "w":2.75}, + {"matrix":[4, 15], "x":16.25, "y":4.25}, {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25}, {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25}, - {"matrix":[5,10], "x":10, "y":5.25, "w":1.25}, - {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25}, - {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25}, - {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25}, - {"matrix":[5,14], "x":15.25, "y":5.25}, - {"matrix":[5,15], "x":16.25, "y":5.25}, - {"matrix":[4,14], "x":17.25, "y":5.25} + {"matrix":[5, 10], "x":10, "y":5.25, "w":1.25}, + {"matrix":[5, 11], "x":11.25, "y":5.25, "w":1.25}, + {"matrix":[5, 12], "x":12.5, "y":5.25, "w":1.25}, + {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25}, + {"matrix":[5, 14], "x":15.25, "y":5.25}, + {"matrix":[5, 15], "x":16.25, "y":5.25}, + {"matrix":[4, 14], "x":17.25, "y":5.25} ] } } diff --git a/keyboards/keychron/q3/iso/iso.c b/keyboards/keychron/q3/iso/iso.c index e753a39c1b..d747d55115 100644 --- a/keyboards/keychron/q3/iso/iso.c +++ b/keyboards/keychron/q3/iso/iso.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "iso.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q3/iso/iso.h b/keyboards/keychron/q3/iso/iso.h deleted file mode 100644 index de5b0aedb1..0000000000 --- a/keyboards/keychron/q3/iso/iso.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.com) - * - * 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" diff --git a/keyboards/keychron/q3/iso/rules.mk b/keyboards/keychron/q3/iso/rules.mk index 8669178c4c..566c476585 100644 --- a/keyboards/keychron/q3/iso/rules.mk +++ b/keyboards/keychron/q3/iso/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 LTO_ENABLE = yes EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/q3/iso_encoder/info.json b/keyboards/keychron/q3/iso_encoder/info.json index 6f1a24b372..79938eccc4 100644 --- a/keyboards/keychron/q3/iso_encoder/info.json +++ b/keyboards/keychron/q3/iso_encoder/info.json @@ -8,6 +8,9 @@ "pid": "0x0123", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "encoder": { "rotary": [ {"pin_a": "A10", "pin_b": "A8"} @@ -28,13 +31,13 @@ {"matrix":[0, 7], "x":7.5, "y":0}, {"matrix":[0, 8], "x":8.5, "y":0}, {"matrix":[0, 9], "x":9.75, "y":0}, - {"matrix":[0,10], "x":10.75, "y":0}, - {"matrix":[0,11], "x":11.75, "y":0}, - {"matrix":[0,12], "x":12.75, "y":0}, - {"matrix":[0,13], "x":14, "y":0}, - {"matrix":[0,14], "x":15.25, "y":0}, - {"matrix":[0,15], "x":16.25, "y":0}, - {"matrix":[3,14], "x":17.25, "y":0}, + {"matrix":[0, 10], "x":10.75, "y":0}, + {"matrix":[0, 11], "x":11.75, "y":0}, + {"matrix":[0, 12], "x":12.75, "y":0}, + {"matrix":[0, 13], "x":14, "y":0}, + {"matrix":[0, 14], "x":15.25, "y":0}, + {"matrix":[0, 15], "x":16.25, "y":0}, + {"matrix":[3, 14], "x":17.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -46,13 +49,13 @@ {"matrix":[1, 7], "x":7, "y":1.25}, {"matrix":[1, 8], "x":8, "y":1.25}, {"matrix":[1, 9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25, "w":2}, - {"matrix":[1,14], "x":15.25, "y":1.25}, - {"matrix":[1,15], "x":16.25, "y":1.25}, - {"matrix":[3,15], "x":17.25, "y":1.25}, + {"matrix":[1, 10], "x":10, "y":1.25}, + {"matrix":[1, 11], "x":11, "y":1.25}, + {"matrix":[1, 12], "x":12, "y":1.25}, + {"matrix":[1, 13], "x":13, "y":1.25, "w":2}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, + {"matrix":[1, 15], "x":16.25, "y":1.25}, + {"matrix":[3, 15], "x":17.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -64,12 +67,12 @@ {"matrix":[2, 7], "x":7.5, "y":2.25}, {"matrix":[2, 8], "x":8.5, "y":2.25}, {"matrix":[2, 9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,14], "x":15.25, "y":2.25}, - {"matrix":[2,15], "x":16.25, "y":2.25}, - {"matrix":[3,12], "x":17.25, "y":2.25}, + {"matrix":[2, 10], "x":10.5, "y":2.25}, + {"matrix":[2, 11], "x":11.5, "y":2.25}, + {"matrix":[2, 12], "x":12.5, "y":2.25}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, + {"matrix":[2, 15], "x":16.25, "y":2.25}, + {"matrix":[3, 12], "x":17.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -81,10 +84,10 @@ {"matrix":[3, 7], "x":7.75, "y":3.25}, {"matrix":[3, 8], "x":8.75, "y":3.25}, {"matrix":[3, 9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3, 10], "x":10.75, "y":3.25}, + {"matrix":[3, 11], "x":11.75, "y":3.25}, + {"matrix":[3, 13], "x":12.75, "y":3.25}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25}, @@ -96,22 +99,22 @@ {"matrix":[4, 7], "x":7.25, "y":4.25}, {"matrix":[4, 8], "x":8.25, "y":4.25}, {"matrix":[4, 9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75}, - {"matrix":[4,15], "x":16.25, "y":4.25}, + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 13], "x":12.25, "y":4.25, "w":2.75}, + {"matrix":[4, 15], "x":16.25, "y":4.25}, {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25}, {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25}, - {"matrix":[5,10], "x":10, "y":5.25, "w":1.25}, - {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25}, - {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25}, - {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25}, - {"matrix":[5,14], "x":15.25, "y":5.25}, - {"matrix":[5,15], "x":16.25, "y":5.25}, - {"matrix":[4,14], "x":17.25, "y":5.25} + {"matrix":[5, 10], "x":10, "y":5.25, "w":1.25}, + {"matrix":[5, 11], "x":11.25, "y":5.25, "w":1.25}, + {"matrix":[5, 12], "x":12.5, "y":5.25, "w":1.25}, + {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25}, + {"matrix":[5, 14], "x":15.25, "y":5.25}, + {"matrix":[5, 15], "x":16.25, "y":5.25}, + {"matrix":[4, 14], "x":17.25, "y":5.25} ] } } diff --git a/keyboards/keychron/q3/iso_encoder/iso_encoder.c b/keyboards/keychron/q3/iso_encoder/iso_encoder.c index 02aac01ddc..d2bb169aac 100644 --- a/keyboards/keychron/q3/iso_encoder/iso_encoder.c +++ b/keyboards/keychron/q3/iso_encoder/iso_encoder.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "iso_encoder.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q3/iso_encoder/iso_encoder.h b/keyboards/keychron/q3/iso_encoder/iso_encoder.h deleted file mode 100644 index de5b0aedb1..0000000000 --- a/keyboards/keychron/q3/iso_encoder/iso_encoder.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.com) - * - * 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" diff --git a/keyboards/keychron/q3/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/q3/iso_encoder/keymaps/default/keymap.c index 999470fa87..caf2983919 100644 --- a/keyboards/keychron/q3/iso_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/q3/iso_encoder/keymaps/default/keymap.c @@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][1][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q3/iso_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q3/iso_encoder/keymaps/keychron/keymap.c index b7292e9fa4..336842a28f 100644 --- a/keyboards/keychron/q3/iso_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/q3/iso_encoder/keymaps/keychron/keymap.c @@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][1][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q3/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/q3/iso_encoder/keymaps/via/keymap.c index 999470fa87..caf2983919 100644 --- a/keyboards/keychron/q3/iso_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/q3/iso_encoder/keymaps/via/keymap.c @@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][1][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q3/iso_encoder/rules.mk b/keyboards/keychron/q3/iso_encoder/rules.mk index a8eaf50f9a..95a153f689 100644 --- a/keyboards/keychron/q3/iso_encoder/rules.mk +++ b/keyboards/keychron/q3/iso_encoder/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 LTO_ENABLE = yes EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/q3/jis/info.json b/keyboards/keychron/q3/jis/info.json index 69536c290c..b9cfdc5346 100644 --- a/keyboards/keychron/q3/jis/info.json +++ b/keyboards/keychron/q3/jis/info.json @@ -8,6 +8,9 @@ "pid": "0x0124", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { @@ -23,12 +26,12 @@ {"matrix":[0, 7], "x":8.5, "y":0}, {"matrix":[0, 8], "x":9.5, "y":0}, {"matrix":[0, 9], "x":11, "y":0}, - {"matrix":[0,10], "x":12, "y":0}, - {"matrix":[0,11], "x":13, "y":0}, - {"matrix":[0,12], "x":14, "y":0}, - {"matrix":[0,14], "x":15.25, "y":0}, - {"matrix":[0,15], "x":16.25, "y":0}, - {"matrix":[3,14], "x":17.25, "y":0}, + {"matrix":[0, 10], "x":12, "y":0}, + {"matrix":[0, 11], "x":13, "y":0}, + {"matrix":[0, 12], "x":14, "y":0}, + {"matrix":[0, 14], "x":15.25, "y":0}, + {"matrix":[0, 15], "x":16.25, "y":0}, + {"matrix":[3, 14], "x":17.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -40,14 +43,14 @@ {"matrix":[1, 7], "x":7, "y":1.25}, {"matrix":[1, 8], "x":8, "y":1.25}, {"matrix":[1, 9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25}, - {"matrix":[0,13], "x":14, "y":1.25}, - {"matrix":[1,14], "x":15.25, "y":1.25}, - {"matrix":[1,15], "x":16.25, "y":1.25}, - {"matrix":[3,15], "x":17.25, "y":1.25}, + {"matrix":[1, 10], "x":10, "y":1.25}, + {"matrix":[1, 11], "x":11, "y":1.25}, + {"matrix":[1, 12], "x":12, "y":1.25}, + {"matrix":[1, 13], "x":13, "y":1.25}, + {"matrix":[0, 13], "x":14, "y":1.25}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, + {"matrix":[1, 15], "x":16.25, "y":1.25}, + {"matrix":[3, 15], "x":17.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -59,12 +62,12 @@ {"matrix":[2, 7], "x":7.5, "y":2.25}, {"matrix":[2, 8], "x":8.5, "y":2.25}, {"matrix":[2, 9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,14], "x":15.25, "y":2.25}, - {"matrix":[2,15], "x":16.25, "y":2.25}, - {"matrix":[3,12], "x":17.25, "y":2.25}, + {"matrix":[2, 10], "x":10.5, "y":2.25}, + {"matrix":[2, 11], "x":11.5, "y":2.25}, + {"matrix":[2, 12], "x":12.5, "y":2.25}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, + {"matrix":[2, 15], "x":16.25, "y":2.25}, + {"matrix":[3, 12], "x":17.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -76,10 +79,10 @@ {"matrix":[3, 7], "x":7.75, "y":3.25}, {"matrix":[3, 8], "x":8.75, "y":3.25}, {"matrix":[3, 9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3, 10], "x":10.75, "y":3.25}, + {"matrix":[3, 11], "x":11.75, "y":3.25}, + {"matrix":[3, 13], "x":12.75, "y":3.25}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4.25}, @@ -90,11 +93,11 @@ {"matrix":[4, 7], "x":7.25, "y":4.25}, {"matrix":[4, 8], "x":8.25, "y":4.25}, {"matrix":[4, 9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,12], "x":12.25, "y":4.25}, - {"matrix":[4,13], "x":13.25, "y":4.25, "w":1.75}, - {"matrix":[4,15], "x":16.25, "y":4.25}, + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 12], "x":12.25, "y":4.25}, + {"matrix":[4, 13], "x":13.25, "y":4.25, "w":1.75}, + {"matrix":[4, 15], "x":16.25, "y":4.25}, {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5.25}, @@ -102,13 +105,13 @@ {"matrix":[5, 3], "x":3.5, "y":5.25}, {"matrix":[5, 6], "x":4.5, "y":5.25, "w":4.5}, {"matrix":[5, 9], "x":9, "y":5.25, "w":1.25}, - {"matrix":[5,10], "x":10.25, "y":5.25, "w":1.25}, - {"matrix":[5,11], "x":11.5, "y":5.25, "w":1.25}, - {"matrix":[5,12], "x":12.75, "y":5.25}, - {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25}, - {"matrix":[5,14], "x":15.25, "y":5.25}, - {"matrix":[5,15], "x":16.25, "y":5.25}, - {"matrix":[4,14], "x":17.25, "y":5.25} + {"matrix":[5, 10], "x":10.25, "y":5.25, "w":1.25}, + {"matrix":[5, 11], "x":11.5, "y":5.25, "w":1.25}, + {"matrix":[5, 12], "x":12.75, "y":5.25}, + {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25}, + {"matrix":[5, 14], "x":15.25, "y":5.25}, + {"matrix":[5, 15], "x":16.25, "y":5.25}, + {"matrix":[4, 14], "x":17.25, "y":5.25} ] } } diff --git a/keyboards/keychron/q3/jis/jis.c b/keyboards/keychron/q3/jis/jis.c index 20983c6a5f..f262d3c7d8 100644 --- a/keyboards/keychron/q3/jis/jis.c +++ b/keyboards/keychron/q3/jis/jis.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "jis.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q3/jis/jis.h b/keyboards/keychron/q3/jis/jis.h deleted file mode 100644 index de5b0aedb1..0000000000 --- a/keyboards/keychron/q3/jis/jis.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.com) - * - * 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" diff --git a/keyboards/keychron/q3/jis/rules.mk b/keyboards/keychron/q3/jis/rules.mk index 8669178c4c..566c476585 100644 --- a/keyboards/keychron/q3/jis/rules.mk +++ b/keyboards/keychron/q3/jis/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 LTO_ENABLE = yes EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/q3/jis_encoder/info.json b/keyboards/keychron/q3/jis_encoder/info.json index ed12472732..f379df430e 100644 --- a/keyboards/keychron/q3/jis_encoder/info.json +++ b/keyboards/keychron/q3/jis_encoder/info.json @@ -8,6 +8,9 @@ "pid": "0x0125", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "encoder": { "rotary": [ {"pin_a": "A10", "pin_b": "A8"} @@ -28,13 +31,13 @@ {"matrix":[0, 7], "x":7.5, "y":0}, {"matrix":[0, 8], "x":8.5, "y":0}, {"matrix":[0, 9], "x":9.75, "y":0}, - {"matrix":[0,10], "x":10.75, "y":0}, - {"matrix":[0,11], "x":11.75, "y":0}, - {"matrix":[0,12], "x":12.75, "y":0}, - {"matrix":[0,13], "x":14, "y":0}, - {"matrix":[0,14], "x":15.25, "y":0}, - {"matrix":[0,15], "x":16.25, "y":0}, - {"matrix":[3,14], "x":17.25, "y":0}, + {"matrix":[0, 10], "x":10.75, "y":0}, + {"matrix":[0, 11], "x":11.75, "y":0}, + {"matrix":[0, 12], "x":12.75, "y":0}, + {"matrix":[0, 13], "x":14, "y":0}, + {"matrix":[0, 14], "x":15.25, "y":0}, + {"matrix":[0, 15], "x":16.25, "y":0}, + {"matrix":[3, 14], "x":17.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -46,14 +49,14 @@ {"matrix":[1, 7], "x":7, "y":1.25}, {"matrix":[1, 8], "x":8, "y":1.25}, {"matrix":[1, 9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25}, + {"matrix":[1, 10], "x":10, "y":1.25}, + {"matrix":[1, 11], "x":11, "y":1.25}, + {"matrix":[1, 12], "x":12, "y":1.25}, + {"matrix":[1, 13], "x":13, "y":1.25}, {"matrix":[5, 5], "x":14, "y":1.25}, - {"matrix":[1,14], "x":15.25, "y":1.25}, - {"matrix":[1,15], "x":16.25, "y":1.25}, - {"matrix":[3,15], "x":17.25, "y":1.25}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, + {"matrix":[1, 15], "x":16.25, "y":1.25}, + {"matrix":[3, 15], "x":17.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -65,12 +68,12 @@ {"matrix":[2, 7], "x":7.5, "y":2.25}, {"matrix":[2, 8], "x":8.5, "y":2.25}, {"matrix":[2, 9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,14], "x":15.25, "y":2.25}, - {"matrix":[2,15], "x":16.25, "y":2.25}, - {"matrix":[3,12], "x":17.25, "y":2.25}, + {"matrix":[2, 10], "x":10.5, "y":2.25}, + {"matrix":[2, 11], "x":11.5, "y":2.25}, + {"matrix":[2, 12], "x":12.5, "y":2.25}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, + {"matrix":[2, 15], "x":16.25, "y":2.25}, + {"matrix":[3, 12], "x":17.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -82,10 +85,10 @@ {"matrix":[3, 7], "x":7.75, "y":3.25}, {"matrix":[3, 8], "x":8.75, "y":3.25}, {"matrix":[3, 9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3, 10], "x":10.75, "y":3.25}, + {"matrix":[3, 11], "x":11.75, "y":3.25}, + {"matrix":[3, 13], "x":12.75, "y":3.25}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4.25}, @@ -96,11 +99,11 @@ {"matrix":[4, 7], "x":7.25, "y":4.25}, {"matrix":[4, 8], "x":8.25, "y":4.25}, {"matrix":[4, 9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,12], "x":12.25, "y":4.25}, - {"matrix":[4,13], "x":13.25, "y":4.25, "w":1.75}, - {"matrix":[4,15], "x":16.25, "y":4.25}, + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 12], "x":12.25, "y":4.25}, + {"matrix":[4, 13], "x":13.25, "y":4.25, "w":1.75}, + {"matrix":[4, 15], "x":16.25, "y":4.25}, {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5.25}, @@ -108,13 +111,13 @@ {"matrix":[5, 3], "x":3.5, "y":5.25}, {"matrix":[5, 6], "x":4.5, "y":5.25, "w":4.5}, {"matrix":[5, 9], "x":9, "y":5.25, "w":1.25}, - {"matrix":[5,10], "x":10.25, "y":5.25, "w":1.25}, - {"matrix":[5,11], "x":11.5, "y":5.25, "w":1.25}, - {"matrix":[5,12], "x":12.75, "y":5.25}, - {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25}, - {"matrix":[5,14], "x":15.25, "y":5.25}, - {"matrix":[5,15], "x":16.25, "y":5.25}, - {"matrix":[4,14], "x":17.25, "y":5.25} + {"matrix":[5, 10], "x":10.25, "y":5.25, "w":1.25}, + {"matrix":[5, 11], "x":11.5, "y":5.25, "w":1.25}, + {"matrix":[5, 12], "x":12.75, "y":5.25}, + {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25}, + {"matrix":[5, 14], "x":15.25, "y":5.25}, + {"matrix":[5, 15], "x":16.25, "y":5.25}, + {"matrix":[4, 14], "x":17.25, "y":5.25} ] } } diff --git a/keyboards/keychron/q3/jis_encoder/jis_encoder.c b/keyboards/keychron/q3/jis_encoder/jis_encoder.c index efaf5fc5f2..0a97c5ca68 100644 --- a/keyboards/keychron/q3/jis_encoder/jis_encoder.c +++ b/keyboards/keychron/q3/jis_encoder/jis_encoder.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "jis_encoder.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q3/jis_encoder/jis_encoder.h b/keyboards/keychron/q3/jis_encoder/jis_encoder.h deleted file mode 100644 index de5b0aedb1..0000000000 --- a/keyboards/keychron/q3/jis_encoder/jis_encoder.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.com) - * - * 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" diff --git a/keyboards/keychron/q3/jis_encoder/keymaps/default/keymap.c b/keyboards/keychron/q3/jis_encoder/keymaps/default/keymap.c index ca51f194a2..30e85d79df 100644 --- a/keyboards/keychron/q3/jis_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/q3/jis_encoder/keymaps/default/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format on #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][1][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q3/jis_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q3/jis_encoder/keymaps/keychron/keymap.c index 48532104f6..3a7e06abd6 100644 --- a/keyboards/keychron/q3/jis_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/q3/jis_encoder/keymaps/keychron/keymap.c @@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format on #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][1][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q3/jis_encoder/keymaps/via/keymap.c b/keyboards/keychron/q3/jis_encoder/keymaps/via/keymap.c index f14ca16c8b..63618ce05a 100644 --- a/keyboards/keychron/q3/jis_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/q3/jis_encoder/keymaps/via/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format on #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][1][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q3/jis_encoder/rules.mk b/keyboards/keychron/q3/jis_encoder/rules.mk index a8eaf50f9a..95a153f689 100644 --- a/keyboards/keychron/q3/jis_encoder/rules.mk +++ b/keyboards/keychron/q3/jis_encoder/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 LTO_ENABLE = yes EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/q3/q3.c b/keyboards/keychron/q3/q3.c index 120013e77e..2bf8bf08a0 100644 --- a/keyboards/keychron/q3/q3.c +++ b/keyboards/keychron/q3/q3.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "q3.h" +#include "quantum.h" #include "rgb_matrix.h" // clang-format off diff --git a/keyboards/keychron/q3/q3.h b/keyboards/keychron/q3/q3.h deleted file mode 100644 index bc2d458bb7..0000000000 --- a/keyboards/keychron/q3/q3.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.com) - * - * 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" - -#if defined(KEYBOARD_keychron_q3_ansi) -# include "ansi.h" -#elif defined(KEYBOARD_keychron_q3_ansi_encoder) -# include "ansi_encoder.h" -#elif defined(KEYBOARD_keychron_q3_iso) -# include "iso.h" -#elif defined(KEYBOARD_keychron_q3_iso_encoder) -# include "iso_encoder.h" -#elif defined(KEYBOARD_keychron_q3_jis) -# include "jis.h" -#elif defined(KEYBOARD_keychron_q3_jis_encoder) -# include "jis_encoder.h" -#endif diff --git a/keyboards/keychron/q4/ansi_v1/ansi_v1.c b/keyboards/keychron/q4/ansi_v1/ansi_v1.c index e651744262..88599103ef 100644 --- a/keyboards/keychron/q4/ansi_v1/ansi_v1.c +++ b/keyboards/keychron/q4/ansi_v1/ansi_v1.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "ansi_v1.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q4/ansi_v1/ansi_v1.h b/keyboards/keychron/q4/ansi_v1/ansi_v1.h deleted file mode 100644 index 381c674dad..0000000000 --- a/keyboards/keychron/q4/ansi_v1/ansi_v1.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.com) - * - * 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"
\ No newline at end of file diff --git a/keyboards/keychron/q4/ansi_v1/info.json b/keyboards/keychron/q4/ansi_v1/info.json index f24a4acba5..3f05afc196 100644 --- a/keyboards/keychron/q4/ansi_v1/info.json +++ b/keyboards/keychron/q4/ansi_v1/info.json @@ -8,6 +8,14 @@ "pid": "0x0140", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, + "matrix_pins": { + "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"], + "rows": ["B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/keychron/q4/ansi_v1/rules.mk b/keyboards/keychron/q4/ansi_v1/rules.mk index 4bb31fd14c..9111c3b9bd 100644 --- a/keyboards/keychron/q4/ansi_v1/rules.mk +++ b/keyboards/keychron/q4/ansi_v1/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 LTO_ENABLE = no EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/q4/ansi_v2/ansi_v2.h b/keyboards/keychron/q4/ansi_v2/ansi_v2.h deleted file mode 100644 index de5b0aedb1..0000000000 --- a/keyboards/keychron/q4/ansi_v2/ansi_v2.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.com) - * - * 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" diff --git a/keyboards/keychron/q4/ansi_v2/info.json b/keyboards/keychron/q4/ansi_v2/info.json index f24a4acba5..3f05afc196 100644 --- a/keyboards/keychron/q4/ansi_v2/info.json +++ b/keyboards/keychron/q4/ansi_v2/info.json @@ -8,6 +8,14 @@ "pid": "0x0140", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, + "matrix_pins": { + "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"], + "rows": ["B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/keychron/q4/ansi_v2/rules.mk b/keyboards/keychron/q4/ansi_v2/rules.mk index 4bb31fd14c..9111c3b9bd 100644 --- a/keyboards/keychron/q4/ansi_v2/rules.mk +++ b/keyboards/keychron/q4/ansi_v2/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 LTO_ENABLE = no EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/q4/config.h b/keyboards/keychron/q4/config.h index 08549247f3..940ee44e77 100644 --- a/keyboards/keychron/q4/config.h +++ b/keyboards/keychron/q4/config.h @@ -16,13 +16,6 @@ #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS { B4, B3, A15, A14, A13 } -#define MATRIX_COL_PINS { C14, C15, A0, A1, A2, A3, A4, A5, A6, A7, B0, B1, A8, A9 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* DIP switch */ #define DIP_SWITCH_MATRIX_GRID { {4,4} } diff --git a/keyboards/keychron/q4/iso/info.json b/keyboards/keychron/q4/iso/info.json index 9c65fa29d1..2db65a4690 100644 --- a/keyboards/keychron/q4/iso/info.json +++ b/keyboards/keychron/q4/iso/info.json @@ -8,6 +8,14 @@ "pid": "0x0142", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, + "matrix_pins": { + "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"], + "rows": ["B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { @@ -27,7 +35,7 @@ {"matrix": [0, 11], "x": 11, "y":0}, {"matrix": [0, 12], "x": 12, "y":0}, {"matrix": [0, 13], "x":13, "y":0, "w":2}, - + {"matrix": [1, 0], "x":0, "y":1, "w":1.5}, {"matrix": [1, 1], "x": 1.5, "y": 1}, {"matrix": [1, 2], "x": 2.5, "y": 1}, @@ -54,7 +62,7 @@ {"matrix": [2, 9], "x": 9.75, "y":2}, {"matrix": [2, 10], "x": 10.75, "y":2}, {"matrix": [2, 11], "x": 11.75, "y":2}, - {"matrix": [2, 13], "x": 12.75, "y":2 }, + {"matrix": [2, 13], "x": 12.75, "y":2}, {"matrix": [1, 13], "x":13.75, "y":1, "w":1.25, "h":2}, {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, diff --git a/keyboards/keychron/q4/iso/iso.c b/keyboards/keychron/q4/iso/iso.c index c1d1982b94..24cbcfd745 100644 --- a/keyboards/keychron/q4/iso/iso.c +++ b/keyboards/keychron/q4/iso/iso.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "iso.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q4/iso/iso.h b/keyboards/keychron/q4/iso/iso.h deleted file mode 100644 index 381c674dad..0000000000 --- a/keyboards/keychron/q4/iso/iso.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.com) - * - * 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"
\ No newline at end of file diff --git a/keyboards/keychron/q4/iso/rules.mk b/keyboards/keychron/q4/iso/rules.mk index 4bb31fd14c..9111c3b9bd 100644 --- a/keyboards/keychron/q4/iso/rules.mk +++ b/keyboards/keychron/q4/iso/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 LTO_ENABLE = no EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/q4/q4.c b/keyboards/keychron/q4/q4.c index 6d31e45607..c3cb67bcc2 100644 --- a/keyboards/keychron/q4/q4.c +++ b/keyboards/keychron/q4/q4.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "q4.h" +#include "quantum.h" const matrix_row_t matrix_mask[] = { 0b11111111111111, diff --git a/keyboards/keychron/q4/q4.h b/keyboards/keychron/q4/q4.h deleted file mode 100644 index 34aa4a8505..0000000000 --- a/keyboards/keychron/q4/q4.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.com) - * - * 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" - -#if defined(KEYBOARD_keychron_q4_ansi_v1) -# include "ansi_v1.h" -#elif defined(KEYBOARD_keychron_q4_ansi_v2) -# include "ansi_v2.h" -#elif defined(KEYBOARD_keychron_q4_iso) -# include "iso.h" -#endif diff --git a/keyboards/keychron/q5/ansi/ansi.c b/keyboards/keychron/q5/ansi/ansi.c index 6aeb46c07d..dda563cd79 100644 --- a/keyboards/keychron/q5/ansi/ansi.c +++ b/keyboards/keychron/q5/ansi/ansi.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "ansi.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q5/ansi/ansi.h b/keyboards/keychron/q5/ansi/ansi.h deleted file mode 100644 index de5b0aedb1..0000000000 --- a/keyboards/keychron/q5/ansi/ansi.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.com) - * - * 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" diff --git a/keyboards/keychron/q5/ansi/info.json b/keyboards/keychron/q5/ansi/info.json index 4e77f23b7c..555034fb80 100644 --- a/keyboards/keychron/q5/ansi/info.json +++ b/keyboards/keychron/q5/ansi/info.json @@ -8,21 +8,24 @@ "pid": "0x0150", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ansi_100": { "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":[0, 6], "x":6, "y":0}, - {"matrix":[0, 7], "x":7, "y":0}, - {"matrix":[0, 8], "x":8, "y":0}, - {"matrix":[0, 9], "x":9, "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}, + {"matrix":[0, 4], "x":4, "y":0}, + {"matrix":[0, 5], "x":5, "y":0}, + {"matrix":[0, 6], "x":6, "y":0}, + {"matrix":[0, 7], "x":7, "y":0}, + {"matrix":[0, 8], "x":8, "y":0}, + {"matrix":[0, 9], "x":9, "y":0}, {"matrix":[0, 10], "x":10, "y":0}, {"matrix":[0, 11], "x":11, "y":0}, {"matrix":[0, 12], "x":12, "y":0}, @@ -43,14 +46,14 @@ {"matrix":[1, 7], "x":7, "y":1.25}, {"matrix":[1, 8], "x":8, "y":1.25}, {"matrix":[1, 9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25, "w":2}, - {"matrix":[1,15], "x":15.5, "y":1.25}, - {"matrix":[1,16], "x":16.5, "y":1.25}, - {"matrix":[1,17], "x":17.5, "y":1.25}, - {"matrix":[3,14], "x":18.5, "y":1.25}, + {"matrix":[1, 10], "x":10, "y":1.25}, + {"matrix":[1, 11], "x":11, "y":1.25}, + {"matrix":[1, 12], "x":12, "y":1.25}, + {"matrix":[1, 13], "x":13, "y":1.25, "w":2}, + {"matrix":[1, 15], "x":15.5, "y":1.25}, + {"matrix":[1, 16], "x":16.5, "y":1.25}, + {"matrix":[1, 17], "x":17.5, "y":1.25}, + {"matrix":[3, 14], "x":18.5, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -62,13 +65,13 @@ {"matrix":[2, 7], "x":7.5, "y":2.25}, {"matrix":[2, 8], "x":8.5, "y":2.25}, {"matrix":[2, 9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5}, - {"matrix":[2,15], "x":15.5, "y":2.25}, - {"matrix":[2,16], "x":16.5, "y":2.25}, - {"matrix":[2,17], "x":17.5, "y":2.25}, + {"matrix":[2, 10], "x":10.5, "y":2.25}, + {"matrix":[2, 11], "x":11.5, "y":2.25}, + {"matrix":[2, 12], "x":12.5, "y":2.25}, + {"matrix":[2, 13], "x":13.5, "y":2.25, "w":1.5}, + {"matrix":[2, 15], "x":15.5, "y":2.25}, + {"matrix":[2, 16], "x":16.5, "y":2.25}, + {"matrix":[2, 17], "x":17.5, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -80,13 +83,13 @@ {"matrix":[3, 7], "x":7.75, "y":3.25}, {"matrix":[3, 8], "x":8.75, "y":3.25}, {"matrix":[3, 9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25}, - {"matrix":[3,15], "x":15.5, "y":3.25}, - {"matrix":[3,16], "x":16.5, "y":3.25}, - {"matrix":[3,17], "x":17.5, "y":3.25}, - {"matrix":[2,14], "x":18.5, "y":2.25, "h":2}, + {"matrix":[3, 10], "x":10.75, "y":3.25}, + {"matrix":[3, 11], "x":11.75, "y":3.25}, + {"matrix":[3, 13], "x":12.75, "y":3.25, "w":2.25}, + {"matrix":[3, 15], "x":15.5, "y":3.25}, + {"matrix":[3, 16], "x":16.5, "y":3.25}, + {"matrix":[3, 17], "x":17.5, "y":3.25}, + {"matrix":[2, 14], "x":18.5, "y":2.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4.25}, @@ -97,26 +100,26 @@ {"matrix":[4, 7], "x":7.25, "y":4.25}, {"matrix":[4, 8], "x":8.25, "y":4.25}, {"matrix":[4, 9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,13], "x":12.25, "y":4.25, "w":1.75}, - {"matrix":[4,14], "x":14.25, "y":4.5}, - {"matrix":[4,15], "x":15.5, "y":4.25}, - {"matrix":[4,16], "x":16.5, "y":4.25}, - {"matrix":[4,17], "x":17.5, "y":4.25}, + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 13], "x":12.25, "y":4.25, "w":1.75}, + {"matrix":[4, 14], "x":14.25, "y":4.5}, + {"matrix":[4, 15], "x":15.5, "y":4.25}, + {"matrix":[4, 16], "x":16.5, "y":4.25}, + {"matrix":[4, 17], "x":17.5, "y":4.25}, {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25}, {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25}, - {"matrix":[5,10], "x":10, "y":5.25}, - {"matrix":[5,11], "x":11, "y":5.25}, - {"matrix":[5,12], "x":12, "y":5.25}, - {"matrix":[5,13], "x":13.25, "y":5.5}, - {"matrix":[5,14], "x":14.25, "y":5.5}, - {"matrix":[5,15], "x":15.25, "y":5.5}, - {"matrix":[5,16], "x":16.5, "y":5.25}, - {"matrix":[5,17], "x":17.5, "y":5.25}, + {"matrix":[5, 10], "x":10, "y":5.25}, + {"matrix":[5, 11], "x":11, "y":5.25}, + {"matrix":[5, 12], "x":12, "y":5.25}, + {"matrix":[5, 13], "x":13.25, "y":5.5}, + {"matrix":[5, 14], "x":14.25, "y":5.5}, + {"matrix":[5, 15], "x":15.25, "y":5.5}, + {"matrix":[5, 16], "x":16.5, "y":5.25}, + {"matrix":[5, 17], "x":17.5, "y":5.25}, {"matrix":[5, 5], "x":18.5, "y":4.25, "h":2} ] } diff --git a/keyboards/keychron/q5/ansi/rules.mk b/keyboards/keychron/q5/ansi/rules.mk index 311ca648e1..f2dba218bf 100644 --- a/keyboards/keychron/q5/ansi/rules.mk +++ b/keyboards/keychron/q5/ansi/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c index 43c27433b2..4d3cc0f036 100644 --- a/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c +++ b/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "ansi_encoder.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q5/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q5/ansi_encoder/ansi_encoder.h deleted file mode 100644 index de5b0aedb1..0000000000 --- a/keyboards/keychron/q5/ansi_encoder/ansi_encoder.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.com) - * - * 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" diff --git a/keyboards/keychron/q5/ansi_encoder/info.json b/keyboards/keychron/q5/ansi_encoder/info.json index 7bd6f179c6..2c828726c7 100644 --- a/keyboards/keychron/q5/ansi_encoder/info.json +++ b/keyboards/keychron/q5/ansi_encoder/info.json @@ -8,6 +8,9 @@ "pid": "0x0151", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "encoder": { "rotary": [ {"pin_a": "C14", "pin_b": "A2"} @@ -18,14 +21,14 @@ "layouts": { "LAYOUT_ansi_98": { "layout": [ - {"matrix":[0, 0], "x":0, "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":[0, 7], "x":6.5, "y":0}, - {"matrix":[0, 8], "x":7.5, "y":0}, - {"matrix":[0, 9], "x":8.5, "y":0}, + {"matrix":[0, 0], "x":0, "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":[0, 7], "x":6.5, "y":0}, + {"matrix":[0, 8], "x":7.5, "y":0}, + {"matrix":[0, 9], "x":8.5, "y":0}, {"matrix":[0, 10], "x":9.5, "y":0}, {"matrix":[0, 11], "x":11, "y":0}, {"matrix":[0, 12], "x":12, "y":0}, @@ -46,14 +49,14 @@ {"matrix":[1, 7], "x":7, "y":1.25}, {"matrix":[1, 8], "x":8, "y":1.25}, {"matrix":[1, 9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25, "w":2}, - {"matrix":[1,15], "x":15.5, "y":1.25}, - {"matrix":[1,16], "x":16.5, "y":1.25}, - {"matrix":[1,17], "x":17.5, "y":1.25}, - {"matrix":[3,14], "x":18.5, "y":1.25}, + {"matrix":[1, 10], "x":10, "y":1.25}, + {"matrix":[1, 11], "x":11, "y":1.25}, + {"matrix":[1, 12], "x":12, "y":1.25}, + {"matrix":[1, 13], "x":13, "y":1.25, "w":2}, + {"matrix":[1, 15], "x":15.5, "y":1.25}, + {"matrix":[1, 16], "x":16.5, "y":1.25}, + {"matrix":[1, 17], "x":17.5, "y":1.25}, + {"matrix":[3, 14], "x":18.5, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -65,13 +68,13 @@ {"matrix":[2, 7], "x":7.5, "y":2.25}, {"matrix":[2, 8], "x":8.5, "y":2.25}, {"matrix":[2, 9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5}, - {"matrix":[2,15], "x":15.5, "y":2.25}, - {"matrix":[2,16], "x":16.5, "y":2.25}, - {"matrix":[2,17], "x":17.5, "y":2.25}, + {"matrix":[2, 10], "x":10.5, "y":2.25}, + {"matrix":[2, 11], "x":11.5, "y":2.25}, + {"matrix":[2, 12], "x":12.5, "y":2.25}, + {"matrix":[2, 13], "x":13.5, "y":2.25, "w":1.5}, + {"matrix":[2, 15], "x":15.5, "y":2.25}, + {"matrix":[2, 16], "x":16.5, "y":2.25}, + {"matrix":[2, 17], "x":17.5, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -83,13 +86,13 @@ {"matrix":[3, 7], "x":7.75, "y":3.25}, {"matrix":[3, 8], "x":8.75, "y":3.25}, {"matrix":[3, 9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25}, - {"matrix":[3,15], "x":15.5, "y":3.25}, - {"matrix":[3,16], "x":16.5, "y":3.25}, - {"matrix":[3,17], "x":17.5, "y":3.25}, - {"matrix":[2,14], "x":18.5, "y":2.25, "h":2}, + {"matrix":[3, 10], "x":10.75, "y":3.25}, + {"matrix":[3, 11], "x":11.75, "y":3.25}, + {"matrix":[3, 13], "x":12.75, "y":3.25, "w":2.25}, + {"matrix":[3, 15], "x":15.5, "y":3.25}, + {"matrix":[3, 16], "x":16.5, "y":3.25}, + {"matrix":[3, 17], "x":17.5, "y":3.25}, + {"matrix":[2, 14], "x":18.5, "y":2.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4.25}, @@ -100,26 +103,26 @@ {"matrix":[4, 7], "x":7.25, "y":4.25}, {"matrix":[4, 8], "x":8.25, "y":4.25}, {"matrix":[4, 9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,13], "x":12.25, "y":4.25, "w":1.75}, - {"matrix":[4,14], "x":14.25, "y":4.5}, - {"matrix":[4,15], "x":15.5, "y":4.25}, - {"matrix":[4,16], "x":16.5, "y":4.25}, - {"matrix":[4,17], "x":17.5, "y":4.25}, + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 13], "x":12.25, "y":4.25, "w":1.75}, + {"matrix":[4, 14], "x":14.25, "y":4.5}, + {"matrix":[4, 15], "x":15.5, "y":4.25}, + {"matrix":[4, 16], "x":16.5, "y":4.25}, + {"matrix":[4, 17], "x":17.5, "y":4.25}, {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25}, {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25}, - {"matrix":[5,10], "x":10, "y":5.25}, - {"matrix":[5,11], "x":11, "y":5.25}, - {"matrix":[5,12], "x":12, "y":5.25}, - {"matrix":[5,13], "x":13.25, "y":5.5}, - {"matrix":[5,14], "x":14.25, "y":5.5}, - {"matrix":[5,15], "x":15.25, "y":5.5}, - {"matrix":[5,16], "x":16.5, "y":5.25}, - {"matrix":[5,17], "x":17.5, "y":5.25}, + {"matrix":[5, 10], "x":10, "y":5.25}, + {"matrix":[5, 11], "x":11, "y":5.25}, + {"matrix":[5, 12], "x":12, "y":5.25}, + {"matrix":[5, 13], "x":13.25, "y":5.5}, + {"matrix":[5, 14], "x":14.25, "y":5.5}, + {"matrix":[5, 15], "x":15.25, "y":5.5}, + {"matrix":[5, 16], "x":16.5, "y":5.25}, + {"matrix":[5, 17], "x":17.5, "y":5.25}, {"matrix":[5, 5], "x":18.5, "y":4.25, "h":2} ] } diff --git a/keyboards/keychron/q5/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q5/ansi_encoder/keymaps/default/keymap.c index c897aecf73..c9079b53ff 100644 --- a/keyboards/keychron/q5/ansi_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/q5/ansi_encoder/keymaps/default/keymap.c @@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][1][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q5/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q5/ansi_encoder/keymaps/keychron/keymap.c index d516c2da4b..62446674fe 100644 --- a/keyboards/keychron/q5/ansi_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/q5/ansi_encoder/keymaps/keychron/keymap.c @@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][1][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q5/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q5/ansi_encoder/keymaps/via/keymap.c index c897aecf73..c9079b53ff 100644 --- a/keyboards/keychron/q5/ansi_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/q5/ansi_encoder/keymaps/via/keymap.c @@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][1][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q5/ansi_encoder/rules.mk b/keyboards/keychron/q5/ansi_encoder/rules.mk index ef55047753..5df3cbccaf 100644 --- a/keyboards/keychron/q5/ansi_encoder/rules.mk +++ b/keyboards/keychron/q5/ansi_encoder/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/q5/iso/info.json b/keyboards/keychron/q5/iso/info.json index 20eebe22b0..125cc33736 100644 --- a/keyboards/keychron/q5/iso/info.json +++ b/keyboards/keychron/q5/iso/info.json @@ -8,21 +8,24 @@ "pid": "0x0152", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { "LAYOUT_iso_101": { "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":[0, 6], "x":6, "y":0}, - {"matrix":[0, 7], "x":7, "y":0}, - {"matrix":[0, 8], "x":8, "y":0}, - {"matrix":[0, 9], "x":9, "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}, + {"matrix":[0, 4], "x":4, "y":0}, + {"matrix":[0, 5], "x":5, "y":0}, + {"matrix":[0, 6], "x":6, "y":0}, + {"matrix":[0, 7], "x":7, "y":0}, + {"matrix":[0, 8], "x":8, "y":0}, + {"matrix":[0, 9], "x":9, "y":0}, {"matrix":[0, 10], "x":10, "y":0}, {"matrix":[0, 11], "x":11, "y":0}, {"matrix":[0, 12], "x":12, "y":0}, @@ -43,14 +46,14 @@ {"matrix":[1, 7], "x":7, "y":1.25}, {"matrix":[1, 8], "x":8, "y":1.25}, {"matrix":[1, 9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25, "w":2}, - {"matrix":[1,15], "x":15.5, "y":1.25}, - {"matrix":[1,16], "x":16.5, "y":1.25}, - {"matrix":[1,17], "x":17.5, "y":1.25}, - {"matrix":[3,14], "x":18.5, "y":1.25}, + {"matrix":[1, 10], "x":10, "y":1.25}, + {"matrix":[1, 11], "x":11, "y":1.25}, + {"matrix":[1, 12], "x":12, "y":1.25}, + {"matrix":[1, 13], "x":13, "y":1.25, "w":2}, + {"matrix":[1, 15], "x":15.5, "y":1.25}, + {"matrix":[1, 16], "x":16.5, "y":1.25}, + {"matrix":[1, 17], "x":17.5, "y":1.25}, + {"matrix":[3, 14], "x":18.5, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -62,12 +65,12 @@ {"matrix":[2, 7], "x":7.5, "y":2.25}, {"matrix":[2, 8], "x":8.5, "y":2.25}, {"matrix":[2, 9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,15], "x":15.5, "y":2.25}, - {"matrix":[2,16], "x":16.5, "y":2.25}, - {"matrix":[2,17], "x":17.5, "y":2.25}, + {"matrix":[2, 10], "x":10.5, "y":2.25}, + {"matrix":[2, 11], "x":11.5, "y":2.25}, + {"matrix":[2, 12], "x":12.5, "y":2.25}, + {"matrix":[2, 15], "x":15.5, "y":2.25}, + {"matrix":[2, 16], "x":16.5, "y":2.25}, + {"matrix":[2, 17], "x":17.5, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -79,14 +82,14 @@ {"matrix":[3, 7], "x":7.75, "y":3.25}, {"matrix":[3, 8], "x":8.75, "y":3.25}, {"matrix":[3, 9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, - {"matrix":[3,15], "x":15.5, "y":3.25}, - {"matrix":[3,16], "x":16.5, "y":3.25}, - {"matrix":[3,17], "x":17.5, "y":3.25}, - {"matrix":[2,14], "x":18.5, "y":2.25, "h":2}, + {"matrix":[3, 10], "x":10.75, "y":3.25}, + {"matrix":[3, 11], "x":11.75, "y":3.25}, + {"matrix":[3, 13], "x":12.75, "y":3.25}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3, 15], "x":15.5, "y":3.25}, + {"matrix":[3, 16], "x":16.5, "y":3.25}, + {"matrix":[3, 17], "x":17.5, "y":3.25}, + {"matrix":[2, 14], "x":18.5, "y":2.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25}, @@ -98,26 +101,26 @@ {"matrix":[4, 7], "x":7.25, "y":4.25}, {"matrix":[4, 8], "x":8.25, "y":4.25}, {"matrix":[4, 9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,13], "x":12.25, "y":4.25, "w":1.75}, - {"matrix":[4,14], "x":14.25, "y":4.5}, - {"matrix":[4,15], "x":15.5, "y":4.25}, - {"matrix":[4,16], "x":16.5, "y":4.25}, - {"matrix":[4,17], "x":17.5, "y":4.25}, + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 13], "x":12.25, "y":4.25, "w":1.75}, + {"matrix":[4, 14], "x":14.25, "y":4.5}, + {"matrix":[4, 15], "x":15.5, "y":4.25}, + {"matrix":[4, 16], "x":16.5, "y":4.25}, + {"matrix":[4, 17], "x":17.5, "y":4.25}, {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25}, {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25}, - {"matrix":[5,10], "x":10, "y":5.25}, - {"matrix":[5,11], "x":11, "y":5.25}, - {"matrix":[5,12], "x":12, "y":5.25}, - {"matrix":[5,13], "x":13.25, "y":5.5}, - {"matrix":[5,14], "x":14.25, "y":5.5}, - {"matrix":[5,15], "x":15.25, "y":5.5}, - {"matrix":[5,16], "x":16.5, "y":5.25}, - {"matrix":[5,17], "x":17.5, "y":5.25}, + {"matrix":[5, 10], "x":10, "y":5.25}, + {"matrix":[5, 11], "x":11, "y":5.25}, + {"matrix":[5, 12], "x":12, "y":5.25}, + {"matrix":[5, 13], "x":13.25, "y":5.5}, + {"matrix":[5, 14], "x":14.25, "y":5.5}, + {"matrix":[5, 15], "x":15.25, "y":5.5}, + {"matrix":[5, 16], "x":16.5, "y":5.25}, + {"matrix":[5, 17], "x":17.5, "y":5.25}, {"matrix":[5, 5], "x":18.5, "y":4.25, "h":2} ] } diff --git a/keyboards/keychron/q5/iso/iso.c b/keyboards/keychron/q5/iso/iso.c index b57474f535..65924abd76 100644 --- a/keyboards/keychron/q5/iso/iso.c +++ b/keyboards/keychron/q5/iso/iso.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "iso.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q5/iso/iso.h b/keyboards/keychron/q5/iso/iso.h deleted file mode 100644 index de5b0aedb1..0000000000 --- a/keyboards/keychron/q5/iso/iso.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.com) - * - * 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" diff --git a/keyboards/keychron/q5/iso/rules.mk b/keyboards/keychron/q5/iso/rules.mk index 311ca648e1..f2dba218bf 100644 --- a/keyboards/keychron/q5/iso/rules.mk +++ b/keyboards/keychron/q5/iso/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/q5/iso_encoder/info.json b/keyboards/keychron/q5/iso_encoder/info.json index 81cd72036f..4a5e1521cf 100644 --- a/keyboards/keychron/q5/iso_encoder/info.json +++ b/keyboards/keychron/q5/iso_encoder/info.json @@ -8,6 +8,9 @@ "pid": "0x0153", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "encoder": { "rotary": [ {"pin_a": "C14", "pin_b": "A2"} @@ -18,14 +21,14 @@ "layouts": { "LAYOUT_iso_99": { "layout": [ - {"matrix":[0, 0], "x":0, "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":[0, 7], "x":6.5, "y":0}, - {"matrix":[0, 8], "x":7.5, "y":0}, - {"matrix":[0, 9], "x":8.5, "y":0}, + {"matrix":[0, 0], "x":0, "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":[0, 7], "x":6.5, "y":0}, + {"matrix":[0, 8], "x":7.5, "y":0}, + {"matrix":[0, 9], "x":8.5, "y":0}, {"matrix":[0, 10], "x":9.5, "y":0}, {"matrix":[0, 11], "x":11, "y":0}, {"matrix":[0, 12], "x":12, "y":0}, @@ -46,14 +49,14 @@ {"matrix":[1, 7], "x":7, "y":1.25}, {"matrix":[1, 8], "x":8, "y":1.25}, {"matrix":[1, 9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25, "w":2}, - {"matrix":[1,15], "x":15.5, "y":1.25}, - {"matrix":[1,16], "x":16.5, "y":1.25}, - {"matrix":[1,17], "x":17.5, "y":1.25}, - {"matrix":[3,14], "x":18.5, "y":1.25}, + {"matrix":[1, 10], "x":10, "y":1.25}, + {"matrix":[1, 11], "x":11, "y":1.25}, + {"matrix":[1, 12], "x":12, "y":1.25}, + {"matrix":[1, 13], "x":13, "y":1.25, "w":2}, + {"matrix":[1, 15], "x":15.5, "y":1.25}, + {"matrix":[1, 16], "x":16.5, "y":1.25}, + {"matrix":[1, 17], "x":17.5, "y":1.25}, + {"matrix":[3, 14], "x":18.5, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -65,12 +68,12 @@ {"matrix":[2, 7], "x":7.5, "y":2.25}, {"matrix":[2, 8], "x":8.5, "y":2.25}, {"matrix":[2, 9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,15], "x":15.5, "y":2.25}, - {"matrix":[2,16], "x":16.5, "y":2.25}, - {"matrix":[2,17], "x":17.5, "y":2.25}, + {"matrix":[2, 10], "x":10.5, "y":2.25}, + {"matrix":[2, 11], "x":11.5, "y":2.25}, + {"matrix":[2, 12], "x":12.5, "y":2.25}, + {"matrix":[2, 15], "x":15.5, "y":2.25}, + {"matrix":[2, 16], "x":16.5, "y":2.25}, + {"matrix":[2, 17], "x":17.5, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -82,14 +85,14 @@ {"matrix":[3, 7], "x":7.75, "y":3.25}, {"matrix":[3, 8], "x":8.75, "y":3.25}, {"matrix":[3, 9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, - {"matrix":[3,15], "x":15.5, "y":3.25}, - {"matrix":[3,16], "x":16.5, "y":3.25}, - {"matrix":[3,17], "x":17.5, "y":3.25}, - {"matrix":[2,14], "x":18.5, "y":2.25, "h":2}, + {"matrix":[3, 10], "x":10.75, "y":3.25}, + {"matrix":[3, 11], "x":11.75, "y":3.25}, + {"matrix":[3, 13], "x":12.75, "y":3.25}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3, 15], "x":15.5, "y":3.25}, + {"matrix":[3, 16], "x":16.5, "y":3.25}, + {"matrix":[3, 17], "x":17.5, "y":3.25}, + {"matrix":[2, 14], "x":18.5, "y":2.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25}, @@ -101,26 +104,26 @@ {"matrix":[4, 7], "x":7.25, "y":4.25}, {"matrix":[4, 8], "x":8.25, "y":4.25}, {"matrix":[4, 9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,13], "x":12.25, "y":4.25, "w":1.75}, - {"matrix":[4,14], "x":14.25, "y":4.5}, - {"matrix":[4,15], "x":15.5, "y":4.25}, - {"matrix":[4,16], "x":16.5, "y":4.25}, - {"matrix":[4,17], "x":17.5, "y":4.25}, + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 13], "x":12.25, "y":4.25, "w":1.75}, + {"matrix":[4, 14], "x":14.25, "y":4.5}, + {"matrix":[4, 15], "x":15.5, "y":4.25}, + {"matrix":[4, 16], "x":16.5, "y":4.25}, + {"matrix":[4, 17], "x":17.5, "y":4.25}, {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25}, {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25}, - {"matrix":[5,10], "x":10, "y":5.25}, - {"matrix":[5,11], "x":11, "y":5.25}, - {"matrix":[5,12], "x":12, "y":5.25}, - {"matrix":[5,13], "x":13.25, "y":5.5}, - {"matrix":[5,14], "x":14.25, "y":5.5}, - {"matrix":[5,15], "x":15.25, "y":5.5}, - {"matrix":[5,16], "x":16.5, "y":5.25}, - {"matrix":[5,17], "x":17.5, "y":5.25}, + {"matrix":[5, 10], "x":10, "y":5.25}, + {"matrix":[5, 11], "x":11, "y":5.25}, + {"matrix":[5, 12], "x":12, "y":5.25}, + {"matrix":[5, 13], "x":13.25, "y":5.5}, + {"matrix":[5, 14], "x":14.25, "y":5.5}, + {"matrix":[5, 15], "x":15.25, "y":5.5}, + {"matrix":[5, 16], "x":16.5, "y":5.25}, + {"matrix":[5, 17], "x":17.5, "y":5.25}, {"matrix":[5, 5], "x":18.5, "y":4.25, "h":2} ] } diff --git a/keyboards/keychron/q5/iso_encoder/iso_encoder.c b/keyboards/keychron/q5/iso_encoder/iso_encoder.c index 8ae11bc36b..22ba9e2d4e 100644 --- a/keyboards/keychron/q5/iso_encoder/iso_encoder.c +++ b/keyboards/keychron/q5/iso_encoder/iso_encoder.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "iso_encoder.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q5/iso_encoder/iso_encoder.h b/keyboards/keychron/q5/iso_encoder/iso_encoder.h deleted file mode 100644 index de5b0aedb1..0000000000 --- a/keyboards/keychron/q5/iso_encoder/iso_encoder.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.com) - * - * 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" diff --git a/keyboards/keychron/q5/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/q5/iso_encoder/keymaps/default/keymap.c index a570031a0b..e1f3d93212 100644 --- a/keyboards/keychron/q5/iso_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/q5/iso_encoder/keymaps/default/keymap.c @@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][1][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q5/iso_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q5/iso_encoder/keymaps/keychron/keymap.c index 85efa63759..95dbb282c2 100644 --- a/keyboards/keychron/q5/iso_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/q5/iso_encoder/keymaps/keychron/keymap.c @@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][1][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q5/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/q5/iso_encoder/keymaps/via/keymap.c index 324f24e90e..9446d04839 100644 --- a/keyboards/keychron/q5/iso_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/q5/iso_encoder/keymaps/via/keymap.c @@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][1][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q5/iso_encoder/rules.mk b/keyboards/keychron/q5/iso_encoder/rules.mk index ef55047753..5df3cbccaf 100644 --- a/keyboards/keychron/q5/iso_encoder/rules.mk +++ b/keyboards/keychron/q5/iso_encoder/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/q5/q5.c b/keyboards/keychron/q5/q5.c index 4130dcebe3..7a1cabcd1a 100644 --- a/keyboards/keychron/q5/q5.c +++ b/keyboards/keychron/q5/q5.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "q5.h" +#include "quantum.h" const matrix_row_t matrix_mask[] = { 0b111111111111111111, diff --git a/keyboards/keychron/q5/q5.h b/keyboards/keychron/q5/q5.h deleted file mode 100644 index 70ccc8dcfa..0000000000 --- a/keyboards/keychron/q5/q5.h +++ /dev/null @@ -1,29 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.com) - * - * 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" - -#if defined(KEYBOARD_keychron_q5_ansi) -# include "ansi.h" -#elif defined(KEYBOARD_keychron_q5_ansi_encoder) -# include "ansi_encoder.h" -#elif defined(KEYBOARD_keychron_q5_iso) -# include "iso.h" -#elif defined(KEYBOARD_keychron_q5_iso_encoder) -# include "iso_encoder.h" -#endif diff --git a/keyboards/keychron/q6/ansi/ansi.c b/keyboards/keychron/q6/ansi/ansi.c index 982996d347..a81d5f9e9f 100644 --- a/keyboards/keychron/q6/ansi/ansi.c +++ b/keyboards/keychron/q6/ansi/ansi.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "ansi.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q6/ansi/ansi.h b/keyboards/keychron/q6/ansi/ansi.h deleted file mode 100644 index de5b0aedb1..0000000000 --- a/keyboards/keychron/q6/ansi/ansi.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.com) - * - * 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" diff --git a/keyboards/keychron/q6/ansi/info.json b/keyboards/keychron/q6/ansi/info.json index ed1732655f..6c343b03f1 100644 --- a/keyboards/keychron/q6/ansi/info.json +++ b/keyboards/keychron/q6/ansi/info.json @@ -8,6 +8,9 @@ "pid": "0x0160", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { @@ -23,16 +26,16 @@ {"matrix":[0, 7], "x":8.5, "y":0}, {"matrix":[0, 8], "x":9.5, "y":0}, {"matrix":[0, 9], "x":11, "y":0}, - {"matrix":[0,10], "x":12, "y":0}, - {"matrix":[0,11], "x":13, "y":0}, - {"matrix":[0,12], "x":14, "y":0}, - {"matrix":[0,14], "x":15.25, "y":0}, - {"matrix":[0,15], "x":16.25, "y":0}, - {"matrix":[0,16], "x":17.25, "y":0}, - {"matrix":[0,19], "x":18.5, "y":0}, - {"matrix":[1,19], "x":19.5, "y":0}, - {"matrix":[2,19], "x":20.5, "y":0}, - {"matrix":[3,19], "x":21.5, "y":0}, + {"matrix":[0, 10], "x":12, "y":0}, + {"matrix":[0, 11], "x":13, "y":0}, + {"matrix":[0, 12], "x":14, "y":0}, + {"matrix":[0, 14], "x":15.25, "y":0}, + {"matrix":[0, 15], "x":16.25, "y":0}, + {"matrix":[0, 16], "x":17.25, "y":0}, + {"matrix":[0, 19], "x":18.5, "y":0}, + {"matrix":[1, 19], "x":19.5, "y":0}, + {"matrix":[2, 19], "x":20.5, "y":0}, + {"matrix":[3, 19], "x":21.5, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -44,17 +47,17 @@ {"matrix":[1, 7], "x":7, "y":1.25}, {"matrix":[1, 8], "x":8, "y":1.25}, {"matrix":[1, 9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25, "w":2}, - {"matrix":[1,14], "x":15.25, "y":1.25}, - {"matrix":[1,15], "x":16.25, "y":1.25}, - {"matrix":[1,16], "x":17.25, "y":1.25}, - {"matrix":[1,17], "x":18.5, "y":1.25}, - {"matrix":[1,18], "x":19.5, "y":1.25}, - {"matrix":[0,17], "x":20.5, "y":1.25}, - {"matrix":[0,18], "x":21.5, "y":1.25}, + {"matrix":[1, 10], "x":10, "y":1.25}, + {"matrix":[1, 11], "x":11, "y":1.25}, + {"matrix":[1, 12], "x":12, "y":1.25}, + {"matrix":[1, 13], "x":13, "y":1.25, "w":2}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, + {"matrix":[1, 15], "x":16.25, "y":1.25}, + {"matrix":[1, 16], "x":17.25, "y":1.25}, + {"matrix":[1, 17], "x":18.5, "y":1.25}, + {"matrix":[1, 18], "x":19.5, "y":1.25}, + {"matrix":[0, 17], "x":20.5, "y":1.25}, + {"matrix":[0, 18], "x":21.5, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -66,16 +69,16 @@ {"matrix":[2, 7], "x":7.5, "y":2.25}, {"matrix":[2, 8], "x":8.5, "y":2.25}, {"matrix":[2, 9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5}, - {"matrix":[2,14], "x":15.25, "y":2.25}, - {"matrix":[2,15], "x":16.25, "y":2.25}, - {"matrix":[2,16], "x":17.25, "y":2.25}, - {"matrix":[2,17], "x":18.5, "y":2.25}, - {"matrix":[2,18], "x":19.5, "y":2.25}, - {"matrix":[3,14], "x":20.5, "y":2.25}, + {"matrix":[2, 10], "x":10.5, "y":2.25}, + {"matrix":[2, 11], "x":11.5, "y":2.25}, + {"matrix":[2, 12], "x":12.5, "y":2.25}, + {"matrix":[2, 13], "x":13.5, "y":2.25, "w":1.5}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, + {"matrix":[2, 15], "x":16.25, "y":2.25}, + {"matrix":[2, 16], "x":17.25, "y":2.25}, + {"matrix":[2, 17], "x":18.5, "y":2.25}, + {"matrix":[2, 18], "x":19.5, "y":2.25}, + {"matrix":[3, 14], "x":20.5, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -87,13 +90,13 @@ {"matrix":[3, 7], "x":7.75, "y":3.25}, {"matrix":[3, 8], "x":8.75, "y":3.25}, {"matrix":[3, 9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25}, - {"matrix":[3,17], "x":18.5, "y":3.25}, - {"matrix":[3,18], "x":19.5, "y":3.25}, - {"matrix":[3,16], "x":20.5, "y":3.25}, - {"matrix":[3,15], "x":21.5, "y":2.25, "h":2}, + {"matrix":[3, 10], "x":10.75, "y":3.25}, + {"matrix":[3, 11], "x":11.75, "y":3.25}, + {"matrix":[3, 13], "x":12.75, "y":3.25, "w":2.25}, + {"matrix":[3, 17], "x":18.5, "y":3.25}, + {"matrix":[3, 18], "x":19.5, "y":3.25}, + {"matrix":[3, 16], "x":20.5, "y":3.25}, + {"matrix":[3, 15], "x":21.5, "y":2.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4.25}, @@ -104,28 +107,28 @@ {"matrix":[4, 7], "x":7.25, "y":4.25}, {"matrix":[4, 8], "x":8.25, "y":4.25}, {"matrix":[4, 9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75}, - {"matrix":[4,15], "x":16.25, "y":4.25}, - {"matrix":[4,17], "x":18.5, "y":4.25}, - {"matrix":[4,18], "x":19.5, "y":4.25}, - {"matrix":[4,14], "x":20.5, "y":4.25}, + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 13], "x":12.25, "y":4.25, "w":2.75}, + {"matrix":[4, 15], "x":16.25, "y":4.25}, + {"matrix":[4, 17], "x":18.5, "y":4.25}, + {"matrix":[4, 18], "x":19.5, "y":4.25}, + {"matrix":[4, 14], "x":20.5, "y":4.25}, {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25}, {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25}, - {"matrix":[5,10], "x":10, "y":5.25, "w":1.25}, - {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25}, - {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25}, - {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25}, - {"matrix":[5,14], "x":15.25, "y":5.25}, - {"matrix":[5,15], "x":16.25, "y":5.25}, - {"matrix":[5,16], "x":17.25, "y":5.25}, - {"matrix":[5,17], "x":18.5, "y":5.25, "w":2}, - {"matrix":[5,18], "x":20.5, "y":5.25}, - {"matrix":[4,16], "x":21.5, "y":4.25, "h":2} + {"matrix":[5, 10], "x":10, "y":5.25, "w":1.25}, + {"matrix":[5, 11], "x":11.25, "y":5.25, "w":1.25}, + {"matrix":[5, 12], "x":12.5, "y":5.25, "w":1.25}, + {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25}, + {"matrix":[5, 14], "x":15.25, "y":5.25}, + {"matrix":[5, 15], "x":16.25, "y":5.25}, + {"matrix":[5, 16], "x":17.25, "y":5.25}, + {"matrix":[5, 17], "x":18.5, "y":5.25, "w":2}, + {"matrix":[5, 18], "x":20.5, "y":5.25}, + {"matrix":[4, 16], "x":21.5, "y":4.25, "h":2} ] } } diff --git a/keyboards/keychron/q6/ansi/rules.mk b/keyboards/keychron/q6/ansi/rules.mk index e57fa16e32..ce3d41a17d 100644 --- a/keyboards/keychron/q6/ansi/rules.mk +++ b/keyboards/keychron/q6/ansi/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 LTO_ENABLE = yes EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/q6/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q6/ansi_encoder/ansi_encoder.c index 6cf593dd25..6fbece3678 100644 --- a/keyboards/keychron/q6/ansi_encoder/ansi_encoder.c +++ b/keyboards/keychron/q6/ansi_encoder/ansi_encoder.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "ansi_encoder.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q6/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q6/ansi_encoder/ansi_encoder.h deleted file mode 100644 index de5b0aedb1..0000000000 --- a/keyboards/keychron/q6/ansi_encoder/ansi_encoder.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.com) - * - * 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" diff --git a/keyboards/keychron/q6/ansi_encoder/info.json b/keyboards/keychron/q6/ansi_encoder/info.json index 60b983b12e..e0ce1f4713 100644 --- a/keyboards/keychron/q6/ansi_encoder/info.json +++ b/keyboards/keychron/q6/ansi_encoder/info.json @@ -8,6 +8,9 @@ "pid": "0x0161", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "encoder": { "rotary": [ {"pin_a": "C14", "pin_b": "A2"} @@ -28,17 +31,17 @@ {"matrix":[0, 7], "x":7.5, "y":0}, {"matrix":[0, 8], "x":8.5, "y":0}, {"matrix":[0, 9], "x":9.75, "y":0}, - {"matrix":[0,10], "x":10.75, "y":0}, - {"matrix":[0,11], "x":11.75, "y":0}, - {"matrix":[0,12], "x":12.75, "y":0}, - {"matrix":[4,19], "x":14, "y":0}, - {"matrix":[0,14], "x":15.25, "y":0}, - {"matrix":[0,15], "x":16.25, "y":0}, - {"matrix":[0,16], "x":17.25, "y":0}, - {"matrix":[0,19], "x":18.5, "y":0}, - {"matrix":[1,19], "x":19.5, "y":0}, - {"matrix":[2,19], "x":20.5, "y":0}, - {"matrix":[3,19], "x":21.5, "y":0}, + {"matrix":[0, 10], "x":10.75, "y":0}, + {"matrix":[0, 11], "x":11.75, "y":0}, + {"matrix":[0, 12], "x":12.75, "y":0}, + {"matrix":[4, 19], "x":14, "y":0}, + {"matrix":[0, 14], "x":15.25, "y":0}, + {"matrix":[0, 15], "x":16.25, "y":0}, + {"matrix":[0, 16], "x":17.25, "y":0}, + {"matrix":[0, 19], "x":18.5, "y":0}, + {"matrix":[1, 19], "x":19.5, "y":0}, + {"matrix":[2, 19], "x":20.5, "y":0}, + {"matrix":[3, 19], "x":21.5, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -50,17 +53,17 @@ {"matrix":[1, 7], "x":7, "y":1.25}, {"matrix":[1, 8], "x":8, "y":1.25}, {"matrix":[1, 9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25, "w":2}, - {"matrix":[1,14], "x":15.25, "y":1.25}, - {"matrix":[1,15], "x":16.25, "y":1.25}, - {"matrix":[1,16], "x":17.25, "y":1.25}, - {"matrix":[1,17], "x":18.5, "y":1.25}, - {"matrix":[1,18], "x":19.5, "y":1.25}, - {"matrix":[0,17], "x":20.5, "y":1.25}, - {"matrix":[0,18], "x":21.5, "y":1.25}, + {"matrix":[1, 10], "x":10, "y":1.25}, + {"matrix":[1, 11], "x":11, "y":1.25}, + {"matrix":[1, 12], "x":12, "y":1.25}, + {"matrix":[1, 13], "x":13, "y":1.25, "w":2}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, + {"matrix":[1, 15], "x":16.25, "y":1.25}, + {"matrix":[1, 16], "x":17.25, "y":1.25}, + {"matrix":[1, 17], "x":18.5, "y":1.25}, + {"matrix":[1, 18], "x":19.5, "y":1.25}, + {"matrix":[0, 17], "x":20.5, "y":1.25}, + {"matrix":[0, 18], "x":21.5, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -72,16 +75,16 @@ {"matrix":[2, 7], "x":7.5, "y":2.25}, {"matrix":[2, 8], "x":8.5, "y":2.25}, {"matrix":[2, 9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5}, - {"matrix":[2,14], "x":15.25, "y":2.25}, - {"matrix":[2,15], "x":16.25, "y":2.25}, - {"matrix":[2,16], "x":17.25, "y":2.25}, - {"matrix":[2,17], "x":18.5, "y":2.25}, - {"matrix":[2,18], "x":19.5, "y":2.25}, - {"matrix":[3,14], "x":20.5, "y":2.25}, + {"matrix":[2, 10], "x":10.5, "y":2.25}, + {"matrix":[2, 11], "x":11.5, "y":2.25}, + {"matrix":[2, 12], "x":12.5, "y":2.25}, + {"matrix":[2, 13], "x":13.5, "y":2.25, "w":1.5}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, + {"matrix":[2, 15], "x":16.25, "y":2.25}, + {"matrix":[2, 16], "x":17.25, "y":2.25}, + {"matrix":[2, 17], "x":18.5, "y":2.25}, + {"matrix":[2, 18], "x":19.5, "y":2.25}, + {"matrix":[3, 14], "x":20.5, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -93,13 +96,13 @@ {"matrix":[3, 7], "x":7.75, "y":3.25}, {"matrix":[3, 8], "x":8.75, "y":3.25}, {"matrix":[3, 9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25}, - {"matrix":[3,17], "x":18.5, "y":3.25}, - {"matrix":[3,18], "x":19.5, "y":3.25}, - {"matrix":[3,16], "x":20.5, "y":3.25}, - {"matrix":[3,15], "x":21.5, "y":2.25, "h":2}, + {"matrix":[3, 10], "x":10.75, "y":3.25}, + {"matrix":[3, 11], "x":11.75, "y":3.25}, + {"matrix":[3, 13], "x":12.75, "y":3.25, "w":2.25}, + {"matrix":[3, 17], "x":18.5, "y":3.25}, + {"matrix":[3, 18], "x":19.5, "y":3.25}, + {"matrix":[3, 16], "x":20.5, "y":3.25}, + {"matrix":[3, 15], "x":21.5, "y":2.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4.25}, @@ -110,28 +113,28 @@ {"matrix":[4, 7], "x":7.25, "y":4.25}, {"matrix":[4, 8], "x":8.25, "y":4.25}, {"matrix":[4, 9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75}, - {"matrix":[4,15], "x":16.25, "y":4.25}, - {"matrix":[4,17], "x":18.5, "y":4.25}, - {"matrix":[4,18], "x":19.5, "y":4.25}, - {"matrix":[4,14], "x":20.5, "y":4.25}, + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 13], "x":12.25, "y":4.25, "w":2.75}, + {"matrix":[4, 15], "x":16.25, "y":4.25}, + {"matrix":[4, 17], "x":18.5, "y":4.25}, + {"matrix":[4, 18], "x":19.5, "y":4.25}, + {"matrix":[4, 14], "x":20.5, "y":4.25}, {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25}, {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25}, - {"matrix":[5,10], "x":10, "y":5.25, "w":1.25}, - {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25}, - {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25}, - {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25}, - {"matrix":[5,14], "x":15.25, "y":5.25}, - {"matrix":[5,15], "x":16.25, "y":5.25}, - {"matrix":[5,16], "x":17.25, "y":5.25}, - {"matrix":[5,17], "x":18.5, "y":5.25, "w":2}, - {"matrix":[5,18], "x":20.5, "y":5.25}, - {"matrix":[4,16], "x":21.5, "y":4.25, "h":2} + {"matrix":[5, 10], "x":10, "y":5.25, "w":1.25}, + {"matrix":[5, 11], "x":11.25, "y":5.25, "w":1.25}, + {"matrix":[5, 12], "x":12.5, "y":5.25, "w":1.25}, + {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25}, + {"matrix":[5, 14], "x":15.25, "y":5.25}, + {"matrix":[5, 15], "x":16.25, "y":5.25}, + {"matrix":[5, 16], "x":17.25, "y":5.25}, + {"matrix":[5, 17], "x":18.5, "y":5.25, "w":2}, + {"matrix":[5, 18], "x":20.5, "y":5.25}, + {"matrix":[4, 16], "x":21.5, "y":4.25, "h":2} ] } } diff --git a/keyboards/keychron/q6/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q6/ansi_encoder/keymaps/default/keymap.c index 73b2b7984d..25f4852ef7 100644 --- a/keyboards/keychron/q6/ansi_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/q6/ansi_encoder/keymaps/default/keymap.c @@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][1][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q6/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q6/ansi_encoder/keymaps/keychron/keymap.c index 4183212305..2fdbbb7dd1 100644 --- a/keyboards/keychron/q6/ansi_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/q6/ansi_encoder/keymaps/keychron/keymap.c @@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][1][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q6/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q6/ansi_encoder/keymaps/via/keymap.c index dfe2bd5e07..762dfe66da 100644 --- a/keyboards/keychron/q6/ansi_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/q6/ansi_encoder/keymaps/via/keymap.c @@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][1][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q6/ansi_encoder/rules.mk b/keyboards/keychron/q6/ansi_encoder/rules.mk index a8eaf50f9a..95a153f689 100644 --- a/keyboards/keychron/q6/ansi_encoder/rules.mk +++ b/keyboards/keychron/q6/ansi_encoder/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 LTO_ENABLE = yes EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/q6/iso/info.json b/keyboards/keychron/q6/iso/info.json index 0195e4420b..4441a4bf8e 100644 --- a/keyboards/keychron/q6/iso/info.json +++ b/keyboards/keychron/q6/iso/info.json @@ -8,6 +8,9 @@ "pid": "0x0162", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { @@ -23,16 +26,16 @@ {"matrix":[0, 7], "x":8.5, "y":0}, {"matrix":[0, 8], "x":9.5, "y":0}, {"matrix":[0, 9], "x":11, "y":0}, - {"matrix":[0,10], "x":12, "y":0}, - {"matrix":[0,11], "x":13, "y":0}, - {"matrix":[0,12], "x":14, "y":0}, - {"matrix":[0,14], "x":15.25, "y":0}, - {"matrix":[0,15], "x":16.25, "y":0}, - {"matrix":[0,16], "x":17.25, "y":0}, - {"matrix":[0,19], "x":18.5, "y":0}, - {"matrix":[1,19], "x":19.5, "y":0}, - {"matrix":[2,19], "x":20.5, "y":0}, - {"matrix":[3,19], "x":21.5, "y":0}, + {"matrix":[0, 10], "x":12, "y":0}, + {"matrix":[0, 11], "x":13, "y":0}, + {"matrix":[0, 12], "x":14, "y":0}, + {"matrix":[0, 14], "x":15.25, "y":0}, + {"matrix":[0, 15], "x":16.25, "y":0}, + {"matrix":[0, 16], "x":17.25, "y":0}, + {"matrix":[0, 19], "x":18.5, "y":0}, + {"matrix":[1, 19], "x":19.5, "y":0}, + {"matrix":[2, 19], "x":20.5, "y":0}, + {"matrix":[3, 19], "x":21.5, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -44,17 +47,17 @@ {"matrix":[1, 7], "x":7, "y":1.25}, {"matrix":[1, 8], "x":8, "y":1.25}, {"matrix":[1, 9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25, "w":2}, - {"matrix":[1,14], "x":15.25, "y":1.25}, - {"matrix":[1,15], "x":16.25, "y":1.25}, - {"matrix":[1,16], "x":17.25, "y":1.25}, - {"matrix":[1,17], "x":18.5, "y":1.25}, - {"matrix":[1,18], "x":19.5, "y":1.25}, - {"matrix":[0,17], "x":20.5, "y":1.25}, - {"matrix":[0,18], "x":21.5, "y":1.25}, + {"matrix":[1, 10], "x":10, "y":1.25}, + {"matrix":[1, 11], "x":11, "y":1.25}, + {"matrix":[1, 12], "x":12, "y":1.25}, + {"matrix":[1, 13], "x":13, "y":1.25, "w":2}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, + {"matrix":[1, 15], "x":16.25, "y":1.25}, + {"matrix":[1, 16], "x":17.25, "y":1.25}, + {"matrix":[1, 17], "x":18.5, "y":1.25}, + {"matrix":[1, 18], "x":19.5, "y":1.25}, + {"matrix":[0, 17], "x":20.5, "y":1.25}, + {"matrix":[0, 18], "x":21.5, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -66,15 +69,15 @@ {"matrix":[2, 7], "x":7.5, "y":2.25}, {"matrix":[2, 8], "x":8.5, "y":2.25}, {"matrix":[2, 9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,14], "x":15.25, "y":2.25}, - {"matrix":[2,15], "x":16.25, "y":2.25}, - {"matrix":[2,16], "x":17.25, "y":2.25}, - {"matrix":[2,17], "x":18.5, "y":2.25}, - {"matrix":[2,18], "x":19.5, "y":2.25}, - {"matrix":[3,14], "x":20.5, "y":2.25}, + {"matrix":[2, 10], "x":10.5, "y":2.25}, + {"matrix":[2, 11], "x":11.5, "y":2.25}, + {"matrix":[2, 12], "x":12.5, "y":2.25}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, + {"matrix":[2, 15], "x":16.25, "y":2.25}, + {"matrix":[2, 16], "x":17.25, "y":2.25}, + {"matrix":[2, 17], "x":18.5, "y":2.25}, + {"matrix":[2, 18], "x":19.5, "y":2.25}, + {"matrix":[3, 14], "x":20.5, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -86,14 +89,14 @@ {"matrix":[3, 7], "x":7.75, "y":3.25}, {"matrix":[3, 8], "x":8.75, "y":3.25}, {"matrix":[3, 9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, - {"matrix":[3,17], "x":18.5, "y":3.25}, - {"matrix":[3,18], "x":19.5, "y":3.25}, - {"matrix":[3,16], "x":20.5, "y":3.25}, - {"matrix":[3,15], "x":21.5, "y":2.25, "h":2}, + {"matrix":[3, 10], "x":10.75, "y":3.25}, + {"matrix":[3, 11], "x":11.75, "y":3.25}, + {"matrix":[3, 13], "x":12.75, "y":3.25}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3, 17], "x":18.5, "y":3.25}, + {"matrix":[3, 18], "x":19.5, "y":3.25}, + {"matrix":[3, 16], "x":20.5, "y":3.25}, + {"matrix":[3, 15], "x":21.5, "y":2.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25}, @@ -105,28 +108,28 @@ {"matrix":[4, 7], "x":7.25, "y":4.25}, {"matrix":[4, 8], "x":8.25, "y":4.25}, {"matrix":[4, 9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75}, - {"matrix":[4,15], "x":16.25, "y":4.25}, - {"matrix":[4,17], "x":18.5, "y":4.25}, - {"matrix":[4,18], "x":19.5, "y":4.25}, - {"matrix":[4,14], "x":20.5, "y":4.25}, + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 13], "x":12.25, "y":4.25, "w":2.75}, + {"matrix":[4, 15], "x":16.25, "y":4.25}, + {"matrix":[4, 17], "x":18.5, "y":4.25}, + {"matrix":[4, 18], "x":19.5, "y":4.25}, + {"matrix":[4, 14], "x":20.5, "y":4.25}, {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25}, {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25}, - {"matrix":[5,10], "x":10, "y":5.25, "w":1.25}, - {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25}, - {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25}, - {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25}, - {"matrix":[5,14], "x":15.25, "y":5.25}, - {"matrix":[5,15], "x":16.25, "y":5.25}, - {"matrix":[5,16], "x":17.25, "y":5.25}, - {"matrix":[5,17], "x":18.5, "y":5.25, "w":2}, - {"matrix":[5,18], "x":20.5, "y":5.25}, - {"matrix":[4,16], "x":21.5, "y":4.25, "h":2} + {"matrix":[5, 10], "x":10, "y":5.25, "w":1.25}, + {"matrix":[5, 11], "x":11.25, "y":5.25, "w":1.25}, + {"matrix":[5, 12], "x":12.5, "y":5.25, "w":1.25}, + {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25}, + {"matrix":[5, 14], "x":15.25, "y":5.25}, + {"matrix":[5, 15], "x":16.25, "y":5.25}, + {"matrix":[5, 16], "x":17.25, "y":5.25}, + {"matrix":[5, 17], "x":18.5, "y":5.25, "w":2}, + {"matrix":[5, 18], "x":20.5, "y":5.25}, + {"matrix":[4, 16], "x":21.5, "y":4.25, "h":2} ] } } diff --git a/keyboards/keychron/q6/iso/iso.c b/keyboards/keychron/q6/iso/iso.c index d8c4add867..f2081177e9 100644 --- a/keyboards/keychron/q6/iso/iso.c +++ b/keyboards/keychron/q6/iso/iso.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "iso.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q6/iso/iso.h b/keyboards/keychron/q6/iso/iso.h deleted file mode 100644 index de5b0aedb1..0000000000 --- a/keyboards/keychron/q6/iso/iso.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.com) - * - * 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" diff --git a/keyboards/keychron/q6/iso/rules.mk b/keyboards/keychron/q6/iso/rules.mk index 638f1eaeb0..3388811add 100644 --- a/keyboards/keychron/q6/iso/rules.mk +++ b/keyboards/keychron/q6/iso/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 RAW_ENABLE = yes LTO_ENABLE = yes EEPROM_DRIVER = wear_leveling diff --git a/keyboards/keychron/q6/iso_encoder/info.json b/keyboards/keychron/q6/iso_encoder/info.json index 783945efb4..0adcec7892 100644 --- a/keyboards/keychron/q6/iso_encoder/info.json +++ b/keyboards/keychron/q6/iso_encoder/info.json @@ -8,6 +8,9 @@ "pid": "0x0163", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "encoder": { "rotary": [ {"pin_a": "C14", "pin_b": "A2"} @@ -28,17 +31,17 @@ {"matrix":[0, 7], "x":7.5, "y":0}, {"matrix":[0, 8], "x":8.5, "y":0}, {"matrix":[0, 9], "x":9.75, "y":0}, - {"matrix":[0,10], "x":10.75, "y":0}, - {"matrix":[0,11], "x":11.75, "y":0}, - {"matrix":[0,12], "x":12.75, "y":0}, - {"matrix":[4,19], "x":14, "y":0}, - {"matrix":[0,14], "x":15.25, "y":0}, - {"matrix":[0,15], "x":16.25, "y":0}, - {"matrix":[0,16], "x":17.25, "y":0}, - {"matrix":[0,19], "x":18.5, "y":0}, - {"matrix":[1,19], "x":19.5, "y":0}, - {"matrix":[2,19], "x":20.5, "y":0}, - {"matrix":[3,19], "x":21.5, "y":0}, + {"matrix":[0, 10], "x":10.75, "y":0}, + {"matrix":[0, 11], "x":11.75, "y":0}, + {"matrix":[0, 12], "x":12.75, "y":0}, + {"matrix":[4, 19], "x":14, "y":0}, + {"matrix":[0, 14], "x":15.25, "y":0}, + {"matrix":[0, 15], "x":16.25, "y":0}, + {"matrix":[0, 16], "x":17.25, "y":0}, + {"matrix":[0, 19], "x":18.5, "y":0}, + {"matrix":[1, 19], "x":19.5, "y":0}, + {"matrix":[2, 19], "x":20.5, "y":0}, + {"matrix":[3, 19], "x":21.5, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -50,17 +53,17 @@ {"matrix":[1, 7], "x":7, "y":1.25}, {"matrix":[1, 8], "x":8, "y":1.25}, {"matrix":[1, 9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25, "w":2}, - {"matrix":[1,14], "x":15.25, "y":1.25}, - {"matrix":[1,15], "x":16.25, "y":1.25}, - {"matrix":[1,16], "x":17.25, "y":1.25}, - {"matrix":[1,17], "x":18.5, "y":1.25}, - {"matrix":[1,18], "x":19.5, "y":1.25}, - {"matrix":[0,17], "x":20.5, "y":1.25}, - {"matrix":[0,18], "x":21.5, "y":1.25}, + {"matrix":[1, 10], "x":10, "y":1.25}, + {"matrix":[1, 11], "x":11, "y":1.25}, + {"matrix":[1, 12], "x":12, "y":1.25}, + {"matrix":[1, 13], "x":13, "y":1.25, "w":2}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, + {"matrix":[1, 15], "x":16.25, "y":1.25}, + {"matrix":[1, 16], "x":17.25, "y":1.25}, + {"matrix":[1, 17], "x":18.5, "y":1.25}, + {"matrix":[1, 18], "x":19.5, "y":1.25}, + {"matrix":[0, 17], "x":20.5, "y":1.25}, + {"matrix":[0, 18], "x":21.5, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -72,15 +75,15 @@ {"matrix":[2, 7], "x":7.5, "y":2.25}, {"matrix":[2, 8], "x":8.5, "y":2.25}, {"matrix":[2, 9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,14], "x":15.25, "y":2.25}, - {"matrix":[2,15], "x":16.25, "y":2.25}, - {"matrix":[2,16], "x":17.25, "y":2.25}, - {"matrix":[2,17], "x":18.5, "y":2.25}, - {"matrix":[2,18], "x":19.5, "y":2.25}, - {"matrix":[3,14], "x":20.5, "y":2.25}, + {"matrix":[2, 10], "x":10.5, "y":2.25}, + {"matrix":[2, 11], "x":11.5, "y":2.25}, + {"matrix":[2, 12], "x":12.5, "y":2.25}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, + {"matrix":[2, 15], "x":16.25, "y":2.25}, + {"matrix":[2, 16], "x":17.25, "y":2.25}, + {"matrix":[2, 17], "x":18.5, "y":2.25}, + {"matrix":[2, 18], "x":19.5, "y":2.25}, + {"matrix":[3, 14], "x":20.5, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -92,14 +95,14 @@ {"matrix":[3, 7], "x":7.75, "y":3.25}, {"matrix":[3, 8], "x":8.75, "y":3.25}, {"matrix":[3, 9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, - {"matrix":[3,17], "x":18.5, "y":3.25}, - {"matrix":[3,18], "x":19.5, "y":3.25}, - {"matrix":[3,16], "x":20.5, "y":3.25}, - {"matrix":[3,15], "x":21.5, "y":2.25, "h":2}, + {"matrix":[3, 10], "x":10.75, "y":3.25}, + {"matrix":[3, 11], "x":11.75, "y":3.25}, + {"matrix":[3, 13], "x":12.75, "y":3.25}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3, 17], "x":18.5, "y":3.25}, + {"matrix":[3, 18], "x":19.5, "y":3.25}, + {"matrix":[3, 16], "x":20.5, "y":3.25}, + {"matrix":[3, 15], "x":21.5, "y":2.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25}, @@ -111,28 +114,28 @@ {"matrix":[4, 7], "x":7.25, "y":4.25}, {"matrix":[4, 8], "x":8.25, "y":4.25}, {"matrix":[4, 9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75}, - {"matrix":[4,15], "x":16.25, "y":4.25}, - {"matrix":[4,17], "x":18.5, "y":4.25}, - {"matrix":[4,18], "x":19.5, "y":4.25}, - {"matrix":[4,14], "x":20.5, "y":4.25}, + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 13], "x":12.25, "y":4.25, "w":2.75}, + {"matrix":[4, 15], "x":16.25, "y":4.25}, + {"matrix":[4, 17], "x":18.5, "y":4.25}, + {"matrix":[4, 18], "x":19.5, "y":4.25}, + {"matrix":[4, 14], "x":20.5, "y":4.25}, {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25}, {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25}, - {"matrix":[5,10], "x":10, "y":5.25, "w":1.25}, - {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25}, - {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25}, - {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25}, - {"matrix":[5,14], "x":15.25, "y":5.25}, - {"matrix":[5,15], "x":16.25, "y":5.25}, - {"matrix":[5,16], "x":17.25, "y":5.25}, - {"matrix":[5,17], "x":18.5, "y":5.25, "w":2}, - {"matrix":[5,18], "x":20.5, "y":5.25}, - {"matrix":[4,16], "x":21.5, "y":4.25, "h":2} + {"matrix":[5, 10], "x":10, "y":5.25, "w":1.25}, + {"matrix":[5, 11], "x":11.25, "y":5.25, "w":1.25}, + {"matrix":[5, 12], "x":12.5, "y":5.25, "w":1.25}, + {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25}, + {"matrix":[5, 14], "x":15.25, "y":5.25}, + {"matrix":[5, 15], "x":16.25, "y":5.25}, + {"matrix":[5, 16], "x":17.25, "y":5.25}, + {"matrix":[5, 17], "x":18.5, "y":5.25, "w":2}, + {"matrix":[5, 18], "x":20.5, "y":5.25}, + {"matrix":[4, 16], "x":21.5, "y":4.25, "h":2} ] } } diff --git a/keyboards/keychron/q6/iso_encoder/iso_encoder.c b/keyboards/keychron/q6/iso_encoder/iso_encoder.c index c6a21a6223..e9a6f6edfc 100644 --- a/keyboards/keychron/q6/iso_encoder/iso_encoder.c +++ b/keyboards/keychron/q6/iso_encoder/iso_encoder.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "iso_encoder.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q6/iso_encoder/iso_encoder.h b/keyboards/keychron/q6/iso_encoder/iso_encoder.h deleted file mode 100644 index de5b0aedb1..0000000000 --- a/keyboards/keychron/q6/iso_encoder/iso_encoder.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.com) - * - * 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" diff --git a/keyboards/keychron/q6/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/q6/iso_encoder/keymaps/default/keymap.c index 69f8c96a0d..8eed8a5b76 100644 --- a/keyboards/keychron/q6/iso_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/q6/iso_encoder/keymaps/default/keymap.c @@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][1][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q6/iso_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q6/iso_encoder/keymaps/keychron/keymap.c index fbe314a2c3..564d070f93 100644 --- a/keyboards/keychron/q6/iso_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/q6/iso_encoder/keymaps/keychron/keymap.c @@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][1][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q6/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/q6/iso_encoder/keymaps/via/keymap.c index dfb6751854..bfd60011de 100644 --- a/keyboards/keychron/q6/iso_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/q6/iso_encoder/keymaps/via/keymap.c @@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][1][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q6/iso_encoder/rules.mk b/keyboards/keychron/q6/iso_encoder/rules.mk index 757e051f46..d7fe88d9ca 100644 --- a/keyboards/keychron/q6/iso_encoder/rules.mk +++ b/keyboards/keychron/q6/iso_encoder/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 RAW_ENABLE = yes LTO_ENABLE = yes EEPROM_DRIVER = wear_leveling diff --git a/keyboards/keychron/q6/q6.c b/keyboards/keychron/q6/q6.c index d2f9d2aa4e..8a9750e9de 100644 --- a/keyboards/keychron/q6/q6.c +++ b/keyboards/keychron/q6/q6.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "q6.h" +#include "quantum.h" const matrix_row_t matrix_mask[] = { 0b11111111111111111111, diff --git a/keyboards/keychron/q6/q6.h b/keyboards/keychron/q6/q6.h deleted file mode 100644 index 9e878e700c..0000000000 --- a/keyboards/keychron/q6/q6.h +++ /dev/null @@ -1,29 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.com) - * - * 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" - -#if defined(KEYBOARD_keychron_q6_ansi) -# include "ansi.h" -#elif defined(KEYBOARD_keychron_q6_ansi_encoder) -# include "ansi_encoder.h" -#elif defined(KEYBOARD_keychron_q6_iso) -# include "iso.h" -#elif defined(KEYBOARD_keychron_q6_iso_encoder) -# include "iso_encoder.h" -#endif diff --git a/keyboards/keychron/q60/ansi/info.json b/keyboards/keychron/q60/ansi/info.json index c64de7b5e2..4756fe0e99 100644 --- a/keyboards/keychron/q60/ansi/info.json +++ b/keyboards/keychron/q60/ansi/info.json @@ -8,6 +8,14 @@ "pid": "0x01C0", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, + "matrix_pins": { + "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"], + "rows": ["B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { @@ -23,11 +31,11 @@ {"matrix":[0, 7], "x":7, "y":0}, {"matrix":[0, 8], "x":8, "y":0}, {"matrix":[0, 9], "x":9, "y":0}, - {"matrix":[0,10], "x":10, "y":0}, - {"matrix":[0,11], "x":11, "y":0}, - {"matrix":[0,12], "x":12, "y":0}, - {"matrix":[0,13], "x":13, "y":0}, - {"matrix":[4,12], "x":14, "y":0}, + {"matrix":[0, 10], "x":10, "y":0}, + {"matrix":[0, 11], "x":11, "y":0}, + {"matrix":[0, 12], "x":12, "y":0}, + {"matrix":[0, 13], "x":13, "y":0}, + {"matrix":[4, 12], "x":14, "y":0}, {"matrix":[1, 0], "x":0, "y":1, "w":1.5}, {"matrix":[1, 1], "x":1.5, "y":1}, @@ -39,10 +47,10 @@ {"matrix":[1, 7], "x":7.5, "y":1}, {"matrix":[1, 8], "x":8.5, "y":1}, {"matrix":[1, 9], "x":9.5, "y":1}, - {"matrix":[1,10], "x":10.5, "y":1}, - {"matrix":[1,11], "x":11.5, "y":1}, - {"matrix":[1,12], "x":12.5, "y":1}, - {"matrix":[1,13], "x":13.5, "y":1, "w":1.5}, + {"matrix":[1, 10], "x":10.5, "y":1}, + {"matrix":[1, 11], "x":11.5, "y":1}, + {"matrix":[1, 12], "x":12.5, "y":1}, + {"matrix":[1, 13], "x":13.5, "y":1, "w":1.5}, {"matrix":[2, 0], "x":0, "y":2, "w":1.75}, {"matrix":[2, 1], "x":1.75, "y":2}, @@ -54,9 +62,9 @@ {"matrix":[2, 7], "x":7.75, "y":2}, {"matrix":[2, 8], "x":8.75, "y":2}, {"matrix":[2, 9], "x":9.75, "y":2}, - {"matrix":[2,10], "x":10.75, "y":2}, - {"matrix":[2,11], "x":11.75, "y":2}, - {"matrix":[2,13], "x":12.75, "y":2, "w":2.25}, + {"matrix":[2, 10], "x":10.75, "y":2}, + {"matrix":[2, 11], "x":11.75, "y":2}, + {"matrix":[2, 13], "x":12.75, "y":2, "w":2.25}, {"matrix":[3, 0], "x":0, "y":3, "w":2.25}, {"matrix":[3, 2], "x":2.25, "y":3}, @@ -67,16 +75,16 @@ {"matrix":[3, 7], "x":7.25, "y":3}, {"matrix":[3, 8], "x":8.25, "y":3}, {"matrix":[3, 9], "x":9.25, "y":3}, - {"matrix":[3,10], "x":10.25, "y":3}, - {"matrix":[3,11], "x":11.25, "y":3}, - {"matrix":[3,12], "x":12.25, "y":3, "w":1.75}, - {"matrix":[3,13], "x":14, "y":3}, + {"matrix":[3, 10], "x":10.25, "y":3}, + {"matrix":[3, 11], "x":11.25, "y":3}, + {"matrix":[3, 12], "x":12.25, "y":3, "w":1.75}, + {"matrix":[3, 13], "x":14, "y":3}, {"matrix":[4, 0], "x":1.5, "y":4}, {"matrix":[4, 1], "x":2.5, "y":4, "w":1.5}, {"matrix":[4, 6], "x":4, "y":4, "w":7}, - {"matrix":[4,10], "x":11, "y":4, "w":1.5}, - {"matrix":[4,11], "x":12.5, "y":4} + {"matrix":[4, 10], "x":11, "y":4, "w":1.5}, + {"matrix":[4, 11], "x":12.5, "y":4} ] } } diff --git a/keyboards/keychron/q60/ansi/rules.mk b/keyboards/keychron/q60/ansi/rules.mk index 70c663e777..6dcd47b1fe 100644 --- a/keyboards/keychron/q60/ansi/rules.mk +++ b/keyboards/keychron/q60/ansi/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/q60/config.h b/keyboards/keychron/q60/config.h index bd192cd8bd..779feea4ce 100644 --- a/keyboards/keychron/q60/config.h +++ b/keyboards/keychron/q60/config.h @@ -16,15 +16,6 @@ #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS \ - { B4, B3, A15, A14, A13 } -#define MATRIX_COL_PINS \ - { C14, C15, A0, A1, A2, A3, A4, A5, A6, A7, B0, B1, A8, A9 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* RGB Matrix Driver Configuration */ #define DRIVER_COUNT 1 #define DRIVER_ADDR_1 0b1110100 diff --git a/keyboards/keychron/q65/ansi_encoder/info.json b/keyboards/keychron/q65/ansi_encoder/info.json index b91892a55b..fec4341d54 100644 --- a/keyboards/keychron/q65/ansi_encoder/info.json +++ b/keyboards/keychron/q65/ansi_encoder/info.json @@ -8,6 +8,9 @@ "pid": "0x01B1", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "encoder": { "rotary": [ {"pin_a": "A10", "pin_b": "A8"} @@ -31,12 +34,12 @@ {"matrix":[0, 7], "x":7.5, "y":0.25}, {"matrix":[0, 8], "x":8.5, "y":0.25}, {"matrix":[0, 9], "x":9.5, "y":0.25}, - {"matrix":[0,10], "x":10.5, "y":0.25}, - {"matrix":[0,11], "x":11.5, "y":0.25}, - {"matrix":[0,12], "x":12.5, "y":0.25}, - {"matrix":[0,13], "x":13.5, "y":0.25}, - {"matrix":[0,14], "x":14.5, "y":0.25, "w":2}, - {"matrix":[0,15], "x":17, "y":0.25}, + {"matrix":[0, 10], "x":10.5, "y":0.25}, + {"matrix":[0, 11], "x":11.5, "y":0.25}, + {"matrix":[0, 12], "x":12.5, "y":0.25}, + {"matrix":[0, 13], "x":13.5, "y":0.25}, + {"matrix":[0, 14], "x":14.5, "y":0.25, "w":2}, + {"matrix":[0, 15], "x":17, "y":0.25}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1.5, "y":1.25, "w":1.5}, @@ -48,12 +51,12 @@ {"matrix":[1, 7], "x":8, "y":1.25}, {"matrix":[1, 8], "x":9, "y":1.25}, {"matrix":[1, 9], "x":10, "y":1.25}, - {"matrix":[1,10], "x":11, "y":1.25}, - {"matrix":[1,11], "x":12, "y":1.25}, - {"matrix":[1,12], "x":13, "y":1.25}, - {"matrix":[1,13], "x":14, "y":1.25}, - {"matrix":[1,14], "x":15, "y":1.25, "w":1.5}, - {"matrix":[1,15], "x":17, "y":1.25}, + {"matrix":[1, 10], "x":11, "y":1.25}, + {"matrix":[1, 11], "x":12, "y":1.25}, + {"matrix":[1, 12], "x":13, "y":1.25}, + {"matrix":[1, 13], "x":14, "y":1.25}, + {"matrix":[1, 14], "x":15, "y":1.25, "w":1.5}, + {"matrix":[1, 15], "x":17, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25}, {"matrix":[2, 1], "x":1.5, "y":2.25, "w":1.75}, @@ -65,11 +68,11 @@ {"matrix":[2, 7], "x":8.25, "y":2.25}, {"matrix":[2, 8], "x":9.25, "y":2.25}, {"matrix":[2, 9], "x":10.25, "y":2.25}, - {"matrix":[2,10], "x":11.25, "y":2.25}, - {"matrix":[2,11], "x":12.25, "y":2.25}, - {"matrix":[2,12], "x":13.25, "y":2.25}, - {"matrix":[2,14], "x":14.25, "y":2.25, "w":2.25}, - {"matrix":[2,15], "x":17, "y":2.25}, + {"matrix":[2, 10], "x":11.25, "y":2.25}, + {"matrix":[2, 11], "x":12.25, "y":2.25}, + {"matrix":[2, 12], "x":13.25, "y":2.25}, + {"matrix":[2, 14], "x":14.25, "y":2.25, "w":2.25}, + {"matrix":[2, 15], "x":17, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25}, {"matrix":[3, 1], "x":1.5, "y":3.25, "w":2.25}, @@ -80,24 +83,24 @@ {"matrix":[3, 7], "x":7.75, "y":3.25}, {"matrix":[3, 8], "x":8.75, "y":3.25}, {"matrix":[3, 9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,12], "x":12.75, "y":3.25}, - {"matrix":[3,13], "x":13.75, "y":3.25, "w":1.75}, - {"matrix":[3,14], "x":17, "y":3.25}, - {"matrix":[3,15], "x":15.75, "y":3.5}, + {"matrix":[3, 10], "x":10.75, "y":3.25}, + {"matrix":[3, 11], "x":11.75, "y":3.25}, + {"matrix":[3, 12], "x":12.75, "y":3.25}, + {"matrix":[3, 13], "x":13.75, "y":3.25, "w":1.75}, + {"matrix":[3, 14], "x":17, "y":3.25}, + {"matrix":[3, 15], "x":15.75, "y":3.5}, {"matrix":[4, 0], "x":0, "y":4.25}, {"matrix":[4, 1], "x":1.5, "y":4.25, "w":1.25}, {"matrix":[4, 2], "x":2.75, "y":4.25, "w":1.25}, {"matrix":[4, 3], "x":4, "y":4.25, "w":1.25}, {"matrix":[4, 7], "x":5.25, "y":4.25, "w":6.25}, - {"matrix":[4,10], "x":11.5, "y":4.25}, - {"matrix":[4,11], "x":12.5, "y":4.25}, - {"matrix":[4,12], "x":13.5, "y":4.25}, - {"matrix":[4,13], "x":14.75, "y":4.5}, - {"matrix":[4,14], "x":15.75, "y":4.5}, - {"matrix":[4,15], "x":16.75, "y":4.5} + {"matrix":[4, 10], "x":11.5, "y":4.25}, + {"matrix":[4, 11], "x":12.5, "y":4.25}, + {"matrix":[4, 12], "x":13.5, "y":4.25}, + {"matrix":[4, 13], "x":14.75, "y":4.5}, + {"matrix":[4, 14], "x":15.75, "y":4.5}, + {"matrix":[4, 15], "x":16.75, "y":4.5} ] } } diff --git a/keyboards/keychron/q65/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q65/ansi_encoder/keymaps/default/keymap.c index 630c1c4261..dbe8c04973 100644 --- a/keyboards/keychron/q65/ansi_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/q65/ansi_encoder/keymaps/default/keymap.c @@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [_FN1] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, diff --git a/keyboards/keychron/q65/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q65/ansi_encoder/keymaps/keychron/keymap.c index 898da7dbac..d543a3bc5c 100644 --- a/keyboards/keychron/q65/ansi_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/q65/ansi_encoder/keymaps/keychron/keymap.c @@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format on #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [_FN1] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, diff --git a/keyboards/keychron/q65/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q65/ansi_encoder/keymaps/via/keymap.c index 630c1c4261..dbe8c04973 100644 --- a/keyboards/keychron/q65/ansi_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/q65/ansi_encoder/keymaps/via/keymap.c @@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [_FN1] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, diff --git a/keyboards/keychron/q65/ansi_encoder/rules.mk b/keyboards/keychron/q65/ansi_encoder/rules.mk index ef55047753..5df3cbccaf 100644 --- a/keyboards/keychron/q65/ansi_encoder/rules.mk +++ b/keyboards/keychron/q65/ansi_encoder/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/q7/ansi/info.json b/keyboards/keychron/q7/ansi/info.json index dbbc462a6d..5d665c2653 100644 --- a/keyboards/keychron/q7/ansi/info.json +++ b/keyboards/keychron/q7/ansi/info.json @@ -8,6 +8,14 @@ "pid": "0x0170", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, + "matrix_pins": { + "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "A10", "B5"], + "rows": ["B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { @@ -23,12 +31,12 @@ {"matrix":[0, 7], "x":7, "y":0}, {"matrix":[0, 8], "x":8, "y":0}, {"matrix":[0, 9], "x":9, "y":0}, - {"matrix":[0,10], "x":10, "y":0}, - {"matrix":[0,11], "x":11, "y":0}, - {"matrix":[0,12], "x":12, "y":0}, - {"matrix":[0,13], "x":13, "y":0, "w":2}, - {"matrix":[0,14], "x":15, "y":0}, - {"matrix":[0,15], "x":16, "y":0}, + {"matrix":[0, 10], "x":10, "y":0}, + {"matrix":[0, 11], "x":11, "y":0}, + {"matrix":[0, 12], "x":12, "y":0}, + {"matrix":[0, 13], "x":13, "y":0, "w":2}, + {"matrix":[0, 14], "x":15, "y":0}, + {"matrix":[0, 15], "x":16, "y":0}, {"matrix":[1, 0], "x":0, "y":1, "w":1.5}, {"matrix":[1, 1], "x":1.5, "y":1}, @@ -40,12 +48,12 @@ {"matrix":[1, 7], "x":7.5, "y":1}, {"matrix":[1, 8], "x":8.5, "y":1}, {"matrix":[1, 9], "x":9.5, "y":1}, - {"matrix":[1,10], "x":10.5, "y":1}, - {"matrix":[1,11], "x":11.5, "y":1}, - {"matrix":[1,12], "x":12.5, "y":1}, - {"matrix":[1,13], "x":13.5, "y":1, "w":1.5}, - {"matrix":[1,14], "x":15, "y":1}, - {"matrix":[1,15], "x":16, "y":1}, + {"matrix":[1, 10], "x":10.5, "y":1}, + {"matrix":[1, 11], "x":11.5, "y":1}, + {"matrix":[1, 12], "x":12.5, "y":1}, + {"matrix":[1, 13], "x":13.5, "y":1, "w":1.5}, + {"matrix":[1, 14], "x":15, "y":1}, + {"matrix":[1, 15], "x":16, "y":1}, {"matrix":[2, 0], "x":0, "y":2, "w":1.75}, {"matrix":[2, 1], "x":1.75, "y":2}, @@ -57,11 +65,11 @@ {"matrix":[2, 7], "x":7.75, "y":2}, {"matrix":[2, 8], "x":8.75, "y":2}, {"matrix":[2, 9], "x":9.75, "y":2}, - {"matrix":[2,10], "x":10.75, "y":2}, - {"matrix":[2,11], "x":11.75, "y":2}, - {"matrix":[2,13], "x":12.75, "y":2, "w":2.25}, - {"matrix":[2,14], "x":15, "y":2}, - {"matrix":[2,15], "x":16, "y":2}, + {"matrix":[2, 10], "x":10.75, "y":2}, + {"matrix":[2, 11], "x":11.75, "y":2}, + {"matrix":[2, 13], "x":12.75, "y":2, "w":2.25}, + {"matrix":[2, 14], "x":15, "y":2}, + {"matrix":[2, 15], "x":16, "y":2}, {"matrix":[3, 0], "x":0, "y":3, "w":2.25}, {"matrix":[3, 2], "x":2.25, "y":3}, @@ -72,23 +80,23 @@ {"matrix":[3, 7], "x":7.25, "y":3}, {"matrix":[3, 8], "x":8.25, "y":3}, {"matrix":[3, 9], "x":9.25, "y":3}, - {"matrix":[3,10], "x":10.25, "y":3}, - {"matrix":[3,11], "x":11.25, "y":3}, - {"matrix":[3,13], "x":12.25, "y":3, "w":2.75}, - {"matrix":[3,14], "x":15, "y":3}, - {"matrix":[3,15], "x":16, "y":3}, + {"matrix":[3, 10], "x":10.25, "y":3}, + {"matrix":[3, 11], "x":11.25, "y":3}, + {"matrix":[3, 13], "x":12.25, "y":3, "w":2.75}, + {"matrix":[3, 14], "x":15, "y":3}, + {"matrix":[3, 15], "x":16, "y":3}, {"matrix":[4, 0], "x":0, "y":4, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4, "w":1.25}, {"matrix":[4, 2], "x":2.5, "y":4, "w":1.25}, {"matrix":[4, 6], "x":3.75, "y":4, "w":6.25}, {"matrix":[4, 9], "x":10, "y":4}, - {"matrix":[4,10], "x":11, "y":4}, - {"matrix":[4,11], "x":12, "y":4}, - {"matrix":[4,12], "x":13, "y":4}, - {"matrix":[4,13], "x":14, "y":4}, - {"matrix":[4,14], "x":15, "y":4}, - {"matrix":[4,15], "x":16, "y":4} + {"matrix":[4, 10], "x":11, "y":4}, + {"matrix":[4, 11], "x":12, "y":4}, + {"matrix":[4, 12], "x":13, "y":4}, + {"matrix":[4, 13], "x":14, "y":4}, + {"matrix":[4, 14], "x":15, "y":4}, + {"matrix":[4, 15], "x":16, "y":4} ] } } diff --git a/keyboards/keychron/q7/ansi/rules.mk b/keyboards/keychron/q7/ansi/rules.mk index 345807d824..2b4a67b1ee 100644 --- a/keyboards/keychron/q7/ansi/rules.mk +++ b/keyboards/keychron/q7/ansi/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/q7/config.h b/keyboards/keychron/q7/config.h index f0a545bd98..0ea9ee5f46 100644 --- a/keyboards/keychron/q7/config.h +++ b/keyboards/keychron/q7/config.h @@ -16,13 +16,6 @@ #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS { B4, B3, A15, A14, A13 } -#define MATRIX_COL_PINS { C14, C15, A0, A1, A2, A3, A4, A5, A6, A7, B0, B1, A8, A9, A10, B5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* RGB Matrix Driver Configuration */ #define DRIVER_COUNT 2 #define DRIVER_ADDR_1 0b1110111 diff --git a/keyboards/keychron/q7/iso/info.json b/keyboards/keychron/q7/iso/info.json index 876412d7b6..efa3abdbc9 100644 --- a/keyboards/keychron/q7/iso/info.json +++ b/keyboards/keychron/q7/iso/info.json @@ -8,6 +8,14 @@ "pid": "0x0172", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, + "matrix_pins": { + "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "A10", "B5"], + "rows": ["B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { @@ -23,12 +31,12 @@ {"matrix":[0, 7], "x":7, "y":0}, {"matrix":[0, 8], "x":8, "y":0}, {"matrix":[0, 9], "x":9, "y":0}, - {"matrix":[0,10], "x":10, "y":0}, - {"matrix":[0,11], "x":11, "y":0}, - {"matrix":[0,12], "x":12, "y":0}, - {"matrix":[0,13], "x":13, "y":0, "w":2}, - {"matrix":[0,14], "x":15, "y":0}, - {"matrix":[0,15], "x":16, "y":0}, + {"matrix":[0, 10], "x":10, "y":0}, + {"matrix":[0, 11], "x":11, "y":0}, + {"matrix":[0, 12], "x":12, "y":0}, + {"matrix":[0, 13], "x":13, "y":0, "w":2}, + {"matrix":[0, 14], "x":15, "y":0}, + {"matrix":[0, 15], "x":16, "y":0}, {"matrix":[1, 0], "x":0, "y":1, "w":1.5}, {"matrix":[1, 1], "x":1.5, "y":1}, @@ -40,11 +48,11 @@ {"matrix":[1, 7], "x":7.5, "y":1}, {"matrix":[1, 8], "x":8.5, "y":1}, {"matrix":[1, 9], "x":9.5, "y":1}, - {"matrix":[1,10], "x":10.5, "y":1}, - {"matrix":[1,11], "x":11.5, "y":1}, - {"matrix":[1,12], "x":12.5, "y":1}, - {"matrix":[1,14], "x":15, "y":1}, - {"matrix":[1,15], "x":16, "y":1}, + {"matrix":[1, 10], "x":10.5, "y":1}, + {"matrix":[1, 11], "x":11.5, "y":1}, + {"matrix":[1, 12], "x":12.5, "y":1}, + {"matrix":[1, 14], "x":15, "y":1}, + {"matrix":[1, 15], "x":16, "y":1}, {"matrix":[2, 0], "x":0, "y":2, "w":1.75}, {"matrix":[2, 1], "x":1.75, "y":2}, @@ -56,12 +64,12 @@ {"matrix":[2, 7], "x":7.75, "y":2}, {"matrix":[2, 8], "x":8.75, "y":2}, {"matrix":[2, 9], "x":9.75, "y":2}, - {"matrix":[2,10], "x":10.75, "y":2}, - {"matrix":[2,11], "x":11.75, "y":2}, - {"matrix":[2,13], "x":12.75, "y":2}, - {"matrix":[1,13], "x":13.75, "y":1, "w":1.25, "h":2}, - {"matrix":[2,14], "x":15, "y":2}, - {"matrix":[2,15], "x":16, "y":2}, + {"matrix":[2, 10], "x":10.75, "y":2}, + {"matrix":[2, 11], "x":11.75, "y":2}, + {"matrix":[2, 13], "x":12.75, "y":2}, + {"matrix":[1, 13], "x":13.75, "y":1, "w":1.25, "h":2}, + {"matrix":[2, 14], "x":15, "y":2}, + {"matrix":[2, 15], "x":16, "y":2}, {"matrix":[3, 0], "x":0, "y":3, "w":1.25}, {"matrix":[3, 1], "x":1.25, "y":3}, @@ -73,23 +81,23 @@ {"matrix":[3, 7], "x":7.25, "y":3}, {"matrix":[3, 8], "x":8.25, "y":3}, {"matrix":[3, 9], "x":9.25, "y":3}, - {"matrix":[3,10], "x":10.25, "y":3}, - {"matrix":[3,11], "x":11.25, "y":3}, - {"matrix":[3,13], "x":12.25, "y":3, "w":2.75}, - {"matrix":[3,14], "x":15, "y":3}, - {"matrix":[3,15], "x":16, "y":3}, + {"matrix":[3, 10], "x":10.25, "y":3}, + {"matrix":[3, 11], "x":11.25, "y":3}, + {"matrix":[3, 13], "x":12.25, "y":3, "w":2.75}, + {"matrix":[3, 14], "x":15, "y":3}, + {"matrix":[3, 15], "x":16, "y":3}, {"matrix":[4, 0], "x":0, "y":4, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4, "w":1.25}, {"matrix":[4, 2], "x":2.5, "y":4, "w":1.25}, {"matrix":[4, 6], "x":3.75, "y":4, "w":6.25}, {"matrix":[4, 9], "x":10, "y":4}, - {"matrix":[4,10], "x":11, "y":4}, - {"matrix":[4,11], "x":12, "y":4}, - {"matrix":[4,12], "x":13, "y":4}, - {"matrix":[4,13], "x":14, "y":4}, - {"matrix":[4,14], "x":15, "y":4}, - {"matrix":[4,15], "x":16, "y":4} + {"matrix":[4, 10], "x":11, "y":4}, + {"matrix":[4, 11], "x":12, "y":4}, + {"matrix":[4, 12], "x":13, "y":4}, + {"matrix":[4, 13], "x":14, "y":4}, + {"matrix":[4, 14], "x":15, "y":4}, + {"matrix":[4, 15], "x":16, "y":4} ] } } diff --git a/keyboards/keychron/q7/iso/rules.mk b/keyboards/keychron/q7/iso/rules.mk index deac2e12e6..7f91e808b1 100644 --- a/keyboards/keychron/q7/iso/rules.mk +++ b/keyboards/keychron/q7/iso/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/q8/ansi/ansi.h b/keyboards/keychron/q8/ansi/ansi.h deleted file mode 100644 index db52563dc4..0000000000 --- a/keyboards/keychron/q8/ansi/ansi.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.com) - * - * 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" diff --git a/keyboards/keychron/q8/ansi/info.json b/keyboards/keychron/q8/ansi/info.json index b80cb42432..7ec38683c5 100644 --- a/keyboards/keychron/q8/ansi/info.json +++ b/keyboards/keychron/q8/ansi/info.json @@ -8,6 +8,14 @@ "pid": "0x0180", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, + "matrix_pins": { + "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], + "rows": ["B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { @@ -23,11 +31,11 @@ {"matrix":[0, 7], "x":9.5, "y":0.25}, {"matrix":[0, 8], "x":10.5, "y":0.25}, {"matrix":[0, 9], "x":11.5, "y":0.25}, - {"matrix":[0,10], "x":12.5, "y":0.25}, - {"matrix":[0,11], "x":13.5, "y":0}, - {"matrix":[0,12], "x":14.5, "y":0.25}, - {"matrix":[0,13], "x":15.5, "y":0.25, "w":2}, - {"matrix":[0,14], "x":18, "y":0}, + {"matrix":[0, 10], "x":12.5, "y":0.25}, + {"matrix":[0, 11], "x":13.5, "y":0}, + {"matrix":[0, 12], "x":14.5, "y":0.25}, + {"matrix":[0, 13], "x":15.5, "y":0.25, "w":2}, + {"matrix":[0, 14], "x":18, "y":0}, {"matrix":[1, 0], "x":0.5, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":2, "y":1.25}, @@ -39,11 +47,11 @@ {"matrix":[1, 7], "x":10, "y":1.25}, {"matrix":[1, 8], "x":11, "y":1.25}, {"matrix":[1, 9], "x":12, "y":1.25}, - {"matrix":[1,10], "x":13.25, "y":1.25}, - {"matrix":[1,11], "x":14.25, "y":1.25}, - {"matrix":[1,12], "x":15.25, "y":1.25}, - {"matrix":[1,13], "x":16.25, "y":1.25, "w":1.5}, - {"matrix":[1,14], "x":18.25, "y":1.5}, + {"matrix":[1, 10], "x":13.25, "y":1.25}, + {"matrix":[1, 11], "x":14.25, "y":1.25}, + {"matrix":[1, 12], "x":15.25, "y":1.25}, + {"matrix":[1, 13], "x":16.25, "y":1.25, "w":1.5}, + {"matrix":[1, 14], "x":18.25, "y":1.5}, {"matrix":[2, 0], "x":0.25, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":2, "y":2.25}, @@ -54,11 +62,11 @@ {"matrix":[2, 7], "x":9.25, "y":2.25}, {"matrix":[2, 8], "x":10.25, "y":2.25}, {"matrix":[2, 9], "x":11.25, "y":2.25}, - {"matrix":[2,10], "x":12.25, "y":2.25}, - {"matrix":[2,11], "x":13.75, "y":2.25}, - {"matrix":[2,12], "x":14.75, "y":2.25}, - {"matrix":[2,13], "x":15.75, "y":2.25, "w":2.25}, - {"matrix":[2,14], "x":18.5, "y":2.5}, + {"matrix":[2, 10], "x":12.25, "y":2.25}, + {"matrix":[2, 11], "x":13.75, "y":2.25}, + {"matrix":[2, 12], "x":14.75, "y":2.25}, + {"matrix":[2, 13], "x":15.75, "y":2.25, "w":2.25}, + {"matrix":[2, 14], "x":18.5, "y":2.5}, {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25}, {"matrix":[3, 2], "x":2.25, "y":3.25}, @@ -69,11 +77,11 @@ {"matrix":[3, 7], "x":8.5, "y":3.25}, {"matrix":[3, 8], "x":9.5, "y":3.25}, {"matrix":[3, 9], "x":10.5, "y":3.25}, - {"matrix":[3,10], "x":11.5, "y":3.25}, - {"matrix":[3,11], "x":12.5, "y":3.25}, - {"matrix":[3,12], "x":14.25, "y":3.25}, - {"matrix":[3,13], "x":15.25, "y":3.25, "w":1.75}, - {"matrix":[3,14], "x":17.25, "y":3.5}, + {"matrix":[3, 10], "x":11.5, "y":3.25}, + {"matrix":[3, 11], "x":12.5, "y":3.25}, + {"matrix":[3, 12], "x":14.25, "y":3.25}, + {"matrix":[3, 13], "x":15.25, "y":3.25, "w":1.75}, + {"matrix":[3, 14], "x":17.25, "y":3.5}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25}, @@ -83,9 +91,9 @@ {"matrix":[4, 7], "x":8.75, "y":4.25}, {"matrix":[4, 8], "x":9.75, "y":4.25, "w":2.75}, {"matrix":[4, 9], "x":12.5, "y":4.25}, - {"matrix":[4,12], "x":16.25, "y":4.5}, - {"matrix":[4,13], "x":17.25, "y":4.5}, - {"matrix":[4,14], "x":18.25, "y":4.5} + {"matrix":[4, 12], "x":16.25, "y":4.5}, + {"matrix":[4, 13], "x":17.25, "y":4.5}, + {"matrix":[4, 14], "x":18.25, "y":4.5} ] } } diff --git a/keyboards/keychron/q8/ansi/rules.mk b/keyboards/keychron/q8/ansi/rules.mk index 345807d824..2b4a67b1ee 100644 --- a/keyboards/keychron/q8/ansi/rules.mk +++ b/keyboards/keychron/q8/ansi/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/q8/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q8/ansi_encoder/ansi_encoder.h deleted file mode 100644 index db52563dc4..0000000000 --- a/keyboards/keychron/q8/ansi_encoder/ansi_encoder.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.com) - * - * 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" diff --git a/keyboards/keychron/q8/ansi_encoder/info.json b/keyboards/keychron/q8/ansi_encoder/info.json index b75a878198..c506224a32 100644 --- a/keyboards/keychron/q8/ansi_encoder/info.json +++ b/keyboards/keychron/q8/ansi_encoder/info.json @@ -8,6 +8,14 @@ "pid": "0x0181", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, + "matrix_pins": { + "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], + "rows": ["B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "encoder": { "rotary": [ {"pin_a": "B5", "pin_b": "A10"} @@ -28,11 +36,11 @@ {"matrix":[0, 7], "x":9.5, "y":0.25}, {"matrix":[0, 8], "x":10.5, "y":0.25}, {"matrix":[0, 9], "x":11.5, "y":0.25}, - {"matrix":[0,10], "x":12.5, "y":0.25}, - {"matrix":[0,11], "x":13.5, "y":0}, - {"matrix":[0,12], "x":14.5, "y":0.25}, - {"matrix":[0,13], "x":15.5, "y":0.25, "w":2}, - {"matrix":[0,14], "x":18, "y":0}, + {"matrix":[0, 10], "x":12.5, "y":0.25}, + {"matrix":[0, 11], "x":13.5, "y":0}, + {"matrix":[0, 12], "x":14.5, "y":0.25}, + {"matrix":[0, 13], "x":15.5, "y":0.25, "w":2}, + {"matrix":[0, 14], "x":18, "y":0}, {"matrix":[1, 0], "x":0.5, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":2, "y":1.25}, @@ -44,11 +52,11 @@ {"matrix":[1, 7], "x":10, "y":1.25}, {"matrix":[1, 8], "x":11, "y":1.25}, {"matrix":[1, 9], "x":12, "y":1.25}, - {"matrix":[1,10], "x":13.25, "y":1.25}, - {"matrix":[1,11], "x":14.25, "y":1.25}, - {"matrix":[1,12], "x":15.25, "y":1.25}, - {"matrix":[1,13], "x":16.25, "y":1.25, "w":1.5}, - {"matrix":[1,14], "x":18.25, "y":1.5}, + {"matrix":[1, 10], "x":13.25, "y":1.25}, + {"matrix":[1, 11], "x":14.25, "y":1.25}, + {"matrix":[1, 12], "x":15.25, "y":1.25}, + {"matrix":[1, 13], "x":16.25, "y":1.25, "w":1.5}, + {"matrix":[1, 14], "x":18.25, "y":1.5}, {"matrix":[2, 0], "x":0.25, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":2, "y":2.25}, @@ -59,11 +67,11 @@ {"matrix":[2, 7], "x":9.25, "y":2.25}, {"matrix":[2, 8], "x":10.25, "y":2.25}, {"matrix":[2, 9], "x":11.25, "y":2.25}, - {"matrix":[2,10], "x":12.25, "y":2.25}, - {"matrix":[2,11], "x":13.75, "y":2.25}, - {"matrix":[2,12], "x":14.75, "y":2.25}, - {"matrix":[2,13], "x":15.75, "y":2.25, "w":2.25}, - {"matrix":[2,14], "x":18.5, "y":2.5}, + {"matrix":[2, 10], "x":12.25, "y":2.25}, + {"matrix":[2, 11], "x":13.75, "y":2.25}, + {"matrix":[2, 12], "x":14.75, "y":2.25}, + {"matrix":[2, 13], "x":15.75, "y":2.25, "w":2.25}, + {"matrix":[2, 14], "x":18.5, "y":2.5}, {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25}, {"matrix":[3, 2], "x":2.25, "y":3.25}, @@ -74,11 +82,11 @@ {"matrix":[3, 7], "x":8.5, "y":3.25}, {"matrix":[3, 8], "x":9.5, "y":3.25}, {"matrix":[3, 9], "x":10.5, "y":3.25}, - {"matrix":[3,10], "x":11.5, "y":3.25}, - {"matrix":[3,11], "x":12.5, "y":3.25}, - {"matrix":[3,12], "x":14.25, "y":3.25}, - {"matrix":[3,13], "x":15.25, "y":3.25, "w":1.75}, - {"matrix":[3,14], "x":17.25, "y":3.5}, + {"matrix":[3, 10], "x":11.5, "y":3.25}, + {"matrix":[3, 11], "x":12.5, "y":3.25}, + {"matrix":[3, 12], "x":14.25, "y":3.25}, + {"matrix":[3, 13], "x":15.25, "y":3.25, "w":1.75}, + {"matrix":[3, 14], "x":17.25, "y":3.5}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25}, @@ -88,9 +96,9 @@ {"matrix":[4, 7], "x":8.75, "y":4.25}, {"matrix":[4, 8], "x":9.75, "y":4.25, "w":2.75}, {"matrix":[4, 9], "x":12.5, "y":4.25}, - {"matrix":[4,12], "x":16.25, "y":4.5}, - {"matrix":[4,13], "x":17.25, "y":4.5}, - {"matrix":[4,14], "x":18.25, "y":4.5} + {"matrix":[4, 12], "x":16.25, "y":4.5}, + {"matrix":[4, 13], "x":17.25, "y":4.5}, + {"matrix":[4, 14], "x":18.25, "y":4.5} ] } } diff --git a/keyboards/keychron/q8/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q8/ansi_encoder/keymaps/default/keymap.c index 248ea1fe4a..a86ae6d8cf 100644 --- a/keyboards/keychron/q8/ansi_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/q8/ansi_encoder/keymaps/default/keymap.c @@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [_FN1] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, diff --git a/keyboards/keychron/q8/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q8/ansi_encoder/keymaps/keychron/keymap.c index 1ece0b6de7..bb5c406046 100644 --- a/keyboards/keychron/q8/ansi_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/q8/ansi_encoder/keymaps/keychron/keymap.c @@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [_FN1] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, diff --git a/keyboards/keychron/q8/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q8/ansi_encoder/keymaps/via/keymap.c index 248ea1fe4a..a86ae6d8cf 100644 --- a/keyboards/keychron/q8/ansi_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/q8/ansi_encoder/keymaps/via/keymap.c @@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [_FN1] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, diff --git a/keyboards/keychron/q8/ansi_encoder/rules.mk b/keyboards/keychron/q8/ansi_encoder/rules.mk index d0d74a11b5..e94a89ab85 100644 --- a/keyboards/keychron/q8/ansi_encoder/rules.mk +++ b/keyboards/keychron/q8/ansi_encoder/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/q8/config.h b/keyboards/keychron/q8/config.h index 017f463d84..e0f6c673a5 100644 --- a/keyboards/keychron/q8/config.h +++ b/keyboards/keychron/q8/config.h @@ -16,15 +16,6 @@ #pragma once -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - -/* Key matrix pins */ -#define MATRIX_ROW_PINS \ - { B4, B3, A15, A14, A13 } -#define MATRIX_COL_PINS \ - { C14, C15, A0, A1, A2, A3, A4, A5, A6, A7, B0, B1, A8, A9, H3 } - /* If PH3 used with a stronger pull resistor then the following definition needs be included */ // #define MATRIX_UNSELECT_DRIVE_HIGH diff --git a/keyboards/keychron/q8/iso/info.json b/keyboards/keychron/q8/iso/info.json index c5a5b7653e..60b4006150 100644 --- a/keyboards/keychron/q8/iso/info.json +++ b/keyboards/keychron/q8/iso/info.json @@ -8,6 +8,14 @@ "pid": "0x0182", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, + "matrix_pins": { + "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], + "rows": ["B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { @@ -23,11 +31,11 @@ {"matrix":[0, 7], "x":9.5, "y":0.25}, {"matrix":[0, 8], "x":10.5, "y":0.25}, {"matrix":[0, 9], "x":11.5, "y":0.25}, - {"matrix":[0,10], "x":12.5, "y":0.25}, - {"matrix":[0,11], "x":13.5, "y":0}, - {"matrix":[0,12], "x":14.5, "y":0.25}, - {"matrix":[0,13], "x":15.5, "y":0.25, "w":2}, - {"matrix":[0,14], "x":18, "y":0.25}, + {"matrix":[0, 10], "x":12.5, "y":0.25}, + {"matrix":[0, 11], "x":13.5, "y":0}, + {"matrix":[0, 12], "x":14.5, "y":0.25}, + {"matrix":[0, 13], "x":15.5, "y":0.25, "w":2}, + {"matrix":[0, 14], "x":18, "y":0.25}, {"matrix":[1, 0], "x":0.5, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":2, "y":1.25}, @@ -39,10 +47,10 @@ {"matrix":[1, 7], "x":10, "y":1.25}, {"matrix":[1, 8], "x":11, "y":1.25}, {"matrix":[1, 9], "x":12, "y":1.25}, - {"matrix":[1,10], "x":13.25, "y":1.25}, - {"matrix":[1,11], "x":14.25, "y":1.25}, - {"matrix":[1,12], "x":15.25, "y":1.25}, - {"matrix":[1,14], "x":18.25, "y":1.5}, + {"matrix":[1, 10], "x":13.25, "y":1.25}, + {"matrix":[1, 11], "x":14.25, "y":1.25}, + {"matrix":[1, 12], "x":15.25, "y":1.25}, + {"matrix":[1, 14], "x":18.25, "y":1.5}, {"matrix":[2, 0], "x":0.25, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":2, "y":2.25}, @@ -53,12 +61,12 @@ {"matrix":[2, 7], "x":9.25, "y":2.25}, {"matrix":[2, 8], "x":10.25, "y":2.25}, {"matrix":[2, 9], "x":11.25, "y":2.25}, - {"matrix":[2,10], "x":12.25, "y":2.25}, - {"matrix":[2,11], "x":13.5, "y":2.25}, - {"matrix":[2,12], "x":14.5, "y":2.25}, - {"matrix":[2,13], "x":15.5, "y":2.25}, - {"matrix":[1,13], "x":16.5, "y":1.25, "w":1.25, "h":2}, - {"matrix":[2,14], "x":18.5, "y":2.5}, + {"matrix":[2, 10], "x":12.25, "y":2.25}, + {"matrix":[2, 11], "x":13.5, "y":2.25}, + {"matrix":[2, 12], "x":14.5, "y":2.25}, + {"matrix":[2, 13], "x":15.5, "y":2.25}, + {"matrix":[1, 13], "x":16.5, "y":1.25, "w":1.25, "h":2}, + {"matrix":[2, 14], "x":18.5, "y":2.5}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.25}, {"matrix":[3, 1], "x":1.25, "y":3.25}, @@ -70,11 +78,11 @@ {"matrix":[3, 7], "x":8.5, "y":3.25}, {"matrix":[3, 8], "x":9.5, "y":3.25}, {"matrix":[3, 9], "x":10.5, "y":3.25}, - {"matrix":[3,10], "x":11.5, "y":3.25}, - {"matrix":[3,11], "x":12.5, "y":3.25}, - {"matrix":[3,12], "x":14.25, "y":3.25}, - {"matrix":[3,13], "x":15.25, "y":3.25, "w":1.75}, - {"matrix":[3,14], "x":17.25, "y":3.5}, + {"matrix":[3, 10], "x":11.5, "y":3.25}, + {"matrix":[3, 11], "x":12.5, "y":3.25}, + {"matrix":[3, 12], "x":14.25, "y":3.25}, + {"matrix":[3, 13], "x":15.25, "y":3.25, "w":1.75}, + {"matrix":[3, 14], "x":17.25, "y":3.5}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25}, @@ -84,9 +92,9 @@ {"matrix":[4, 7], "x":8.75, "y":4.25}, {"matrix":[4, 8], "x":9.75, "y":4.25, "w":2.75}, {"matrix":[4, 9], "x":12.5, "y":4.25}, - {"matrix":[4,12], "x":16.25, "y":4.5}, - {"matrix":[4,13], "x":17.25, "y":4.5}, - {"matrix":[4,14], "x":18.25, "y":4.5} + {"matrix":[4, 12], "x":16.25, "y":4.5}, + {"matrix":[4, 13], "x":17.25, "y":4.5}, + {"matrix":[4, 14], "x":18.25, "y":4.5} ] } } diff --git a/keyboards/keychron/q8/iso/iso.h b/keyboards/keychron/q8/iso/iso.h deleted file mode 100644 index db52563dc4..0000000000 --- a/keyboards/keychron/q8/iso/iso.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.com) - * - * 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" diff --git a/keyboards/keychron/q8/iso/rules.mk b/keyboards/keychron/q8/iso/rules.mk index 345807d824..2b4a67b1ee 100644 --- a/keyboards/keychron/q8/iso/rules.mk +++ b/keyboards/keychron/q8/iso/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/q8/iso_encoder/info.json b/keyboards/keychron/q8/iso_encoder/info.json index 45181452be..ebcf8a8ee0 100644 --- a/keyboards/keychron/q8/iso_encoder/info.json +++ b/keyboards/keychron/q8/iso_encoder/info.json @@ -8,6 +8,14 @@ "pid": "0x0183", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, + "matrix_pins": { + "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], + "rows": ["B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "encoder": { "rotary": [ {"pin_a": "B5", "pin_b": "A10"} @@ -28,11 +36,11 @@ {"matrix":[0, 7], "x":9.5, "y":0.25}, {"matrix":[0, 8], "x":10.5, "y":0.25}, {"matrix":[0, 9], "x":11.5, "y":0.25}, - {"matrix":[0,10], "x":12.5, "y":0.25}, - {"matrix":[0,11], "x":13.5, "y":0}, - {"matrix":[0,12], "x":14.5, "y":0.25}, - {"matrix":[0,13], "x":15.5, "y":0.25, "w":2}, - {"matrix":[0,14], "x":18, "y":0.25}, + {"matrix":[0, 10], "x":12.5, "y":0.25}, + {"matrix":[0, 11], "x":13.5, "y":0}, + {"matrix":[0, 12], "x":14.5, "y":0.25}, + {"matrix":[0, 13], "x":15.5, "y":0.25, "w":2}, + {"matrix":[0, 14], "x":18, "y":0.25}, {"matrix":[1, 0], "x":0.5, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":2, "y":1.25}, @@ -44,10 +52,10 @@ {"matrix":[1, 7], "x":10, "y":1.25}, {"matrix":[1, 8], "x":11, "y":1.25}, {"matrix":[1, 9], "x":12, "y":1.25}, - {"matrix":[1,10], "x":13.25, "y":1.25}, - {"matrix":[1,11], "x":14.25, "y":1.25}, - {"matrix":[1,12], "x":15.25, "y":1.25}, - {"matrix":[1,14], "x":18.25, "y":1.5}, + {"matrix":[1, 10], "x":13.25, "y":1.25}, + {"matrix":[1, 11], "x":14.25, "y":1.25}, + {"matrix":[1, 12], "x":15.25, "y":1.25}, + {"matrix":[1, 14], "x":18.25, "y":1.5}, {"matrix":[2, 0], "x":0.25, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":2, "y":2.25}, @@ -58,12 +66,12 @@ {"matrix":[2, 7], "x":9.25, "y":2.25}, {"matrix":[2, 8], "x":10.25, "y":2.25}, {"matrix":[2, 9], "x":11.25, "y":2.25}, - {"matrix":[2,10], "x":12.25, "y":2.25}, - {"matrix":[2,11], "x":13.5, "y":2.25}, - {"matrix":[2,12], "x":14.5, "y":2.25}, - {"matrix":[2,13], "x":15.5, "y":2.25}, - {"matrix":[1,13], "x":16.5, "y":1.25, "w":1.25, "h":2}, - {"matrix":[2,14], "x":18.5, "y":2.5}, + {"matrix":[2, 10], "x":12.25, "y":2.25}, + {"matrix":[2, 11], "x":13.5, "y":2.25}, + {"matrix":[2, 12], "x":14.5, "y":2.25}, + {"matrix":[2, 13], "x":15.5, "y":2.25}, + {"matrix":[1, 13], "x":16.5, "y":1.25, "w":1.25, "h":2}, + {"matrix":[2, 14], "x":18.5, "y":2.5}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.25}, {"matrix":[3, 1], "x":1.25, "y":3.25}, @@ -75,11 +83,11 @@ {"matrix":[3, 7], "x":8.5, "y":3.25}, {"matrix":[3, 8], "x":9.5, "y":3.25}, {"matrix":[3, 9], "x":10.5, "y":3.25}, - {"matrix":[3,10], "x":11.5, "y":3.25}, - {"matrix":[3,11], "x":12.5, "y":3.25}, - {"matrix":[3,12], "x":14.25, "y":3.25}, - {"matrix":[3,13], "x":15.25, "y":3.25, "w":1.75}, - {"matrix":[3,14], "x":17.25, "y":3.5}, + {"matrix":[3, 10], "x":11.5, "y":3.25}, + {"matrix":[3, 11], "x":12.5, "y":3.25}, + {"matrix":[3, 12], "x":14.25, "y":3.25}, + {"matrix":[3, 13], "x":15.25, "y":3.25, "w":1.75}, + {"matrix":[3, 14], "x":17.25, "y":3.5}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25}, @@ -89,9 +97,9 @@ {"matrix":[4, 7], "x":8.75, "y":4.25}, {"matrix":[4, 8], "x":9.75, "y":4.25, "w":2.75}, {"matrix":[4, 9], "x":12.5, "y":4.25}, - {"matrix":[4,12], "x":16.25, "y":4.5}, - {"matrix":[4,13], "x":17.25, "y":4.5}, - {"matrix":[4,14], "x":18.25, "y":4.5} + {"matrix":[4, 12], "x":16.25, "y":4.5}, + {"matrix":[4, 13], "x":17.25, "y":4.5}, + {"matrix":[4, 14], "x":18.25, "y":4.5} ] } } diff --git a/keyboards/keychron/q8/iso_encoder/iso_encoder.h b/keyboards/keychron/q8/iso_encoder/iso_encoder.h deleted file mode 100644 index db52563dc4..0000000000 --- a/keyboards/keychron/q8/iso_encoder/iso_encoder.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.com) - * - * 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" diff --git a/keyboards/keychron/q8/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/q8/iso_encoder/keymaps/default/keymap.c index a779fdc130..7db63d4118 100644 --- a/keyboards/keychron/q8/iso_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/q8/iso_encoder/keymaps/default/keymap.c @@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [_FN1] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, diff --git a/keyboards/keychron/q8/iso_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q8/iso_encoder/keymaps/keychron/keymap.c index 4884aeaeae..b3abda2975 100644 --- a/keyboards/keychron/q8/iso_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/q8/iso_encoder/keymaps/keychron/keymap.c @@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [_FN1] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, diff --git a/keyboards/keychron/q8/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/q8/iso_encoder/keymaps/via/keymap.c index da409a551d..8b66a40c6b 100644 --- a/keyboards/keychron/q8/iso_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/q8/iso_encoder/keymaps/via/keymap.c @@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [_FN1] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, diff --git a/keyboards/keychron/q8/iso_encoder/rules.mk b/keyboards/keychron/q8/iso_encoder/rules.mk index 5240004b8c..6a772965ff 100644 --- a/keyboards/keychron/q8/iso_encoder/rules.mk +++ b/keyboards/keychron/q8/iso_encoder/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/q8/q8.c b/keyboards/keychron/q8/q8.c index d86ced3d1b..a653bdc8b9 100644 --- a/keyboards/keychron/q8/q8.c +++ b/keyboards/keychron/q8/q8.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "q8.h" +#include "quantum.h" const matrix_row_t matrix_mask[] = { 0b111111111111111, diff --git a/keyboards/keychron/q8/q8.h b/keyboards/keychron/q8/q8.h deleted file mode 100644 index 02981db19c..0000000000 --- a/keyboards/keychron/q8/q8.h +++ /dev/null @@ -1,29 +0,0 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.com) - * - * 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" - -#if defined(KEYBOARD_keychron_q8_ansi) -# include "ansi.h" -#elif defined(KEYBOARD_keychron_q8_ansi_encoder) -# include "ansi_encoder.h" -#elif defined(KEYBOARD_keychron_q8_iso) -# include "iso.h" -#elif defined(KEYBOARD_keychron_q8_iso_encoder) -# include "iso_encoder.h" -#endif diff --git a/keyboards/keychron/q9/ansi/ansi.c b/keyboards/keychron/q9/ansi/ansi.c index e10c4de25b..b98149a5f8 100644 --- a/keyboards/keychron/q9/ansi/ansi.c +++ b/keyboards/keychron/q9/ansi/ansi.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "ansi.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q9/ansi/ansi.h b/keyboards/keychron/q9/ansi/ansi.h deleted file mode 100644 index db52563dc4..0000000000 --- a/keyboards/keychron/q9/ansi/ansi.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.com) - * - * 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" diff --git a/keyboards/keychron/q9/ansi/info.json b/keyboards/keychron/q9/ansi/info.json index e1a6ae534d..28ed46e56d 100644 --- a/keyboards/keychron/q9/ansi/info.json +++ b/keyboards/keychron/q9/ansi/info.json @@ -8,6 +8,14 @@ "pid": "0x0190", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, + "matrix_pins": { + "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"], + "rows": ["B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { @@ -23,11 +31,11 @@ {"matrix":[0, 7], "x":7.5, "y":0.25}, {"matrix":[0, 8], "x":8.5, "y":0.25}, {"matrix":[0, 9], "x":9.5, "y":0.25}, - {"matrix":[0,10], "x":10.5, "y":0.25}, - {"matrix":[0,11], "x":11.5, "y":0.25}, - {"matrix":[0,12], "x":12.5, "y":0.25}, - {"matrix":[0,13], "x":13.5, "y":0.25, "w":1.5}, - {"matrix":[0,14], "x":15.25, "y":0}, + {"matrix":[0, 10], "x":10.5, "y":0.25}, + {"matrix":[0, 11], "x":11.5, "y":0.25}, + {"matrix":[0, 12], "x":12.5, "y":0.25}, + {"matrix":[0, 13], "x":13.5, "y":0.25, "w":1.5}, + {"matrix":[0, 14], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25, "w":1.75}, {"matrix":[1, 1], "x":1.75, "y":1.25}, @@ -39,10 +47,10 @@ {"matrix":[1, 7], "x":7.75, "y":1.25}, {"matrix":[1, 8], "x":8.75, "y":1.25}, {"matrix":[1, 9], "x":9.75, "y":1.25}, - {"matrix":[1,10], "x":10.75, "y":1.25}, - {"matrix":[1,11], "x":11.75, "y":1.25}, - {"matrix":[1,13], "x":12.75, "y":1.25, "w":2.25}, - {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10.75, "y":1.25}, + {"matrix":[1, 11], "x":11.75, "y":1.25}, + {"matrix":[1, 13], "x":12.75, "y":1.25, "w":2.25}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":2.25}, {"matrix":[2, 2], "x":2.25, "y":2.25}, @@ -53,21 +61,21 @@ {"matrix":[2, 7], "x":7.25, "y":2.25}, {"matrix":[2, 8], "x":8.25, "y":2.25}, {"matrix":[2, 9], "x":9.25, "y":2.25}, - {"matrix":[2,10], "x":10.25, "y":2.25}, - {"matrix":[2,11], "x":11.25, "y":2.25}, - {"matrix":[2,13], "x":12.25, "y":2.25, "w":1.75}, - {"matrix":[2,14], "x":14.25, "y":2.5}, + {"matrix":[2, 10], "x":10.25, "y":2.25}, + {"matrix":[2, 11], "x":11.25, "y":2.25}, + {"matrix":[2, 13], "x":12.25, "y":2.25, "w":1.75}, + {"matrix":[2, 14], "x":14.25, "y":2.5}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.25}, {"matrix":[3, 1], "x":1.25, "y":3.25, "w":1.25}, {"matrix":[3, 2], "x":2.5, "y":3.25, "w":1.25}, {"matrix":[3, 6], "x":3.75, "y":3.25, "w":6.25}, - {"matrix":[3,10], "x":10, "y":3.25}, - {"matrix":[3,11], "x":11, "y":3.25}, - {"matrix":[3,12], "x":12, "y":3.25}, - {"matrix":[3,13], "x":13.25, "y":3.5}, - {"matrix":[3,14], "x":14.25, "y":3.5}, - {"matrix":[1,12], "x":15.25, "y":3.5} + {"matrix":[3, 10], "x":10, "y":3.25}, + {"matrix":[3, 11], "x":11, "y":3.25}, + {"matrix":[3, 12], "x":12, "y":3.25}, + {"matrix":[3, 13], "x":13.25, "y":3.5}, + {"matrix":[3, 14], "x":14.25, "y":3.5}, + {"matrix":[1, 12], "x":15.25, "y":3.5} ] } } diff --git a/keyboards/keychron/q9/ansi/rules.mk b/keyboards/keychron/q9/ansi/rules.mk index 345807d824..2b4a67b1ee 100644 --- a/keyboards/keychron/q9/ansi/rules.mk +++ b/keyboards/keychron/q9/ansi/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/q9/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q9/ansi_encoder/ansi_encoder.c index 24c401473d..de0eda1c02 100644 --- a/keyboards/keychron/q9/ansi_encoder/ansi_encoder.c +++ b/keyboards/keychron/q9/ansi_encoder/ansi_encoder.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "ansi_encoder.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q9/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q9/ansi_encoder/ansi_encoder.h deleted file mode 100644 index 366d3f39c2..0000000000 --- a/keyboards/keychron/q9/ansi_encoder/ansi_encoder.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 1010 @ Keychron (https://www.keychron.com) - * - * 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 1 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" diff --git a/keyboards/keychron/q9/ansi_encoder/info.json b/keyboards/keychron/q9/ansi_encoder/info.json index 5100c18945..e00278143f 100644 --- a/keyboards/keychron/q9/ansi_encoder/info.json +++ b/keyboards/keychron/q9/ansi_encoder/info.json @@ -8,6 +8,14 @@ "pid": "0x0191", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, + "matrix_pins": { + "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"], + "rows": ["B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "encoder": { "rotary": [ {"pin_a": "B4", "pin_b": "B5"} @@ -28,11 +36,11 @@ {"matrix":[0, 7], "x":7.5, "y":0.25}, {"matrix":[0, 8], "x":8.5, "y":0.25}, {"matrix":[0, 9], "x":9.5, "y":0.25}, - {"matrix":[0,10], "x":10.5, "y":0.25}, - {"matrix":[0,11], "x":11.5, "y":0.25}, - {"matrix":[0,12], "x":12.5, "y":0.25}, - {"matrix":[0,13], "x":13.5, "y":0.25, "w":1.5}, - {"matrix":[0,14], "x":15.25, "y":0}, + {"matrix":[0, 10], "x":10.5, "y":0.25}, + {"matrix":[0, 11], "x":11.5, "y":0.25}, + {"matrix":[0, 12], "x":12.5, "y":0.25}, + {"matrix":[0, 13], "x":13.5, "y":0.25, "w":1.5}, + {"matrix":[0, 14], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25, "w":1.75}, {"matrix":[1, 1], "x":1.75, "y":1.25}, @@ -44,10 +52,10 @@ {"matrix":[1, 7], "x":7.75, "y":1.25}, {"matrix":[1, 8], "x":8.75, "y":1.25}, {"matrix":[1, 9], "x":9.75, "y":1.25}, - {"matrix":[1,10], "x":10.75, "y":1.25}, - {"matrix":[1,11], "x":11.75, "y":1.25}, - {"matrix":[1,13], "x":12.75, "y":1.25, "w":2.25}, - {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10.75, "y":1.25}, + {"matrix":[1, 11], "x":11.75, "y":1.25}, + {"matrix":[1, 13], "x":12.75, "y":1.25, "w":2.25}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":2.25}, {"matrix":[2, 2], "x":2.25, "y":2.25}, @@ -58,21 +66,21 @@ {"matrix":[2, 7], "x":7.25, "y":2.25}, {"matrix":[2, 8], "x":8.25, "y":2.25}, {"matrix":[2, 9], "x":9.25, "y":2.25}, - {"matrix":[2,10], "x":10.25, "y":2.25}, - {"matrix":[2,11], "x":11.25, "y":2.25}, - {"matrix":[2,13], "x":12.25, "y":2.25, "w":1.75}, - {"matrix":[2,14], "x":14.25, "y":2.5}, + {"matrix":[2, 10], "x":10.25, "y":2.25}, + {"matrix":[2, 11], "x":11.25, "y":2.25}, + {"matrix":[2, 13], "x":12.25, "y":2.25, "w":1.75}, + {"matrix":[2, 14], "x":14.25, "y":2.5}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.25}, {"matrix":[3, 1], "x":1.25, "y":3.25, "w":1.25}, {"matrix":[3, 2], "x":2.5, "y":3.25, "w":1.25}, {"matrix":[3, 6], "x":3.75, "y":3.25, "w":6.25}, - {"matrix":[3,10], "x":10, "y":3.25}, - {"matrix":[3,11], "x":11, "y":3.25}, - {"matrix":[3,12], "x":12, "y":3.25}, - {"matrix":[3,13], "x":13.25, "y":3.5}, - {"matrix":[3,14], "x":14.25, "y":3.5}, - {"matrix":[1,12], "x":15.25, "y":3.5} + {"matrix":[3, 10], "x":10, "y":3.25}, + {"matrix":[3, 11], "x":11, "y":3.25}, + {"matrix":[3, 12], "x":12, "y":3.25}, + {"matrix":[3, 13], "x":13.25, "y":3.5}, + {"matrix":[3, 14], "x":14.25, "y":3.5}, + {"matrix":[1, 12], "x":15.25, "y":3.5} ] } } diff --git a/keyboards/keychron/q9/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q9/ansi_encoder/keymaps/default/keymap.c index adda2df857..eb5a5fa3b3 100644 --- a/keyboards/keychron/q9/ansi_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/q9/ansi_encoder/keymaps/default/keymap.c @@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [_FN1] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, diff --git a/keyboards/keychron/q9/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q9/ansi_encoder/keymaps/keychron/keymap.c index 16f4401a03..c8718da228 100644 --- a/keyboards/keychron/q9/ansi_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/q9/ansi_encoder/keymaps/keychron/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [_FN1] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, diff --git a/keyboards/keychron/q9/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q9/ansi_encoder/keymaps/via/keymap.c index adda2df857..eb5a5fa3b3 100644 --- a/keyboards/keychron/q9/ansi_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/q9/ansi_encoder/keymaps/via/keymap.c @@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [_FN1] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, diff --git a/keyboards/keychron/q9/ansi_encoder/rules.mk b/keyboards/keychron/q9/ansi_encoder/rules.mk index 37010e0d59..7caead18d7 100644 --- a/keyboards/keychron/q9/ansi_encoder/rules.mk +++ b/keyboards/keychron/q9/ansi_encoder/rules.mk @@ -14,7 +14,6 @@ ENCODER_ENABLE = yes # Enable Encoder ENCODER_MAP_ENBALE = no DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/q9/config.h b/keyboards/keychron/q9/config.h index e051703d11..742dde3ff2 100644 --- a/keyboards/keychron/q9/config.h +++ b/keyboards/keychron/q9/config.h @@ -16,15 +16,6 @@ #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS \ - { B3, A15, A14, A13 } -#define MATRIX_COL_PINS \ - { A10, A9, A8, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0, C15, C14 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* Disable DIP switch in matrix data */ #define MATRIX_MASKED diff --git a/keyboards/keychron/q9/iso/info.json b/keyboards/keychron/q9/iso/info.json index 159abc63ae..eb34386ecb 100644 --- a/keyboards/keychron/q9/iso/info.json +++ b/keyboards/keychron/q9/iso/info.json @@ -8,6 +8,14 @@ "pid": "0x0192", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, + "matrix_pins": { + "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"], + "rows": ["B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { @@ -23,10 +31,10 @@ {"matrix":[0, 7], "x":7.5, "y":0}, {"matrix":[0, 8], "x":8.5, "y":0}, {"matrix":[0, 9], "x":9.5, "y":0}, - {"matrix":[0,10], "x":10.5, "y":0}, - {"matrix":[0,11], "x":11.5, "y":0}, - {"matrix":[0,12], "x":12.5, "y":0}, - {"matrix":[0,14], "x":15.25, "y":0}, + {"matrix":[0, 10], "x":10.5, "y":0}, + {"matrix":[0, 11], "x":11.5, "y":0}, + {"matrix":[0, 12], "x":12.5, "y":0}, + {"matrix":[0, 14], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1, "w":1.75}, {"matrix":[1, 1], "x":1.75, "y":1}, @@ -38,11 +46,11 @@ {"matrix":[1, 7], "x":7.75, "y":1}, {"matrix":[1, 8], "x":8.75, "y":1}, {"matrix":[1, 9], "x":9.75, "y":1}, - {"matrix":[1,10], "x":10.75, "y":1}, - {"matrix":[1,11], "x":11.75, "y":1}, - {"matrix":[1,13], "x":12.75, "y":1}, - {"matrix":[0,13], "x":13.75, "y":0, "w":1.25, "h":2}, - {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10.75, "y":1}, + {"matrix":[1, 11], "x":11.75, "y":1}, + {"matrix":[1, 13], "x":12.75, "y":1}, + {"matrix":[0, 13], "x":13.75, "y":0, "w":1.25, "h":2}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2, "w":1.25}, {"matrix":[2, 1], "x":1.25, "y":2}, @@ -54,21 +62,21 @@ {"matrix":[2, 7], "x":7.25, "y":2}, {"matrix":[2, 8], "x":8.25, "y":2}, {"matrix":[2, 9], "x":9.25, "y":2}, - {"matrix":[2,10], "x":10.25, "y":2}, - {"matrix":[2,11], "x":11.25, "y":2}, - {"matrix":[2,13], "x":12.25, "y":2, "w":1.75}, - {"matrix":[2,14], "x":14, "y":2}, + {"matrix":[2, 10], "x":10.25, "y":2}, + {"matrix":[2, 11], "x":11.25, "y":2}, + {"matrix":[2, 13], "x":12.25, "y":2, "w":1.75}, + {"matrix":[2, 14], "x":14, "y":2}, {"matrix":[3, 0], "x":0, "y":3, "w":1.25}, {"matrix":[3, 1], "x":1.25, "y":3, "w":1.25}, {"matrix":[3, 2], "x":2.5, "y":3, "w":1.25}, {"matrix":[3, 6], "x":3.75, "y":3, "w":6.25}, - {"matrix":[3,10], "x":10, "y":3}, - {"matrix":[3,11], "x":11, "y":3}, - {"matrix":[3,12], "x":12, "y":3}, - {"matrix":[3,13], "x":13, "y":3}, - {"matrix":[3,14], "x":14, "y":3}, - {"matrix":[1,12], "x":15, "y":3} + {"matrix":[3, 10], "x":10, "y":3}, + {"matrix":[3, 11], "x":11, "y":3}, + {"matrix":[3, 12], "x":12, "y":3}, + {"matrix":[3, 13], "x":13, "y":3}, + {"matrix":[3, 14], "x":14, "y":3}, + {"matrix":[1, 12], "x":15, "y":3} ] } } diff --git a/keyboards/keychron/q9/iso/iso.c b/keyboards/keychron/q9/iso/iso.c index e038e8581f..0e258e8c63 100644 --- a/keyboards/keychron/q9/iso/iso.c +++ b/keyboards/keychron/q9/iso/iso.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "iso.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q9/iso/iso.h b/keyboards/keychron/q9/iso/iso.h deleted file mode 100644 index db52563dc4..0000000000 --- a/keyboards/keychron/q9/iso/iso.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.com) - * - * 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" diff --git a/keyboards/keychron/q9/iso/rules.mk b/keyboards/keychron/q9/iso/rules.mk index 345807d824..2b4a67b1ee 100644 --- a/keyboards/keychron/q9/iso/rules.mk +++ b/keyboards/keychron/q9/iso/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/q9/iso_encoder/info.json b/keyboards/keychron/q9/iso_encoder/info.json index dee0a8953a..b6d24d46de 100644 --- a/keyboards/keychron/q9/iso_encoder/info.json +++ b/keyboards/keychron/q9/iso_encoder/info.json @@ -8,6 +8,14 @@ "pid": "0x0193", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, + "matrix_pins": { + "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"], + "rows": ["B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "encoder": { "rotary": [ {"pin_a": "B4", "pin_b": "B5"} @@ -28,10 +36,10 @@ {"matrix":[0, 7], "x":7.5, "y":0}, {"matrix":[0, 8], "x":8.5, "y":0}, {"matrix":[0, 9], "x":9.5, "y":0}, - {"matrix":[0,10], "x":10.5, "y":0}, - {"matrix":[0,11], "x":11.5, "y":0}, - {"matrix":[0,12], "x":12.5, "y":0}, - {"matrix":[0,14], "x":15.25, "y":0}, + {"matrix":[0, 10], "x":10.5, "y":0}, + {"matrix":[0, 11], "x":11.5, "y":0}, + {"matrix":[0, 12], "x":12.5, "y":0}, + {"matrix":[0, 14], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1, "w":1.75}, {"matrix":[1, 1], "x":1.75, "y":1}, @@ -43,11 +51,11 @@ {"matrix":[1, 7], "x":7.75, "y":1}, {"matrix":[1, 8], "x":8.75, "y":1}, {"matrix":[1, 9], "x":9.75, "y":1}, - {"matrix":[1,10], "x":10.75, "y":1}, - {"matrix":[1,11], "x":11.75, "y":1}, - {"matrix":[1,13], "x":12.75, "y":1}, - {"matrix":[0,13], "x":13.75, "y":0, "w":1.25, "h":2}, - {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10.75, "y":1}, + {"matrix":[1, 11], "x":11.75, "y":1}, + {"matrix":[1, 13], "x":12.75, "y":1}, + {"matrix":[0, 13], "x":13.75, "y":0, "w":1.25, "h":2}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2, "w":1.25}, {"matrix":[2, 1], "x":1.25, "y":2}, @@ -59,21 +67,21 @@ {"matrix":[2, 7], "x":7.25, "y":2}, {"matrix":[2, 8], "x":8.25, "y":2}, {"matrix":[2, 9], "x":9.25, "y":2}, - {"matrix":[2,10], "x":10.25, "y":2}, - {"matrix":[2,11], "x":11.25, "y":2}, - {"matrix":[2,13], "x":12.25, "y":2, "w":1.75}, - {"matrix":[2,14], "x":14, "y":2}, + {"matrix":[2, 10], "x":10.25, "y":2}, + {"matrix":[2, 11], "x":11.25, "y":2}, + {"matrix":[2, 13], "x":12.25, "y":2, "w":1.75}, + {"matrix":[2, 14], "x":14, "y":2}, {"matrix":[3, 0], "x":0, "y":3, "w":1.25}, {"matrix":[3, 1], "x":1.25, "y":3, "w":1.25}, {"matrix":[3, 2], "x":2.5, "y":3, "w":1.25}, {"matrix":[3, 6], "x":3.75, "y":3, "w":6.25}, - {"matrix":[3,10], "x":10, "y":3}, - {"matrix":[3,11], "x":11, "y":3}, - {"matrix":[3,12], "x":12, "y":3}, - {"matrix":[3,13], "x":13, "y":3}, - {"matrix":[3,14], "x":14, "y":3}, - {"matrix":[1,12], "x":15, "y":3} + {"matrix":[3, 10], "x":10, "y":3}, + {"matrix":[3, 11], "x":11, "y":3}, + {"matrix":[3, 12], "x":12, "y":3}, + {"matrix":[3, 13], "x":13, "y":3}, + {"matrix":[3, 14], "x":14, "y":3}, + {"matrix":[1, 12], "x":15, "y":3} ] } } diff --git a/keyboards/keychron/q9/iso_encoder/iso_encoder.c b/keyboards/keychron/q9/iso_encoder/iso_encoder.c index 7f6db9a128..0804f33671 100644 --- a/keyboards/keychron/q9/iso_encoder/iso_encoder.c +++ b/keyboards/keychron/q9/iso_encoder/iso_encoder.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "iso_encoder.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q9/iso_encoder/iso_encoder.h b/keyboards/keychron/q9/iso_encoder/iso_encoder.h deleted file mode 100644 index 366d3f39c2..0000000000 --- a/keyboards/keychron/q9/iso_encoder/iso_encoder.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 1010 @ Keychron (https://www.keychron.com) - * - * 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 1 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" diff --git a/keyboards/keychron/q9/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/q9/iso_encoder/keymaps/default/keymap.c index af697d6395..3541851973 100644 --- a/keyboards/keychron/q9/iso_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/q9/iso_encoder/keymaps/default/keymap.c @@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [_FN1] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, diff --git a/keyboards/keychron/q9/iso_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q9/iso_encoder/keymaps/keychron/keymap.c index e899be3ec2..2eab292389 100644 --- a/keyboards/keychron/q9/iso_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/q9/iso_encoder/keymaps/keychron/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [_FN1] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, diff --git a/keyboards/keychron/q9/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/q9/iso_encoder/keymaps/via/keymap.c index b3fb89f39c..94b160f1c8 100644 --- a/keyboards/keychron/q9/iso_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/q9/iso_encoder/keymaps/via/keymap.c @@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [_FN1] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, diff --git a/keyboards/keychron/q9/iso_encoder/rules.mk b/keyboards/keychron/q9/iso_encoder/rules.mk index 37010e0d59..7caead18d7 100644 --- a/keyboards/keychron/q9/iso_encoder/rules.mk +++ b/keyboards/keychron/q9/iso_encoder/rules.mk @@ -14,7 +14,6 @@ ENCODER_ENABLE = yes # Enable Encoder ENCODER_MAP_ENBALE = no DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/q9/q9.c b/keyboards/keychron/q9/q9.c index 2f98a72974..51dea886f1 100644 --- a/keyboards/keychron/q9/q9.c +++ b/keyboards/keychron/q9/q9.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "q9.h" +#include "quantum.h" const matrix_row_t matrix_mask[] = { 0b111111111111111, diff --git a/keyboards/keychron/q9/q9.h b/keyboards/keychron/q9/q9.h deleted file mode 100644 index d6a0ef1bea..0000000000 --- a/keyboards/keychron/q9/q9.h +++ /dev/null @@ -1,29 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.com) - * - * 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" - -#if defined(KEYBOARD_keychron_q9_ansi) -# include "ansi.h" -#elif defined(KEYBOARD_keychron_q9_ansi_encoder) -# include "ansi_encoder.h" -#elif defined(KEYBOARD_keychron_q9_iso) -# include "iso.h" -#elif defined(KEYBOARD_keychron_q9_iso_encoder) -# include "iso_encoder.h" -#endif diff --git a/keyboards/keychron/s1/ansi/rgb/info.json b/keyboards/keychron/s1/ansi/rgb/info.json index 02ea4d4c90..82ec24e3fb 100644 --- a/keyboards/keychron/s1/ansi/rgb/info.json +++ b/keyboards/keychron/s1/ansi/rgb/info.json @@ -8,6 +8,14 @@ "pid": "0x0410", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, + "matrix_pins": { + "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"], + "rows": ["B5", "B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "processor": "STM32L432", "bootloader": "stm32-dfu", "layout_aliases": { @@ -27,12 +35,12 @@ {"matrix":[0, 7], "x":7, "y":0}, {"matrix":[0, 8], "x":8, "y":0}, {"matrix":[0, 9], "x":9, "y":0}, - {"matrix":[0,10], "x":10, "y":0}, - {"matrix":[0,11], "x":11, "y":0}, - {"matrix":[0,12], "x":12, "y":0}, - {"matrix":[0,13], "x":13, "y":0}, - {"matrix":[3,12], "x":14, "y":0}, - {"matrix":[0,14], "x":15, "y":0}, + {"matrix":[0, 10], "x":10, "y":0}, + {"matrix":[0, 11], "x":11, "y":0}, + {"matrix":[0, 12], "x":12, "y":0}, + {"matrix":[0, 13], "x":13, "y":0}, + {"matrix":[3, 12], "x":14, "y":0}, + {"matrix":[0, 14], "x":15, "y":0}, {"matrix":[1, 0], "x":0, "y":1}, {"matrix":[1, 1], "x":1, "y":1}, @@ -44,11 +52,11 @@ {"matrix":[1, 7], "x":7, "y":1}, {"matrix":[1, 8], "x":8, "y":1}, {"matrix":[1, 9], "x":9, "y":1}, - {"matrix":[1,10], "x":10, "y":1}, - {"matrix":[1,11], "x":11, "y":1}, - {"matrix":[1,12], "x":12, "y":1}, - {"matrix":[1,13], "x":13, "y":1, "w":2}, - {"matrix":[1,14], "x":15, "y":1}, + {"matrix":[1, 10], "x":10, "y":1}, + {"matrix":[1, 11], "x":11, "y":1}, + {"matrix":[1, 12], "x":12, "y":1}, + {"matrix":[1, 13], "x":13, "y":1, "w":2}, + {"matrix":[1, 14], "x":15, "y":1}, {"matrix":[2, 0], "x":0, "y":2, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2}, @@ -60,11 +68,11 @@ {"matrix":[2, 7], "x":7.5, "y":2}, {"matrix":[2, 8], "x":8.5, "y":2}, {"matrix":[2, 9], "x":9.5, "y":2}, - {"matrix":[2,10], "x":10.5, "y":2}, - {"matrix":[2,11], "x":11.5, "y":2}, - {"matrix":[2,12], "x":12.5, "y":2}, - {"matrix":[2,13], "x":13.5, "y":2, "w":1.5}, - {"matrix":[2,14], "x":15, "y":2}, + {"matrix":[2, 10], "x":10.5, "y":2}, + {"matrix":[2, 11], "x":11.5, "y":2}, + {"matrix":[2, 12], "x":12.5, "y":2}, + {"matrix":[2, 13], "x":13.5, "y":2, "w":1.5}, + {"matrix":[2, 14], "x":15, "y":2}, {"matrix":[3, 0], "x":0, "y":3, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3}, @@ -76,10 +84,10 @@ {"matrix":[3, 7], "x":7.75, "y":3}, {"matrix":[3, 8], "x":8.75, "y":3}, {"matrix":[3, 9], "x":9.75, "y":3}, - {"matrix":[3,10], "x":10.75, "y":3}, - {"matrix":[3,11], "x":11.75, "y":3}, - {"matrix":[3,13], "x":12.75, "y":3, "w":2.25}, - {"matrix":[3,14], "x":15, "y":3}, + {"matrix":[3, 10], "x":10.75, "y":3}, + {"matrix":[3, 11], "x":11.75, "y":3}, + {"matrix":[3, 13], "x":12.75, "y":3, "w":2.25}, + {"matrix":[3, 14], "x":15, "y":3}, {"matrix":[4, 0], "x":0, "y":4, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4}, @@ -90,22 +98,22 @@ {"matrix":[4, 7], "x":7.25, "y":4}, {"matrix":[4, 8], "x":8.25, "y":4}, {"matrix":[4, 9], "x":9.25, "y":4}, - {"matrix":[4,10], "x":10.25, "y":4}, - {"matrix":[4,11], "x":11.25, "y":4}, - {"matrix":[4,12], "x":12.25, "y":4, "w":1.75}, - {"matrix":[4,13], "x":14, "y":4}, - {"matrix":[4,14], "x":15, "y":4}, + {"matrix":[4, 10], "x":10.25, "y":4}, + {"matrix":[4, 11], "x":11.25, "y":4}, + {"matrix":[4, 12], "x":12.25, "y":4, "w":1.75}, + {"matrix":[4, 13], "x":14, "y":4}, + {"matrix":[4, 14], "x":15, "y":4}, {"matrix":[5, 0], "x":0, "y":5, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5, "w":1.25}, {"matrix":[5, 2], "x":2.5, "y":5, "w":1.25}, {"matrix":[5, 6], "x":3.75, "y":5, "w":6.25}, {"matrix":[5, 9], "x":10, "y":5}, - {"matrix":[5,10], "x":11, "y":5}, - {"matrix":[5,11], "x":12, "y":5}, - {"matrix":[5,12], "x":13, "y":5}, - {"matrix":[5,13], "x":14, "y":5}, - {"matrix":[5,14], "x":15, "y":5} + {"matrix":[5, 10], "x":11, "y":5}, + {"matrix":[5, 11], "x":12, "y":5}, + {"matrix":[5, 12], "x":13, "y":5}, + {"matrix":[5, 13], "x":14, "y":5}, + {"matrix":[5, 14], "x":15, "y":5} ] } } diff --git a/keyboards/keychron/s1/ansi/rgb/rules.mk b/keyboards/keychron/s1/ansi/rgb/rules.mk index 345807d824..2b4a67b1ee 100644 --- a/keyboards/keychron/s1/ansi/rgb/rules.mk +++ b/keyboards/keychron/s1/ansi/rgb/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/s1/ansi/white/info.json b/keyboards/keychron/s1/ansi/white/info.json index a64f5eb0a9..04580e30b4 100644 --- a/keyboards/keychron/s1/ansi/white/info.json +++ b/keyboards/keychron/s1/ansi/white/info.json @@ -8,6 +8,14 @@ "pid": "0x0411", "device_version": "1.0.0" }, + "led_matrix": { + "driver": "CKLED2001" + }, + "matrix_pins": { + "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"], + "rows": ["B5", "B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "processor": "STM32L432", "bootloader": "stm32-dfu", "layout_aliases": { @@ -27,12 +35,12 @@ {"matrix":[0, 7], "x":7, "y":0}, {"matrix":[0, 8], "x":8, "y":0}, {"matrix":[0, 9], "x":9, "y":0}, - {"matrix":[0,10], "x":10, "y":0}, - {"matrix":[0,11], "x":11, "y":0}, - {"matrix":[0,12], "x":12, "y":0}, - {"matrix":[0,13], "x":13, "y":0}, - {"matrix":[3,12], "x":14, "y":0}, - {"matrix":[0,14], "x":15, "y":0}, + {"matrix":[0, 10], "x":10, "y":0}, + {"matrix":[0, 11], "x":11, "y":0}, + {"matrix":[0, 12], "x":12, "y":0}, + {"matrix":[0, 13], "x":13, "y":0}, + {"matrix":[3, 12], "x":14, "y":0}, + {"matrix":[0, 14], "x":15, "y":0}, {"matrix":[1, 0], "x":0, "y":1}, {"matrix":[1, 1], "x":1, "y":1}, @@ -44,11 +52,11 @@ {"matrix":[1, 7], "x":7, "y":1}, {"matrix":[1, 8], "x":8, "y":1}, {"matrix":[1, 9], "x":9, "y":1}, - {"matrix":[1,10], "x":10, "y":1}, - {"matrix":[1,11], "x":11, "y":1}, - {"matrix":[1,12], "x":12, "y":1}, - {"matrix":[1,13], "x":13, "y":1, "w":2}, - {"matrix":[1,14], "x":15, "y":1}, + {"matrix":[1, 10], "x":10, "y":1}, + {"matrix":[1, 11], "x":11, "y":1}, + {"matrix":[1, 12], "x":12, "y":1}, + {"matrix":[1, 13], "x":13, "y":1, "w":2}, + {"matrix":[1, 14], "x":15, "y":1}, {"matrix":[2, 0], "x":0, "y":2, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2}, @@ -60,11 +68,11 @@ {"matrix":[2, 7], "x":7.5, "y":2}, {"matrix":[2, 8], "x":8.5, "y":2}, {"matrix":[2, 9], "x":9.5, "y":2}, - {"matrix":[2,10], "x":10.5, "y":2}, - {"matrix":[2,11], "x":11.5, "y":2}, - {"matrix":[2,12], "x":12.5, "y":2}, - {"matrix":[2,13], "x":13.5, "y":2, "w":1.5}, - {"matrix":[2,14], "x":15, "y":2}, + {"matrix":[2, 10], "x":10.5, "y":2}, + {"matrix":[2, 11], "x":11.5, "y":2}, + {"matrix":[2, 12], "x":12.5, "y":2}, + {"matrix":[2, 13], "x":13.5, "y":2, "w":1.5}, + {"matrix":[2, 14], "x":15, "y":2}, {"matrix":[3, 0], "x":0, "y":3, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3}, @@ -76,10 +84,10 @@ {"matrix":[3, 7], "x":7.75, "y":3}, {"matrix":[3, 8], "x":8.75, "y":3}, {"matrix":[3, 9], "x":9.75, "y":3}, - {"matrix":[3,10], "x":10.75, "y":3}, - {"matrix":[3,11], "x":11.75, "y":3}, - {"matrix":[3,13], "x":12.75, "y":3, "w":2.25}, - {"matrix":[3,14], "x":15, "y":3}, + {"matrix":[3, 10], "x":10.75, "y":3}, + {"matrix":[3, 11], "x":11.75, "y":3}, + {"matrix":[3, 13], "x":12.75, "y":3, "w":2.25}, + {"matrix":[3, 14], "x":15, "y":3}, {"matrix":[4, 0], "x":0, "y":4, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4}, @@ -90,22 +98,22 @@ {"matrix":[4, 7], "x":7.25, "y":4}, {"matrix":[4, 8], "x":8.25, "y":4}, {"matrix":[4, 9], "x":9.25, "y":4}, - {"matrix":[4,10], "x":10.25, "y":4}, - {"matrix":[4,11], "x":11.25, "y":4}, - {"matrix":[4,12], "x":12.25, "y":4, "w":1.75}, - {"matrix":[4,13], "x":14, "y":4}, - {"matrix":[4,14], "x":15, "y":4}, + {"matrix":[4, 10], "x":10.25, "y":4}, + {"matrix":[4, 11], "x":11.25, "y":4}, + {"matrix":[4, 12], "x":12.25, "y":4, "w":1.75}, + {"matrix":[4, 13], "x":14, "y":4}, + {"matrix":[4, 14], "x":15, "y":4}, {"matrix":[5, 0], "x":0, "y":5, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5, "w":1.25}, {"matrix":[5, 2], "x":2.5, "y":5, "w":1.25}, {"matrix":[5, 6], "x":3.75, "y":5, "w":6.25}, {"matrix":[5, 9], "x":10, "y":5}, - {"matrix":[5,10], "x":11, "y":5}, - {"matrix":[5,11], "x":12, "y":5}, - {"matrix":[5,12], "x":13, "y":5}, - {"matrix":[5,13], "x":14, "y":5}, - {"matrix":[5,14], "x":15, "y":5} + {"matrix":[5, 10], "x":11, "y":5}, + {"matrix":[5, 11], "x":12, "y":5}, + {"matrix":[5, 12], "x":13, "y":5}, + {"matrix":[5, 13], "x":14, "y":5}, + {"matrix":[5, 14], "x":15, "y":5} ] } } diff --git a/keyboards/keychron/s1/ansi/white/rules.mk b/keyboards/keychron/s1/ansi/white/rules.mk index 081a3b63f0..1fa4f83a77 100644 --- a/keyboards/keychron/s1/ansi/white/rules.mk +++ b/keyboards/keychron/s1/ansi/white/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes LED_MATRIX_ENABLE = yes -LED_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/s1/config.h b/keyboards/keychron/s1/config.h index e12cc0479c..8c98389522 100644 --- a/keyboards/keychron/s1/config.h +++ b/keyboards/keychron/s1/config.h @@ -16,15 +16,6 @@ #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS \ - { B5, B4, B3, A15, A14, A13 } -#define MATRIX_COL_PINS \ - { A10, A9, A8, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0, C15, C14 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* Disable DIP switch in matrix data */ #define MATRIX_MASKED diff --git a/keyboards/keychron/v1/ansi/info.json b/keyboards/keychron/v1/ansi/info.json index d6d35f8474..e6326a9538 100644 --- a/keyboards/keychron/v1/ansi/info.json +++ b/keyboards/keychron/v1/ansi/info.json @@ -8,6 +8,9 @@ "pid": "0x0310", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { @@ -23,11 +26,11 @@ {"matrix":[0, 7], "x":7.5, "y":0}, {"matrix":[0, 8], "x":8.5, "y":0}, {"matrix":[0, 9], "x":9.75, "y":0}, - {"matrix":[0,10], "x":10.75, "y":0}, - {"matrix":[0,11], "x":11.75, "y":0}, - {"matrix":[0,12], "x":12.75, "y":0}, - {"matrix":[0,13], "x":14, "y":0}, - {"matrix":[0,15], "x":15.25, "y":0}, + {"matrix":[0, 10], "x":10.75, "y":0}, + {"matrix":[0, 11], "x":11.75, "y":0}, + {"matrix":[0, 12], "x":12.75, "y":0}, + {"matrix":[0, 13], "x":14, "y":0}, + {"matrix":[0, 15], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -39,11 +42,11 @@ {"matrix":[1, 7], "x":7, "y":1.25}, {"matrix":[1, 8], "x":8, "y":1.25}, {"matrix":[1, 9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25, "w":2}, - {"matrix":[1,15], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10, "y":1.25}, + {"matrix":[1, 11], "x":11, "y":1.25}, + {"matrix":[1, 12], "x":12, "y":1.25}, + {"matrix":[1, 13], "x":13, "y":1.25, "w":2}, + {"matrix":[1, 15], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -55,11 +58,11 @@ {"matrix":[2, 7], "x":7.5, "y":2.25}, {"matrix":[2, 8], "x":8.5, "y":2.25}, {"matrix":[2, 9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5}, - {"matrix":[2,15], "x":15.25, "y":2.25}, + {"matrix":[2, 10], "x":10.5, "y":2.25}, + {"matrix":[2, 11], "x":11.5, "y":2.25}, + {"matrix":[2, 12], "x":12.5, "y":2.25}, + {"matrix":[2, 13], "x":13.5, "y":2.25, "w":1.5}, + {"matrix":[2, 15], "x":15.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -71,10 +74,10 @@ {"matrix":[3, 7], "x":7.75, "y":3.25}, {"matrix":[3, 8], "x":8.75, "y":3.25}, {"matrix":[3, 9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25}, - {"matrix":[3,15], "x":15.25, "y":3.25}, + {"matrix":[3, 10], "x":10.75, "y":3.25}, + {"matrix":[3, 11], "x":11.75, "y":3.25}, + {"matrix":[3, 13], "x":12.75, "y":3.25, "w":2.25}, + {"matrix":[3, 15], "x":15.25, "y":3.25}, {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4.25}, @@ -85,21 +88,21 @@ {"matrix":[4, 7], "x":7.25, "y":4.25}, {"matrix":[4, 8], "x":8.25, "y":4.25}, {"matrix":[4, 9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,13], "x":12.25, "y":4.25, "w":1.75}, - {"matrix":[4,14], "x":14.25, "y":4.5}, + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 13], "x":12.25, "y":4.25, "w":1.75}, + {"matrix":[4, 14], "x":14.25, "y":4.5}, {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25}, {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25}, - {"matrix":[5,10], "x":10, "y":5.25}, - {"matrix":[5,11], "x":11, "y":5.25}, - {"matrix":[5,12], "x":12, "y":5.25}, - {"matrix":[5,13], "x":13.25, "y":5.5}, - {"matrix":[5,14], "x":14.25, "y":5.5}, - {"matrix":[5,15], "x":15.25, "y":5.5} + {"matrix":[5, 10], "x":10, "y":5.25}, + {"matrix":[5, 11], "x":11, "y":5.25}, + {"matrix":[5, 12], "x":12, "y":5.25}, + {"matrix":[5, 13], "x":13.25, "y":5.5}, + {"matrix":[5, 14], "x":14.25, "y":5.5}, + {"matrix":[5, 15], "x":15.25, "y":5.5} ] } } diff --git a/keyboards/keychron/v1/ansi/rules.mk b/keyboards/keychron/v1/ansi/rules.mk index 311ca648e1..f2dba218bf 100644 --- a/keyboards/keychron/v1/ansi/rules.mk +++ b/keyboards/keychron/v1/ansi/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/v1/ansi_encoder/info.json b/keyboards/keychron/v1/ansi_encoder/info.json index af396f6bb6..303f1e6475 100644 --- a/keyboards/keychron/v1/ansi_encoder/info.json +++ b/keyboards/keychron/v1/ansi_encoder/info.json @@ -8,6 +8,9 @@ "pid": "0x0311", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "encoder": { "rotary": [ {"pin_a": "A10", "pin_b": "A8"} @@ -28,11 +31,11 @@ {"matrix":[0, 7], "x":7.5, "y":0}, {"matrix":[0, 8], "x":8.5, "y":0}, {"matrix":[0, 9], "x":9.75, "y":0}, - {"matrix":[0,10], "x":10.75, "y":0}, - {"matrix":[0,11], "x":11.75, "y":0}, - {"matrix":[0,12], "x":12.75, "y":0}, - {"matrix":[0,13], "x":14, "y":0}, - {"matrix":[0,15], "x":15.25, "y":0}, + {"matrix":[0, 10], "x":10.75, "y":0}, + {"matrix":[0, 11], "x":11.75, "y":0}, + {"matrix":[0, 12], "x":12.75, "y":0}, + {"matrix":[0, 13], "x":14, "y":0}, + {"matrix":[0, 15], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -44,11 +47,11 @@ {"matrix":[1, 7], "x":7, "y":1.25}, {"matrix":[1, 8], "x":8, "y":1.25}, {"matrix":[1, 9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25, "w":2}, - {"matrix":[1,15], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10, "y":1.25}, + {"matrix":[1, 11], "x":11, "y":1.25}, + {"matrix":[1, 12], "x":12, "y":1.25}, + {"matrix":[1, 13], "x":13, "y":1.25, "w":2}, + {"matrix":[1, 15], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -60,11 +63,11 @@ {"matrix":[2, 7], "x":7.5, "y":2.25}, {"matrix":[2, 8], "x":8.5, "y":2.25}, {"matrix":[2, 9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5}, - {"matrix":[2,15], "x":15.25, "y":2.25}, + {"matrix":[2, 10], "x":10.5, "y":2.25}, + {"matrix":[2, 11], "x":11.5, "y":2.25}, + {"matrix":[2, 12], "x":12.5, "y":2.25}, + {"matrix":[2, 13], "x":13.5, "y":2.25, "w":1.5}, + {"matrix":[2, 15], "x":15.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -76,10 +79,10 @@ {"matrix":[3, 7], "x":7.75, "y":3.25}, {"matrix":[3, 8], "x":8.75, "y":3.25}, {"matrix":[3, 9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25}, - {"matrix":[3,15], "x":15.25, "y":3.25}, + {"matrix":[3, 10], "x":10.75, "y":3.25}, + {"matrix":[3, 11], "x":11.75, "y":3.25}, + {"matrix":[3, 13], "x":12.75, "y":3.25, "w":2.25}, + {"matrix":[3, 15], "x":15.25, "y":3.25}, {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4.25}, @@ -90,21 +93,21 @@ {"matrix":[4, 7], "x":7.25, "y":4.25}, {"matrix":[4, 8], "x":8.25, "y":4.25}, {"matrix":[4, 9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,13], "x":12.25, "y":4.25, "w":1.75}, - {"matrix":[4,14], "x":14.25, "y":4.5}, + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 13], "x":12.25, "y":4.25, "w":1.75}, + {"matrix":[4, 14], "x":14.25, "y":4.5}, {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25}, {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25}, - {"matrix":[5,10], "x":10, "y":5.25}, - {"matrix":[5,11], "x":11, "y":5.25}, - {"matrix":[5,12], "x":12, "y":5.25}, - {"matrix":[5,13], "x":13.25, "y":5.5}, - {"matrix":[5,14], "x":14.25, "y":5.5}, - {"matrix":[5,15], "x":15.25, "y":5.5} + {"matrix":[5, 10], "x":10, "y":5.25}, + {"matrix":[5, 11], "x":11, "y":5.25}, + {"matrix":[5, 12], "x":12, "y":5.25}, + {"matrix":[5, 13], "x":13.25, "y":5.5}, + {"matrix":[5, 14], "x":14.25, "y":5.5}, + {"matrix":[5, 15], "x":15.25, "y":5.5} ] } } diff --git a/keyboards/keychron/v1/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/v1/ansi_encoder/keymaps/default/keymap.c index 7f36fd988e..a5eed7de19 100644 --- a/keyboards/keychron/v1/ansi_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/v1/ansi_encoder/keymaps/default/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, diff --git a/keyboards/keychron/v1/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/v1/ansi_encoder/keymaps/keychron/keymap.c index daa3d07512..f5e6247ca6 100644 --- a/keyboards/keychron/v1/ansi_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/v1/ansi_encoder/keymaps/keychron/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format on #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, diff --git a/keyboards/keychron/v1/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/v1/ansi_encoder/keymaps/via/keymap.c index 282e530fff..2ff15e873d 100644 --- a/keyboards/keychron/v1/ansi_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/v1/ansi_encoder/keymaps/via/keymap.c @@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format on #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, diff --git a/keyboards/keychron/v1/ansi_encoder/rules.mk b/keyboards/keychron/v1/ansi_encoder/rules.mk index ef55047753..5df3cbccaf 100644 --- a/keyboards/keychron/v1/ansi_encoder/rules.mk +++ b/keyboards/keychron/v1/ansi_encoder/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/v1/iso/info.json b/keyboards/keychron/v1/iso/info.json index d9b11f5f55..4ebb8607f3 100644 --- a/keyboards/keychron/v1/iso/info.json +++ b/keyboards/keychron/v1/iso/info.json @@ -8,6 +8,9 @@ "pid": "0x0312", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { @@ -23,11 +26,11 @@ {"matrix":[0, 7], "x":7.5, "y":0}, {"matrix":[0, 8], "x":8.5, "y":0}, {"matrix":[0, 9], "x":9.75, "y":0}, - {"matrix":[0,10], "x":10.75, "y":0}, - {"matrix":[0,11], "x":11.75, "y":0}, - {"matrix":[0,12], "x":12.75, "y":0}, - {"matrix":[0,13], "x":14, "y":0}, - {"matrix":[0,15], "x":15.25, "y":0}, + {"matrix":[0, 10], "x":10.75, "y":0}, + {"matrix":[0, 11], "x":11.75, "y":0}, + {"matrix":[0, 12], "x":12.75, "y":0}, + {"matrix":[0, 13], "x":14, "y":0}, + {"matrix":[0, 15], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -39,11 +42,11 @@ {"matrix":[1, 7], "x":7, "y":1.25}, {"matrix":[1, 8], "x":8, "y":1.25}, {"matrix":[1, 9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25, "w":2}, - {"matrix":[1,15], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10, "y":1.25}, + {"matrix":[1, 11], "x":11, "y":1.25}, + {"matrix":[1, 12], "x":12, "y":1.25}, + {"matrix":[1, 13], "x":13, "y":1.25, "w":2}, + {"matrix":[1, 15], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -55,10 +58,10 @@ {"matrix":[2, 7], "x":7.5, "y":2.25}, {"matrix":[2, 8], "x":8.5, "y":2.25}, {"matrix":[2, 9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,15], "x":15.25, "y":2.25}, + {"matrix":[2, 10], "x":10.5, "y":2.25}, + {"matrix":[2, 11], "x":11.5, "y":2.25}, + {"matrix":[2, 12], "x":12.5, "y":2.25}, + {"matrix":[2, 15], "x":15.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -70,11 +73,11 @@ {"matrix":[3, 7], "x":7.75, "y":3.25}, {"matrix":[3, 8], "x":8.75, "y":3.25}, {"matrix":[3, 9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, - {"matrix":[3,15], "x":15.25, "y":3.25}, + {"matrix":[3, 10], "x":10.75, "y":3.25}, + {"matrix":[3, 11], "x":11.75, "y":3.25}, + {"matrix":[3, 13], "x":12.75, "y":3.25}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3, 15], "x":15.25, "y":3.25}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25}, @@ -86,21 +89,21 @@ {"matrix":[4, 7], "x":7.25, "y":4.25}, {"matrix":[4, 8], "x":8.25, "y":4.25}, {"matrix":[4, 9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,13], "x":12.25, "y":4.25, "w":1.75}, - {"matrix":[4,14], "x":14.25, "y":4.5}, + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 13], "x":12.25, "y":4.25, "w":1.75}, + {"matrix":[4, 14], "x":14.25, "y":4.5}, {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25}, {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25}, - {"matrix":[5,10], "x":10, "y":5.25}, - {"matrix":[5,11], "x":11, "y":5.25}, - {"matrix":[5,12], "x":12, "y":5.25}, - {"matrix":[5,13], "x":13.25, "y":5.5}, - {"matrix":[5,14], "x":14.25, "y":5.5}, - {"matrix":[5,15], "x":15.25, "y":5.5} + {"matrix":[5, 10], "x":10, "y":5.25}, + {"matrix":[5, 11], "x":11, "y":5.25}, + {"matrix":[5, 12], "x":12, "y":5.25}, + {"matrix":[5, 13], "x":13.25, "y":5.5}, + {"matrix":[5, 14], "x":14.25, "y":5.5}, + {"matrix":[5, 15], "x":15.25, "y":5.5} ] } } diff --git a/keyboards/keychron/v1/iso/rules.mk b/keyboards/keychron/v1/iso/rules.mk index 311ca648e1..f2dba218bf 100644 --- a/keyboards/keychron/v1/iso/rules.mk +++ b/keyboards/keychron/v1/iso/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/v1/iso_encoder/info.json b/keyboards/keychron/v1/iso_encoder/info.json index c08e7d4539..fcd2dbb793 100644 --- a/keyboards/keychron/v1/iso_encoder/info.json +++ b/keyboards/keychron/v1/iso_encoder/info.json @@ -8,6 +8,9 @@ "pid": "0x0313", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "encoder": { "rotary": [ {"pin_a": "A10", "pin_b": "A8"} @@ -28,11 +31,11 @@ {"matrix":[0, 7], "x":7.5, "y":0}, {"matrix":[0, 8], "x":8.5, "y":0}, {"matrix":[0, 9], "x":9.75, "y":0}, - {"matrix":[0,10], "x":10.75, "y":0}, - {"matrix":[0,11], "x":11.75, "y":0}, - {"matrix":[0,12], "x":12.75, "y":0}, - {"matrix":[0,13], "x":14, "y":0}, - {"matrix":[0,15], "x":15.25, "y":0}, + {"matrix":[0, 10], "x":10.75, "y":0}, + {"matrix":[0, 11], "x":11.75, "y":0}, + {"matrix":[0, 12], "x":12.75, "y":0}, + {"matrix":[0, 13], "x":14, "y":0}, + {"matrix":[0, 15], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -44,11 +47,11 @@ {"matrix":[1, 7], "x":7, "y":1.25}, {"matrix":[1, 8], "x":8, "y":1.25}, {"matrix":[1, 9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25, "w":2}, - {"matrix":[1,15], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10, "y":1.25}, + {"matrix":[1, 11], "x":11, "y":1.25}, + {"matrix":[1, 12], "x":12, "y":1.25}, + {"matrix":[1, 13], "x":13, "y":1.25, "w":2}, + {"matrix":[1, 15], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -60,10 +63,10 @@ {"matrix":[2, 7], "x":7.5, "y":2.25}, {"matrix":[2, 8], "x":8.5, "y":2.25}, {"matrix":[2, 9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,15], "x":15.25, "y":2.25}, + {"matrix":[2, 10], "x":10.5, "y":2.25}, + {"matrix":[2, 11], "x":11.5, "y":2.25}, + {"matrix":[2, 12], "x":12.5, "y":2.25}, + {"matrix":[2, 15], "x":15.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -75,11 +78,11 @@ {"matrix":[3, 7], "x":7.75, "y":3.25}, {"matrix":[3, 8], "x":8.75, "y":3.25}, {"matrix":[3, 9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, - {"matrix":[3,15], "x":15.25, "y":3.25}, + {"matrix":[3, 10], "x":10.75, "y":3.25}, + {"matrix":[3, 11], "x":11.75, "y":3.25}, + {"matrix":[3, 13], "x":12.75, "y":3.25}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3, 15], "x":15.25, "y":3.25}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25}, @@ -91,21 +94,21 @@ {"matrix":[4, 7], "x":7.25, "y":4.25}, {"matrix":[4, 8], "x":8.25, "y":4.25}, {"matrix":[4, 9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,13], "x":12.25, "y":4.25, "w":1.75}, - {"matrix":[4,14], "x":14.25, "y":4.5}, + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 13], "x":12.25, "y":4.25, "w":1.75}, + {"matrix":[4, 14], "x":14.25, "y":4.5}, {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25}, {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25}, - {"matrix":[5,10], "x":10, "y":5.25}, - {"matrix":[5,11], "x":11, "y":5.25}, - {"matrix":[5,12], "x":12, "y":5.25}, - {"matrix":[5,13], "x":13.25, "y":5.5}, - {"matrix":[5,14], "x":14.25, "y":5.5}, - {"matrix":[5,15], "x":15.25, "y":5.5} + {"matrix":[5, 10], "x":10, "y":5.25}, + {"matrix":[5, 11], "x":11, "y":5.25}, + {"matrix":[5, 12], "x":12, "y":5.25}, + {"matrix":[5, 13], "x":13.25, "y":5.5}, + {"matrix":[5, 14], "x":14.25, "y":5.5}, + {"matrix":[5, 15], "x":15.25, "y":5.5} ] } } diff --git a/keyboards/keychron/v1/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/v1/iso_encoder/keymaps/default/keymap.c index 91b784a074..2667e16d5e 100644 --- a/keyboards/keychron/v1/iso_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/v1/iso_encoder/keymaps/default/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, diff --git a/keyboards/keychron/v1/iso_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/v1/iso_encoder/keymaps/keychron/keymap.c index cf93ef4ce7..52e1a31654 100644 --- a/keyboards/keychron/v1/iso_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/v1/iso_encoder/keymaps/keychron/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format on #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, diff --git a/keyboards/keychron/v1/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/v1/iso_encoder/keymaps/via/keymap.c index 91b784a074..2667e16d5e 100644 --- a/keyboards/keychron/v1/iso_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/v1/iso_encoder/keymaps/via/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, diff --git a/keyboards/keychron/v1/iso_encoder/rules.mk b/keyboards/keychron/v1/iso_encoder/rules.mk index ef55047753..5df3cbccaf 100644 --- a/keyboards/keychron/v1/iso_encoder/rules.mk +++ b/keyboards/keychron/v1/iso_encoder/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/v1/jis/info.json b/keyboards/keychron/v1/jis/info.json index 8d06120f5d..efdb9664f1 100644 --- a/keyboards/keychron/v1/jis/info.json +++ b/keyboards/keychron/v1/jis/info.json @@ -8,6 +8,9 @@ "pid": "0x0314", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { @@ -23,11 +26,11 @@ {"matrix":[0, 7], "x":7.5, "y":0}, {"matrix":[0, 8], "x":8.5, "y":0}, {"matrix":[0, 9], "x":9.75, "y":0}, - {"matrix":[0,10], "x":10.75, "y":0}, - {"matrix":[0,11], "x":11.75, "y":0}, - {"matrix":[0,12], "x":12.75, "y":0}, - {"matrix":[0,13], "x":14, "y":0}, - {"matrix":[0,15], "x":15.25, "y":0}, + {"matrix":[0, 10], "x":10.75, "y":0}, + {"matrix":[0, 11], "x":11.75, "y":0}, + {"matrix":[0, 12], "x":12.75, "y":0}, + {"matrix":[0, 13], "x":14, "y":0}, + {"matrix":[0, 15], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -39,12 +42,12 @@ {"matrix":[1, 7], "x":7, "y":1.25}, {"matrix":[1, 8], "x":8, "y":1.25}, {"matrix":[1, 9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25}, - {"matrix":[1,14], "x":14, "y":1.25}, - {"matrix":[1,15], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10, "y":1.25}, + {"matrix":[1, 11], "x":11, "y":1.25}, + {"matrix":[1, 12], "x":12, "y":1.25}, + {"matrix":[1, 13], "x":13, "y":1.25}, + {"matrix":[1, 14], "x":14, "y":1.25}, + {"matrix":[1, 15], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -56,10 +59,10 @@ {"matrix":[2, 7], "x":7.5, "y":2.25}, {"matrix":[2, 8], "x":8.5, "y":2.25}, {"matrix":[2, 9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,15], "x":15.25, "y":2.25}, + {"matrix":[2, 10], "x":10.5, "y":2.25}, + {"matrix":[2, 11], "x":11.5, "y":2.25}, + {"matrix":[2, 12], "x":12.5, "y":2.25}, + {"matrix":[2, 15], "x":15.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -71,11 +74,11 @@ {"matrix":[3, 7], "x":7.75, "y":3.25}, {"matrix":[3, 8], "x":8.75, "y":3.25}, {"matrix":[3, 9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, - {"matrix":[3,15], "x":15.25, "y":3.25}, + {"matrix":[3, 10], "x":10.75, "y":3.25}, + {"matrix":[3, 11], "x":11.75, "y":3.25}, + {"matrix":[3, 13], "x":12.75, "y":3.25}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3, 15], "x":15.25, "y":3.25}, {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4.25}, @@ -86,11 +89,11 @@ {"matrix":[4, 7], "x":7.25, "y":4.25}, {"matrix":[4, 8], "x":8.25, "y":4.25}, {"matrix":[4, 9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,12], "x":12.25, "y":4.25}, - {"matrix":[4,13], "x":13.25, "y":4.25}, - {"matrix":[4,14], "x":14.25, "y":4.5}, + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 12], "x":12.25, "y":4.25}, + {"matrix":[4, 13], "x":13.25, "y":4.25}, + {"matrix":[4, 14], "x":14.25, "y":4.5}, {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5.25}, @@ -98,12 +101,12 @@ {"matrix":[5, 3], "x":3.5, "y":5.25}, {"matrix":[5, 6], "x":4.5, "y":5.25, "w":4.5}, {"matrix":[5, 9], "x":9, "y":5.25, "w":1.25}, - {"matrix":[5,10], "x":10.25, "y":5.25}, - {"matrix":[5,11], "x":11.25, "y":5.25}, - {"matrix":[5,12], "x":12.25, "y":5.25}, - {"matrix":[5,13], "x":13.25, "y":5.25}, - {"matrix":[5,14], "x":14.25, "y":5.25}, - {"matrix":[5,15], "x":15.25, "y":5.25} + {"matrix":[5, 10], "x":10.25, "y":5.25}, + {"matrix":[5, 11], "x":11.25, "y":5.25}, + {"matrix":[5, 12], "x":12.25, "y":5.25}, + {"matrix":[5, 13], "x":13.25, "y":5.25}, + {"matrix":[5, 14], "x":14.25, "y":5.25}, + {"matrix":[5, 15], "x":15.25, "y":5.25} ] } } diff --git a/keyboards/keychron/v1/jis/rules.mk b/keyboards/keychron/v1/jis/rules.mk index 311ca648e1..f2dba218bf 100644 --- a/keyboards/keychron/v1/jis/rules.mk +++ b/keyboards/keychron/v1/jis/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/v1/jis_encoder/info.json b/keyboards/keychron/v1/jis_encoder/info.json index 7554498481..511d33f01e 100644 --- a/keyboards/keychron/v1/jis_encoder/info.json +++ b/keyboards/keychron/v1/jis_encoder/info.json @@ -8,6 +8,9 @@ "pid": "0x0315", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "encoder": { "rotary": [ {"pin_a": "A10", "pin_b": "A8"} @@ -28,11 +31,11 @@ {"matrix":[0, 7], "x":7.5, "y":0}, {"matrix":[0, 8], "x":8.5, "y":0}, {"matrix":[0, 9], "x":9.75, "y":0}, - {"matrix":[0,10], "x":10.75, "y":0}, - {"matrix":[0,11], "x":11.75, "y":0}, - {"matrix":[0,12], "x":12.75, "y":0}, - {"matrix":[0,13], "x":14, "y":0}, - {"matrix":[0,15], "x":15.25, "y":0}, + {"matrix":[0, 10], "x":10.75, "y":0}, + {"matrix":[0, 11], "x":11.75, "y":0}, + {"matrix":[0, 12], "x":12.75, "y":0}, + {"matrix":[0, 13], "x":14, "y":0}, + {"matrix":[0, 15], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -44,12 +47,12 @@ {"matrix":[1, 7], "x":7, "y":1.25}, {"matrix":[1, 8], "x":8, "y":1.25}, {"matrix":[1, 9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25}, - {"matrix":[1,14], "x":14, "y":1.25}, - {"matrix":[1,15], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10, "y":1.25}, + {"matrix":[1, 11], "x":11, "y":1.25}, + {"matrix":[1, 12], "x":12, "y":1.25}, + {"matrix":[1, 13], "x":13, "y":1.25}, + {"matrix":[1, 14], "x":14, "y":1.25}, + {"matrix":[1, 15], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -61,10 +64,10 @@ {"matrix":[2, 7], "x":7.5, "y":2.25}, {"matrix":[2, 8], "x":8.5, "y":2.25}, {"matrix":[2, 9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,15], "x":15.25, "y":2.25}, + {"matrix":[2, 10], "x":10.5, "y":2.25}, + {"matrix":[2, 11], "x":11.5, "y":2.25}, + {"matrix":[2, 12], "x":12.5, "y":2.25}, + {"matrix":[2, 15], "x":15.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -76,11 +79,11 @@ {"matrix":[3, 7], "x":7.75, "y":3.25}, {"matrix":[3, 8], "x":8.75, "y":3.25}, {"matrix":[3, 9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, - {"matrix":[3,15], "x":15.25, "y":3.25}, + {"matrix":[3, 10], "x":10.75, "y":3.25}, + {"matrix":[3, 11], "x":11.75, "y":3.25}, + {"matrix":[3, 13], "x":12.75, "y":3.25}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3, 15], "x":15.25, "y":3.25}, {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4.25}, @@ -91,11 +94,11 @@ {"matrix":[4, 7], "x":7.25, "y":4.25}, {"matrix":[4, 8], "x":8.25, "y":4.25}, {"matrix":[4, 9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,12], "x":12.25, "y":4.25}, - {"matrix":[4,13], "x":13.25, "y":4.25}, - {"matrix":[4,14], "x":14.25, "y":4.5}, + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 12], "x":12.25, "y":4.25}, + {"matrix":[4, 13], "x":13.25, "y":4.25}, + {"matrix":[4, 14], "x":14.25, "y":4.5}, {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5.25}, @@ -103,12 +106,12 @@ {"matrix":[5, 3], "x":3.5, "y":5.25}, {"matrix":[5, 6], "x":4.5, "y":5.25, "w":4.5}, {"matrix":[5, 9], "x":9, "y":5.25, "w":1.25}, - {"matrix":[5,10], "x":10.25, "y":5.25}, - {"matrix":[5,11], "x":11.25, "y":5.25}, - {"matrix":[5,12], "x":12.25, "y":5.25}, - {"matrix":[5,13], "x":13.25, "y":5.25}, - {"matrix":[5,14], "x":14.25, "y":5.25}, - {"matrix":[5,15], "x":15.25, "y":5.25} + {"matrix":[5, 10], "x":10.25, "y":5.25}, + {"matrix":[5, 11], "x":11.25, "y":5.25}, + {"matrix":[5, 12], "x":12.25, "y":5.25}, + {"matrix":[5, 13], "x":13.25, "y":5.25}, + {"matrix":[5, 14], "x":14.25, "y":5.25}, + {"matrix":[5, 15], "x":15.25, "y":5.25} ] } } diff --git a/keyboards/keychron/v1/jis_encoder/keymaps/default/keymap.c b/keyboards/keychron/v1/jis_encoder/keymaps/default/keymap.c index 5e93c2a6ba..05f0d38846 100644 --- a/keyboards/keychron/v1/jis_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/v1/jis_encoder/keymaps/default/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, diff --git a/keyboards/keychron/v1/jis_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/v1/jis_encoder/keymaps/keychron/keymap.c index 927846ea8a..bef69ccea8 100644 --- a/keyboards/keychron/v1/jis_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/v1/jis_encoder/keymaps/keychron/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format on #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, diff --git a/keyboards/keychron/v1/jis_encoder/keymaps/via/keymap.c b/keyboards/keychron/v1/jis_encoder/keymaps/via/keymap.c index 5e93c2a6ba..05f0d38846 100644 --- a/keyboards/keychron/v1/jis_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/v1/jis_encoder/keymaps/via/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, diff --git a/keyboards/keychron/v1/jis_encoder/rules.mk b/keyboards/keychron/v1/jis_encoder/rules.mk index ef55047753..5df3cbccaf 100644 --- a/keyboards/keychron/v1/jis_encoder/rules.mk +++ b/keyboards/keychron/v1/jis_encoder/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/v10/ansi_encoder/info.json b/keyboards/keychron/v10/ansi_encoder/info.json index cf8ae78b99..3df1d8212a 100644 --- a/keyboards/keychron/v10/ansi_encoder/info.json +++ b/keyboards/keychron/v10/ansi_encoder/info.json @@ -8,6 +8,9 @@ "pid": "0x03A1", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "encoder": { "rotary": [ {"pin_a": "A10", "pin_b": "A8"} @@ -31,12 +34,12 @@ {"matrix":[0, 7], "x":8.25, "y":0}, {"matrix":[0, 8], "x":11, "y":0}, {"matrix":[0, 9], "x":12, "y":0}, - {"matrix":[0,10], "x":13.25, "y":0}, - {"matrix":[0,11], "x":14.25, "y":0}, - {"matrix":[0,12], "x":15.25, "y":0}, - {"matrix":[0,13], "x":16.25, "y":0}, - {"matrix":[0,14], "x":17.5, "y":0}, - {"matrix":[0,15], "x":18.75, "y":0}, + {"matrix":[0, 10], "x":13.25, "y":0}, + {"matrix":[0, 11], "x":14.25, "y":0}, + {"matrix":[0, 12], "x":15.25, "y":0}, + {"matrix":[0, 13], "x":16.25, "y":0}, + {"matrix":[0, 14], "x":17.5, "y":0}, + {"matrix":[0, 15], "x":18.75, "y":0}, {"matrix":[1, 0], "x":0.75, "y":1.25}, {"matrix":[1, 1], "x":2.25, "y":1.25}, @@ -48,12 +51,12 @@ {"matrix":[1, 7], "x":8.25, "y":1.25}, {"matrix":[1, 8], "x":10.5, "y":1.25}, {"matrix":[1, 9], "x":11.5, "y":1.25}, - {"matrix":[1,10], "x":12.5, "y":1.25}, - {"matrix":[1,11], "x":13.5, "y":1.25}, - {"matrix":[1,12], "x":14.5, "y":1.25}, - {"matrix":[1,13], "x":15.5, "y":1.25}, - {"matrix":[1,14], "x":16.5, "y":1.25, "w":2}, - {"matrix":[1,15], "x":19, "y":1.25}, + {"matrix":[1, 10], "x":12.5, "y":1.25}, + {"matrix":[1, 11], "x":13.5, "y":1.25}, + {"matrix":[1, 12], "x":14.5, "y":1.25}, + {"matrix":[1, 13], "x":15.5, "y":1.25}, + {"matrix":[1, 14], "x":16.5, "y":1.25, "w":2}, + {"matrix":[1, 15], "x":19, "y":1.25}, {"matrix":[2, 0], "x":0.5, "y":2.25}, {"matrix":[2, 1], "x":1.75, "y":2.25, "w":1.5}, @@ -65,12 +68,12 @@ {"matrix":[2, 7], "x":10, "y":2.25}, {"matrix":[2, 8], "x":11, "y":2.25}, {"matrix":[2, 9], "x":12, "y":2.25}, - {"matrix":[2,10], "x":13, "y":2.25}, - {"matrix":[2,11], "x":14, "y":2.25}, - {"matrix":[2,12], "x":15.25, "y":2.25}, - {"matrix":[2,13], "x":16.25, "y":2.25}, - {"matrix":[2,14], "x":17.25, "y":2.25, "w":1.5}, - {"matrix":[2,15], "x":19.25, "y":2.25}, + {"matrix":[2, 10], "x":13, "y":2.25}, + {"matrix":[2, 11], "x":14, "y":2.25}, + {"matrix":[2, 12], "x":15.25, "y":2.25}, + {"matrix":[2, 13], "x":16.25, "y":2.25}, + {"matrix":[2, 14], "x":17.25, "y":2.25, "w":1.5}, + {"matrix":[2, 15], "x":19.25, "y":2.25}, {"matrix":[3, 0], "x":0.25, "y":3.25}, {"matrix":[3, 1], "x":1.5, "y":3.25, "w":1.75}, @@ -81,12 +84,12 @@ {"matrix":[3, 6], "x":7.5, "y":3.25}, {"matrix":[3, 8], "x":10.25, "y":3.25}, {"matrix":[3, 9], "x":11.25, "y":3.25}, - {"matrix":[3,10], "x":12.25, "y":3.25}, - {"matrix":[3,11], "x":13.25, "y":3.25}, - {"matrix":[3,12], "x":14.75, "y":3.25}, - {"matrix":[3,13], "x":15.75, "y":3.25}, - {"matrix":[3,14], "x":16.75, "y":3.25, "w":2.25}, - {"matrix":[3,15], "x":19.5, "y":3.25}, + {"matrix":[3, 10], "x":12.25, "y":3.25}, + {"matrix":[3, 11], "x":13.25, "y":3.25}, + {"matrix":[3, 12], "x":14.75, "y":3.25}, + {"matrix":[3, 13], "x":15.75, "y":3.25}, + {"matrix":[3, 14], "x":16.75, "y":3.25, "w":2.25}, + {"matrix":[3, 15], "x":19.5, "y":3.25}, {"matrix":[4, 0], "x":0, "y":4.25}, {"matrix":[4, 1], "x":1.5, "y":4.25, "w":2.25}, @@ -97,12 +100,12 @@ {"matrix":[4, 7], "x":7.75, "y":4.25}, {"matrix":[4, 8], "x":9.5, "y":4.25}, {"matrix":[4, 9], "x":10.5, "y":4.25}, - {"matrix":[4,10], "x":11.5, "y":4.25}, - {"matrix":[4,11], "x":12.5, "y":4.25}, - {"matrix":[4,12], "x":13.5, "y":4.25}, - {"matrix":[4,13], "x":15.25, "y":4.25}, - {"matrix":[4,14], "x":16.25, "y":4.25, "w":1.75}, - {"matrix":[4,15], "x":18.25, "y":4.5}, + {"matrix":[4, 10], "x":11.5, "y":4.25}, + {"matrix":[4, 11], "x":12.5, "y":4.25}, + {"matrix":[4, 12], "x":13.5, "y":4.25}, + {"matrix":[4, 13], "x":15.25, "y":4.25}, + {"matrix":[4, 14], "x":16.25, "y":4.25, "w":1.75}, + {"matrix":[4, 15], "x":18.25, "y":4.5}, {"matrix":[5, 0], "x":0, "y":5.25}, {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, @@ -112,9 +115,9 @@ {"matrix":[5, 7], "x":8.25, "y":5.25}, {"matrix":[5, 8], "x":9.5, "y":5.25, "w":2.75}, {"matrix":[5, 9], "x":12.25, "y":5.25}, - {"matrix":[5,13], "x":17.25, "y":5.5}, - {"matrix":[5,14], "x":18.25, "y":5.5}, - {"matrix":[5,15], "x":19.25, "y":5.5} + {"matrix":[5, 13], "x":17.25, "y":5.5}, + {"matrix":[5, 14], "x":18.25, "y":5.5}, + {"matrix":[5, 15], "x":19.25, "y":5.5} ] } } diff --git a/keyboards/keychron/v10/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/v10/ansi_encoder/keymaps/default/keymap.c index 122e55978c..85daf6fb52 100644 --- a/keyboards/keychron/v10/ansi_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/v10/ansi_encoder/keymaps/default/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][1][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/v10/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/v10/ansi_encoder/keymaps/keychron/keymap.c index 08758d3638..888d9cf754 100644 --- a/keyboards/keychron/v10/ansi_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/v10/ansi_encoder/keymaps/keychron/keymap.c @@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][1][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/v10/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/v10/ansi_encoder/keymaps/via/keymap.c index 6f4483d309..939edd9548 100644 --- a/keyboards/keychron/v10/ansi_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/v10/ansi_encoder/keymaps/via/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][1][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/v10/ansi_encoder/rules.mk b/keyboards/keychron/v10/ansi_encoder/rules.mk index ef55047753..5df3cbccaf 100644 --- a/keyboards/keychron/v10/ansi_encoder/rules.mk +++ b/keyboards/keychron/v10/ansi_encoder/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/v10/iso_encoder/info.json b/keyboards/keychron/v10/iso_encoder/info.json index f214e6a333..5e4bb8c32f 100644 --- a/keyboards/keychron/v10/iso_encoder/info.json +++ b/keyboards/keychron/v10/iso_encoder/info.json @@ -8,6 +8,9 @@ "pid": "0x03A3", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "encoder": { "rotary": [ {"pin_a": "A10", "pin_b": "A8"} @@ -31,12 +34,12 @@ {"matrix":[0, 7], "x":8.25, "y":0}, {"matrix":[0, 8], "x":11, "y":0}, {"matrix":[0, 9], "x":12, "y":0}, - {"matrix":[0,10], "x":13.25, "y":0}, - {"matrix":[0,11], "x":14.25, "y":0}, - {"matrix":[0,12], "x":15.25, "y":0}, - {"matrix":[0,13], "x":16.25, "y":0}, - {"matrix":[0,14], "x":17.5, "y":0}, - {"matrix":[0,15], "x":18.75, "y":0}, + {"matrix":[0, 10], "x":13.25, "y":0}, + {"matrix":[0, 11], "x":14.25, "y":0}, + {"matrix":[0, 12], "x":15.25, "y":0}, + {"matrix":[0, 13], "x":16.25, "y":0}, + {"matrix":[0, 14], "x":17.5, "y":0}, + {"matrix":[0, 15], "x":18.75, "y":0}, {"matrix":[1, 0], "x":0.75, "y":1.25}, {"matrix":[1, 1], "x":2.25, "y":1.25}, @@ -48,12 +51,12 @@ {"matrix":[1, 7], "x":8.25, "y":1.25}, {"matrix":[1, 8], "x":10.5, "y":1.25}, {"matrix":[1, 9], "x":11.5, "y":1.25}, - {"matrix":[1,10], "x":12.5, "y":1.25}, - {"matrix":[1,11], "x":13.5, "y":1.25}, - {"matrix":[1,12], "x":14.5, "y":1.25}, - {"matrix":[1,13], "x":15.5, "y":1.25}, - {"matrix":[1,14], "x":16.5, "y":1.25, "w":2}, - {"matrix":[1,15], "x":19, "y":1.25}, + {"matrix":[1, 10], "x":12.5, "y":1.25}, + {"matrix":[1, 11], "x":13.5, "y":1.25}, + {"matrix":[1, 12], "x":14.5, "y":1.25}, + {"matrix":[1, 13], "x":15.5, "y":1.25}, + {"matrix":[1, 14], "x":16.5, "y":1.25, "w":2}, + {"matrix":[1, 15], "x":19, "y":1.25}, {"matrix":[2, 0], "x":0.5, "y":2.25}, {"matrix":[2, 1], "x":1.75, "y":2.25, "w":1.5}, @@ -65,11 +68,11 @@ {"matrix":[2, 7], "x":10, "y":2.25}, {"matrix":[2, 8], "x":11, "y":2.25}, {"matrix":[2, 9], "x":12, "y":2.25}, - {"matrix":[2,10], "x":13, "y":2.25}, - {"matrix":[2,11], "x":14, "y":2.25}, - {"matrix":[2,12], "x":15.25, "y":2.25}, - {"matrix":[2,13], "x":16.25, "y":2.25}, - {"matrix":[2,15], "x":19.25, "y":2.25}, + {"matrix":[2, 10], "x":13, "y":2.25}, + {"matrix":[2, 11], "x":14, "y":2.25}, + {"matrix":[2, 12], "x":15.25, "y":2.25}, + {"matrix":[2, 13], "x":16.25, "y":2.25}, + {"matrix":[2, 15], "x":19.25, "y":2.25}, {"matrix":[3, 0], "x":0.25, "y":3.25}, {"matrix":[3, 1], "x":1.5, "y":3.25, "w":1.75}, @@ -80,13 +83,13 @@ {"matrix":[3, 6], "x":7.5, "y":3.25}, {"matrix":[3, 8], "x":10.25, "y":3.25}, {"matrix":[3, 9], "x":11.25, "y":3.25}, - {"matrix":[3,10], "x":12.25, "y":3.25}, - {"matrix":[3,11], "x":13.25, "y":3.25}, - {"matrix":[3,12], "x":14.75, "y":3.25}, - {"matrix":[3,13], "x":15.75, "y":3.25}, - {"matrix":[3,14], "x":16.75, "y":3.25}, - {"matrix":[2,14], "x":17.75, "y":2.25, "w":1.25, "h":2}, - {"matrix":[3,15], "x":19.5, "y":3.25}, + {"matrix":[3, 10], "x":12.25, "y":3.25}, + {"matrix":[3, 11], "x":13.25, "y":3.25}, + {"matrix":[3, 12], "x":14.75, "y":3.25}, + {"matrix":[3, 13], "x":15.75, "y":3.25}, + {"matrix":[3, 14], "x":16.75, "y":3.25}, + {"matrix":[2, 14], "x":17.75, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3, 15], "x":19.5, "y":3.25}, {"matrix":[4, 0], "x":0, "y":4.25}, {"matrix":[4, 1], "x":1.5, "y":4.25}, @@ -98,12 +101,12 @@ {"matrix":[4, 7], "x":7.75, "y":4.25}, {"matrix":[4, 8], "x":9.5, "y":4.25}, {"matrix":[4, 9], "x":10.5, "y":4.25}, - {"matrix":[4,10], "x":11.5, "y":4.25}, - {"matrix":[4,11], "x":12.5, "y":4.25}, - {"matrix":[4,12], "x":13.5, "y":4.25}, - {"matrix":[4,13], "x":15.25, "y":4.25}, - {"matrix":[4,14], "x":16.25, "y":4.25, "w":1.75}, - {"matrix":[4,15], "x":18.25, "y":4.5}, + {"matrix":[4, 10], "x":11.5, "y":4.25}, + {"matrix":[4, 11], "x":12.5, "y":4.25}, + {"matrix":[4, 12], "x":13.5, "y":4.25}, + {"matrix":[4, 13], "x":15.25, "y":4.25}, + {"matrix":[4, 14], "x":16.25, "y":4.25, "w":1.75}, + {"matrix":[4, 15], "x":18.25, "y":4.5}, {"matrix":[5, 0], "x":0, "y":5.25}, {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, @@ -113,9 +116,9 @@ {"matrix":[5, 7], "x":8.25, "y":5.25}, {"matrix":[5, 8], "x":9.5, "y":5.25, "w":2.75}, {"matrix":[5, 9], "x":12.25, "y":5.25}, - {"matrix":[5,13], "x":17.25, "y":5.5}, - {"matrix":[5,14], "x":18.25, "y":5.5}, - {"matrix":[5,15], "x":19.25, "y":5.5} + {"matrix":[5, 13], "x":17.25, "y":5.5}, + {"matrix":[5, 14], "x":18.25, "y":5.5}, + {"matrix":[5, 15], "x":19.25, "y":5.5} ] } } diff --git a/keyboards/keychron/v10/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/v10/iso_encoder/keymaps/default/keymap.c index e5dd06d1bc..40046cc69d 100644 --- a/keyboards/keychron/v10/iso_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/v10/iso_encoder/keymaps/default/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][1][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/v10/iso_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/v10/iso_encoder/keymaps/keychron/keymap.c index db8818512f..0db9e37831 100644 --- a/keyboards/keychron/v10/iso_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/v10/iso_encoder/keymaps/keychron/keymap.c @@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][1][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/v10/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/v10/iso_encoder/keymaps/via/keymap.c index 9eb71df48d..66545f8b18 100644 --- a/keyboards/keychron/v10/iso_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/v10/iso_encoder/keymaps/via/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][1][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/v10/iso_encoder/rules.mk b/keyboards/keychron/v10/iso_encoder/rules.mk index ef55047753..5df3cbccaf 100644 --- a/keyboards/keychron/v10/iso_encoder/rules.mk +++ b/keyboards/keychron/v10/iso_encoder/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/v10/v10.c b/keyboards/keychron/v10/v10.c index 091c2e9a4b..2e1e3f090f 100644 --- a/keyboards/keychron/v10/v10.c +++ b/keyboards/keychron/v10/v10.c @@ -84,17 +84,3 @@ bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) { } #endif // CAPS_LOCK_LED_INDEX - -#ifdef ENCODER_ENABLE -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) { return false; } - if (index == 0) { - if (clockwise) { - tap_code_delay(KC_VOLU, 10); - } else { - tap_code_delay(KC_VOLD, 10); - } - } - return true; -} -#endif diff --git a/keyboards/keychron/v2/ansi/info.json b/keyboards/keychron/v2/ansi/info.json index f0bb49cee2..969eae09a2 100644 --- a/keyboards/keychron/v2/ansi/info.json +++ b/keyboards/keychron/v2/ansi/info.json @@ -8,6 +8,14 @@ "pid": "0x0320", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, + "matrix_pins": { + "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], + "rows": ["B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { @@ -23,11 +31,11 @@ {"matrix":[0, 7], "x":7, "y":0.25}, {"matrix":[0, 8], "x":8, "y":0.25}, {"matrix":[0, 9], "x":9, "y":0.25}, - {"matrix":[0,10], "x":10, "y":0.25}, - {"matrix":[0,11], "x":11, "y":0.25}, - {"matrix":[0,12], "x":12, "y":0.25}, - {"matrix":[0,13], "x":13, "y":0.25, "w":2}, - {"matrix":[0,14], "x":15.25, "y":0}, + {"matrix":[0, 10], "x":10, "y":0.25}, + {"matrix":[0, 11], "x":11, "y":0.25}, + {"matrix":[0, 12], "x":12, "y":0.25}, + {"matrix":[0, 13], "x":13, "y":0.25, "w":2}, + {"matrix":[0, 14], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":1.5, "y":1.25}, @@ -39,11 +47,11 @@ {"matrix":[1, 7], "x":7.5, "y":1.25}, {"matrix":[1, 8], "x":8.5, "y":1.25}, {"matrix":[1, 9], "x":9.5, "y":1.25}, - {"matrix":[1,10], "x":10.5, "y":1.25}, - {"matrix":[1,11], "x":11.5, "y":1.25}, - {"matrix":[1,12], "x":12.5, "y":1.25}, - {"matrix":[1,13], "x":13.5, "y":1.25, "w":1.5}, - {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10.5, "y":1.25}, + {"matrix":[1, 11], "x":11.5, "y":1.25}, + {"matrix":[1, 12], "x":12.5, "y":1.25}, + {"matrix":[1, 13], "x":13.5, "y":1.25, "w":1.5}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":1.75, "y":2.25}, @@ -55,10 +63,10 @@ {"matrix":[2, 7], "x":7.75, "y":2.25}, {"matrix":[2, 8], "x":8.75, "y":2.25}, {"matrix":[2, 9], "x":9.75, "y":2.25}, - {"matrix":[2,10], "x":10.75, "y":2.25}, - {"matrix":[2,11], "x":11.75, "y":2.25}, - {"matrix":[2,13], "x":12.75, "y":2.25, "w":2.25}, - {"matrix":[2,14], "x":15.25, "y":2.25}, + {"matrix":[2, 10], "x":10.75, "y":2.25}, + {"matrix":[2, 11], "x":11.75, "y":2.25}, + {"matrix":[2, 13], "x":12.75, "y":2.25, "w":2.25}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25}, {"matrix":[3, 2], "x":2.25, "y":3.25}, @@ -69,21 +77,21 @@ {"matrix":[3, 7], "x":7.25, "y":3.25}, {"matrix":[3, 8], "x":8.25, "y":3.25}, {"matrix":[3, 9], "x":9.25, "y":3.25}, - {"matrix":[3,10], "x":10.25, "y":3.25}, - {"matrix":[3,11], "x":11.25, "y":3.25}, - {"matrix":[3,13], "x":12.25, "y":3.25, "w":1.75}, - {"matrix":[3,14], "x":14.25, "y":3.5}, + {"matrix":[3, 10], "x":10.25, "y":3.25}, + {"matrix":[3, 11], "x":11.25, "y":3.25}, + {"matrix":[3, 13], "x":12.25, "y":3.25, "w":1.75}, + {"matrix":[3, 14], "x":14.25, "y":3.5}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25}, {"matrix":[4, 2], "x":2.5, "y":4.25, "w":1.25}, {"matrix":[4, 6], "x":3.75, "y":4.25, "w":6.25}, - {"matrix":[4,10], "x":10, "y":4.25}, - {"matrix":[4,11], "x":11, "y":4.25}, - {"matrix":[4,12], "x":12, "y":4.25}, - {"matrix":[4,13], "x":13.25, "y":4.5}, - {"matrix":[2,12], "x":14.25, "y":4.5}, - {"matrix":[4,14], "x":15.25, "y":4.5} + {"matrix":[4, 10], "x":10, "y":4.25}, + {"matrix":[4, 11], "x":11, "y":4.25}, + {"matrix":[4, 12], "x":12, "y":4.25}, + {"matrix":[4, 13], "x":13.25, "y":4.5}, + {"matrix":[2, 12], "x":14.25, "y":4.5}, + {"matrix":[4, 14], "x":15.25, "y":4.5} ] } } diff --git a/keyboards/keychron/v2/ansi/rules.mk b/keyboards/keychron/v2/ansi/rules.mk index 345807d824..2b4a67b1ee 100644 --- a/keyboards/keychron/v2/ansi/rules.mk +++ b/keyboards/keychron/v2/ansi/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/v2/ansi_encoder/info.json b/keyboards/keychron/v2/ansi_encoder/info.json index 1e729eb636..9676278be1 100644 --- a/keyboards/keychron/v2/ansi_encoder/info.json +++ b/keyboards/keychron/v2/ansi_encoder/info.json @@ -8,6 +8,14 @@ "pid": "0x0321", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, + "matrix_pins": { + "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], + "rows": ["B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "encoder": { "rotary": [ {"pin_a": "A10", "pin_b": "B5"} @@ -28,11 +36,11 @@ {"matrix":[0, 7], "x":7, "y":0.25}, {"matrix":[0, 8], "x":8, "y":0.25}, {"matrix":[0, 9], "x":9, "y":0.25}, - {"matrix":[0,10], "x":10, "y":0.25}, - {"matrix":[0,11], "x":11, "y":0.25}, - {"matrix":[0,12], "x":12, "y":0.25}, - {"matrix":[0,13], "x":13, "y":0.25, "w":2}, - {"matrix":[0,14], "x":15.25, "y":0}, + {"matrix":[0, 10], "x":10, "y":0.25}, + {"matrix":[0, 11], "x":11, "y":0.25}, + {"matrix":[0, 12], "x":12, "y":0.25}, + {"matrix":[0, 13], "x":13, "y":0.25, "w":2}, + {"matrix":[0, 14], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":1.5, "y":1.25}, @@ -44,11 +52,11 @@ {"matrix":[1, 7], "x":7.5, "y":1.25}, {"matrix":[1, 8], "x":8.5, "y":1.25}, {"matrix":[1, 9], "x":9.5, "y":1.25}, - {"matrix":[1,10], "x":10.5, "y":1.25}, - {"matrix":[1,11], "x":11.5, "y":1.25}, - {"matrix":[1,12], "x":12.5, "y":1.25}, - {"matrix":[1,13], "x":13.5, "y":1.25, "w":1.5}, - {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10.5, "y":1.25}, + {"matrix":[1, 11], "x":11.5, "y":1.25}, + {"matrix":[1, 12], "x":12.5, "y":1.25}, + {"matrix":[1, 13], "x":13.5, "y":1.25, "w":1.5}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":1.75, "y":2.25}, @@ -60,10 +68,10 @@ {"matrix":[2, 7], "x":7.75, "y":2.25}, {"matrix":[2, 8], "x":8.75, "y":2.25}, {"matrix":[2, 9], "x":9.75, "y":2.25}, - {"matrix":[2,10], "x":10.75, "y":2.25}, - {"matrix":[2,11], "x":11.75, "y":2.25}, - {"matrix":[2,13], "x":12.75, "y":2.25, "w":2.25}, - {"matrix":[2,14], "x":15.25, "y":2.25}, + {"matrix":[2, 10], "x":10.75, "y":2.25}, + {"matrix":[2, 11], "x":11.75, "y":2.25}, + {"matrix":[2, 13], "x":12.75, "y":2.25, "w":2.25}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25}, {"matrix":[3, 2], "x":2.25, "y":3.25}, @@ -74,21 +82,21 @@ {"matrix":[3, 7], "x":7.25, "y":3.25}, {"matrix":[3, 8], "x":8.25, "y":3.25}, {"matrix":[3, 9], "x":9.25, "y":3.25}, - {"matrix":[3,10], "x":10.25, "y":3.25}, - {"matrix":[3,11], "x":11.25, "y":3.25}, - {"matrix":[3,13], "x":12.25, "y":3.25, "w":1.75}, - {"matrix":[3,14], "x":14.25, "y":3.5}, + {"matrix":[3, 10], "x":10.25, "y":3.25}, + {"matrix":[3, 11], "x":11.25, "y":3.25}, + {"matrix":[3, 13], "x":12.25, "y":3.25, "w":1.75}, + {"matrix":[3, 14], "x":14.25, "y":3.5}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25}, {"matrix":[4, 2], "x":2.5, "y":4.25, "w":1.25}, {"matrix":[4, 6], "x":3.75, "y":4.25, "w":6.25}, - {"matrix":[4,10], "x":10, "y":4.25}, - {"matrix":[4,11], "x":11, "y":4.25}, - {"matrix":[4,12], "x":12, "y":4.25}, - {"matrix":[4,13], "x":13.25, "y":4.5}, - {"matrix":[2,12], "x":14.25, "y":4.5}, - {"matrix":[4,14], "x":15.25, "y":4.5} + {"matrix":[4, 10], "x":10, "y":4.25}, + {"matrix":[4, 11], "x":11, "y":4.25}, + {"matrix":[4, 12], "x":12, "y":4.25}, + {"matrix":[4, 13], "x":13.25, "y":4.5}, + {"matrix":[2, 12], "x":14.25, "y":4.5}, + {"matrix":[4, 14], "x":15.25, "y":4.5} ] } } diff --git a/keyboards/keychron/v2/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/v2/ansi_encoder/keymaps/default/keymap.c index 0385af47dc..71da961dac 100644 --- a/keyboards/keychron/v2/ansi_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/v2/ansi_encoder/keymaps/default/keymap.c @@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [_FN1] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, diff --git a/keyboards/keychron/v2/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/v2/ansi_encoder/keymaps/keychron/keymap.c index 00e7940fd9..5aa3a1fecc 100644 --- a/keyboards/keychron/v2/ansi_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/v2/ansi_encoder/keymaps/keychron/keymap.c @@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format on #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [_FN1] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, diff --git a/keyboards/keychron/v2/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/v2/ansi_encoder/keymaps/via/keymap.c index 0385af47dc..71da961dac 100644 --- a/keyboards/keychron/v2/ansi_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/v2/ansi_encoder/keymaps/via/keymap.c @@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [_FN1] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, diff --git a/keyboards/keychron/v2/ansi_encoder/rules.mk b/keyboards/keychron/v2/ansi_encoder/rules.mk index 5240004b8c..6a772965ff 100644 --- a/keyboards/keychron/v2/ansi_encoder/rules.mk +++ b/keyboards/keychron/v2/ansi_encoder/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/v2/config.h b/keyboards/keychron/v2/config.h index 4cb2721911..08cc5b8e84 100644 --- a/keyboards/keychron/v2/config.h +++ b/keyboards/keychron/v2/config.h @@ -16,15 +16,6 @@ #pragma once -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - -/* key matrix pins */ -#define MATRIX_ROW_PINS \ - { B4, B3, A15, A14, A13 } -#define MATRIX_COL_PINS \ - { C14, C15, A0, A1, A2, A3, A4, A5, A6, A7, B0, B1, A8, A9, H3 } - /* If uses PH3 with a stronger pull resistor then the following definition should be included */ // #define MATRIX_UNSELECT_DRIVE_HIGH diff --git a/keyboards/keychron/v2/iso/info.json b/keyboards/keychron/v2/iso/info.json index 0679e1737c..8afe06f047 100644 --- a/keyboards/keychron/v2/iso/info.json +++ b/keyboards/keychron/v2/iso/info.json @@ -8,6 +8,14 @@ "pid": "0x0322", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, + "matrix_pins": { + "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], + "rows": ["B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { @@ -23,11 +31,11 @@ {"matrix":[0, 7], "x":7, "y":0.25}, {"matrix":[0, 8], "x":8, "y":0.25}, {"matrix":[0, 9], "x":9, "y":0.25}, - {"matrix":[0,10], "x":10, "y":0.25}, - {"matrix":[0,11], "x":11, "y":0.25}, - {"matrix":[0,12], "x":12, "y":0.25}, - {"matrix":[0,13], "x":13, "y":0.25, "w":2}, - {"matrix":[0,14], "x":15.25, "y":0}, + {"matrix":[0, 10], "x":10, "y":0.25}, + {"matrix":[0, 11], "x":11, "y":0.25}, + {"matrix":[0, 12], "x":12, "y":0.25}, + {"matrix":[0, 13], "x":13, "y":0.25, "w":2}, + {"matrix":[0, 14], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":1.5, "y":1.25}, @@ -39,10 +47,10 @@ {"matrix":[1, 7], "x":7.5, "y":1.25}, {"matrix":[1, 8], "x":8.5, "y":1.25}, {"matrix":[1, 9], "x":9.5, "y":1.25}, - {"matrix":[1,10], "x":10.5, "y":1.25}, - {"matrix":[1,11], "x":11.5, "y":1.25}, - {"matrix":[1,12], "x":12.5, "y":1.25}, - {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10.5, "y":1.25}, + {"matrix":[1, 11], "x":11.5, "y":1.25}, + {"matrix":[1, 12], "x":12.5, "y":1.25}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":1.75, "y":2.25}, @@ -54,11 +62,11 @@ {"matrix":[2, 7], "x":7.75, "y":2.25}, {"matrix":[2, 8], "x":8.75, "y":2.25}, {"matrix":[2, 9], "x":9.75, "y":2.25}, - {"matrix":[2,10], "x":10.75, "y":2.25}, - {"matrix":[2,11], "x":11.75, "y":2.25}, - {"matrix":[2,13], "x":12.75, "y":2.25}, - {"matrix":[1,13], "x":13.75, "y":1.25, "w":1.25, "h":2}, - {"matrix":[2,14], "x":15.25, "y":2.25}, + {"matrix":[2, 10], "x":10.75, "y":2.25}, + {"matrix":[2, 11], "x":11.75, "y":2.25}, + {"matrix":[2, 13], "x":12.75, "y":2.25}, + {"matrix":[1, 13], "x":13.75, "y":1.25, "w":1.25, "h":2}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.25}, {"matrix":[3, 1], "x":1.25, "y":3.25}, @@ -70,21 +78,21 @@ {"matrix":[3, 7], "x":7.25, "y":3.25}, {"matrix":[3, 8], "x":8.25, "y":3.25}, {"matrix":[3, 9], "x":9.25, "y":3.25}, - {"matrix":[3,10], "x":10.25, "y":3.25}, - {"matrix":[3,11], "x":11.25, "y":3.25}, - {"matrix":[3,13], "x":12.25, "y":3.25, "w":1.75}, - {"matrix":[3,14], "x":14.25, "y":3.5}, + {"matrix":[3, 10], "x":10.25, "y":3.25}, + {"matrix":[3, 11], "x":11.25, "y":3.25}, + {"matrix":[3, 13], "x":12.25, "y":3.25, "w":1.75}, + {"matrix":[3, 14], "x":14.25, "y":3.5}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25}, {"matrix":[4, 2], "x":2.5, "y":4.25, "w":1.25}, {"matrix":[4, 6], "x":3.75, "y":4.25, "w":6.25}, - {"matrix":[4,10], "x":10, "y":4.25}, - {"matrix":[4,11], "x":11, "y":4.25}, - {"matrix":[4,12], "x":12, "y":4.25}, - {"matrix":[4,13], "x":13.25, "y":4.5}, - {"matrix":[2,12], "x":14.25, "y":4.5}, - {"matrix":[4,14], "x":15.25, "y":4.5} + {"matrix":[4, 10], "x":10, "y":4.25}, + {"matrix":[4, 11], "x":11, "y":4.25}, + {"matrix":[4, 12], "x":12, "y":4.25}, + {"matrix":[4, 13], "x":13.25, "y":4.5}, + {"matrix":[2, 12], "x":14.25, "y":4.5}, + {"matrix":[4, 14], "x":15.25, "y":4.5} ] } } diff --git a/keyboards/keychron/v2/iso/rules.mk b/keyboards/keychron/v2/iso/rules.mk index 345807d824..2b4a67b1ee 100644 --- a/keyboards/keychron/v2/iso/rules.mk +++ b/keyboards/keychron/v2/iso/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/v2/iso_encoder/info.json b/keyboards/keychron/v2/iso_encoder/info.json index a784b33ec5..4aef5b79b2 100644 --- a/keyboards/keychron/v2/iso_encoder/info.json +++ b/keyboards/keychron/v2/iso_encoder/info.json @@ -7,6 +7,14 @@ "pid": "0x0323", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, + "matrix_pins": { + "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], + "rows": ["B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "encoder": { "rotary": [ {"pin_a": "A10", "pin_b": "B5"} @@ -27,11 +35,11 @@ {"matrix":[0, 7], "x":7, "y":0.25}, {"matrix":[0, 8], "x":8, "y":0.25}, {"matrix":[0, 9], "x":9, "y":0.25}, - {"matrix":[0,10], "x":10, "y":0.25}, - {"matrix":[0,11], "x":11, "y":0.25}, - {"matrix":[0,12], "x":12, "y":0.25}, - {"matrix":[0,13], "x":13, "y":0.25, "w":2}, - {"matrix":[0,14], "x":15.25, "y":0}, + {"matrix":[0, 10], "x":10, "y":0.25}, + {"matrix":[0, 11], "x":11, "y":0.25}, + {"matrix":[0, 12], "x":12, "y":0.25}, + {"matrix":[0, 13], "x":13, "y":0.25, "w":2}, + {"matrix":[0, 14], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":1.5, "y":1.25}, @@ -43,10 +51,10 @@ {"matrix":[1, 7], "x":7.5, "y":1.25}, {"matrix":[1, 8], "x":8.5, "y":1.25}, {"matrix":[1, 9], "x":9.5, "y":1.25}, - {"matrix":[1,10], "x":10.5, "y":1.25}, - {"matrix":[1,11], "x":11.5, "y":1.25}, - {"matrix":[1,12], "x":12.5, "y":1.25}, - {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10.5, "y":1.25}, + {"matrix":[1, 11], "x":11.5, "y":1.25}, + {"matrix":[1, 12], "x":12.5, "y":1.25}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":1.75, "y":2.25}, @@ -58,11 +66,11 @@ {"matrix":[2, 7], "x":7.75, "y":2.25}, {"matrix":[2, 8], "x":8.75, "y":2.25}, {"matrix":[2, 9], "x":9.75, "y":2.25}, - {"matrix":[2,10], "x":10.75, "y":2.25}, - {"matrix":[2,11], "x":11.75, "y":2.25}, - {"matrix":[2,13], "x":12.75, "y":2.25}, - {"matrix":[1,13], "x":13.75, "y":1.25, "w":1.25, "h":2}, - {"matrix":[2,14], "x":15.25, "y":2.25}, + {"matrix":[2, 10], "x":10.75, "y":2.25}, + {"matrix":[2, 11], "x":11.75, "y":2.25}, + {"matrix":[2, 13], "x":12.75, "y":2.25}, + {"matrix":[1, 13], "x":13.75, "y":1.25, "w":1.25, "h":2}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.25}, {"matrix":[3, 1], "x":1.25, "y":3.25}, @@ -74,21 +82,21 @@ {"matrix":[3, 7], "x":7.25, "y":3.25}, {"matrix":[3, 8], "x":8.25, "y":3.25}, {"matrix":[3, 9], "x":9.25, "y":3.25}, - {"matrix":[3,10], "x":10.25, "y":3.25}, - {"matrix":[3,11], "x":11.25, "y":3.25}, - {"matrix":[3,13], "x":12.25, "y":3.25, "w":1.75}, - {"matrix":[3,14], "x":14.25, "y":3.5}, + {"matrix":[3, 10], "x":10.25, "y":3.25}, + {"matrix":[3, 11], "x":11.25, "y":3.25}, + {"matrix":[3, 13], "x":12.25, "y":3.25, "w":1.75}, + {"matrix":[3, 14], "x":14.25, "y":3.5}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25}, {"matrix":[4, 2], "x":2.5, "y":4.25, "w":1.25}, {"matrix":[4, 6], "x":3.75, "y":4.25, "w":6.25}, - {"matrix":[4,10], "x":10, "y":4.25}, - {"matrix":[4,11], "x":11, "y":4.25}, - {"matrix":[4,12], "x":12, "y":4.25}, - {"matrix":[4,13], "x":13.25, "y":4.5}, - {"matrix":[2,12], "x":14.25, "y":4.5}, - {"matrix":[4,14], "x":15.25, "y":4.5} + {"matrix":[4, 10], "x":10, "y":4.25}, + {"matrix":[4, 11], "x":11, "y":4.25}, + {"matrix":[4, 12], "x":12, "y":4.25}, + {"matrix":[4, 13], "x":13.25, "y":4.5}, + {"matrix":[2, 12], "x":14.25, "y":4.5}, + {"matrix":[4, 14], "x":15.25, "y":4.5} ] } } diff --git a/keyboards/keychron/v2/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/v2/iso_encoder/keymaps/default/keymap.c index cb22cf9fae..585b6bb6cb 100644 --- a/keyboards/keychron/v2/iso_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/v2/iso_encoder/keymaps/default/keymap.c @@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [_FN1] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, diff --git a/keyboards/keychron/v2/iso_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/v2/iso_encoder/keymaps/keychron/keymap.c index eafc713b71..8057fd7a1b 100644 --- a/keyboards/keychron/v2/iso_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/v2/iso_encoder/keymaps/keychron/keymap.c @@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format on #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [_FN1] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, diff --git a/keyboards/keychron/v2/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/v2/iso_encoder/keymaps/via/keymap.c index cb22cf9fae..585b6bb6cb 100644 --- a/keyboards/keychron/v2/iso_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/v2/iso_encoder/keymaps/via/keymap.c @@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [_FN1] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, diff --git a/keyboards/keychron/v2/iso_encoder/rules.mk b/keyboards/keychron/v2/iso_encoder/rules.mk index 5240004b8c..6a772965ff 100644 --- a/keyboards/keychron/v2/iso_encoder/rules.mk +++ b/keyboards/keychron/v2/iso_encoder/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/v2/jis/info.json b/keyboards/keychron/v2/jis/info.json index 89ec07b072..91283ef4f7 100644 --- a/keyboards/keychron/v2/jis/info.json +++ b/keyboards/keychron/v2/jis/info.json @@ -8,6 +8,14 @@ "pid": "0x0324", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, + "matrix_pins": { + "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], + "rows": ["B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { @@ -23,12 +31,12 @@ {"matrix":[0, 7], "x":7, "y":0.25}, {"matrix":[0, 8], "x":8, "y":0.25}, {"matrix":[0, 9], "x":9, "y":0.25}, - {"matrix":[0,10], "x":10, "y":0.25}, - {"matrix":[0,11], "x":11, "y":0.25}, - {"matrix":[0,12], "x":12, "y":0.25}, - {"matrix":[0,13], "x":13, "y":0.25}, + {"matrix":[0, 10], "x":10, "y":0.25}, + {"matrix":[0, 11], "x":11, "y":0.25}, + {"matrix":[0, 12], "x":12, "y":0.25}, + {"matrix":[0, 13], "x":13, "y":0.25}, {"matrix":[3, 1], "x":14, "y":0.25}, - {"matrix":[0,14], "x":15.25, "y":0}, + {"matrix":[0, 14], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":1.5, "y":1.25}, @@ -40,10 +48,10 @@ {"matrix":[1, 7], "x":7.5, "y":1.25}, {"matrix":[1, 8], "x":8.5, "y":1.25}, {"matrix":[1, 9], "x":9.5, "y":1.25}, - {"matrix":[1,10], "x":10.5, "y":1.25}, - {"matrix":[1,11], "x":11.5, "y":1.25}, - {"matrix":[1,12], "x":12.5, "y":1.25}, - {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10.5, "y":1.25}, + {"matrix":[1, 11], "x":11.5, "y":1.25}, + {"matrix":[1, 12], "x":12.5, "y":1.25}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":1.75, "y":2.25}, @@ -55,11 +63,11 @@ {"matrix":[2, 7], "x":7.75, "y":2.25}, {"matrix":[2, 8], "x":8.75, "y":2.25}, {"matrix":[2, 9], "x":9.75, "y":2.25}, - {"matrix":[2,10], "x":10.75, "y":2.25}, - {"matrix":[2,11], "x":11.75, "y":2.25}, - {"matrix":[2,13], "x":12.75, "y":2.25}, - {"matrix":[1,13], "x":13.75, "y":1.25, "w":1.25, "h":2}, - {"matrix":[2,14], "x":15.25, "y":2.25}, + {"matrix":[2, 10], "x":10.75, "y":2.25}, + {"matrix":[2, 11], "x":11.75, "y":2.25}, + {"matrix":[2, 13], "x":12.75, "y":2.25}, + {"matrix":[1, 13], "x":13.75, "y":1.25, "w":1.25, "h":2}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25}, {"matrix":[3, 2], "x":2.25, "y":3.25}, @@ -70,11 +78,11 @@ {"matrix":[3, 7], "x":7.25, "y":3.25}, {"matrix":[3, 8], "x":8.25, "y":3.25}, {"matrix":[3, 9], "x":9.25, "y":3.25}, - {"matrix":[3,10], "x":10.25, "y":3.25}, - {"matrix":[3,11], "x":11.25, "y":3.25}, - {"matrix":[3,12], "x":12.25, "y":3.25}, - {"matrix":[3,13], "x":13.25, "y":3.25}, - {"matrix":[3,14], "x":14.25, "y":3.25}, + {"matrix":[3, 10], "x":10.25, "y":3.25}, + {"matrix":[3, 11], "x":11.25, "y":3.25}, + {"matrix":[3, 12], "x":12.25, "y":3.25}, + {"matrix":[3, 13], "x":13.25, "y":3.25}, + {"matrix":[3, 14], "x":14.25, "y":3.25}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25}, @@ -82,12 +90,12 @@ {"matrix":[4, 3], "x":3.5, "y":4.25}, {"matrix":[4, 6], "x":4.5, "y":4.25, "w":4.5}, {"matrix":[4, 9], "x":9, "y":4.25, "w":1.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,12], "x":12.25, "y":4.25}, - {"matrix":[4,13], "x":13.25, "y":4.25}, - {"matrix":[2,12], "x":14.25, "y":4.25}, - {"matrix":[4,14], "x":15.25, "y":4.25} + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 12], "x":12.25, "y":4.25}, + {"matrix":[4, 13], "x":13.25, "y":4.25}, + {"matrix":[2, 12], "x":14.25, "y":4.25}, + {"matrix":[4, 14], "x":15.25, "y":4.25} ] } } diff --git a/keyboards/keychron/v2/jis/rules.mk b/keyboards/keychron/v2/jis/rules.mk index 345807d824..2b4a67b1ee 100644 --- a/keyboards/keychron/v2/jis/rules.mk +++ b/keyboards/keychron/v2/jis/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/v2/jis_encoder/info.json b/keyboards/keychron/v2/jis_encoder/info.json index abb76636f7..8e2683342d 100644 --- a/keyboards/keychron/v2/jis_encoder/info.json +++ b/keyboards/keychron/v2/jis_encoder/info.json @@ -8,6 +8,14 @@ "pid": "0x0325", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, + "matrix_pins": { + "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], + "rows": ["B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "encoder": { "rotary": [ {"pin_a": "A10", "pin_b": "B5"} @@ -28,12 +36,12 @@ {"matrix":[0, 7], "x":7, "y":0.25}, {"matrix":[0, 8], "x":8, "y":0.25}, {"matrix":[0, 9], "x":9, "y":0.25}, - {"matrix":[0,10], "x":10, "y":0.25}, - {"matrix":[0,11], "x":11, "y":0.25}, - {"matrix":[0,12], "x":12, "y":0.25}, - {"matrix":[0,13], "x":13, "y":0.25}, + {"matrix":[0, 10], "x":10, "y":0.25}, + {"matrix":[0, 11], "x":11, "y":0.25}, + {"matrix":[0, 12], "x":12, "y":0.25}, + {"matrix":[0, 13], "x":13, "y":0.25}, {"matrix":[3, 1], "x":14, "y":0.25}, - {"matrix":[0,14], "x":15.25, "y":0}, + {"matrix":[0, 14], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":1.5, "y":1.25}, @@ -45,10 +53,10 @@ {"matrix":[1, 7], "x":7.5, "y":1.25}, {"matrix":[1, 8], "x":8.5, "y":1.25}, {"matrix":[1, 9], "x":9.5, "y":1.25}, - {"matrix":[1,10], "x":10.5, "y":1.25}, - {"matrix":[1,11], "x":11.5, "y":1.25}, - {"matrix":[1,12], "x":12.5, "y":1.25}, - {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10.5, "y":1.25}, + {"matrix":[1, 11], "x":11.5, "y":1.25}, + {"matrix":[1, 12], "x":12.5, "y":1.25}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":1.75, "y":2.25}, @@ -60,11 +68,11 @@ {"matrix":[2, 7], "x":7.75, "y":2.25}, {"matrix":[2, 8], "x":8.75, "y":2.25}, {"matrix":[2, 9], "x":9.75, "y":2.25}, - {"matrix":[2,10], "x":10.75, "y":2.25}, - {"matrix":[2,11], "x":11.75, "y":2.25}, - {"matrix":[2,13], "x":12.75, "y":2.25}, - {"matrix":[1,13], "x":13.75, "y":1.25, "w":1.25, "h":2}, - {"matrix":[2,14], "x":15.25, "y":2.25}, + {"matrix":[2, 10], "x":10.75, "y":2.25}, + {"matrix":[2, 11], "x":11.75, "y":2.25}, + {"matrix":[2, 13], "x":12.75, "y":2.25}, + {"matrix":[1, 13], "x":13.75, "y":1.25, "w":1.25, "h":2}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25}, {"matrix":[3, 2], "x":2.25, "y":3.25}, @@ -75,11 +83,11 @@ {"matrix":[3, 7], "x":7.25, "y":3.25}, {"matrix":[3, 8], "x":8.25, "y":3.25}, {"matrix":[3, 9], "x":9.25, "y":3.25}, - {"matrix":[3,10], "x":10.25, "y":3.25}, - {"matrix":[3,11], "x":11.25, "y":3.25}, - {"matrix":[3,12], "x":12.25, "y":3.25}, - {"matrix":[3,13], "x":13.25, "y":3.25}, - {"matrix":[3,14], "x":14.25, "y":3.25}, + {"matrix":[3, 10], "x":10.25, "y":3.25}, + {"matrix":[3, 11], "x":11.25, "y":3.25}, + {"matrix":[3, 12], "x":12.25, "y":3.25}, + {"matrix":[3, 13], "x":13.25, "y":3.25}, + {"matrix":[3, 14], "x":14.25, "y":3.25}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25}, @@ -87,12 +95,12 @@ {"matrix":[4, 3], "x":3.5, "y":4.25}, {"matrix":[4, 6], "x":4.5, "y":4.25, "w":4.5}, {"matrix":[4, 9], "x":9, "y":4.25, "w":1.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,12], "x":12.25, "y":4.25}, - {"matrix":[4,13], "x":13.25, "y":4.25}, - {"matrix":[2,12], "x":14.25, "y":4.25}, - {"matrix":[4,14], "x":15.25, "y":4.25} + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 12], "x":12.25, "y":4.25}, + {"matrix":[4, 13], "x":13.25, "y":4.25}, + {"matrix":[2, 12], "x":14.25, "y":4.25}, + {"matrix":[4, 14], "x":15.25, "y":4.25} ] } } diff --git a/keyboards/keychron/v2/jis_encoder/keymaps/default/keymap.c b/keyboards/keychron/v2/jis_encoder/keymaps/default/keymap.c index 3a4a2aee15..68ca97e791 100644 --- a/keyboards/keychron/v2/jis_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/v2/jis_encoder/keymaps/default/keymap.c @@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [_FN1] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, diff --git a/keyboards/keychron/v2/jis_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/v2/jis_encoder/keymaps/keychron/keymap.c index 7968d11320..49bdca2fd1 100644 --- a/keyboards/keychron/v2/jis_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/v2/jis_encoder/keymaps/keychron/keymap.c @@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format on #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [_FN1] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, diff --git a/keyboards/keychron/v2/jis_encoder/keymaps/via/keymap.c b/keyboards/keychron/v2/jis_encoder/keymaps/via/keymap.c index 3a4a2aee15..68ca97e791 100644 --- a/keyboards/keychron/v2/jis_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/v2/jis_encoder/keymaps/via/keymap.c @@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [_FN1] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, diff --git a/keyboards/keychron/v2/jis_encoder/rules.mk b/keyboards/keychron/v2/jis_encoder/rules.mk index 5240004b8c..6a772965ff 100644 --- a/keyboards/keychron/v2/jis_encoder/rules.mk +++ b/keyboards/keychron/v2/jis_encoder/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/v3/ansi/info.json b/keyboards/keychron/v3/ansi/info.json index ae70657b84..ccb9166cf0 100644 --- a/keyboards/keychron/v3/ansi/info.json +++ b/keyboards/keychron/v3/ansi/info.json @@ -8,6 +8,9 @@ "pid": "0x0330", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { @@ -23,12 +26,12 @@ {"matrix":[0, 7], "x":8.5, "y":0}, {"matrix":[0, 8], "x":9.5, "y":0}, {"matrix":[0, 9], "x":11, "y":0}, - {"matrix":[0,10], "x":12, "y":0}, - {"matrix":[0,11], "x":13, "y":0}, - {"matrix":[0,12], "x":14, "y":0}, - {"matrix":[0,14], "x":15.25, "y":0}, - {"matrix":[0,15], "x":16.25, "y":0}, - {"matrix":[3,14], "x":17.25, "y":0}, + {"matrix":[0, 10], "x":12, "y":0}, + {"matrix":[0, 11], "x":13, "y":0}, + {"matrix":[0, 12], "x":14, "y":0}, + {"matrix":[0, 14], "x":15.25, "y":0}, + {"matrix":[0, 15], "x":16.25, "y":0}, + {"matrix":[3, 14], "x":17.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -40,13 +43,13 @@ {"matrix":[1, 7], "x":7, "y":1.25}, {"matrix":[1, 8], "x":8, "y":1.25}, {"matrix":[1, 9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25, "w":2}, - {"matrix":[1,14], "x":15.25, "y":1.25}, - {"matrix":[1,15], "x":16.25, "y":1.25}, - {"matrix":[3,15], "x":17.25, "y":1.25}, + {"matrix":[1, 10], "x":10, "y":1.25}, + {"matrix":[1, 11], "x":11, "y":1.25}, + {"matrix":[1, 12], "x":12, "y":1.25}, + {"matrix":[1, 13], "x":13, "y":1.25, "w":2}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, + {"matrix":[1, 15], "x":16.25, "y":1.25}, + {"matrix":[3, 15], "x":17.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -58,13 +61,13 @@ {"matrix":[2, 7], "x":7.5, "y":2.25}, {"matrix":[2, 8], "x":8.5, "y":2.25}, {"matrix":[2, 9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5}, - {"matrix":[2,14], "x":15.25, "y":2.25}, - {"matrix":[2,15], "x":16.25, "y":2.25}, - {"matrix":[3,12], "x":17.25, "y":2.25}, + {"matrix":[2, 10], "x":10.5, "y":2.25}, + {"matrix":[2, 11], "x":11.5, "y":2.25}, + {"matrix":[2, 12], "x":12.5, "y":2.25}, + {"matrix":[2, 13], "x":13.5, "y":2.25, "w":1.5}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, + {"matrix":[2, 15], "x":16.25, "y":2.25}, + {"matrix":[3, 12], "x":17.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -76,9 +79,9 @@ {"matrix":[3, 7], "x":7.75, "y":3.25}, {"matrix":[3, 8], "x":8.75, "y":3.25}, {"matrix":[3, 9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25}, + {"matrix":[3, 10], "x":10.75, "y":3.25}, + {"matrix":[3, 11], "x":11.75, "y":3.25}, + {"matrix":[3, 13], "x":12.75, "y":3.25, "w":2.25}, {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4.25}, @@ -89,22 +92,22 @@ {"matrix":[4, 7], "x":7.25, "y":4.25}, {"matrix":[4, 8], "x":8.25, "y":4.25}, {"matrix":[4, 9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75}, - {"matrix":[4,15], "x":16.25, "y":4.25}, + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 13], "x":12.25, "y":4.25, "w":2.75}, + {"matrix":[4, 15], "x":16.25, "y":4.25}, {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25}, {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25}, - {"matrix":[5,10], "x":10, "y":5.25, "w":1.25}, - {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25}, - {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25}, - {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25}, - {"matrix":[5,14], "x":15.25, "y":5.25}, - {"matrix":[5,15], "x":16.25, "y":5.25}, - {"matrix":[4,14], "x":17.25, "y":5.25} + {"matrix":[5, 10], "x":10, "y":5.25, "w":1.25}, + {"matrix":[5, 11], "x":11.25, "y":5.25, "w":1.25}, + {"matrix":[5, 12], "x":12.5, "y":5.25, "w":1.25}, + {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25}, + {"matrix":[5, 14], "x":15.25, "y":5.25}, + {"matrix":[5, 15], "x":16.25, "y":5.25}, + {"matrix":[4, 14], "x":17.25, "y":5.25} ] } } diff --git a/keyboards/keychron/v3/ansi/rules.mk b/keyboards/keychron/v3/ansi/rules.mk index 345807d824..2b4a67b1ee 100644 --- a/keyboards/keychron/v3/ansi/rules.mk +++ b/keyboards/keychron/v3/ansi/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/v3/ansi_encoder/info.json b/keyboards/keychron/v3/ansi_encoder/info.json index 5fdf765356..7760b1107b 100644 --- a/keyboards/keychron/v3/ansi_encoder/info.json +++ b/keyboards/keychron/v3/ansi_encoder/info.json @@ -8,6 +8,9 @@ "pid": "0x0331", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "encoder": { "rotary": [ {"pin_a": "A10", "pin_b": "A8"} @@ -28,13 +31,13 @@ {"matrix":[0, 7], "x":7.5, "y":0}, {"matrix":[0, 8], "x":8.5, "y":0}, {"matrix":[0, 9], "x":9.75, "y":0}, - {"matrix":[0,10], "x":10.75, "y":0}, - {"matrix":[0,11], "x":11.75, "y":0}, - {"matrix":[0,12], "x":12.75, "y":0}, - {"matrix":[0,13], "x":14, "y":0}, - {"matrix":[0,14], "x":15.25, "y":0}, - {"matrix":[0,15], "x":16.25, "y":0}, - {"matrix":[3,14], "x":17.25, "y":0}, + {"matrix":[0, 10], "x":10.75, "y":0}, + {"matrix":[0, 11], "x":11.75, "y":0}, + {"matrix":[0, 12], "x":12.75, "y":0}, + {"matrix":[0, 13], "x":14, "y":0}, + {"matrix":[0, 14], "x":15.25, "y":0}, + {"matrix":[0, 15], "x":16.25, "y":0}, + {"matrix":[3, 14], "x":17.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -46,13 +49,13 @@ {"matrix":[1, 7], "x":7, "y":1.25}, {"matrix":[1, 8], "x":8, "y":1.25}, {"matrix":[1, 9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25, "w":2}, - {"matrix":[1,14], "x":15.25, "y":1.25}, - {"matrix":[1,15], "x":16.25, "y":1.25}, - {"matrix":[3,15], "x":17.25, "y":1.25}, + {"matrix":[1, 10], "x":10, "y":1.25}, + {"matrix":[1, 11], "x":11, "y":1.25}, + {"matrix":[1, 12], "x":12, "y":1.25}, + {"matrix":[1, 13], "x":13, "y":1.25, "w":2}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, + {"matrix":[1, 15], "x":16.25, "y":1.25}, + {"matrix":[3, 15], "x":17.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -64,13 +67,13 @@ {"matrix":[2, 7], "x":7.5, "y":2.25}, {"matrix":[2, 8], "x":8.5, "y":2.25}, {"matrix":[2, 9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5}, - {"matrix":[2,14], "x":15.25, "y":2.25}, - {"matrix":[2,15], "x":16.25, "y":2.25}, - {"matrix":[3,12], "x":17.25, "y":2.25}, + {"matrix":[2, 10], "x":10.5, "y":2.25}, + {"matrix":[2, 11], "x":11.5, "y":2.25}, + {"matrix":[2, 12], "x":12.5, "y":2.25}, + {"matrix":[2, 13], "x":13.5, "y":2.25, "w":1.5}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, + {"matrix":[2, 15], "x":16.25, "y":2.25}, + {"matrix":[3, 12], "x":17.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -82,9 +85,9 @@ {"matrix":[3, 7], "x":7.75, "y":3.25}, {"matrix":[3, 8], "x":8.75, "y":3.25}, {"matrix":[3, 9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25}, + {"matrix":[3, 10], "x":10.75, "y":3.25}, + {"matrix":[3, 11], "x":11.75, "y":3.25}, + {"matrix":[3, 13], "x":12.75, "y":3.25, "w":2.25}, {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4.25}, @@ -95,22 +98,22 @@ {"matrix":[4, 7], "x":7.25, "y":4.25}, {"matrix":[4, 8], "x":8.25, "y":4.25}, {"matrix":[4, 9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75}, - {"matrix":[4,15], "x":16.25, "y":4.25}, + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 13], "x":12.25, "y":4.25, "w":2.75}, + {"matrix":[4, 15], "x":16.25, "y":4.25}, {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25}, {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25}, - {"matrix":[5,10], "x":10, "y":5.25, "w":1.25}, - {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25}, - {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25}, - {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25}, - {"matrix":[5,14], "x":15.25, "y":5.25}, - {"matrix":[5,15], "x":16.25, "y":5.25}, - {"matrix":[4,14], "x":17.25, "y":5.25} + {"matrix":[5, 10], "x":10, "y":5.25, "w":1.25}, + {"matrix":[5, 11], "x":11.25, "y":5.25, "w":1.25}, + {"matrix":[5, 12], "x":12.5, "y":5.25, "w":1.25}, + {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25}, + {"matrix":[5, 14], "x":15.25, "y":5.25}, + {"matrix":[5, 15], "x":16.25, "y":5.25}, + {"matrix":[4, 14], "x":17.25, "y":5.25} ] } } diff --git a/keyboards/keychron/v3/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/v3/ansi_encoder/keymaps/default/keymap.c index ac2363f627..1d3b2a2d46 100644 --- a/keyboards/keychron/v3/ansi_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/v3/ansi_encoder/keymaps/default/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, diff --git a/keyboards/keychron/v3/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/v3/ansi_encoder/keymaps/keychron/keymap.c index ec8c4f8b1e..1cae15b737 100644 --- a/keyboards/keychron/v3/ansi_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/v3/ansi_encoder/keymaps/keychron/keymap.c @@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, diff --git a/keyboards/keychron/v3/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/v3/ansi_encoder/keymaps/via/keymap.c index ac2363f627..1d3b2a2d46 100644 --- a/keyboards/keychron/v3/ansi_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/v3/ansi_encoder/keymaps/via/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, diff --git a/keyboards/keychron/v3/ansi_encoder/rules.mk b/keyboards/keychron/v3/ansi_encoder/rules.mk index ef55047753..5df3cbccaf 100644 --- a/keyboards/keychron/v3/ansi_encoder/rules.mk +++ b/keyboards/keychron/v3/ansi_encoder/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/v3/iso/info.json b/keyboards/keychron/v3/iso/info.json index 9f79518cb2..0ebb41d417 100644 --- a/keyboards/keychron/v3/iso/info.json +++ b/keyboards/keychron/v3/iso/info.json @@ -8,6 +8,9 @@ "pid": "0x0332", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { @@ -23,12 +26,12 @@ {"matrix":[0, 7], "x":8.5, "y":0}, {"matrix":[0, 8], "x":9.5, "y":0}, {"matrix":[0, 9], "x":11, "y":0}, - {"matrix":[0,10], "x":12, "y":0}, - {"matrix":[0,11], "x":13, "y":0}, - {"matrix":[0,12], "x":14, "y":0}, - {"matrix":[0,14], "x":15.25, "y":0}, - {"matrix":[0,15], "x":16.25, "y":0}, - {"matrix":[3,14], "x":17.25, "y":0}, + {"matrix":[0, 10], "x":12, "y":0}, + {"matrix":[0, 11], "x":13, "y":0}, + {"matrix":[0, 12], "x":14, "y":0}, + {"matrix":[0, 14], "x":15.25, "y":0}, + {"matrix":[0, 15], "x":16.25, "y":0}, + {"matrix":[3, 14], "x":17.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -40,13 +43,13 @@ {"matrix":[1, 7], "x":7, "y":1.25}, {"matrix":[1, 8], "x":8, "y":1.25}, {"matrix":[1, 9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25, "w":2}, - {"matrix":[1,14], "x":15.25, "y":1.25}, - {"matrix":[1,15], "x":16.25, "y":1.25}, - {"matrix":[3,15], "x":17.25, "y":1.25}, + {"matrix":[1, 10], "x":10, "y":1.25}, + {"matrix":[1, 11], "x":11, "y":1.25}, + {"matrix":[1, 12], "x":12, "y":1.25}, + {"matrix":[1, 13], "x":13, "y":1.25, "w":2}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, + {"matrix":[1, 15], "x":16.25, "y":1.25}, + {"matrix":[3, 15], "x":17.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -58,12 +61,12 @@ {"matrix":[2, 7], "x":7.5, "y":2.25}, {"matrix":[2, 8], "x":8.5, "y":2.25}, {"matrix":[2, 9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,14], "x":15.25, "y":2.25}, - {"matrix":[2,15], "x":16.25, "y":2.25}, - {"matrix":[3,12], "x":17.25, "y":2.25}, + {"matrix":[2, 10], "x":10.5, "y":2.25}, + {"matrix":[2, 11], "x":11.5, "y":2.25}, + {"matrix":[2, 12], "x":12.5, "y":2.25}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, + {"matrix":[2, 15], "x":16.25, "y":2.25}, + {"matrix":[3, 12], "x":17.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -75,10 +78,10 @@ {"matrix":[3, 7], "x":7.75, "y":3.25}, {"matrix":[3, 8], "x":8.75, "y":3.25}, {"matrix":[3, 9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3, 10], "x":10.75, "y":3.25}, + {"matrix":[3, 11], "x":11.75, "y":3.25}, + {"matrix":[3, 13], "x":12.75, "y":3.25}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25}, @@ -90,22 +93,22 @@ {"matrix":[4, 7], "x":7.25, "y":4.25}, {"matrix":[4, 8], "x":8.25, "y":4.25}, {"matrix":[4, 9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75}, - {"matrix":[4,15], "x":16.25, "y":4.25}, + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 13], "x":12.25, "y":4.25, "w":2.75}, + {"matrix":[4, 15], "x":16.25, "y":4.25}, {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25}, {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25}, - {"matrix":[5,10], "x":10, "y":5.25, "w":1.25}, - {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25}, - {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25}, - {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25}, - {"matrix":[5,14], "x":15.25, "y":5.25}, - {"matrix":[5,15], "x":16.25, "y":5.25}, - {"matrix":[4,14], "x":17.25, "y":5.25} + {"matrix":[5, 10], "x":10, "y":5.25, "w":1.25}, + {"matrix":[5, 11], "x":11.25, "y":5.25, "w":1.25}, + {"matrix":[5, 12], "x":12.5, "y":5.25, "w":1.25}, + {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25}, + {"matrix":[5, 14], "x":15.25, "y":5.25}, + {"matrix":[5, 15], "x":16.25, "y":5.25}, + {"matrix":[4, 14], "x":17.25, "y":5.25} ] } } diff --git a/keyboards/keychron/v3/iso/rules.mk b/keyboards/keychron/v3/iso/rules.mk index 8f5af0583c..201148f39d 100644 --- a/keyboards/keychron/v3/iso/rules.mk +++ b/keyboards/keychron/v3/iso/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/v3/iso_encoder/info.json b/keyboards/keychron/v3/iso_encoder/info.json index b38ad45930..0b6a7c1019 100644 --- a/keyboards/keychron/v3/iso_encoder/info.json +++ b/keyboards/keychron/v3/iso_encoder/info.json @@ -8,6 +8,9 @@ "pid": "0x0333", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "encoder": { "rotary": [ {"pin_a": "A10", "pin_b": "A8"} @@ -28,13 +31,13 @@ {"matrix":[0, 7], "x":7.5, "y":0}, {"matrix":[0, 8], "x":8.5, "y":0}, {"matrix":[0, 9], "x":9.75, "y":0}, - {"matrix":[0,10], "x":10.75, "y":0}, - {"matrix":[0,11], "x":11.75, "y":0}, - {"matrix":[0,12], "x":12.75, "y":0}, - {"matrix":[0,13], "x":14, "y":0}, - {"matrix":[0,14], "x":15.25, "y":0}, - {"matrix":[0,15], "x":16.25, "y":0}, - {"matrix":[3,14], "x":17.25, "y":0}, + {"matrix":[0, 10], "x":10.75, "y":0}, + {"matrix":[0, 11], "x":11.75, "y":0}, + {"matrix":[0, 12], "x":12.75, "y":0}, + {"matrix":[0, 13], "x":14, "y":0}, + {"matrix":[0, 14], "x":15.25, "y":0}, + {"matrix":[0, 15], "x":16.25, "y":0}, + {"matrix":[3, 14], "x":17.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -46,13 +49,13 @@ {"matrix":[1, 7], "x":7, "y":1.25}, {"matrix":[1, 8], "x":8, "y":1.25}, {"matrix":[1, 9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25, "w":2}, - {"matrix":[1,14], "x":15.25, "y":1.25}, - {"matrix":[1,15], "x":16.25, "y":1.25}, - {"matrix":[3,15], "x":17.25, "y":1.25}, + {"matrix":[1, 10], "x":10, "y":1.25}, + {"matrix":[1, 11], "x":11, "y":1.25}, + {"matrix":[1, 12], "x":12, "y":1.25}, + {"matrix":[1, 13], "x":13, "y":1.25, "w":2}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, + {"matrix":[1, 15], "x":16.25, "y":1.25}, + {"matrix":[3, 15], "x":17.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -64,12 +67,12 @@ {"matrix":[2, 7], "x":7.5, "y":2.25}, {"matrix":[2, 8], "x":8.5, "y":2.25}, {"matrix":[2, 9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,14], "x":15.25, "y":2.25}, - {"matrix":[2,15], "x":16.25, "y":2.25}, - {"matrix":[3,12], "x":17.25, "y":2.25}, + {"matrix":[2, 10], "x":10.5, "y":2.25}, + {"matrix":[2, 11], "x":11.5, "y":2.25}, + {"matrix":[2, 12], "x":12.5, "y":2.25}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, + {"matrix":[2, 15], "x":16.25, "y":2.25}, + {"matrix":[3, 12], "x":17.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -81,10 +84,10 @@ {"matrix":[3, 7], "x":7.75, "y":3.25}, {"matrix":[3, 8], "x":8.75, "y":3.25}, {"matrix":[3, 9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3, 10], "x":10.75, "y":3.25}, + {"matrix":[3, 11], "x":11.75, "y":3.25}, + {"matrix":[3, 13], "x":12.75, "y":3.25}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25}, @@ -96,22 +99,22 @@ {"matrix":[4, 7], "x":7.25, "y":4.25}, {"matrix":[4, 8], "x":8.25, "y":4.25}, {"matrix":[4, 9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75}, - {"matrix":[4,15], "x":16.25, "y":4.25}, + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 13], "x":12.25, "y":4.25, "w":2.75}, + {"matrix":[4, 15], "x":16.25, "y":4.25}, {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25}, {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25}, - {"matrix":[5,10], "x":10, "y":5.25, "w":1.25}, - {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25}, - {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25}, - {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25}, - {"matrix":[5,14], "x":15.25, "y":5.25}, - {"matrix":[5,15], "x":16.25, "y":5.25}, - {"matrix":[4,14], "x":17.25, "y":5.25} + {"matrix":[5, 10], "x":10, "y":5.25, "w":1.25}, + {"matrix":[5, 11], "x":11.25, "y":5.25, "w":1.25}, + {"matrix":[5, 12], "x":12.5, "y":5.25, "w":1.25}, + {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25}, + {"matrix":[5, 14], "x":15.25, "y":5.25}, + {"matrix":[5, 15], "x":16.25, "y":5.25}, + {"matrix":[4, 14], "x":17.25, "y":5.25} ] } } diff --git a/keyboards/keychron/v3/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/v3/iso_encoder/keymaps/default/keymap.c index 03ff4215a2..9d92865528 100644 --- a/keyboards/keychron/v3/iso_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/v3/iso_encoder/keymaps/default/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, diff --git a/keyboards/keychron/v3/iso_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/v3/iso_encoder/keymaps/keychron/keymap.c index 3f2b5cf7a6..3f28e23e31 100644 --- a/keyboards/keychron/v3/iso_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/v3/iso_encoder/keymaps/keychron/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format on #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, diff --git a/keyboards/keychron/v3/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/v3/iso_encoder/keymaps/via/keymap.c index 03ff4215a2..9d92865528 100644 --- a/keyboards/keychron/v3/iso_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/v3/iso_encoder/keymaps/via/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, diff --git a/keyboards/keychron/v3/iso_encoder/rules.mk b/keyboards/keychron/v3/iso_encoder/rules.mk index ef55047753..5df3cbccaf 100644 --- a/keyboards/keychron/v3/iso_encoder/rules.mk +++ b/keyboards/keychron/v3/iso_encoder/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/v3/jis/info.json b/keyboards/keychron/v3/jis/info.json index 3bab42c8dd..43ee08e448 100644 --- a/keyboards/keychron/v3/jis/info.json +++ b/keyboards/keychron/v3/jis/info.json @@ -8,6 +8,9 @@ "pid": "0x0334", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { @@ -23,12 +26,12 @@ {"matrix":[0, 7], "x":8.5, "y":0}, {"matrix":[0, 8], "x":9.5, "y":0}, {"matrix":[0, 9], "x":11, "y":0}, - {"matrix":[0,10], "x":12, "y":0}, - {"matrix":[0,11], "x":13, "y":0}, - {"matrix":[0,12], "x":14, "y":0}, - {"matrix":[0,14], "x":15.25, "y":0}, - {"matrix":[0,15], "x":16.25, "y":0}, - {"matrix":[3,14], "x":17.25, "y":0}, + {"matrix":[0, 10], "x":12, "y":0}, + {"matrix":[0, 11], "x":13, "y":0}, + {"matrix":[0, 12], "x":14, "y":0}, + {"matrix":[0, 14], "x":15.25, "y":0}, + {"matrix":[0, 15], "x":16.25, "y":0}, + {"matrix":[3, 14], "x":17.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -40,14 +43,14 @@ {"matrix":[1, 7], "x":7, "y":1.25}, {"matrix":[1, 8], "x":8, "y":1.25}, {"matrix":[1, 9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[0,13], "x":13, "y":1.25}, - {"matrix":[1,13], "x":14, "y":1.25}, - {"matrix":[1,14], "x":15.25, "y":1.25}, - {"matrix":[1,15], "x":16.25, "y":1.25}, - {"matrix":[3,15], "x":17.25, "y":1.25}, + {"matrix":[1, 10], "x":10, "y":1.25}, + {"matrix":[1, 11], "x":11, "y":1.25}, + {"matrix":[1, 12], "x":12, "y":1.25}, + {"matrix":[0, 13], "x":13, "y":1.25}, + {"matrix":[1, 13], "x":14, "y":1.25}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, + {"matrix":[1, 15], "x":16.25, "y":1.25}, + {"matrix":[3, 15], "x":17.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -59,12 +62,12 @@ {"matrix":[2, 7], "x":7.5, "y":2.25}, {"matrix":[2, 8], "x":8.5, "y":2.25}, {"matrix":[2, 9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,14], "x":15.25, "y":2.25}, - {"matrix":[2,15], "x":16.25, "y":2.25}, - {"matrix":[3,12], "x":17.25, "y":2.25}, + {"matrix":[2, 10], "x":10.5, "y":2.25}, + {"matrix":[2, 11], "x":11.5, "y":2.25}, + {"matrix":[2, 12], "x":12.5, "y":2.25}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, + {"matrix":[2, 15], "x":16.25, "y":2.25}, + {"matrix":[3, 12], "x":17.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -76,10 +79,10 @@ {"matrix":[3, 7], "x":7.75, "y":3.25}, {"matrix":[3, 8], "x":8.75, "y":3.25}, {"matrix":[3, 9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3, 10], "x":10.75, "y":3.25}, + {"matrix":[3, 11], "x":11.75, "y":3.25}, + {"matrix":[3, 13], "x":12.75, "y":3.25}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4.25}, @@ -90,11 +93,11 @@ {"matrix":[4, 7], "x":7.25, "y":4.25}, {"matrix":[4, 8], "x":8.25, "y":4.25}, {"matrix":[4, 9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,12], "x":12.25, "y":4.25}, - {"matrix":[4,13], "x":13.25, "y":4.25, "w":1.75}, - {"matrix":[4,15], "x":16.25, "y":4.25}, + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 12], "x":12.25, "y":4.25}, + {"matrix":[4, 13], "x":13.25, "y":4.25, "w":1.75}, + {"matrix":[4, 15], "x":16.25, "y":4.25}, {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5.25}, @@ -102,13 +105,13 @@ {"matrix":[5, 3], "x":3.5, "y":5.25}, {"matrix":[5, 6], "x":4.5, "y":5.25, "w":4.5}, {"matrix":[5, 9], "x":9, "y":5.25, "w":1.25}, - {"matrix":[5,10], "x":10.25, "y":5.25, "w":1.25}, - {"matrix":[5,11], "x":11.5, "y":5.25, "w":1.25}, - {"matrix":[5,12], "x":12.75, "y":5.25}, - {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25}, - {"matrix":[5,14], "x":15.25, "y":5.25}, - {"matrix":[5,15], "x":16.25, "y":5.25}, - {"matrix":[4,14], "x":17.25, "y":5.25} + {"matrix":[5, 10], "x":10.25, "y":5.25, "w":1.25}, + {"matrix":[5, 11], "x":11.5, "y":5.25, "w":1.25}, + {"matrix":[5, 12], "x":12.75, "y":5.25}, + {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25}, + {"matrix":[5, 14], "x":15.25, "y":5.25}, + {"matrix":[5, 15], "x":16.25, "y":5.25}, + {"matrix":[4, 14], "x":17.25, "y":5.25} ] } } diff --git a/keyboards/keychron/v3/jis/rules.mk b/keyboards/keychron/v3/jis/rules.mk index deac2e12e6..7f91e808b1 100644 --- a/keyboards/keychron/v3/jis/rules.mk +++ b/keyboards/keychron/v3/jis/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/v3/jis_encoder/info.json b/keyboards/keychron/v3/jis_encoder/info.json index 1f2d2b425b..85184c0a3d 100644 --- a/keyboards/keychron/v3/jis_encoder/info.json +++ b/keyboards/keychron/v3/jis_encoder/info.json @@ -8,6 +8,9 @@ "pid": "0x0335", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "encoder": { "rotary": [ {"pin_a": "A10", "pin_b": "A8"} @@ -28,13 +31,13 @@ {"matrix":[0, 7], "x":7.5, "y":0}, {"matrix":[0, 8], "x":8.5, "y":0}, {"matrix":[0, 9], "x":9.75, "y":0}, - {"matrix":[0,10], "x":10.75, "y":0}, - {"matrix":[0,11], "x":11.75, "y":0}, - {"matrix":[0,12], "x":12.75, "y":0}, - {"matrix":[0,13], "x":14, "y":0}, - {"matrix":[0,14], "x":15.25, "y":0}, - {"matrix":[0,15], "x":16.25, "y":0}, - {"matrix":[3,14], "x":17.25, "y":0}, + {"matrix":[0, 10], "x":10.75, "y":0}, + {"matrix":[0, 11], "x":11.75, "y":0}, + {"matrix":[0, 12], "x":12.75, "y":0}, + {"matrix":[0, 13], "x":14, "y":0}, + {"matrix":[0, 14], "x":15.25, "y":0}, + {"matrix":[0, 15], "x":16.25, "y":0}, + {"matrix":[3, 14], "x":17.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -46,14 +49,14 @@ {"matrix":[1, 7], "x":7, "y":1.25}, {"matrix":[1, 8], "x":8, "y":1.25}, {"matrix":[1, 9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25}, + {"matrix":[1, 10], "x":10, "y":1.25}, + {"matrix":[1, 11], "x":11, "y":1.25}, + {"matrix":[1, 12], "x":12, "y":1.25}, + {"matrix":[1, 13], "x":13, "y":1.25}, {"matrix":[5, 5], "x":14, "y":1.25}, - {"matrix":[1,14], "x":15.25, "y":1.25}, - {"matrix":[1,15], "x":16.25, "y":1.25}, - {"matrix":[3,15], "x":17.25, "y":1.25}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, + {"matrix":[1, 15], "x":16.25, "y":1.25}, + {"matrix":[3, 15], "x":17.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -65,12 +68,12 @@ {"matrix":[2, 7], "x":7.5, "y":2.25}, {"matrix":[2, 8], "x":8.5, "y":2.25}, {"matrix":[2, 9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,14], "x":15.25, "y":2.25}, - {"matrix":[2,15], "x":16.25, "y":2.25}, - {"matrix":[3,12], "x":17.25, "y":2.25}, + {"matrix":[2, 10], "x":10.5, "y":2.25}, + {"matrix":[2, 11], "x":11.5, "y":2.25}, + {"matrix":[2, 12], "x":12.5, "y":2.25}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, + {"matrix":[2, 15], "x":16.25, "y":2.25}, + {"matrix":[3, 12], "x":17.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -82,10 +85,10 @@ {"matrix":[3, 7], "x":7.75, "y":3.25}, {"matrix":[3, 8], "x":8.75, "y":3.25}, {"matrix":[3, 9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3, 10], "x":10.75, "y":3.25}, + {"matrix":[3, 11], "x":11.75, "y":3.25}, + {"matrix":[3, 13], "x":12.75, "y":3.25}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4.25}, @@ -96,11 +99,11 @@ {"matrix":[4, 7], "x":7.25, "y":4.25}, {"matrix":[4, 8], "x":8.25, "y":4.25}, {"matrix":[4, 9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,12], "x":12.25, "y":4.25}, - {"matrix":[4,13], "x":13.25, "y":4.25, "w":1.75}, - {"matrix":[4,15], "x":16.25, "y":4.25}, + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 12], "x":12.25, "y":4.25}, + {"matrix":[4, 13], "x":13.25, "y":4.25, "w":1.75}, + {"matrix":[4, 15], "x":16.25, "y":4.25}, {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5.25}, @@ -108,13 +111,13 @@ {"matrix":[5, 3], "x":3.5, "y":5.25}, {"matrix":[5, 6], "x":4.5, "y":5.25, "w":4.5}, {"matrix":[5, 9], "x":9, "y":5.25, "w":1.25}, - {"matrix":[5,10], "x":10.25, "y":5.25, "w":1.25}, - {"matrix":[5,11], "x":11.5, "y":5.25, "w":1.25}, - {"matrix":[5,12], "x":12.75, "y":5.25}, - {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25}, - {"matrix":[5,14], "x":15.25, "y":5.25}, - {"matrix":[5,15], "x":16.25, "y":5.25}, - {"matrix":[4,14], "x":17.25, "y":5.25} + {"matrix":[5, 10], "x":10.25, "y":5.25, "w":1.25}, + {"matrix":[5, 11], "x":11.5, "y":5.25, "w":1.25}, + {"matrix":[5, 12], "x":12.75, "y":5.25}, + {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25}, + {"matrix":[5, 14], "x":15.25, "y":5.25}, + {"matrix":[5, 15], "x":16.25, "y":5.25}, + {"matrix":[4, 14], "x":17.25, "y":5.25} ] } } diff --git a/keyboards/keychron/v3/jis_encoder/keymaps/default/keymap.c b/keyboards/keychron/v3/jis_encoder/keymaps/default/keymap.c index 0bc92b2931..18c17da4fd 100644 --- a/keyboards/keychron/v3/jis_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/v3/jis_encoder/keymaps/default/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, diff --git a/keyboards/keychron/v3/jis_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/v3/jis_encoder/keymaps/keychron/keymap.c index 5dd16ca0f1..9b69c9443c 100644 --- a/keyboards/keychron/v3/jis_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/v3/jis_encoder/keymaps/keychron/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format on #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, diff --git a/keyboards/keychron/v3/jis_encoder/keymaps/via/keymap.c b/keyboards/keychron/v3/jis_encoder/keymaps/via/keymap.c index 0bc92b2931..18c17da4fd 100644 --- a/keyboards/keychron/v3/jis_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/v3/jis_encoder/keymaps/via/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, diff --git a/keyboards/keychron/v3/jis_encoder/rules.mk b/keyboards/keychron/v3/jis_encoder/rules.mk index ef55047753..5df3cbccaf 100644 --- a/keyboards/keychron/v3/jis_encoder/rules.mk +++ b/keyboards/keychron/v3/jis_encoder/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/v4/ansi/info.json b/keyboards/keychron/v4/ansi/info.json index 04bd9e4761..11d246a121 100644 --- a/keyboards/keychron/v4/ansi/info.json +++ b/keyboards/keychron/v4/ansi/info.json @@ -8,6 +8,14 @@ "pid": "0x0340", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, + "matrix_pins": { + "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"], + "rows": ["B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { @@ -23,10 +31,10 @@ {"matrix":[0, 7], "x":7, "y":0}, {"matrix":[0, 8], "x":8, "y":0}, {"matrix":[0, 9], "x":9, "y":0}, - {"matrix":[0,10], "x":10, "y":0}, - {"matrix":[0,11], "x":11, "y":0}, - {"matrix":[0,12], "x":12, "y":0}, - {"matrix":[0,13], "x":13, "y":0, "w":2}, + {"matrix":[0, 10], "x":10, "y":0}, + {"matrix":[0, 11], "x":11, "y":0}, + {"matrix":[0, 12], "x":12, "y":0}, + {"matrix":[0, 13], "x":13, "y":0, "w":2}, {"matrix":[1, 0], "x":0, "y":1, "w":1.5}, {"matrix":[1, 1], "x":1.5, "y":1}, @@ -38,10 +46,10 @@ {"matrix":[1, 7], "x":7.5, "y":1}, {"matrix":[1, 8], "x":8.5, "y":1}, {"matrix":[1, 9], "x":9.5, "y":1}, - {"matrix":[1,10], "x":10.5, "y":1}, - {"matrix":[1,11], "x":11.5, "y":1}, - {"matrix":[1,12], "x":12.5, "y":1}, - {"matrix":[1,13], "x":13.5, "y":1, "w":1.5}, + {"matrix":[1, 10], "x":10.5, "y":1}, + {"matrix":[1, 11], "x":11.5, "y":1}, + {"matrix":[1, 12], "x":12.5, "y":1}, + {"matrix":[1, 13], "x":13.5, "y":1, "w":1.5}, {"matrix":[2, 0], "x":0, "y":2, "w":1.75}, {"matrix":[2, 1], "x":1.75, "y":2}, @@ -53,9 +61,9 @@ {"matrix":[2, 7], "x":7.75, "y":2}, {"matrix":[2, 8], "x":8.75, "y":2}, {"matrix":[2, 9], "x":9.75, "y":2}, - {"matrix":[2,10], "x":10.75, "y":2}, - {"matrix":[2,11], "x":11.75, "y":2}, - {"matrix":[2,13], "x":12.75, "y":2, "w":2.25}, + {"matrix":[2, 10], "x":10.75, "y":2}, + {"matrix":[2, 11], "x":11.75, "y":2}, + {"matrix":[2, 13], "x":12.75, "y":2, "w":2.25}, {"matrix":[3, 0], "x":0, "y":3, "w":2.25}, {"matrix":[3, 2], "x":2.25, "y":3}, @@ -66,18 +74,18 @@ {"matrix":[3, 7], "x":7.25, "y":3}, {"matrix":[3, 8], "x":8.25, "y":3}, {"matrix":[3, 9], "x":9.25, "y":3}, - {"matrix":[3,10], "x":10.25, "y":3}, - {"matrix":[3,11], "x":11.25, "y":3}, - {"matrix":[3,13], "x":12.25, "y":3, "w":2.75}, + {"matrix":[3, 10], "x":10.25, "y":3}, + {"matrix":[3, 11], "x":11.25, "y":3}, + {"matrix":[3, 13], "x":12.25, "y":3, "w":2.75}, {"matrix":[4, 0], "x":0, "y":4, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4, "w":1.25}, {"matrix":[4, 2], "x":2.5, "y":4, "w":1.25}, {"matrix":[4, 6], "x":3.75, "y":4, "w":6.25}, - {"matrix":[4,10], "x":10, "y":4, "w":1.25}, - {"matrix":[4,11], "x":11.25, "y":4, "w":1.25}, - {"matrix":[4,12], "x":12.5, "y":4, "w":1.25}, - {"matrix":[4,13], "x":13.75, "y":4, "w":1.25} + {"matrix":[4, 10], "x":10, "y":4, "w":1.25}, + {"matrix":[4, 11], "x":11.25, "y":4, "w":1.25}, + {"matrix":[4, 12], "x":12.5, "y":4, "w":1.25}, + {"matrix":[4, 13], "x":13.75, "y":4, "w":1.25} ] } } diff --git a/keyboards/keychron/v4/ansi/rules.mk b/keyboards/keychron/v4/ansi/rules.mk index 70c663e777..6dcd47b1fe 100644 --- a/keyboards/keychron/v4/ansi/rules.mk +++ b/keyboards/keychron/v4/ansi/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/v4/config.h b/keyboards/keychron/v4/config.h index eb22d58fb9..8d92219f20 100644 --- a/keyboards/keychron/v4/config.h +++ b/keyboards/keychron/v4/config.h @@ -16,15 +16,6 @@ #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS \ - { B4, B3, A15, A14, A13 } -#define MATRIX_COL_PINS \ - { C14, C15, A0, A1, A2, A3, A4, A5, A6, A7, B0, B1, A8, A9 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* RGB Matrix Driver Configuration */ #define DRIVER_COUNT 1 #define DRIVER_ADDR_1 0b1110111 diff --git a/keyboards/keychron/v4/iso/info.json b/keyboards/keychron/v4/iso/info.json index 561fdde3cc..362875903f 100644 --- a/keyboards/keychron/v4/iso/info.json +++ b/keyboards/keychron/v4/iso/info.json @@ -8,6 +8,14 @@ "pid": "0x0342", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, + "matrix_pins": { + "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"], + "rows": ["B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { @@ -23,10 +31,10 @@ {"matrix":[0, 7], "x":7, "y":0}, {"matrix":[0, 8], "x":8, "y":0}, {"matrix":[0, 9], "x":9, "y":0}, - {"matrix":[0,10], "x":10, "y":0}, - {"matrix":[0,11], "x":11, "y":0}, - {"matrix":[0,12], "x":12, "y":0}, - {"matrix":[0,13], "x":13, "y":0, "w":2}, + {"matrix":[0, 10], "x":10, "y":0}, + {"matrix":[0, 11], "x":11, "y":0}, + {"matrix":[0, 12], "x":12, "y":0}, + {"matrix":[0, 13], "x":13, "y":0, "w":2}, {"matrix":[1, 0], "x":0, "y":1, "w":1.5}, {"matrix":[1, 1], "x":1.5, "y":1}, @@ -38,9 +46,9 @@ {"matrix":[1, 7], "x":7.5, "y":1}, {"matrix":[1, 8], "x":8.5, "y":1}, {"matrix":[1, 9], "x":9.5, "y":1}, - {"matrix":[1,10], "x":10.5, "y":1}, - {"matrix":[1,11], "x":11.5, "y":1}, - {"matrix":[1,12], "x":12.5, "y":1}, + {"matrix":[1, 10], "x":10.5, "y":1}, + {"matrix":[1, 11], "x":11.5, "y":1}, + {"matrix":[1, 12], "x":12.5, "y":1}, {"matrix":[2, 0], "x":0, "y":2, "w":1.75}, {"matrix":[2, 1], "x":1.75, "y":2}, @@ -52,10 +60,10 @@ {"matrix":[2, 7], "x":7.75, "y":2}, {"matrix":[2, 8], "x":8.75, "y":2}, {"matrix":[2, 9], "x":9.75, "y":2}, - {"matrix":[2,10], "x":10.75, "y":2}, - {"matrix":[2,11], "x":11.75, "y":2}, - {"matrix":[2,13], "x":12.75, "y":2}, - {"matrix":[1,13], "x":13.75, "y":1, "w":1.25, "h":2}, + {"matrix":[2, 10], "x":10.75, "y":2}, + {"matrix":[2, 11], "x":11.75, "y":2}, + {"matrix":[2, 13], "x":12.75, "y":2}, + {"matrix":[1, 13], "x":13.75, "y":1, "w":1.25, "h":2}, {"matrix":[3, 0], "x":0, "y":3, "w":1.25}, {"matrix":[3, 1], "x":1.25, "y":3.25}, @@ -67,18 +75,18 @@ {"matrix":[3, 7], "x":7.25, "y":3}, {"matrix":[3, 8], "x":8.25, "y":3}, {"matrix":[3, 9], "x":9.25, "y":3}, - {"matrix":[3,10], "x":10.25, "y":3}, - {"matrix":[3,11], "x":11.25, "y":3}, - {"matrix":[3,13], "x":12.25, "y":3, "w":2.75}, + {"matrix":[3, 10], "x":10.25, "y":3}, + {"matrix":[3, 11], "x":11.25, "y":3}, + {"matrix":[3, 13], "x":12.25, "y":3, "w":2.75}, {"matrix":[4, 0], "x":0, "y":4, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4, "w":1.25}, {"matrix":[4, 2], "x":2.5, "y":4, "w":1.25}, {"matrix":[4, 6], "x":3.75, "y":4, "w":6.25}, - {"matrix":[4,10], "x":10, "y":4, "w":1.25}, - {"matrix":[4,11], "x":11.25, "y":4, "w":1.25}, - {"matrix":[4,12], "x":12.5, "y":4, "w":1.25}, - {"matrix":[4,13], "x":13.75, "y":4, "w":1.25} + {"matrix":[4, 10], "x":10, "y":4, "w":1.25}, + {"matrix":[4, 11], "x":11.25, "y":4, "w":1.25}, + {"matrix":[4, 12], "x":12.5, "y":4, "w":1.25}, + {"matrix":[4, 13], "x":13.75, "y":4, "w":1.25} ] } } diff --git a/keyboards/keychron/v4/iso/rules.mk b/keyboards/keychron/v4/iso/rules.mk index 70c663e777..6dcd47b1fe 100644 --- a/keyboards/keychron/v4/iso/rules.mk +++ b/keyboards/keychron/v4/iso/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/v5/ansi/info.json b/keyboards/keychron/v5/ansi/info.json index 40e253367c..62d6a5332c 100644 --- a/keyboards/keychron/v5/ansi/info.json +++ b/keyboards/keychron/v5/ansi/info.json @@ -8,6 +8,9 @@ "pid": "0x0350", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { @@ -23,15 +26,15 @@ {"matrix":[0, 7], "x":7, "y":0}, {"matrix":[0, 8], "x":8, "y":0}, {"matrix":[0, 9], "x":9, "y":0}, - {"matrix":[0,10], "x":10, "y":0}, - {"matrix":[0,11], "x":11, "y":0}, - {"matrix":[0,12], "x":12, "y":0}, - {"matrix":[0,13], "x":13, "y":0}, - {"matrix":[0,14], "x":14, "y":0}, - {"matrix":[0,15], "x":15.5, "y":0}, - {"matrix":[0,16], "x":16.5, "y":0}, - {"matrix":[0,17], "x":17.5, "y":0}, - {"matrix":[3,12], "x":18.5, "y":0}, + {"matrix":[0, 10], "x":10, "y":0}, + {"matrix":[0, 11], "x":11, "y":0}, + {"matrix":[0, 12], "x":12, "y":0}, + {"matrix":[0, 13], "x":13, "y":0}, + {"matrix":[0, 14], "x":14, "y":0}, + {"matrix":[0, 15], "x":15.5, "y":0}, + {"matrix":[0, 16], "x":16.5, "y":0}, + {"matrix":[0, 17], "x":17.5, "y":0}, + {"matrix":[3, 12], "x":18.5, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -43,14 +46,14 @@ {"matrix":[1, 7], "x":7, "y":1.25}, {"matrix":[1, 8], "x":8, "y":1.25}, {"matrix":[1, 9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25, "w":2}, - {"matrix":[1,15], "x":15.5, "y":1.25}, - {"matrix":[1,16], "x":16.5, "y":1.25}, - {"matrix":[1,17], "x":17.5, "y":1.25}, - {"matrix":[3,14], "x":18.5, "y":1.25}, + {"matrix":[1, 10], "x":10, "y":1.25}, + {"matrix":[1, 11], "x":11, "y":1.25}, + {"matrix":[1, 12], "x":12, "y":1.25}, + {"matrix":[1, 13], "x":13, "y":1.25, "w":2}, + {"matrix":[1, 15], "x":15.5, "y":1.25}, + {"matrix":[1, 16], "x":16.5, "y":1.25}, + {"matrix":[1, 17], "x":17.5, "y":1.25}, + {"matrix":[3, 14], "x":18.5, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -62,13 +65,13 @@ {"matrix":[2, 7], "x":7.5, "y":2.25}, {"matrix":[2, 8], "x":8.5, "y":2.25}, {"matrix":[2, 9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5}, - {"matrix":[2,15], "x":15.5, "y":2.25}, - {"matrix":[2,16], "x":16.5, "y":2.25}, - {"matrix":[2,17], "x":17.5, "y":2.25}, + {"matrix":[2, 10], "x":10.5, "y":2.25}, + {"matrix":[2, 11], "x":11.5, "y":2.25}, + {"matrix":[2, 12], "x":12.5, "y":2.25}, + {"matrix":[2, 13], "x":13.5, "y":2.25, "w":1.5}, + {"matrix":[2, 15], "x":15.5, "y":2.25}, + {"matrix":[2, 16], "x":16.5, "y":2.25}, + {"matrix":[2, 17], "x":17.5, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -80,13 +83,13 @@ {"matrix":[3, 7], "x":7.75, "y":3.25}, {"matrix":[3, 8], "x":8.75, "y":3.25}, {"matrix":[3, 9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25}, - {"matrix":[3,15], "x":15.5, "y":3.25}, - {"matrix":[3,16], "x":16.5, "y":3.25}, - {"matrix":[3,17], "x":17.5, "y":3.25}, - {"matrix":[2,14], "x":18.5, "y":2.25, "h":2}, + {"matrix":[3, 10], "x":10.75, "y":3.25}, + {"matrix":[3, 11], "x":11.75, "y":3.25}, + {"matrix":[3, 13], "x":12.75, "y":3.25, "w":2.25}, + {"matrix":[3, 15], "x":15.5, "y":3.25}, + {"matrix":[3, 16], "x":16.5, "y":3.25}, + {"matrix":[3, 17], "x":17.5, "y":3.25}, + {"matrix":[2, 14], "x":18.5, "y":2.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4.25}, @@ -97,26 +100,26 @@ {"matrix":[4, 7], "x":7.25, "y":4.25}, {"matrix":[4, 8], "x":8.25, "y":4.25}, {"matrix":[4, 9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,13], "x":12.25, "y":4.25, "w":1.75}, - {"matrix":[4,14], "x":14.25, "y":4.5}, - {"matrix":[4,15], "x":15.5, "y":4.25}, - {"matrix":[4,16], "x":16.5, "y":4.25}, - {"matrix":[4,17], "x":17.5, "y":4.25}, + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 13], "x":12.25, "y":4.25, "w":1.75}, + {"matrix":[4, 14], "x":14.25, "y":4.5}, + {"matrix":[4, 15], "x":15.5, "y":4.25}, + {"matrix":[4, 16], "x":16.5, "y":4.25}, + {"matrix":[4, 17], "x":17.5, "y":4.25}, {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25}, {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25}, - {"matrix":[5,10], "x":10, "y":5.25}, - {"matrix":[5,11], "x":11, "y":5.25}, - {"matrix":[5,12], "x":12, "y":5.25}, - {"matrix":[5,13], "x":13.25, "y":5.5}, - {"matrix":[5,14], "x":14.25, "y":5.5}, - {"matrix":[5,15], "x":15.25, "y":5.5}, - {"matrix":[5,16], "x":16.5, "y":5.25}, - {"matrix":[5,17], "x":17.5, "y":5.25}, + {"matrix":[5, 10], "x":10, "y":5.25}, + {"matrix":[5, 11], "x":11, "y":5.25}, + {"matrix":[5, 12], "x":12, "y":5.25}, + {"matrix":[5, 13], "x":13.25, "y":5.5}, + {"matrix":[5, 14], "x":14.25, "y":5.5}, + {"matrix":[5, 15], "x":15.25, "y":5.5}, + {"matrix":[5, 16], "x":16.5, "y":5.25}, + {"matrix":[5, 17], "x":17.5, "y":5.25}, {"matrix":[5, 5], "x":18.5, "y":4.25, "h":2} ] } diff --git a/keyboards/keychron/v5/ansi/rules.mk b/keyboards/keychron/v5/ansi/rules.mk index 311ca648e1..f2dba218bf 100644 --- a/keyboards/keychron/v5/ansi/rules.mk +++ b/keyboards/keychron/v5/ansi/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/v5/ansi_encoder/info.json b/keyboards/keychron/v5/ansi_encoder/info.json index 9461379d1a..2b16b37c37 100644 --- a/keyboards/keychron/v5/ansi_encoder/info.json +++ b/keyboards/keychron/v5/ansi_encoder/info.json @@ -8,6 +8,9 @@ "pid": "0x0351", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "encoder": { "rotary": [ {"pin_a": "C14", "pin_b": "A2"} @@ -26,15 +29,15 @@ {"matrix":[0, 7], "x":6.5, "y":0}, {"matrix":[0, 8], "x":7.5, "y":0}, {"matrix":[0, 9], "x":8.5, "y":0}, - {"matrix":[0,10], "x":9.5, "y":0}, - {"matrix":[0,11], "x":11, "y":0}, - {"matrix":[0,12], "x":12, "y":0}, - {"matrix":[0,13], "x":13, "y":0}, - {"matrix":[0,14], "x":14, "y":0}, - {"matrix":[0,15], "x":15.25, "y":0}, - {"matrix":[0,16], "x":16.25, "y":0}, - {"matrix":[0,17], "x":17.25, "y":0}, - {"matrix":[3,12], "x":18.5, "y":0}, + {"matrix":[0, 10], "x":9.5, "y":0}, + {"matrix":[0, 11], "x":11, "y":0}, + {"matrix":[0, 12], "x":12, "y":0}, + {"matrix":[0, 13], "x":13, "y":0}, + {"matrix":[0, 14], "x":14, "y":0}, + {"matrix":[0, 15], "x":15.25, "y":0}, + {"matrix":[0, 16], "x":16.25, "y":0}, + {"matrix":[0, 17], "x":17.25, "y":0}, + {"matrix":[3, 12], "x":18.5, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -46,14 +49,14 @@ {"matrix":[1, 7], "x":7, "y":1.25}, {"matrix":[1, 8], "x":8, "y":1.25}, {"matrix":[1, 9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25, "w":2}, - {"matrix":[1,15], "x":15.5, "y":1.25}, - {"matrix":[1,16], "x":16.5, "y":1.25}, - {"matrix":[1,17], "x":17.5, "y":1.25}, - {"matrix":[3,14], "x":18.5, "y":1.25}, + {"matrix":[1, 10], "x":10, "y":1.25}, + {"matrix":[1, 11], "x":11, "y":1.25}, + {"matrix":[1, 12], "x":12, "y":1.25}, + {"matrix":[1, 13], "x":13, "y":1.25, "w":2}, + {"matrix":[1, 15], "x":15.5, "y":1.25}, + {"matrix":[1, 16], "x":16.5, "y":1.25}, + {"matrix":[1, 17], "x":17.5, "y":1.25}, + {"matrix":[3, 14], "x":18.5, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -65,13 +68,13 @@ {"matrix":[2, 7], "x":7.5, "y":2.25}, {"matrix":[2, 8], "x":8.5, "y":2.25}, {"matrix":[2, 9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5}, - {"matrix":[2,15], "x":15.5, "y":2.25}, - {"matrix":[2,16], "x":16.5, "y":2.25}, - {"matrix":[2,17], "x":17.5, "y":2.25}, + {"matrix":[2, 10], "x":10.5, "y":2.25}, + {"matrix":[2, 11], "x":11.5, "y":2.25}, + {"matrix":[2, 12], "x":12.5, "y":2.25}, + {"matrix":[2, 13], "x":13.5, "y":2.25, "w":1.5}, + {"matrix":[2, 15], "x":15.5, "y":2.25}, + {"matrix":[2, 16], "x":16.5, "y":2.25}, + {"matrix":[2, 17], "x":17.5, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -83,13 +86,13 @@ {"matrix":[3, 7], "x":7.75, "y":3.25}, {"matrix":[3, 8], "x":8.75, "y":3.25}, {"matrix":[3, 9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25}, - {"matrix":[3,15], "x":15.5, "y":3.25}, - {"matrix":[3,16], "x":16.5, "y":3.25}, - {"matrix":[3,17], "x":17.5, "y":3.25}, - {"matrix":[2,14], "x":18.5, "y":2.25, "h":2}, + {"matrix":[3, 10], "x":10.75, "y":3.25}, + {"matrix":[3, 11], "x":11.75, "y":3.25}, + {"matrix":[3, 13], "x":12.75, "y":3.25, "w":2.25}, + {"matrix":[3, 15], "x":15.5, "y":3.25}, + {"matrix":[3, 16], "x":16.5, "y":3.25}, + {"matrix":[3, 17], "x":17.5, "y":3.25}, + {"matrix":[2, 14], "x":18.5, "y":2.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4.25}, @@ -100,26 +103,26 @@ {"matrix":[4, 7], "x":7.25, "y":4.25}, {"matrix":[4, 8], "x":8.25, "y":4.25}, {"matrix":[4, 9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,13], "x":12.25, "y":4.25, "w":1.75}, - {"matrix":[4,14], "x":14.25, "y":4.5}, - {"matrix":[4,15], "x":15.5, "y":4.25}, - {"matrix":[4,16], "x":16.5, "y":4.25}, - {"matrix":[4,17], "x":17.5, "y":4.25}, + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 13], "x":12.25, "y":4.25, "w":1.75}, + {"matrix":[4, 14], "x":14.25, "y":4.5}, + {"matrix":[4, 15], "x":15.5, "y":4.25}, + {"matrix":[4, 16], "x":16.5, "y":4.25}, + {"matrix":[4, 17], "x":17.5, "y":4.25}, {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25}, {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25}, - {"matrix":[5,10], "x":10, "y":5.25}, - {"matrix":[5,11], "x":11, "y":5.25}, - {"matrix":[5,12], "x":12, "y":5.25}, - {"matrix":[5,13], "x":13.25, "y":5.5}, - {"matrix":[5,14], "x":14.25, "y":5.5}, - {"matrix":[5,15], "x":15.25, "y":5.5}, - {"matrix":[5,16], "x":16.5, "y":5.25}, - {"matrix":[5,17], "x":17.5, "y":5.25}, + {"matrix":[5, 10], "x":10, "y":5.25}, + {"matrix":[5, 11], "x":11, "y":5.25}, + {"matrix":[5, 12], "x":12, "y":5.25}, + {"matrix":[5, 13], "x":13.25, "y":5.5}, + {"matrix":[5, 14], "x":14.25, "y":5.5}, + {"matrix":[5, 15], "x":15.25, "y":5.5}, + {"matrix":[5, 16], "x":16.5, "y":5.25}, + {"matrix":[5, 17], "x":17.5, "y":5.25}, {"matrix":[5, 5], "x":18.5, "y":4.25, "h":2} ] } diff --git a/keyboards/keychron/v5/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/v5/ansi_encoder/keymaps/default/keymap.c index d3e3ba41f3..c48e7036be 100644 --- a/keyboards/keychron/v5/ansi_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/v5/ansi_encoder/keymaps/default/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, diff --git a/keyboards/keychron/v5/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/v5/ansi_encoder/keymaps/keychron/keymap.c index 7f4ed64136..b2ec70c095 100644 --- a/keyboards/keychron/v5/ansi_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/v5/ansi_encoder/keymaps/keychron/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format on #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, diff --git a/keyboards/keychron/v5/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/v5/ansi_encoder/keymaps/via/keymap.c index d3e3ba41f3..c48e7036be 100644 --- a/keyboards/keychron/v5/ansi_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/v5/ansi_encoder/keymaps/via/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, diff --git a/keyboards/keychron/v5/ansi_encoder/rules.mk b/keyboards/keychron/v5/ansi_encoder/rules.mk index ef55047753..5df3cbccaf 100644 --- a/keyboards/keychron/v5/ansi_encoder/rules.mk +++ b/keyboards/keychron/v5/ansi_encoder/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/v5/iso/info.json b/keyboards/keychron/v5/iso/info.json index 729297f2a1..ab7765ea58 100644 --- a/keyboards/keychron/v5/iso/info.json +++ b/keyboards/keychron/v5/iso/info.json @@ -8,6 +8,9 @@ "pid": "0x0352", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { @@ -23,15 +26,15 @@ {"matrix":[0, 7], "x":7, "y":0}, {"matrix":[0, 8], "x":8, "y":0}, {"matrix":[0, 9], "x":9, "y":0}, - {"matrix":[0,10], "x":10, "y":0}, - {"matrix":[0,11], "x":11, "y":0}, - {"matrix":[0,12], "x":12, "y":0}, - {"matrix":[0,13], "x":13, "y":0}, - {"matrix":[0,14], "x":14, "y":0}, - {"matrix":[0,15], "x":15.5, "y":0}, - {"matrix":[0,16], "x":16.5, "y":0}, - {"matrix":[0,17], "x":17.5, "y":0}, - {"matrix":[3,12], "x":18.5, "y":0}, + {"matrix":[0, 10], "x":10, "y":0}, + {"matrix":[0, 11], "x":11, "y":0}, + {"matrix":[0, 12], "x":12, "y":0}, + {"matrix":[0, 13], "x":13, "y":0}, + {"matrix":[0, 14], "x":14, "y":0}, + {"matrix":[0, 15], "x":15.5, "y":0}, + {"matrix":[0, 16], "x":16.5, "y":0}, + {"matrix":[0, 17], "x":17.5, "y":0}, + {"matrix":[3, 12], "x":18.5, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -43,14 +46,14 @@ {"matrix":[1, 7], "x":7, "y":1.25}, {"matrix":[1, 8], "x":8, "y":1.25}, {"matrix":[1, 9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25, "w":2}, - {"matrix":[1,15], "x":15.5, "y":1.25}, - {"matrix":[1,16], "x":16.5, "y":1.25}, - {"matrix":[1,17], "x":17.5, "y":1.25}, - {"matrix":[3,14], "x":18.5, "y":1.25}, + {"matrix":[1, 10], "x":10, "y":1.25}, + {"matrix":[1, 11], "x":11, "y":1.25}, + {"matrix":[1, 12], "x":12, "y":1.25}, + {"matrix":[1, 13], "x":13, "y":1.25, "w":2}, + {"matrix":[1, 15], "x":15.5, "y":1.25}, + {"matrix":[1, 16], "x":16.5, "y":1.25}, + {"matrix":[1, 17], "x":17.5, "y":1.25}, + {"matrix":[3, 14], "x":18.5, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -62,12 +65,12 @@ {"matrix":[2, 7], "x":7.5, "y":2.25}, {"matrix":[2, 8], "x":8.5, "y":2.25}, {"matrix":[2, 9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,15], "x":15.5, "y":2.25}, - {"matrix":[2,16], "x":16.5, "y":2.25}, - {"matrix":[2,17], "x":17.5, "y":2.25}, + {"matrix":[2, 10], "x":10.5, "y":2.25}, + {"matrix":[2, 11], "x":11.5, "y":2.25}, + {"matrix":[2, 12], "x":12.5, "y":2.25}, + {"matrix":[2, 15], "x":15.5, "y":2.25}, + {"matrix":[2, 16], "x":16.5, "y":2.25}, + {"matrix":[2, 17], "x":17.5, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -79,14 +82,14 @@ {"matrix":[3, 7], "x":7.75, "y":3.25}, {"matrix":[3, 8], "x":8.75, "y":3.25}, {"matrix":[3, 9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, - {"matrix":[3,15], "x":15.5, "y":3.25}, - {"matrix":[3,16], "x":16.5, "y":3.25}, - {"matrix":[3,17], "x":17.5, "y":3.25}, - {"matrix":[2,14], "x":18.5, "y":2.25, "h":2}, + {"matrix":[3, 10], "x":10.75, "y":3.25}, + {"matrix":[3, 11], "x":11.75, "y":3.25}, + {"matrix":[3, 13], "x":12.75, "y":3.25}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3, 15], "x":15.5, "y":3.25}, + {"matrix":[3, 16], "x":16.5, "y":3.25}, + {"matrix":[3, 17], "x":17.5, "y":3.25}, + {"matrix":[2, 14], "x":18.5, "y":2.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25}, @@ -98,26 +101,26 @@ {"matrix":[4, 7], "x":7.25, "y":4.25}, {"matrix":[4, 8], "x":8.25, "y":4.25}, {"matrix":[4, 9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,13], "x":12.25, "y":4.25, "w":1.75}, - {"matrix":[4,14], "x":14.25, "y":4.5}, - {"matrix":[4,15], "x":15.5, "y":4.25}, - {"matrix":[4,16], "x":16.5, "y":4.25}, - {"matrix":[4,17], "x":17.5, "y":4.25}, + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 13], "x":12.25, "y":4.25, "w":1.75}, + {"matrix":[4, 14], "x":14.25, "y":4.5}, + {"matrix":[4, 15], "x":15.5, "y":4.25}, + {"matrix":[4, 16], "x":16.5, "y":4.25}, + {"matrix":[4, 17], "x":17.5, "y":4.25}, {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25}, {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25}, - {"matrix":[5,10], "x":10, "y":5.25}, - {"matrix":[5,11], "x":11, "y":5.25}, - {"matrix":[5,12], "x":12, "y":5.25}, - {"matrix":[5,13], "x":13.25, "y":5.5}, - {"matrix":[5,14], "x":14.25, "y":5.5}, - {"matrix":[5,15], "x":15.25, "y":5.5}, - {"matrix":[5,16], "x":16.5, "y":5.25}, - {"matrix":[5,17], "x":17.5, "y":5.25}, + {"matrix":[5, 10], "x":10, "y":5.25}, + {"matrix":[5, 11], "x":11, "y":5.25}, + {"matrix":[5, 12], "x":12, "y":5.25}, + {"matrix":[5, 13], "x":13.25, "y":5.5}, + {"matrix":[5, 14], "x":14.25, "y":5.5}, + {"matrix":[5, 15], "x":15.25, "y":5.5}, + {"matrix":[5, 16], "x":16.5, "y":5.25}, + {"matrix":[5, 17], "x":17.5, "y":5.25}, {"matrix":[5, 5], "x":18.5, "y":4.25, "h":2} ] } diff --git a/keyboards/keychron/v5/iso/rules.mk b/keyboards/keychron/v5/iso/rules.mk index 311ca648e1..f2dba218bf 100644 --- a/keyboards/keychron/v5/iso/rules.mk +++ b/keyboards/keychron/v5/iso/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/v5/iso_encoder/info.json b/keyboards/keychron/v5/iso_encoder/info.json index 21c1891069..e15360af0f 100644 --- a/keyboards/keychron/v5/iso_encoder/info.json +++ b/keyboards/keychron/v5/iso_encoder/info.json @@ -8,6 +8,9 @@ "pid": "0x0353", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "encoder": { "rotary": [ {"pin_a": "C14", "pin_b": "A2"} @@ -26,15 +29,15 @@ {"matrix":[0, 7], "x":6.5, "y":0}, {"matrix":[0, 8], "x":7.5, "y":0}, {"matrix":[0, 9], "x":8.5, "y":0}, - {"matrix":[0,10], "x":9.5, "y":0}, - {"matrix":[0,11], "x":11, "y":0}, - {"matrix":[0,12], "x":12, "y":0}, - {"matrix":[0,13], "x":13, "y":0}, - {"matrix":[0,14], "x":14, "y":0}, - {"matrix":[0,15], "x":15.25, "y":0}, - {"matrix":[0,16], "x":16.25, "y":0}, - {"matrix":[0,17], "x":17.25, "y":0}, - {"matrix":[3,12], "x":18.5, "y":0}, + {"matrix":[0, 10], "x":9.5, "y":0}, + {"matrix":[0, 11], "x":11, "y":0}, + {"matrix":[0, 12], "x":12, "y":0}, + {"matrix":[0, 13], "x":13, "y":0}, + {"matrix":[0, 14], "x":14, "y":0}, + {"matrix":[0, 15], "x":15.25, "y":0}, + {"matrix":[0, 16], "x":16.25, "y":0}, + {"matrix":[0, 17], "x":17.25, "y":0}, + {"matrix":[3, 12], "x":18.5, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -46,14 +49,14 @@ {"matrix":[1, 7], "x":7, "y":1.25}, {"matrix":[1, 8], "x":8, "y":1.25}, {"matrix":[1, 9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25, "w":2}, - {"matrix":[1,15], "x":15.5, "y":1.25}, - {"matrix":[1,16], "x":16.5, "y":1.25}, - {"matrix":[1,17], "x":17.5, "y":1.25}, - {"matrix":[3,14], "x":18.5, "y":1.25}, + {"matrix":[1, 10], "x":10, "y":1.25}, + {"matrix":[1, 11], "x":11, "y":1.25}, + {"matrix":[1, 12], "x":12, "y":1.25}, + {"matrix":[1, 13], "x":13, "y":1.25, "w":2}, + {"matrix":[1, 15], "x":15.5, "y":1.25}, + {"matrix":[1, 16], "x":16.5, "y":1.25}, + {"matrix":[1, 17], "x":17.5, "y":1.25}, + {"matrix":[3, 14], "x":18.5, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -65,12 +68,12 @@ {"matrix":[2, 7], "x":7.5, "y":2.25}, {"matrix":[2, 8], "x":8.5, "y":2.25}, {"matrix":[2, 9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,15], "x":15.5, "y":2.25}, - {"matrix":[2,16], "x":16.5, "y":2.25}, - {"matrix":[2,17], "x":17.5, "y":2.25}, + {"matrix":[2, 10], "x":10.5, "y":2.25}, + {"matrix":[2, 11], "x":11.5, "y":2.25}, + {"matrix":[2, 12], "x":12.5, "y":2.25}, + {"matrix":[2, 15], "x":15.5, "y":2.25}, + {"matrix":[2, 16], "x":16.5, "y":2.25}, + {"matrix":[2, 17], "x":17.5, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -82,14 +85,14 @@ {"matrix":[3, 7], "x":7.75, "y":3.25}, {"matrix":[3, 8], "x":8.75, "y":3.25}, {"matrix":[3, 9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, - {"matrix":[3,15], "x":15.5, "y":3.25}, - {"matrix":[3,16], "x":16.5, "y":3.25}, - {"matrix":[3,17], "x":17.5, "y":3.25}, - {"matrix":[2,14], "x":18.5, "y":2.25, "h":2}, + {"matrix":[3, 10], "x":10.75, "y":3.25}, + {"matrix":[3, 11], "x":11.75, "y":3.25}, + {"matrix":[3, 13], "x":12.75, "y":3.25}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3, 15], "x":15.5, "y":3.25}, + {"matrix":[3, 16], "x":16.5, "y":3.25}, + {"matrix":[3, 17], "x":17.5, "y":3.25}, + {"matrix":[2, 14], "x":18.5, "y":2.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25}, @@ -101,26 +104,26 @@ {"matrix":[4, 7], "x":7.25, "y":4.25}, {"matrix":[4, 8], "x":8.25, "y":4.25}, {"matrix":[4, 9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,13], "x":12.25, "y":4.25, "w":1.75}, - {"matrix":[4,14], "x":14.25, "y":4.5}, - {"matrix":[4,15], "x":15.5, "y":4.25}, - {"matrix":[4,16], "x":16.5, "y":4.25}, - {"matrix":[4,17], "x":17.5, "y":4.25}, + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 13], "x":12.25, "y":4.25, "w":1.75}, + {"matrix":[4, 14], "x":14.25, "y":4.5}, + {"matrix":[4, 15], "x":15.5, "y":4.25}, + {"matrix":[4, 16], "x":16.5, "y":4.25}, + {"matrix":[4, 17], "x":17.5, "y":4.25}, {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25}, {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25}, - {"matrix":[5,10], "x":10, "y":5.25}, - {"matrix":[5,11], "x":11, "y":5.25}, - {"matrix":[5,12], "x":12, "y":5.25}, - {"matrix":[5,13], "x":13.25, "y":5.5}, - {"matrix":[5,14], "x":14.25, "y":5.5}, - {"matrix":[5,15], "x":15.25, "y":5.5}, - {"matrix":[5,16], "x":16.5, "y":5.25}, - {"matrix":[5,17], "x":17.5, "y":5.25}, + {"matrix":[5, 10], "x":10, "y":5.25}, + {"matrix":[5, 11], "x":11, "y":5.25}, + {"matrix":[5, 12], "x":12, "y":5.25}, + {"matrix":[5, 13], "x":13.25, "y":5.5}, + {"matrix":[5, 14], "x":14.25, "y":5.5}, + {"matrix":[5, 15], "x":15.25, "y":5.5}, + {"matrix":[5, 16], "x":16.5, "y":5.25}, + {"matrix":[5, 17], "x":17.5, "y":5.25}, {"matrix":[5, 5], "x":18.5, "y":4.25, "h":2} ] } diff --git a/keyboards/keychron/v5/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/v5/iso_encoder/keymaps/default/keymap.c index 6751743c3f..7defc8c79a 100644 --- a/keyboards/keychron/v5/iso_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/v5/iso_encoder/keymaps/default/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, diff --git a/keyboards/keychron/v5/iso_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/v5/iso_encoder/keymaps/keychron/keymap.c index 34229b819b..fe61219034 100644 --- a/keyboards/keychron/v5/iso_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/v5/iso_encoder/keymaps/keychron/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format off #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, diff --git a/keyboards/keychron/v5/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/v5/iso_encoder/keymaps/via/keymap.c index 6751743c3f..7defc8c79a 100644 --- a/keyboards/keychron/v5/iso_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/v5/iso_encoder/keymaps/via/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, diff --git a/keyboards/keychron/v5/iso_encoder/rules.mk b/keyboards/keychron/v5/iso_encoder/rules.mk index ef55047753..5df3cbccaf 100644 --- a/keyboards/keychron/v5/iso_encoder/rules.mk +++ b/keyboards/keychron/v5/iso_encoder/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/v6/ansi/info.json b/keyboards/keychron/v6/ansi/info.json index b694849f88..436cd30a78 100644 --- a/keyboards/keychron/v6/ansi/info.json +++ b/keyboards/keychron/v6/ansi/info.json @@ -8,6 +8,9 @@ "pid": "0x0360", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { @@ -23,16 +26,16 @@ {"matrix":[0, 7], "x":8.5, "y":0}, {"matrix":[0, 8], "x":9.5, "y":0}, {"matrix":[0, 9], "x":11, "y":0}, - {"matrix":[0,10], "x":12, "y":0}, - {"matrix":[0,11], "x":13, "y":0}, - {"matrix":[0,12], "x":14, "y":0}, - {"matrix":[0,14], "x":15.25, "y":0}, - {"matrix":[0,15], "x":16.25, "y":0}, - {"matrix":[0,16], "x":17.25, "y":0}, - {"matrix":[0,19], "x":18.5, "y":0}, - {"matrix":[1,19], "x":19.5, "y":0}, - {"matrix":[2,19], "x":20.5, "y":0}, - {"matrix":[3,19], "x":21.5, "y":0}, + {"matrix":[0, 10], "x":12, "y":0}, + {"matrix":[0, 11], "x":13, "y":0}, + {"matrix":[0, 12], "x":14, "y":0}, + {"matrix":[0, 14], "x":15.25, "y":0}, + {"matrix":[0, 15], "x":16.25, "y":0}, + {"matrix":[0, 16], "x":17.25, "y":0}, + {"matrix":[0, 19], "x":18.5, "y":0}, + {"matrix":[1, 19], "x":19.5, "y":0}, + {"matrix":[2, 19], "x":20.5, "y":0}, + {"matrix":[3, 19], "x":21.5, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -44,17 +47,17 @@ {"matrix":[1, 7], "x":7, "y":1.25}, {"matrix":[1, 8], "x":8, "y":1.25}, {"matrix":[1, 9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25, "w":2}, - {"matrix":[1,14], "x":15.25, "y":1.25}, - {"matrix":[1,15], "x":16.25, "y":1.25}, - {"matrix":[1,16], "x":17.25, "y":1.25}, - {"matrix":[1,17], "x":18.5, "y":1.25}, - {"matrix":[1,18], "x":19.5, "y":1.25}, - {"matrix":[0,17], "x":20.5, "y":1.25}, - {"matrix":[0,18], "x":21.5, "y":1.25}, + {"matrix":[1, 10], "x":10, "y":1.25}, + {"matrix":[1, 11], "x":11, "y":1.25}, + {"matrix":[1, 12], "x":12, "y":1.25}, + {"matrix":[1, 13], "x":13, "y":1.25, "w":2}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, + {"matrix":[1, 15], "x":16.25, "y":1.25}, + {"matrix":[1, 16], "x":17.25, "y":1.25}, + {"matrix":[1, 17], "x":18.5, "y":1.25}, + {"matrix":[1, 18], "x":19.5, "y":1.25}, + {"matrix":[0, 17], "x":20.5, "y":1.25}, + {"matrix":[0, 18], "x":21.5, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -66,16 +69,16 @@ {"matrix":[2, 7], "x":7.5, "y":2.25}, {"matrix":[2, 8], "x":8.5, "y":2.25}, {"matrix":[2, 9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5}, - {"matrix":[2,14], "x":15.25, "y":2.25}, - {"matrix":[2,15], "x":16.25, "y":2.25}, - {"matrix":[2,16], "x":17.25, "y":2.25}, - {"matrix":[2,17], "x":18.5, "y":2.25}, - {"matrix":[2,18], "x":19.5, "y":2.25}, - {"matrix":[3,14], "x":20.5, "y":2.25}, + {"matrix":[2, 10], "x":10.5, "y":2.25}, + {"matrix":[2, 11], "x":11.5, "y":2.25}, + {"matrix":[2, 12], "x":12.5, "y":2.25}, + {"matrix":[2, 13], "x":13.5, "y":2.25, "w":1.5}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, + {"matrix":[2, 15], "x":16.25, "y":2.25}, + {"matrix":[2, 16], "x":17.25, "y":2.25}, + {"matrix":[2, 17], "x":18.5, "y":2.25}, + {"matrix":[2, 18], "x":19.5, "y":2.25}, + {"matrix":[3, 14], "x":20.5, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -87,13 +90,13 @@ {"matrix":[3, 7], "x":7.75, "y":3.25}, {"matrix":[3, 8], "x":8.75, "y":3.25}, {"matrix":[3, 9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25}, - {"matrix":[3,17], "x":18.5, "y":3.25}, - {"matrix":[3,18], "x":19.5, "y":3.25}, - {"matrix":[3,16], "x":20.5, "y":3.25}, - {"matrix":[3,15], "x":21.5, "y":2.25, "h":2}, + {"matrix":[3, 10], "x":10.75, "y":3.25}, + {"matrix":[3, 11], "x":11.75, "y":3.25}, + {"matrix":[3, 13], "x":12.75, "y":3.25, "w":2.25}, + {"matrix":[3, 17], "x":18.5, "y":3.25}, + {"matrix":[3, 18], "x":19.5, "y":3.25}, + {"matrix":[3, 16], "x":20.5, "y":3.25}, + {"matrix":[3, 15], "x":21.5, "y":2.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4.25}, @@ -104,28 +107,28 @@ {"matrix":[4, 7], "x":7.25, "y":4.25}, {"matrix":[4, 8], "x":8.25, "y":4.25}, {"matrix":[4, 9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75}, - {"matrix":[4,15], "x":16.25, "y":4.25}, - {"matrix":[4,17], "x":18.5, "y":4.25}, - {"matrix":[4,18], "x":19.5, "y":4.25}, - {"matrix":[4,14], "x":20.5, "y":4.25}, + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 13], "x":12.25, "y":4.25, "w":2.75}, + {"matrix":[4, 15], "x":16.25, "y":4.25}, + {"matrix":[4, 17], "x":18.5, "y":4.25}, + {"matrix":[4, 18], "x":19.5, "y":4.25}, + {"matrix":[4, 14], "x":20.5, "y":4.25}, {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25}, {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25}, - {"matrix":[5,10], "x":10, "y":5.25, "w":1.25}, - {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25}, - {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25}, - {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25}, - {"matrix":[5,14], "x":15.25, "y":5.25}, - {"matrix":[5,15], "x":16.25, "y":5.25}, - {"matrix":[5,16], "x":17.25, "y":5.25}, - {"matrix":[5,17], "x":18.5, "y":5.25, "w":2}, - {"matrix":[5,18], "x":20.5, "y":5.25}, - {"matrix":[4,16], "x":21.5, "y":4.25, "h":2} + {"matrix":[5, 10], "x":10, "y":5.25, "w":1.25}, + {"matrix":[5, 11], "x":11.25, "y":5.25, "w":1.25}, + {"matrix":[5, 12], "x":12.5, "y":5.25, "w":1.25}, + {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25}, + {"matrix":[5, 14], "x":15.25, "y":5.25}, + {"matrix":[5, 15], "x":16.25, "y":5.25}, + {"matrix":[5, 16], "x":17.25, "y":5.25}, + {"matrix":[5, 17], "x":18.5, "y":5.25, "w":2}, + {"matrix":[5, 18], "x":20.5, "y":5.25}, + {"matrix":[4, 16], "x":21.5, "y":4.25, "h":2} ] } } diff --git a/keyboards/keychron/v6/ansi/rules.mk b/keyboards/keychron/v6/ansi/rules.mk index ee83debd68..de86b770f3 100644 --- a/keyboards/keychron/v6/ansi/rules.mk +++ b/keyboards/keychron/v6/ansi/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/v6/ansi_encoder/info.json b/keyboards/keychron/v6/ansi_encoder/info.json index d6f46506ec..a2cf5bdd76 100644 --- a/keyboards/keychron/v6/ansi_encoder/info.json +++ b/keyboards/keychron/v6/ansi_encoder/info.json @@ -8,6 +8,9 @@ "pid": "0x0361", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "encoder": { "rotary": [ {"pin_a": "C14", "pin_b": "A2"} @@ -28,17 +31,17 @@ {"matrix":[0, 7], "x":7.5, "y":0}, {"matrix":[0, 8], "x":8.5, "y":0}, {"matrix":[0, 9], "x":9.75, "y":0}, - {"matrix":[0,10], "x":10.75, "y":0}, - {"matrix":[0,11], "x":11.75, "y":0}, - {"matrix":[0,12], "x":12.75, "y":0}, - {"matrix":[4,19], "x":14, "y":0}, - {"matrix":[0,14], "x":15.25, "y":0}, - {"matrix":[0,15], "x":16.25, "y":0}, - {"matrix":[0,16], "x":17.25, "y":0}, - {"matrix":[0,19], "x":18.5, "y":0}, - {"matrix":[1,19], "x":19.5, "y":0}, - {"matrix":[2,19], "x":20.5, "y":0}, - {"matrix":[3,19], "x":21.5, "y":0}, + {"matrix":[0, 10], "x":10.75, "y":0}, + {"matrix":[0, 11], "x":11.75, "y":0}, + {"matrix":[0, 12], "x":12.75, "y":0}, + {"matrix":[4, 19], "x":14, "y":0}, + {"matrix":[0, 14], "x":15.25, "y":0}, + {"matrix":[0, 15], "x":16.25, "y":0}, + {"matrix":[0, 16], "x":17.25, "y":0}, + {"matrix":[0, 19], "x":18.5, "y":0}, + {"matrix":[1, 19], "x":19.5, "y":0}, + {"matrix":[2, 19], "x":20.5, "y":0}, + {"matrix":[3, 19], "x":21.5, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -50,17 +53,17 @@ {"matrix":[1, 7], "x":7, "y":1.25}, {"matrix":[1, 8], "x":8, "y":1.25}, {"matrix":[1, 9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25, "w":2}, - {"matrix":[1,14], "x":15.25, "y":1.25}, - {"matrix":[1,15], "x":16.25, "y":1.25}, - {"matrix":[1,16], "x":17.25, "y":1.25}, - {"matrix":[1,17], "x":18.5, "y":1.25}, - {"matrix":[1,18], "x":19.5, "y":1.25}, - {"matrix":[0,17], "x":20.5, "y":1.25}, - {"matrix":[0,18], "x":21.5, "y":1.25}, + {"matrix":[1, 10], "x":10, "y":1.25}, + {"matrix":[1, 11], "x":11, "y":1.25}, + {"matrix":[1, 12], "x":12, "y":1.25}, + {"matrix":[1, 13], "x":13, "y":1.25, "w":2}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, + {"matrix":[1, 15], "x":16.25, "y":1.25}, + {"matrix":[1, 16], "x":17.25, "y":1.25}, + {"matrix":[1, 17], "x":18.5, "y":1.25}, + {"matrix":[1, 18], "x":19.5, "y":1.25}, + {"matrix":[0, 17], "x":20.5, "y":1.25}, + {"matrix":[0, 18], "x":21.5, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -72,16 +75,16 @@ {"matrix":[2, 7], "x":7.5, "y":2.25}, {"matrix":[2, 8], "x":8.5, "y":2.25}, {"matrix":[2, 9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5}, - {"matrix":[2,14], "x":15.25, "y":2.25}, - {"matrix":[2,15], "x":16.25, "y":2.25}, - {"matrix":[2,16], "x":17.25, "y":2.25}, - {"matrix":[2,17], "x":18.5, "y":2.25}, - {"matrix":[2,18], "x":19.5, "y":2.25}, - {"matrix":[3,14], "x":20.5, "y":2.25}, + {"matrix":[2, 10], "x":10.5, "y":2.25}, + {"matrix":[2, 11], "x":11.5, "y":2.25}, + {"matrix":[2, 12], "x":12.5, "y":2.25}, + {"matrix":[2, 13], "x":13.5, "y":2.25, "w":1.5}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, + {"matrix":[2, 15], "x":16.25, "y":2.25}, + {"matrix":[2, 16], "x":17.25, "y":2.25}, + {"matrix":[2, 17], "x":18.5, "y":2.25}, + {"matrix":[2, 18], "x":19.5, "y":2.25}, + {"matrix":[3, 14], "x":20.5, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -93,13 +96,13 @@ {"matrix":[3, 7], "x":7.75, "y":3.25}, {"matrix":[3, 8], "x":8.75, "y":3.25}, {"matrix":[3, 9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25}, - {"matrix":[3,17], "x":18.5, "y":3.25}, - {"matrix":[3,18], "x":19.5, "y":3.25}, - {"matrix":[3,16], "x":20.5, "y":3.25}, - {"matrix":[3,15], "x":21.5, "y":2.25, "h":2}, + {"matrix":[3, 10], "x":10.75, "y":3.25}, + {"matrix":[3, 11], "x":11.75, "y":3.25}, + {"matrix":[3, 13], "x":12.75, "y":3.25, "w":2.25}, + {"matrix":[3, 17], "x":18.5, "y":3.25}, + {"matrix":[3, 18], "x":19.5, "y":3.25}, + {"matrix":[3, 16], "x":20.5, "y":3.25}, + {"matrix":[3, 15], "x":21.5, "y":2.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4.25}, @@ -110,28 +113,28 @@ {"matrix":[4, 7], "x":7.25, "y":4.25}, {"matrix":[4, 8], "x":8.25, "y":4.25}, {"matrix":[4, 9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75}, - {"matrix":[4,15], "x":16.25, "y":4.25}, - {"matrix":[4,17], "x":18.5, "y":4.25}, - {"matrix":[4,18], "x":19.5, "y":4.25}, - {"matrix":[4,14], "x":20.5, "y":4.25}, + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 13], "x":12.25, "y":4.25, "w":2.75}, + {"matrix":[4, 15], "x":16.25, "y":4.25}, + {"matrix":[4, 17], "x":18.5, "y":4.25}, + {"matrix":[4, 18], "x":19.5, "y":4.25}, + {"matrix":[4, 14], "x":20.5, "y":4.25}, {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25}, {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25}, - {"matrix":[5,10], "x":10, "y":5.25, "w":1.25}, - {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25}, - {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25}, - {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25}, - {"matrix":[5,14], "x":15.25, "y":5.25}, - {"matrix":[5,15], "x":16.25, "y":5.25}, - {"matrix":[5,16], "x":17.25, "y":5.25}, - {"matrix":[5,17], "x":18.5, "y":5.25, "w":2}, - {"matrix":[5,18], "x":20.5, "y":5.25}, - {"matrix":[4,16], "x":21.5, "y":4.25, "h":2} + {"matrix":[5, 10], "x":10, "y":5.25, "w":1.25}, + {"matrix":[5, 11], "x":11.25, "y":5.25, "w":1.25}, + {"matrix":[5, 12], "x":12.5, "y":5.25, "w":1.25}, + {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25}, + {"matrix":[5, 14], "x":15.25, "y":5.25}, + {"matrix":[5, 15], "x":16.25, "y":5.25}, + {"matrix":[5, 16], "x":17.25, "y":5.25}, + {"matrix":[5, 17], "x":18.5, "y":5.25, "w":2}, + {"matrix":[5, 18], "x":20.5, "y":5.25}, + {"matrix":[4, 16], "x":21.5, "y":4.25, "h":2} ] } } diff --git a/keyboards/keychron/v6/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/v6/ansi_encoder/keymaps/default/keymap.c index 39ab68e67b..b51ea1a09c 100644 --- a/keyboards/keychron/v6/ansi_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/v6/ansi_encoder/keymaps/default/keymap.c @@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][1][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/v6/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/v6/ansi_encoder/keymaps/keychron/keymap.c index 374f75fd3e..058ec0dcc9 100644 --- a/keyboards/keychron/v6/ansi_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/v6/ansi_encoder/keymaps/keychron/keymap.c @@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][1][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/v6/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/v6/ansi_encoder/keymaps/via/keymap.c index 39ab68e67b..b51ea1a09c 100644 --- a/keyboards/keychron/v6/ansi_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/v6/ansi_encoder/keymaps/via/keymap.c @@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][1][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/v6/ansi_encoder/rules.mk b/keyboards/keychron/v6/ansi_encoder/rules.mk index bf60bb7d7d..9958a466f6 100644 --- a/keyboards/keychron/v6/ansi_encoder/rules.mk +++ b/keyboards/keychron/v6/ansi_encoder/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/v6/iso/info.json b/keyboards/keychron/v6/iso/info.json index 764a3d7622..381754c706 100644 --- a/keyboards/keychron/v6/iso/info.json +++ b/keyboards/keychron/v6/iso/info.json @@ -8,6 +8,9 @@ "pid": "0x0362", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { @@ -23,16 +26,16 @@ {"matrix":[0, 7], "x":8.5, "y":0}, {"matrix":[0, 8], "x":9.5, "y":0}, {"matrix":[0, 9], "x":11, "y":0}, - {"matrix":[0,10], "x":12, "y":0}, - {"matrix":[0,11], "x":13, "y":0}, - {"matrix":[0,12], "x":14, "y":0}, - {"matrix":[0,14], "x":15.25, "y":0}, - {"matrix":[0,15], "x":16.25, "y":0}, - {"matrix":[0,16], "x":17.25, "y":0}, - {"matrix":[0,19], "x":18.5, "y":0}, - {"matrix":[1,19], "x":19.5, "y":0}, - {"matrix":[2,19], "x":20.5, "y":0}, - {"matrix":[3,19], "x":21.5, "y":0}, + {"matrix":[0, 10], "x":12, "y":0}, + {"matrix":[0, 11], "x":13, "y":0}, + {"matrix":[0, 12], "x":14, "y":0}, + {"matrix":[0, 14], "x":15.25, "y":0}, + {"matrix":[0, 15], "x":16.25, "y":0}, + {"matrix":[0, 16], "x":17.25, "y":0}, + {"matrix":[0, 19], "x":18.5, "y":0}, + {"matrix":[1, 19], "x":19.5, "y":0}, + {"matrix":[2, 19], "x":20.5, "y":0}, + {"matrix":[3, 19], "x":21.5, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -44,17 +47,17 @@ {"matrix":[1, 7], "x":7, "y":1.25}, {"matrix":[1, 8], "x":8, "y":1.25}, {"matrix":[1, 9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25, "w":2}, - {"matrix":[1,14], "x":15.25, "y":1.25}, - {"matrix":[1,15], "x":16.25, "y":1.25}, - {"matrix":[1,16], "x":17.25, "y":1.25}, - {"matrix":[1,17], "x":18.5, "y":1.25}, - {"matrix":[1,18], "x":19.5, "y":1.25}, - {"matrix":[0,17], "x":20.5, "y":1.25}, - {"matrix":[0,18], "x":21.5, "y":1.25}, + {"matrix":[1, 10], "x":10, "y":1.25}, + {"matrix":[1, 11], "x":11, "y":1.25}, + {"matrix":[1, 12], "x":12, "y":1.25}, + {"matrix":[1, 13], "x":13, "y":1.25, "w":2}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, + {"matrix":[1, 15], "x":16.25, "y":1.25}, + {"matrix":[1, 16], "x":17.25, "y":1.25}, + {"matrix":[1, 17], "x":18.5, "y":1.25}, + {"matrix":[1, 18], "x":19.5, "y":1.25}, + {"matrix":[0, 17], "x":20.5, "y":1.25}, + {"matrix":[0, 18], "x":21.5, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -66,15 +69,15 @@ {"matrix":[2, 7], "x":7.5, "y":2.25}, {"matrix":[2, 8], "x":8.5, "y":2.25}, {"matrix":[2, 9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,14], "x":15.25, "y":2.25}, - {"matrix":[2,15], "x":16.25, "y":2.25}, - {"matrix":[2,16], "x":17.25, "y":2.25}, - {"matrix":[2,17], "x":18.5, "y":2.25}, - {"matrix":[2,18], "x":19.5, "y":2.25}, - {"matrix":[3,14], "x":20.5, "y":2.25}, + {"matrix":[2, 10], "x":10.5, "y":2.25}, + {"matrix":[2, 11], "x":11.5, "y":2.25}, + {"matrix":[2, 12], "x":12.5, "y":2.25}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, + {"matrix":[2, 15], "x":16.25, "y":2.25}, + {"matrix":[2, 16], "x":17.25, "y":2.25}, + {"matrix":[2, 17], "x":18.5, "y":2.25}, + {"matrix":[2, 18], "x":19.5, "y":2.25}, + {"matrix":[3, 14], "x":20.5, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -86,14 +89,14 @@ {"matrix":[3, 7], "x":7.75, "y":3.25}, {"matrix":[3, 8], "x":8.75, "y":3.25}, {"matrix":[3, 9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, - {"matrix":[3,17], "x":18.5, "y":3.25}, - {"matrix":[3,18], "x":19.5, "y":3.25}, - {"matrix":[3,16], "x":20.5, "y":3.25}, - {"matrix":[3,15], "x":21.5, "y":2.25, "h":2}, + {"matrix":[3, 10], "x":10.75, "y":3.25}, + {"matrix":[3, 11], "x":11.75, "y":3.25}, + {"matrix":[3, 13], "x":12.75, "y":3.25}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3, 17], "x":18.5, "y":3.25}, + {"matrix":[3, 18], "x":19.5, "y":3.25}, + {"matrix":[3, 16], "x":20.5, "y":3.25}, + {"matrix":[3, 15], "x":21.5, "y":2.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25}, @@ -105,28 +108,28 @@ {"matrix":[4, 7], "x":7.25, "y":4.25}, {"matrix":[4, 8], "x":8.25, "y":4.25}, {"matrix":[4, 9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75}, - {"matrix":[4,15], "x":16.25, "y":4.25}, - {"matrix":[4,17], "x":18.5, "y":4.25}, - {"matrix":[4,18], "x":19.5, "y":4.25}, - {"matrix":[4,14], "x":20.5, "y":4.25}, + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 13], "x":12.25, "y":4.25, "w":2.75}, + {"matrix":[4, 15], "x":16.25, "y":4.25}, + {"matrix":[4, 17], "x":18.5, "y":4.25}, + {"matrix":[4, 18], "x":19.5, "y":4.25}, + {"matrix":[4, 14], "x":20.5, "y":4.25}, {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25}, {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25}, - {"matrix":[5,10], "x":10, "y":5.25, "w":1.25}, - {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25}, - {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25}, - {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25}, - {"matrix":[5,14], "x":15.25, "y":5.25}, - {"matrix":[5,15], "x":16.25, "y":5.25}, - {"matrix":[5,16], "x":17.25, "y":5.25}, - {"matrix":[5,17], "x":18.5, "y":5.25, "w":2}, - {"matrix":[5,18], "x":20.5, "y":5.25}, - {"matrix":[4,16], "x":21.5, "y":4.25, "h":2} + {"matrix":[5, 10], "x":10, "y":5.25, "w":1.25}, + {"matrix":[5, 11], "x":11.25, "y":5.25, "w":1.25}, + {"matrix":[5, 12], "x":12.5, "y":5.25, "w":1.25}, + {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25}, + {"matrix":[5, 14], "x":15.25, "y":5.25}, + {"matrix":[5, 15], "x":16.25, "y":5.25}, + {"matrix":[5, 16], "x":17.25, "y":5.25}, + {"matrix":[5, 17], "x":18.5, "y":5.25, "w":2}, + {"matrix":[5, 18], "x":20.5, "y":5.25}, + {"matrix":[4, 16], "x":21.5, "y":4.25, "h":2} ] } } diff --git a/keyboards/keychron/v6/iso/rules.mk b/keyboards/keychron/v6/iso/rules.mk index ee83debd68..de86b770f3 100644 --- a/keyboards/keychron/v6/iso/rules.mk +++ b/keyboards/keychron/v6/iso/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/v6/iso_encoder/info.json b/keyboards/keychron/v6/iso_encoder/info.json index e9401b855f..f5048e25ad 100644 --- a/keyboards/keychron/v6/iso_encoder/info.json +++ b/keyboards/keychron/v6/iso_encoder/info.json @@ -8,6 +8,9 @@ "pid": "0x0363", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "encoder": { "rotary": [ {"pin_a": "C14", "pin_b": "A2"} @@ -28,17 +31,17 @@ {"matrix":[0, 7], "x":7.5, "y":0}, {"matrix":[0, 8], "x":8.5, "y":0}, {"matrix":[0, 9], "x":9.75, "y":0}, - {"matrix":[0,10], "x":10.75, "y":0}, - {"matrix":[0,11], "x":11.75, "y":0}, - {"matrix":[0,12], "x":12.75, "y":0}, - {"matrix":[4,19], "x":14, "y":0}, - {"matrix":[0,14], "x":15.25, "y":0}, - {"matrix":[0,15], "x":16.25, "y":0}, - {"matrix":[0,16], "x":17.25, "y":0}, - {"matrix":[0,19], "x":18.5, "y":0}, - {"matrix":[1,19], "x":19.5, "y":0}, - {"matrix":[2,19], "x":20.5, "y":0}, - {"matrix":[3,19], "x":21.5, "y":0}, + {"matrix":[0, 10], "x":10.75, "y":0}, + {"matrix":[0, 11], "x":11.75, "y":0}, + {"matrix":[0, 12], "x":12.75, "y":0}, + {"matrix":[4, 19], "x":14, "y":0}, + {"matrix":[0, 14], "x":15.25, "y":0}, + {"matrix":[0, 15], "x":16.25, "y":0}, + {"matrix":[0, 16], "x":17.25, "y":0}, + {"matrix":[0, 19], "x":18.5, "y":0}, + {"matrix":[1, 19], "x":19.5, "y":0}, + {"matrix":[2, 19], "x":20.5, "y":0}, + {"matrix":[3, 19], "x":21.5, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -50,17 +53,17 @@ {"matrix":[1, 7], "x":7, "y":1.25}, {"matrix":[1, 8], "x":8, "y":1.25}, {"matrix":[1, 9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25, "w":2}, - {"matrix":[1,14], "x":15.25, "y":1.25}, - {"matrix":[1,15], "x":16.25, "y":1.25}, - {"matrix":[1,16], "x":17.25, "y":1.25}, - {"matrix":[1,17], "x":18.5, "y":1.25}, - {"matrix":[1,18], "x":19.5, "y":1.25}, - {"matrix":[0,17], "x":20.5, "y":1.25}, - {"matrix":[0,18], "x":21.5, "y":1.25}, + {"matrix":[1, 10], "x":10, "y":1.25}, + {"matrix":[1, 11], "x":11, "y":1.25}, + {"matrix":[1, 12], "x":12, "y":1.25}, + {"matrix":[1, 13], "x":13, "y":1.25, "w":2}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, + {"matrix":[1, 15], "x":16.25, "y":1.25}, + {"matrix":[1, 16], "x":17.25, "y":1.25}, + {"matrix":[1, 17], "x":18.5, "y":1.25}, + {"matrix":[1, 18], "x":19.5, "y":1.25}, + {"matrix":[0, 17], "x":20.5, "y":1.25}, + {"matrix":[0, 18], "x":21.5, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -72,15 +75,15 @@ {"matrix":[2, 7], "x":7.5, "y":2.25}, {"matrix":[2, 8], "x":8.5, "y":2.25}, {"matrix":[2, 9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,14], "x":15.25, "y":2.25}, - {"matrix":[2,15], "x":16.25, "y":2.25}, - {"matrix":[2,16], "x":17.25, "y":2.25}, - {"matrix":[2,17], "x":18.5, "y":2.25}, - {"matrix":[2,18], "x":19.5, "y":2.25}, - {"matrix":[3,14], "x":20.5, "y":2.25}, + {"matrix":[2, 10], "x":10.5, "y":2.25}, + {"matrix":[2, 11], "x":11.5, "y":2.25}, + {"matrix":[2, 12], "x":12.5, "y":2.25}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, + {"matrix":[2, 15], "x":16.25, "y":2.25}, + {"matrix":[2, 16], "x":17.25, "y":2.25}, + {"matrix":[2, 17], "x":18.5, "y":2.25}, + {"matrix":[2, 18], "x":19.5, "y":2.25}, + {"matrix":[3, 14], "x":20.5, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -92,14 +95,14 @@ {"matrix":[3, 7], "x":7.75, "y":3.25}, {"matrix":[3, 8], "x":8.75, "y":3.25}, {"matrix":[3, 9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, - {"matrix":[3,17], "x":18.5, "y":3.25}, - {"matrix":[3,18], "x":19.5, "y":3.25}, - {"matrix":[3,16], "x":20.5, "y":3.25}, - {"matrix":[3,15], "x":21.5, "y":2.25, "h":2}, + {"matrix":[3, 10], "x":10.75, "y":3.25}, + {"matrix":[3, 11], "x":11.75, "y":3.25}, + {"matrix":[3, 13], "x":12.75, "y":3.25}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3, 17], "x":18.5, "y":3.25}, + {"matrix":[3, 18], "x":19.5, "y":3.25}, + {"matrix":[3, 16], "x":20.5, "y":3.25}, + {"matrix":[3, 15], "x":21.5, "y":2.25, "h":2}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25}, @@ -111,28 +114,28 @@ {"matrix":[4, 7], "x":7.25, "y":4.25}, {"matrix":[4, 8], "x":8.25, "y":4.25}, {"matrix":[4, 9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75}, - {"matrix":[4,15], "x":16.25, "y":4.25}, - {"matrix":[4,17], "x":18.5, "y":4.25}, - {"matrix":[4,18], "x":19.5, "y":4.25}, - {"matrix":[4,14], "x":20.5, "y":4.25}, + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 13], "x":12.25, "y":4.25, "w":2.75}, + {"matrix":[4, 15], "x":16.25, "y":4.25}, + {"matrix":[4, 17], "x":18.5, "y":4.25}, + {"matrix":[4, 18], "x":19.5, "y":4.25}, + {"matrix":[4, 14], "x":20.5, "y":4.25}, {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25}, {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25}, - {"matrix":[5,10], "x":10, "y":5.25, "w":1.25}, - {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25}, - {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25}, - {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25}, - {"matrix":[5,14], "x":15.25, "y":5.25}, - {"matrix":[5,15], "x":16.25, "y":5.25}, - {"matrix":[5,16], "x":17.25, "y":5.25}, - {"matrix":[5,17], "x":18.5, "y":5.25, "w":2}, - {"matrix":[5,18], "x":20.5, "y":5.25}, - {"matrix":[4,16], "x":21.5, "y":4.25, "h":2} + {"matrix":[5, 10], "x":10, "y":5.25, "w":1.25}, + {"matrix":[5, 11], "x":11.25, "y":5.25, "w":1.25}, + {"matrix":[5, 12], "x":12.5, "y":5.25, "w":1.25}, + {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25}, + {"matrix":[5, 14], "x":15.25, "y":5.25}, + {"matrix":[5, 15], "x":16.25, "y":5.25}, + {"matrix":[5, 16], "x":17.25, "y":5.25}, + {"matrix":[5, 17], "x":18.5, "y":5.25, "w":2}, + {"matrix":[5, 18], "x":20.5, "y":5.25}, + {"matrix":[4, 16], "x":21.5, "y":4.25, "h":2} ] } } diff --git a/keyboards/keychron/v6/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/v6/iso_encoder/keymaps/default/keymap.c index b07c9fc3e1..73b0c57786 100644 --- a/keyboards/keychron/v6/iso_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/v6/iso_encoder/keymaps/default/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][1][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/v6/iso_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/v6/iso_encoder/keymaps/keychron/keymap.c index 72b599dd74..bef0b61bac 100644 --- a/keyboards/keychron/v6/iso_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/v6/iso_encoder/keymaps/keychron/keymap.c @@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][1][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/v6/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/v6/iso_encoder/keymaps/via/keymap.c index b07c9fc3e1..73b0c57786 100644 --- a/keyboards/keychron/v6/iso_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/v6/iso_encoder/keymaps/via/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][1][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/v6/iso_encoder/rules.mk b/keyboards/keychron/v6/iso_encoder/rules.mk index f76ec9b08d..df920055a0 100644 --- a/keyboards/keychron/v6/iso_encoder/rules.mk +++ b/keyboards/keychron/v6/iso_encoder/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/v6/v6.c b/keyboards/keychron/v6/v6.c index 02708e7bc1..0f9305d2d0 100644 --- a/keyboards/keychron/v6/v6.c +++ b/keyboards/keychron/v6/v6.c @@ -98,17 +98,3 @@ bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) { } #endif // RGB_MATRIX_ENABLE... - -#ifdef ENCODER_ENABLE -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) { return false; } - if (index == 0) { - if (clockwise) { - tap_code_delay(KC_VOLU, 10); - } else { - tap_code_delay(KC_VOLD, 10); - } - } - return true; -} -#endif diff --git a/keyboards/keychron/v7/ansi/info.json b/keyboards/keychron/v7/ansi/info.json index 00df236f6d..ba799b0ed8 100644 --- a/keyboards/keychron/v7/ansi/info.json +++ b/keyboards/keychron/v7/ansi/info.json @@ -8,6 +8,14 @@ "pid": "0x0370", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, + "matrix_pins": { + "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "A10", "B5"], + "rows": ["B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { @@ -23,12 +31,12 @@ {"matrix":[0, 7], "x":7, "y":0}, {"matrix":[0, 8], "x":8, "y":0}, {"matrix":[0, 9], "x":9, "y":0}, - {"matrix":[0,10], "x":10, "y":0}, - {"matrix":[0,11], "x":11, "y":0}, - {"matrix":[0,12], "x":12, "y":0}, - {"matrix":[0,13], "x":13, "y":0, "w":2}, - {"matrix":[0,14], "x":15, "y":0}, - {"matrix":[0,15], "x":16, "y":0}, + {"matrix":[0, 10], "x":10, "y":0}, + {"matrix":[0, 11], "x":11, "y":0}, + {"matrix":[0, 12], "x":12, "y":0}, + {"matrix":[0, 13], "x":13, "y":0, "w":2}, + {"matrix":[0, 14], "x":15, "y":0}, + {"matrix":[0, 15], "x":16, "y":0}, {"matrix":[1, 0], "x":0, "y":1, "w":1.5}, {"matrix":[1, 1], "x":1.5, "y":1}, @@ -40,12 +48,12 @@ {"matrix":[1, 7], "x":7.5, "y":1}, {"matrix":[1, 8], "x":8.5, "y":1}, {"matrix":[1, 9], "x":9.5, "y":1}, - {"matrix":[1,10], "x":10.5, "y":1}, - {"matrix":[1,11], "x":11.5, "y":1}, - {"matrix":[1,12], "x":12.5, "y":1}, - {"matrix":[1,13], "x":13.5, "y":1, "w":1.5}, - {"matrix":[1,14], "x":15, "y":1}, - {"matrix":[1,15], "x":16, "y":1}, + {"matrix":[1, 10], "x":10.5, "y":1}, + {"matrix":[1, 11], "x":11.5, "y":1}, + {"matrix":[1, 12], "x":12.5, "y":1}, + {"matrix":[1, 13], "x":13.5, "y":1, "w":1.5}, + {"matrix":[1, 14], "x":15, "y":1}, + {"matrix":[1, 15], "x":16, "y":1}, {"matrix":[2, 0], "x":0, "y":2, "w":1.75}, {"matrix":[2, 1], "x":1.75, "y":2}, @@ -57,11 +65,11 @@ {"matrix":[2, 7], "x":7.75, "y":2}, {"matrix":[2, 8], "x":8.75, "y":2}, {"matrix":[2, 9], "x":9.75, "y":2}, - {"matrix":[2,10], "x":10.75, "y":2}, - {"matrix":[2,11], "x":11.75, "y":2}, - {"matrix":[2,13], "x":12.75, "y":2, "w":2.25}, - {"matrix":[2,14], "x":15, "y":2}, - {"matrix":[2,15], "x":16, "y":2}, + {"matrix":[2, 10], "x":10.75, "y":2}, + {"matrix":[2, 11], "x":11.75, "y":2}, + {"matrix":[2, 13], "x":12.75, "y":2, "w":2.25}, + {"matrix":[2, 14], "x":15, "y":2}, + {"matrix":[2, 15], "x":16, "y":2}, {"matrix":[3, 0], "x":0, "y":3, "w":2.25}, {"matrix":[3, 2], "x":2.25, "y":3}, @@ -72,23 +80,23 @@ {"matrix":[3, 7], "x":7.25, "y":3}, {"matrix":[3, 8], "x":8.25, "y":3}, {"matrix":[3, 9], "x":9.25, "y":3}, - {"matrix":[3,10], "x":10.25, "y":3}, - {"matrix":[3,11], "x":11.25, "y":3}, - {"matrix":[3,13], "x":12.25, "y":3, "w":2.75}, - {"matrix":[3,14], "x":15, "y":3}, - {"matrix":[3,15], "x":16, "y":3}, + {"matrix":[3, 10], "x":10.25, "y":3}, + {"matrix":[3, 11], "x":11.25, "y":3}, + {"matrix":[3, 13], "x":12.25, "y":3, "w":2.75}, + {"matrix":[3, 14], "x":15, "y":3}, + {"matrix":[3, 15], "x":16, "y":3}, {"matrix":[4, 0], "x":0, "y":4, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4, "w":1.25}, {"matrix":[4, 2], "x":2.5, "y":4, "w":1.25}, {"matrix":[4, 6], "x":3.75, "y":4, "w":6.25}, {"matrix":[4, 9], "x":10, "y":4}, - {"matrix":[4,10], "x":11, "y":4}, - {"matrix":[4,11], "x":12, "y":4}, - {"matrix":[4,12], "x":13, "y":4}, - {"matrix":[4,13], "x":14, "y":4}, - {"matrix":[4,14], "x":15, "y":4}, - {"matrix":[4,15], "x":16, "y":4} + {"matrix":[4, 10], "x":11, "y":4}, + {"matrix":[4, 11], "x":12, "y":4}, + {"matrix":[4, 12], "x":13, "y":4}, + {"matrix":[4, 13], "x":14, "y":4}, + {"matrix":[4, 14], "x":15, "y":4}, + {"matrix":[4, 15], "x":16, "y":4} ] } } diff --git a/keyboards/keychron/v7/ansi/rules.mk b/keyboards/keychron/v7/ansi/rules.mk index 70c663e777..6dcd47b1fe 100644 --- a/keyboards/keychron/v7/ansi/rules.mk +++ b/keyboards/keychron/v7/ansi/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/v7/config.h b/keyboards/keychron/v7/config.h index b6a08098ce..c439a7e366 100644 --- a/keyboards/keychron/v7/config.h +++ b/keyboards/keychron/v7/config.h @@ -16,15 +16,6 @@ #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS \ - { B4, B3, A15, A14, A13 } -#define MATRIX_COL_PINS \ - { C14, C15, A0, A1, A2, A3, A4, A5, A6, A7, B0, B1, A8, A9, A10, B5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* RGB Matrix Driver Configuration */ #define DRIVER_COUNT 2 #define DRIVER_ADDR_1 0b1110111 diff --git a/keyboards/keychron/v7/iso/info.json b/keyboards/keychron/v7/iso/info.json index e01b12464c..99883b225c 100644 --- a/keyboards/keychron/v7/iso/info.json +++ b/keyboards/keychron/v7/iso/info.json @@ -8,6 +8,14 @@ "pid": "0x0372", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, + "matrix_pins": { + "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "A10", "B5"], + "rows": ["B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { @@ -23,12 +31,12 @@ {"matrix":[0, 7], "x":7, "y":0}, {"matrix":[0, 8], "x":8, "y":0}, {"matrix":[0, 9], "x":9, "y":0}, - {"matrix":[0,10], "x":10, "y":0}, - {"matrix":[0,11], "x":11, "y":0}, - {"matrix":[0,12], "x":12, "y":0}, - {"matrix":[0,13], "x":13, "y":0, "w":2}, - {"matrix":[0,14], "x":15, "y":0}, - {"matrix":[0,15], "x":16, "y":0}, + {"matrix":[0, 10], "x":10, "y":0}, + {"matrix":[0, 11], "x":11, "y":0}, + {"matrix":[0, 12], "x":12, "y":0}, + {"matrix":[0, 13], "x":13, "y":0, "w":2}, + {"matrix":[0, 14], "x":15, "y":0}, + {"matrix":[0, 15], "x":16, "y":0}, {"matrix":[1, 0], "x":0, "y":1, "w":1.5}, {"matrix":[1, 1], "x":1.5, "y":1}, @@ -40,11 +48,11 @@ {"matrix":[1, 7], "x":7.5, "y":1}, {"matrix":[1, 8], "x":8.5, "y":1}, {"matrix":[1, 9], "x":9.5, "y":1}, - {"matrix":[1,10], "x":10.5, "y":1}, - {"matrix":[1,11], "x":11.5, "y":1}, - {"matrix":[1,12], "x":12.5, "y":1}, - {"matrix":[1,14], "x":15, "y":1}, - {"matrix":[1,15], "x":16, "y":1}, + {"matrix":[1, 10], "x":10.5, "y":1}, + {"matrix":[1, 11], "x":11.5, "y":1}, + {"matrix":[1, 12], "x":12.5, "y":1}, + {"matrix":[1, 14], "x":15, "y":1}, + {"matrix":[1, 15], "x":16, "y":1}, {"matrix":[2, 0], "x":0, "y":2, "w":1.75}, {"matrix":[2, 1], "x":1.75, "y":2}, @@ -56,12 +64,12 @@ {"matrix":[2, 7], "x":7.75, "y":2}, {"matrix":[2, 8], "x":8.75, "y":2}, {"matrix":[2, 9], "x":9.75, "y":2}, - {"matrix":[2,10], "x":10.75, "y":2}, - {"matrix":[2,11], "x":11.75, "y":2}, - {"matrix":[2,13], "x":12.75, "y":2}, - {"matrix":[1,13], "x":13.75, "y":1, "w":1.25, "h":2}, - {"matrix":[2,14], "x":15, "y":2}, - {"matrix":[2,15], "x":16, "y":2}, + {"matrix":[2, 10], "x":10.75, "y":2}, + {"matrix":[2, 11], "x":11.75, "y":2}, + {"matrix":[2, 13], "x":12.75, "y":2}, + {"matrix":[1, 13], "x":13.75, "y":1, "w":1.25, "h":2}, + {"matrix":[2, 14], "x":15, "y":2}, + {"matrix":[2, 15], "x":16, "y":2}, {"matrix":[3, 0], "x":0, "y":3, "w":1.25}, {"matrix":[3, 1], "x":1.25, "y":3}, @@ -73,23 +81,23 @@ {"matrix":[3, 7], "x":7.25, "y":3}, {"matrix":[3, 8], "x":8.25, "y":3}, {"matrix":[3, 9], "x":9.25, "y":3}, - {"matrix":[3,10], "x":10.25, "y":3}, - {"matrix":[3,11], "x":11.25, "y":3}, - {"matrix":[3,13], "x":12.25, "y":3, "w":2.75}, - {"matrix":[3,14], "x":15, "y":3}, - {"matrix":[3,15], "x":16, "y":3}, + {"matrix":[3, 10], "x":10.25, "y":3}, + {"matrix":[3, 11], "x":11.25, "y":3}, + {"matrix":[3, 13], "x":12.25, "y":3, "w":2.75}, + {"matrix":[3, 14], "x":15, "y":3}, + {"matrix":[3, 15], "x":16, "y":3}, {"matrix":[4, 0], "x":0, "y":4, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4, "w":1.25}, {"matrix":[4, 2], "x":2.5, "y":4, "w":1.25}, {"matrix":[4, 6], "x":3.75, "y":4, "w":6.25}, {"matrix":[4, 9], "x":10, "y":4}, - {"matrix":[4,10], "x":11, "y":4}, - {"matrix":[4,11], "x":12, "y":4}, - {"matrix":[4,12], "x":13, "y":4}, - {"matrix":[4,13], "x":14, "y":4}, - {"matrix":[4,14], "x":15, "y":4}, - {"matrix":[4,15], "x":16, "y":4} + {"matrix":[4, 10], "x":11, "y":4}, + {"matrix":[4, 11], "x":12, "y":4}, + {"matrix":[4, 12], "x":13, "y":4}, + {"matrix":[4, 13], "x":14, "y":4}, + {"matrix":[4, 14], "x":15, "y":4}, + {"matrix":[4, 15], "x":16, "y":4} ] } } diff --git a/keyboards/keychron/v7/iso/rules.mk b/keyboards/keychron/v7/iso/rules.mk index 70c663e777..6dcd47b1fe 100644 --- a/keyboards/keychron/v7/iso/rules.mk +++ b/keyboards/keychron/v7/iso/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/v8/ansi/info.json b/keyboards/keychron/v8/ansi/info.json index f1f2e75e4d..3c2538aad9 100644 --- a/keyboards/keychron/v8/ansi/info.json +++ b/keyboards/keychron/v8/ansi/info.json @@ -8,6 +8,14 @@ "pid": "0x0380", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, + "matrix_pins": { + "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], + "rows": ["B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { @@ -23,11 +31,11 @@ {"matrix":[0, 7], "x":9.5, "y":0.25}, {"matrix":[0, 8], "x":10.5, "y":0.25}, {"matrix":[0, 9], "x":11.5, "y":0.25}, - {"matrix":[0,10], "x":12.5, "y":0.25}, - {"matrix":[0,11], "x":13.5, "y":0}, - {"matrix":[0,12], "x":14.5, "y":0.25}, - {"matrix":[0,13], "x":15.5, "y":0.25, "w":2}, - {"matrix":[0,14], "x":18, "y":0}, + {"matrix":[0, 10], "x":12.5, "y":0.25}, + {"matrix":[0, 11], "x":13.5, "y":0}, + {"matrix":[0, 12], "x":14.5, "y":0.25}, + {"matrix":[0, 13], "x":15.5, "y":0.25, "w":2}, + {"matrix":[0, 14], "x":18, "y":0}, {"matrix":[1, 0], "x":0.5, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":2, "y":1.25}, @@ -39,11 +47,11 @@ {"matrix":[1, 7], "x":10, "y":1.25}, {"matrix":[1, 8], "x":11, "y":1.25}, {"matrix":[1, 9], "x":12, "y":1.25}, - {"matrix":[1,10], "x":13.25, "y":1.25}, - {"matrix":[1,11], "x":14.25, "y":1.25}, - {"matrix":[1,12], "x":15.25, "y":1.25}, - {"matrix":[1,13], "x":16.25, "y":1.25, "w":1.5}, - {"matrix":[1,14], "x":18.25, "y":1.5}, + {"matrix":[1, 10], "x":13.25, "y":1.25}, + {"matrix":[1, 11], "x":14.25, "y":1.25}, + {"matrix":[1, 12], "x":15.25, "y":1.25}, + {"matrix":[1, 13], "x":16.25, "y":1.25, "w":1.5}, + {"matrix":[1, 14], "x":18.25, "y":1.5}, {"matrix":[2, 0], "x":0.25, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":2, "y":2.25}, @@ -54,11 +62,11 @@ {"matrix":[2, 7], "x":9.25, "y":2.25}, {"matrix":[2, 8], "x":10.25, "y":2.25}, {"matrix":[2, 9], "x":11.25, "y":2.25}, - {"matrix":[2,10], "x":12.25, "y":2.25}, - {"matrix":[2,11], "x":13.75, "y":2.25}, - {"matrix":[2,12], "x":14.75, "y":2.25}, - {"matrix":[2,13], "x":15.75, "y":2.25, "w":2.25}, - {"matrix":[2,14], "x":18.5, "y":2.5}, + {"matrix":[2, 10], "x":12.25, "y":2.25}, + {"matrix":[2, 11], "x":13.75, "y":2.25}, + {"matrix":[2, 12], "x":14.75, "y":2.25}, + {"matrix":[2, 13], "x":15.75, "y":2.25, "w":2.25}, + {"matrix":[2, 14], "x":18.5, "y":2.5}, {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25}, {"matrix":[3, 2], "x":2.25, "y":3.25}, @@ -69,11 +77,11 @@ {"matrix":[3, 7], "x":8.5, "y":3.25}, {"matrix":[3, 8], "x":9.5, "y":3.25}, {"matrix":[3, 9], "x":10.5, "y":3.25}, - {"matrix":[3,10], "x":11.5, "y":3.25}, - {"matrix":[3,11], "x":12.5, "y":3.25}, - {"matrix":[3,12], "x":14.25, "y":3.25}, - {"matrix":[3,13], "x":15.25, "y":3.25, "w":1.75}, - {"matrix":[3,14], "x":17.25, "y":3.5}, + {"matrix":[3, 10], "x":11.5, "y":3.25}, + {"matrix":[3, 11], "x":12.5, "y":3.25}, + {"matrix":[3, 12], "x":14.25, "y":3.25}, + {"matrix":[3, 13], "x":15.25, "y":3.25, "w":1.75}, + {"matrix":[3, 14], "x":17.25, "y":3.5}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25}, @@ -83,9 +91,9 @@ {"matrix":[4, 7], "x":8.75, "y":4.25}, {"matrix":[4, 8], "x":9.75, "y":4.25, "w":2.75}, {"matrix":[4, 9], "x":12.5, "y":4.25}, - {"matrix":[4,12], "x":16.25, "y":4.5}, - {"matrix":[4,13], "x":17.25, "y":4.5}, - {"matrix":[4,14], "x":18.25, "y":4.5} + {"matrix":[4, 12], "x":16.25, "y":4.5}, + {"matrix":[4, 13], "x":17.25, "y":4.5}, + {"matrix":[4, 14], "x":18.25, "y":4.5} ] } } diff --git a/keyboards/keychron/v8/ansi/rules.mk b/keyboards/keychron/v8/ansi/rules.mk index 6f738741e9..bdb97dbf1c 100644 --- a/keyboards/keychron/v8/ansi/rules.mk +++ b/keyboards/keychron/v8/ansi/rules.mk @@ -14,7 +14,6 @@ ENCODER_ENABLE = no # Enable Encoder ENCODER_MAP_ENABLE = no DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/v8/ansi_encoder/info.json b/keyboards/keychron/v8/ansi_encoder/info.json index f6a9de655b..7104a56169 100644 --- a/keyboards/keychron/v8/ansi_encoder/info.json +++ b/keyboards/keychron/v8/ansi_encoder/info.json @@ -8,6 +8,14 @@ "pid": "0x0381", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, + "matrix_pins": { + "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], + "rows": ["B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "encoder": { "rotary": [ {"pin_a": "A10", "pin_b": "B5"} @@ -28,11 +36,11 @@ {"matrix":[0, 7], "x":9.5, "y":0.25}, {"matrix":[0, 8], "x":10.5, "y":0.25}, {"matrix":[0, 9], "x":11.5, "y":0.25}, - {"matrix":[0,10], "x":12.5, "y":0.25}, - {"matrix":[0,11], "x":13.5, "y":0}, - {"matrix":[0,12], "x":14.5, "y":0.25}, - {"matrix":[0,13], "x":15.5, "y":0.25, "w":2}, - {"matrix":[0,14], "x":18, "y":0}, + {"matrix":[0, 10], "x":12.5, "y":0.25}, + {"matrix":[0, 11], "x":13.5, "y":0}, + {"matrix":[0, 12], "x":14.5, "y":0.25}, + {"matrix":[0, 13], "x":15.5, "y":0.25, "w":2}, + {"matrix":[0, 14], "x":18, "y":0}, {"matrix":[1, 0], "x":0.5, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":2, "y":1.25}, @@ -44,11 +52,11 @@ {"matrix":[1, 7], "x":10, "y":1.25}, {"matrix":[1, 8], "x":11, "y":1.25}, {"matrix":[1, 9], "x":12, "y":1.25}, - {"matrix":[1,10], "x":13.25, "y":1.25}, - {"matrix":[1,11], "x":14.25, "y":1.25}, - {"matrix":[1,12], "x":15.25, "y":1.25}, - {"matrix":[1,13], "x":16.25, "y":1.25, "w":1.5}, - {"matrix":[1,14], "x":18.25, "y":1.5}, + {"matrix":[1, 10], "x":13.25, "y":1.25}, + {"matrix":[1, 11], "x":14.25, "y":1.25}, + {"matrix":[1, 12], "x":15.25, "y":1.25}, + {"matrix":[1, 13], "x":16.25, "y":1.25, "w":1.5}, + {"matrix":[1, 14], "x":18.25, "y":1.5}, {"matrix":[2, 0], "x":0.25, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":2, "y":2.25}, @@ -59,11 +67,11 @@ {"matrix":[2, 7], "x":9.25, "y":2.25}, {"matrix":[2, 8], "x":10.25, "y":2.25}, {"matrix":[2, 9], "x":11.25, "y":2.25}, - {"matrix":[2,10], "x":12.25, "y":2.25}, - {"matrix":[2,11], "x":13.75, "y":2.25}, - {"matrix":[2,12], "x":14.75, "y":2.25}, - {"matrix":[2,13], "x":15.75, "y":2.25, "w":2.25}, - {"matrix":[2,14], "x":18.5, "y":2.5}, + {"matrix":[2, 10], "x":12.25, "y":2.25}, + {"matrix":[2, 11], "x":13.75, "y":2.25}, + {"matrix":[2, 12], "x":14.75, "y":2.25}, + {"matrix":[2, 13], "x":15.75, "y":2.25, "w":2.25}, + {"matrix":[2, 14], "x":18.5, "y":2.5}, {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25}, {"matrix":[3, 2], "x":2.25, "y":3.25}, @@ -74,11 +82,11 @@ {"matrix":[3, 7], "x":8.5, "y":3.25}, {"matrix":[3, 8], "x":9.5, "y":3.25}, {"matrix":[3, 9], "x":10.5, "y":3.25}, - {"matrix":[3,10], "x":11.5, "y":3.25}, - {"matrix":[3,11], "x":12.5, "y":3.25}, - {"matrix":[3,12], "x":14.25, "y":3.25}, - {"matrix":[3,13], "x":15.25, "y":3.25, "w":1.75}, - {"matrix":[3,14], "x":17.25, "y":3.5}, + {"matrix":[3, 10], "x":11.5, "y":3.25}, + {"matrix":[3, 11], "x":12.5, "y":3.25}, + {"matrix":[3, 12], "x":14.25, "y":3.25}, + {"matrix":[3, 13], "x":15.25, "y":3.25, "w":1.75}, + {"matrix":[3, 14], "x":17.25, "y":3.5}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25}, @@ -88,9 +96,9 @@ {"matrix":[4, 7], "x":8.75, "y":4.25}, {"matrix":[4, 8], "x":9.75, "y":4.25, "w":2.75}, {"matrix":[4, 9], "x":12.5, "y":4.25}, - {"matrix":[4,12], "x":16.25, "y":4.5}, - {"matrix":[4,13], "x":17.25, "y":4.5}, - {"matrix":[4,14], "x":18.25, "y":4.5} + {"matrix":[4, 12], "x":16.25, "y":4.5}, + {"matrix":[4, 13], "x":17.25, "y":4.5}, + {"matrix":[4, 14], "x":18.25, "y":4.5} ] } } diff --git a/keyboards/keychron/v8/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/v8/ansi_encoder/keymaps/default/keymap.c index d1ea2f207d..a128a54a00 100644 --- a/keyboards/keychron/v8/ansi_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/v8/ansi_encoder/keymaps/default/keymap.c @@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [_FN1] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, diff --git a/keyboards/keychron/v8/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/v8/ansi_encoder/keymaps/keychron/keymap.c index 5af9838437..0058ebda38 100644 --- a/keyboards/keychron/v8/ansi_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/v8/ansi_encoder/keymaps/keychron/keymap.c @@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [_FN1] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, diff --git a/keyboards/keychron/v8/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/v8/ansi_encoder/keymaps/via/keymap.c index d1ea2f207d..a128a54a00 100644 --- a/keyboards/keychron/v8/ansi_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/v8/ansi_encoder/keymaps/via/keymap.c @@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [_FN1] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, diff --git a/keyboards/keychron/v8/ansi_encoder/rules.mk b/keyboards/keychron/v8/ansi_encoder/rules.mk index f2cbf4a660..d2bee999c8 100644 --- a/keyboards/keychron/v8/ansi_encoder/rules.mk +++ b/keyboards/keychron/v8/ansi_encoder/rules.mk @@ -14,7 +14,6 @@ ENCODER_ENABLE = yes # Enable Encoder ENCODER_MAP_ENABLE = no DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/v8/config.h b/keyboards/keychron/v8/config.h index c5a3857f40..7c6076e199 100644 --- a/keyboards/keychron/v8/config.h +++ b/keyboards/keychron/v8/config.h @@ -16,13 +16,6 @@ #pragma once -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - -/* Key matrix pins */ -#define MATRIX_ROW_PINS { B4, B3, A15, A14, A13 } -#define MATRIX_COL_PINS { C14, C15, A0, A1, A2, A3, A4, A5, A6, A7, B0, B1, A8, A9, H3 } - /* If uses PH3 with a stronger pull resistor then the following definition should be included */ // #define MATRIX_UNSELECT_DRIVE_HIGH diff --git a/keyboards/keychron/v8/iso/info.json b/keyboards/keychron/v8/iso/info.json index 22b363d072..2a41cb64fb 100644 --- a/keyboards/keychron/v8/iso/info.json +++ b/keyboards/keychron/v8/iso/info.json @@ -8,6 +8,14 @@ "pid": "0x0382", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, + "matrix_pins": { + "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], + "rows": ["B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { @@ -23,11 +31,11 @@ {"matrix":[0, 7], "x":9.5, "y":0.25}, {"matrix":[0, 8], "x":10.5, "y":0.25}, {"matrix":[0, 9], "x":11.5, "y":0.25}, - {"matrix":[0,10], "x":12.5, "y":0.25}, - {"matrix":[0,11], "x":13.5, "y":0}, - {"matrix":[0,12], "x":14.5, "y":0.25}, - {"matrix":[0,13], "x":15.5, "y":0.25, "w":2}, - {"matrix":[0,14], "x":18, "y":0.25}, + {"matrix":[0, 10], "x":12.5, "y":0.25}, + {"matrix":[0, 11], "x":13.5, "y":0}, + {"matrix":[0, 12], "x":14.5, "y":0.25}, + {"matrix":[0, 13], "x":15.5, "y":0.25, "w":2}, + {"matrix":[0, 14], "x":18, "y":0.25}, {"matrix":[1, 0], "x":0.5, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":2, "y":1.25}, @@ -39,10 +47,10 @@ {"matrix":[1, 7], "x":10, "y":1.25}, {"matrix":[1, 8], "x":11, "y":1.25}, {"matrix":[1, 9], "x":12, "y":1.25}, - {"matrix":[1,10], "x":13.25, "y":1.25}, - {"matrix":[1,11], "x":14.25, "y":1.25}, - {"matrix":[1,12], "x":15.25, "y":1.25}, - {"matrix":[1,14], "x":18.25, "y":1.5}, + {"matrix":[1, 10], "x":13.25, "y":1.25}, + {"matrix":[1, 11], "x":14.25, "y":1.25}, + {"matrix":[1, 12], "x":15.25, "y":1.25}, + {"matrix":[1, 14], "x":18.25, "y":1.5}, {"matrix":[2, 0], "x":0.25, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":2, "y":2.25}, @@ -54,11 +62,11 @@ {"matrix":[2, 7], "x":10.25, "y":2.25}, {"matrix":[2, 8], "x":11.25, "y":2.25}, {"matrix":[2, 9], "x":12.25, "y":2.25}, - {"matrix":[2,10], "x":13.5, "y":2.25}, - {"matrix":[2,11], "x":14.5, "y":2.25}, - {"matrix":[2,13], "x":15.5, "y":2.25}, - {"matrix":[1,13], "x":16.5, "y":1.25, "w":1.25, "h":2}, - {"matrix":[2,14], "x":18.5, "y":2.5}, + {"matrix":[2, 10], "x":13.5, "y":2.25}, + {"matrix":[2, 11], "x":14.5, "y":2.25}, + {"matrix":[2, 13], "x":15.5, "y":2.25}, + {"matrix":[1, 13], "x":16.5, "y":1.25, "w":1.25, "h":2}, + {"matrix":[2, 14], "x":18.5, "y":2.5}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.25}, {"matrix":[3, 1], "x":1.25, "y":3.25}, @@ -70,11 +78,11 @@ {"matrix":[3, 7], "x":8.5, "y":3.25}, {"matrix":[3, 8], "x":9.5, "y":3.25}, {"matrix":[3, 9], "x":10.5, "y":3.25}, - {"matrix":[3,10], "x":11.5, "y":3.25}, - {"matrix":[3,11], "x":12.5, "y":3.25}, - {"matrix":[3,12], "x":14.25, "y":3.25}, - {"matrix":[3,13], "x":15.25, "y":3.25, "w":1.75}, - {"matrix":[3,14], "x":17.25, "y":3.5}, + {"matrix":[3, 10], "x":11.5, "y":3.25}, + {"matrix":[3, 11], "x":12.5, "y":3.25}, + {"matrix":[3, 12], "x":14.25, "y":3.25}, + {"matrix":[3, 13], "x":15.25, "y":3.25, "w":1.75}, + {"matrix":[3, 14], "x":17.25, "y":3.5}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25}, @@ -84,9 +92,9 @@ {"matrix":[4, 7], "x":8.75, "y":4.25}, {"matrix":[4, 8], "x":9.75, "y":4.25, "w":2.75}, {"matrix":[4, 9], "x":12.5, "y":4.25}, - {"matrix":[4,12], "x":16.25, "y":4.5}, - {"matrix":[4,13], "x":17.25, "y":4.5}, - {"matrix":[4,14], "x":18.25, "y":4.5} + {"matrix":[4, 12], "x":16.25, "y":4.5}, + {"matrix":[4, 13], "x":17.25, "y":4.5}, + {"matrix":[4, 14], "x":18.25, "y":4.5} ] } } diff --git a/keyboards/keychron/v8/iso/rules.mk b/keyboards/keychron/v8/iso/rules.mk index e306f3211e..fec3d8d15c 100644 --- a/keyboards/keychron/v8/iso/rules.mk +++ b/keyboards/keychron/v8/iso/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = no # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/v8/iso_encoder/info.json b/keyboards/keychron/v8/iso_encoder/info.json index 2abaeda111..faede3c5f7 100644 --- a/keyboards/keychron/v8/iso_encoder/info.json +++ b/keyboards/keychron/v8/iso_encoder/info.json @@ -8,6 +8,14 @@ "pid": "0x0383", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, + "matrix_pins": { + "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], + "rows": ["B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", "encoder": { "rotary": [ {"pin_a": "A10", "pin_b": "B5"} @@ -28,11 +36,11 @@ {"matrix":[0, 7], "x":9.5, "y":0.25}, {"matrix":[0, 8], "x":10.5, "y":0.25}, {"matrix":[0, 9], "x":11.5, "y":0.25}, - {"matrix":[0,10], "x":12.5, "y":0.25}, - {"matrix":[0,11], "x":13.5, "y":0}, - {"matrix":[0,12], "x":14.5, "y":0.25}, - {"matrix":[0,13], "x":15.5, "y":0.25, "w":2}, - {"matrix":[0,14], "x":18, "y":0.25}, + {"matrix":[0, 10], "x":12.5, "y":0.25}, + {"matrix":[0, 11], "x":13.5, "y":0}, + {"matrix":[0, 12], "x":14.5, "y":0.25}, + {"matrix":[0, 13], "x":15.5, "y":0.25, "w":2}, + {"matrix":[0, 14], "x":18, "y":0.25}, {"matrix":[1, 0], "x":0.5, "y":1.25, "w":1.5}, {"matrix":[1, 1], "x":2, "y":1.25}, @@ -44,10 +52,10 @@ {"matrix":[1, 7], "x":10, "y":1.25}, {"matrix":[1, 8], "x":11, "y":1.25}, {"matrix":[1, 9], "x":12, "y":1.25}, - {"matrix":[1,10], "x":13.25, "y":1.25}, - {"matrix":[1,11], "x":14.25, "y":1.25}, - {"matrix":[1,12], "x":15.25, "y":1.25}, - {"matrix":[1,14], "x":18.25, "y":1.5}, + {"matrix":[1, 10], "x":13.25, "y":1.25}, + {"matrix":[1, 11], "x":14.25, "y":1.25}, + {"matrix":[1, 12], "x":15.25, "y":1.25}, + {"matrix":[1, 14], "x":18.25, "y":1.5}, {"matrix":[2, 0], "x":0.25, "y":2.25, "w":1.75}, {"matrix":[2, 1], "x":2, "y":2.25}, @@ -59,11 +67,11 @@ {"matrix":[2, 7], "x":10.25, "y":2.25}, {"matrix":[2, 8], "x":11.25, "y":2.25}, {"matrix":[2, 9], "x":12.25, "y":2.25}, - {"matrix":[2,10], "x":13.5, "y":2.25}, - {"matrix":[2,11], "x":14.5, "y":2.25}, - {"matrix":[2,13], "x":15.5, "y":2.25}, - {"matrix":[1,13], "x":16.5, "y":1.25, "w":1.25, "h":2}, - {"matrix":[2,14], "x":18.5, "y":2.5}, + {"matrix":[2, 10], "x":13.5, "y":2.25}, + {"matrix":[2, 11], "x":14.5, "y":2.25}, + {"matrix":[2, 13], "x":15.5, "y":2.25}, + {"matrix":[1, 13], "x":16.5, "y":1.25, "w":1.25, "h":2}, + {"matrix":[2, 14], "x":18.5, "y":2.5}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.25}, {"matrix":[3, 1], "x":1.25, "y":3.25}, @@ -75,11 +83,11 @@ {"matrix":[3, 7], "x":8.5, "y":3.25}, {"matrix":[3, 8], "x":9.5, "y":3.25}, {"matrix":[3, 9], "x":10.5, "y":3.25}, - {"matrix":[3,10], "x":11.5, "y":3.25}, - {"matrix":[3,11], "x":12.5, "y":3.25}, - {"matrix":[3,12], "x":14.25, "y":3.25}, - {"matrix":[3,13], "x":15.25, "y":3.25, "w":1.75}, - {"matrix":[3,14], "x":17.25, "y":3.5}, + {"matrix":[3, 10], "x":11.5, "y":3.25}, + {"matrix":[3, 11], "x":12.5, "y":3.25}, + {"matrix":[3, 12], "x":14.25, "y":3.25}, + {"matrix":[3, 13], "x":15.25, "y":3.25, "w":1.75}, + {"matrix":[3, 14], "x":17.25, "y":3.5}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25}, @@ -89,9 +97,9 @@ {"matrix":[4, 7], "x":8.75, "y":4.25}, {"matrix":[4, 8], "x":9.75, "y":4.25, "w":2.75}, {"matrix":[4, 9], "x":12.5, "y":4.25}, - {"matrix":[4,12], "x":16.25, "y":4.5}, - {"matrix":[4,13], "x":17.25, "y":4.5}, - {"matrix":[4,14], "x":18.25, "y":4.5} + {"matrix":[4, 12], "x":16.25, "y":4.5}, + {"matrix":[4, 13], "x":17.25, "y":4.5}, + {"matrix":[4, 14], "x":18.25, "y":4.5} ] } } diff --git a/keyboards/keychron/v8/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/v8/iso_encoder/keymaps/default/keymap.c index c7b37a025a..8d5e493e6a 100644 --- a/keyboards/keychron/v8/iso_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/v8/iso_encoder/keymaps/default/keymap.c @@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [_FN1] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, diff --git a/keyboards/keychron/v8/iso_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/v8/iso_encoder/keymaps/keychron/keymap.c index 6bbc52362d..fd39296536 100644 --- a/keyboards/keychron/v8/iso_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/v8/iso_encoder/keymaps/keychron/keymap.c @@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [_FN1] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, diff --git a/keyboards/keychron/v8/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/v8/iso_encoder/keymaps/via/keymap.c index 1de6be16aa..7c6e4bb8a9 100644 --- a/keyboards/keychron/v8/iso_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/v8/iso_encoder/keymaps/via/keymap.c @@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [_FN1] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, diff --git a/keyboards/keychron/v8/iso_encoder/rules.mk b/keyboards/keychron/v8/iso_encoder/rules.mk index f2cbf4a660..d2bee999c8 100644 --- a/keyboards/keychron/v8/iso_encoder/rules.mk +++ b/keyboards/keychron/v8/iso_encoder/rules.mk @@ -14,7 +14,6 @@ ENCODER_ENABLE = yes # Enable Encoder ENCODER_MAP_ENABLE = no DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash |