diff options
Diffstat (limited to 'keyboards/keychron')
18 files changed, 504 insertions, 233 deletions
diff --git a/keyboards/keychron/k12_pro/ansi/rgb/config.h b/keyboards/keychron/k12_pro/ansi/rgb/config.h index 87e2fdd57e..29bf4ecbb8 100755 --- a/keyboards/keychron/k12_pro/ansi/rgb/config.h +++ b/keyboards/keychron/k12_pro/ansi/rgb/config.h @@ -19,7 +19,6 @@ #ifdef RGB_MATRIX_ENABLE /* RGB Matrix driver configuration */ # define DRIVER_COUNT 1 - # define DRIVER_ADDR_1 0b1110100 # define DRIVER_1_LED_COUNT 61 # define RGB_MATRIX_LED_COUNT DRIVER_1_LED_COUNT @@ -27,73 +26,25 @@ /* Set to infinit, which is use in USB mode by default */ # define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE + /* Allow shutdown of led driver to save power */ # define RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE + /* Turn off backlight on low brightness to save power */ -# define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 32 +# define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 48 +/* Indication led */ # define DIM_CAPS_LOCK # define CAPS_LOCK_INDEX 28 # define LOW_BAT_IND_INDEX 56 -/* RGB Matrix Animation modes. Explicitly enabled - * For full list of effects, see: - * https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects - */ - +// RGB Matrix Animation modes. Explicitly enabled +// For full list of effects, see: +// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects # define RGB_MATRIX_KEYPRESSES # define RGB_MATRIX_FRAMEBUFFER_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 - /* Set LED driver current */ # define CKLED2001_CURRENT_TUNE \ { 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28 } - #endif diff --git a/keyboards/keychron/k12_pro/ansi/rgb/info.json b/keyboards/keychron/k12_pro/ansi/rgb/info.json index 54d1ba7dbb..076ff2981a 100755 --- a/keyboards/keychron/k12_pro/ansi/rgb/info.json +++ b/keyboards/keychron/k12_pro/ansi/rgb/info.json @@ -1,22 +1,13 @@ { - "keyboard_name": "Keychron K12 Pro", - "manufacturer": "Keychron", - "url": "https://github.com/Keychron", - "maintainer": "lalalademaxiya1", "usb": { - "vid": "0x3434", "pid": "0x02C0", "device_version": "1.0.0" }, - "matrix_pins": { - "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null ], - "rows": ["B4", "B3", "A15", "A14", "A13"] + "features": { + "rgb_matrix": true }, - "diode_direction": "ROW2COL", - "processor": "STM32L432", - "bootloader": "stm32-dfu", "layouts": { - "LAYOUT_ansi_61": { + "LAYOUT_61_ansi": { "layout": [ {"matrix":[0,0], "x":0, "y":0}, {"matrix":[0,1], "x":1, "y":0}, @@ -32,6 +23,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}, @@ -46,6 +38,7 @@ {"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}, {"matrix":[2,2], "x":2.75, "y":2}, @@ -59,6 +52,7 @@ {"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}, {"matrix":[3,3], "x":3.25, "y":3}, @@ -71,6 +65,7 @@ {"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}, @@ -81,5 +76,98 @@ {"matrix":[4,13], "x":13.75, "y":4, "w":1.25} ] } + }, + "rgb_matrix": { + "driver": "CKLED2001", + "animations": { + "breathing": true, + "band_spiral_val": 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": [ + {"matrix":[0, 0], "flags":1, "x":0, "y":0}, + {"matrix":[0, 1], "flags":4, "x":16, "y":0}, + {"matrix":[0, 2], "flags":4, "x":32, "y":0}, + {"matrix":[0, 3], "flags":4, "x":48, "y":0}, + {"matrix":[0, 4], "flags":4, "x":65, "y":0}, + {"matrix":[0, 5], "flags":4, "x":81, "y":0}, + {"matrix":[0, 6], "flags":4, "x":97, "y":0}, + {"matrix":[0, 7], "flags":4, "x":113, "y":0}, + {"matrix":[0, 8], "flags":4, "x":129, "y":0}, + {"matrix":[0, 9], "flags":4, "x":145, "y":0}, + {"matrix":[0, 10], "flags":4, "x":161, "y":0}, + {"matrix":[0, 11], "flags":4, "x":178, "y":0}, + {"matrix":[0, 12], "flags":4, "x":194, "y":0}, + {"matrix":[0, 13], "flags":1, "x":218, "y":0}, + + {"matrix":[1, 0], "flags":1, "x":4, "y":16}, + {"matrix":[1, 1], "flags":8, "x":24, "y":16}, + {"matrix":[1, 2], "flags":8, "x":40, "y":16}, + {"matrix":[1, 3], "flags":8, "x":57, "y":16}, + {"matrix":[1, 4], "flags":4, "x":73, "y":16}, + {"matrix":[1, 5], "flags":4, "x":89, "y":16}, + {"matrix":[1, 6], "flags":4, "x":105, "y":16}, + {"matrix":[1, 7], "flags":4, "x":121, "y":16}, + {"matrix":[1, 8], "flags":4, "x":137, "y":16}, + {"matrix":[1, 9], "flags":4, "x":153, "y":16}, + {"matrix":[1, 10], "flags":4, "x":170, "y":16}, + {"matrix":[1, 11], "flags":4, "x":186, "y":16}, + {"matrix":[1, 12], "flags":4, "x":202, "y":16}, + {"matrix":[1, 13], "flags":1, "x":222, "y":16}, + + {"matrix":[2, 0], "flags":8, "x":6, "y":32}, + {"matrix":[2, 1], "flags":4, "x":28, "y":32}, + {"matrix":[2, 2], "flags":4, "x":44, "y":32}, + {"matrix":[2, 3], "flags":4, "x":61, "y":32}, + {"matrix":[2, 4], "flags":4, "x":77, "y":32}, + {"matrix":[2, 5], "flags":4, "x":93, "y":32}, + {"matrix":[2, 6], "flags":4, "x":109, "y":32}, + {"matrix":[2, 7], "flags":4, "x":125, "y":32}, + {"matrix":[2, 8], "flags":4, "x":141, "y":32}, + {"matrix":[2, 9], "flags":4, "x":157, "y":32}, + {"matrix":[2, 10], "flags":4, "x":174, "y":32}, + {"matrix":[2, 11], "flags":4, "x":190, "y":32}, + {"matrix":[2, 13], "flags":1, "x":216, "y":32}, + + {"matrix":[3, 0], "flags":1, "x":10, "y":48}, + {"matrix":[3, 2], "flags":4, "x":36, "y":48}, + {"matrix":[3, 3], "flags":4, "x":52, "y":48}, + {"matrix":[3, 4], "flags":4, "x":69, "y":48}, + {"matrix":[3, 5], "flags":4, "x":85, "y":48}, + {"matrix":[3, 6], "flags":4, "x":101, "y":48}, + {"matrix":[3, 7], "flags":4, "x":117, "y":48}, + {"matrix":[3, 8], "flags":4, "x":133, "y":48}, + {"matrix":[3, 9], "flags":4, "x":149, "y":48}, + {"matrix":[3, 10], "flags":4, "x":165, "y":48}, + {"matrix":[3, 11], "flags":4, "x":182, "y":48}, + {"matrix":[3, 13], "flags":1, "x":212, "y":48}, + + {"matrix":[4, 0], "flags":1, "x":2, "y":64}, + {"matrix":[4, 1], "flags":1, "x":22, "y":64}, + {"matrix":[4, 2], "flags":1, "x":42, "y":64}, + {"matrix":[4, 6], "flags":4, "x":103, "y":64}, + {"matrix":[4, 10], "flags":1, "x":163, "y":64}, + {"matrix":[4, 11], "flags":1, "x":184, "y":64}, + {"matrix":[4, 12], "flags":1, "x":204, "y":64}, + {"matrix":[4, 13], "flags":1, "x":224, "y":64} + ] } } diff --git a/keyboards/keychron/k12_pro/ansi/rgb/keymaps/default/keymap.c b/keyboards/keychron/k12_pro/ansi/rgb/keymaps/default/keymap.c index 9ea3fd599c..fe95a35ea7 100755 --- a/keyboards/keychron/k12_pro/ansi/rgb/keymaps/default/keymap.c +++ b/keyboards/keychron/k12_pro/ansi/rgb/keymaps/default/keymap.c @@ -22,39 +22,39 @@ enum layers{ WIN_BASE, MAC_FN1, WIN_FN1, - FN2 + FN2, }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [MAC_BASE] = LAYOUT_ansi_61( + [MAC_BASE] = LAYOUT_61_ansi( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD,MO(MAC_FN1),MO(FN2), KC_RCTL), - [WIN_BASE] = LAYOUT_ansi_61( + [WIN_BASE] = LAYOUT_61_ansi( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN1),MO(FN2), KC_RCTL), - [MAC_FN1] = LAYOUT_ansi_61( - KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LNPD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, RGB_MOD, + [MAC_FN1] = LAYOUT_61_ansi( + KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, RGB_MOD, _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, KC_INS, KC_PGUP, KC_HOME, _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, KC_UP, KC_SNAP, KC_PGDN, KC_END, _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______), - [WIN_FN1] = LAYOUT_ansi_61( + [WIN_FN1] = LAYOUT_61_ansi( KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, RGB_MOD, _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, KC_APP, KC_SCRL, KC_INS, KC_PGUP, KC_HOME, _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, KC_UP, KC_PSCR, KC_PGDN, KC_END, _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______), - [FN2] = LAYOUT_ansi_61( + [FN2] = LAYOUT_61_ansi( KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/keychron/k12_pro/ansi/rgb/keymaps/via/keymap.c b/keyboards/keychron/k12_pro/ansi/rgb/keymaps/via/keymap.c index 9ae0a33690..fe95a35ea7 100755 --- a/keyboards/keychron/k12_pro/ansi/rgb/keymaps/via/keymap.c +++ b/keyboards/keychron/k12_pro/ansi/rgb/keymaps/via/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.com) +/* Copyright 2023 @ 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 @@ -22,39 +22,39 @@ enum layers{ WIN_BASE, MAC_FN1, WIN_FN1, - FN2 + FN2, }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [MAC_BASE] = LAYOUT_ansi_61( + [MAC_BASE] = LAYOUT_61_ansi( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD,MO(MAC_FN1),MO(FN2), KC_RCTL), - [WIN_BASE] = LAYOUT_ansi_61( + [WIN_BASE] = LAYOUT_61_ansi( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN1),MO(FN2), KC_RCTL), - [MAC_FN1] = LAYOUT_ansi_61( - KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LNPD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, RGB_MOD, + [MAC_FN1] = LAYOUT_61_ansi( + KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, RGB_MOD, _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, KC_INS, KC_PGUP, KC_HOME, _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, KC_UP, KC_SNAP, KC_PGDN, KC_END, _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______), - [WIN_FN1] = LAYOUT_ansi_61( + [WIN_FN1] = LAYOUT_61_ansi( KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, RGB_MOD, _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, KC_APP, KC_SCRL, KC_INS, KC_PGUP, KC_HOME, _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, KC_UP, KC_PSCR, KC_PGDN, KC_END, _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______), - [FN2] = LAYOUT_ansi_61( + [FN2] = LAYOUT_61_ansi( KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/keychron/k12_pro/ansi/rgb/rgb.c b/keyboards/keychron/k12_pro/ansi/rgb/rgb.c index e3ab9e457c..dadd8454f4 100755 --- a/keyboards/keychron/k12_pro/ansi/rgb/rgb.c +++ b/keyboards/keychron/k12_pro/ansi/rgb/rgb.c @@ -1,4 +1,4 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.com) +/* Copyright 2023 @ 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 @@ -91,33 +91,4 @@ const ckled2001_led g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = { {0, I_1, G_1, H_1}, {0, I_2, G_2, H_2} }; - -#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, 26, 27 }, - { 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, __, 40 }, - { 41, __, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, __, 52 }, - { 53, 54, 55, __, __, __, 56, __, __, __, 57, 58, 59, 60 } - }, - { - // LED Index to Physical Position - {0,0}, {16,0}, {32,0}, {48,0}, {65,0}, {81,0}, {97,0}, {113,0}, {129,0}, {145,0}, {161,0}, {178,0}, {194,0}, {218,0}, - {4,16}, {24,16}, {40,16}, {57,16}, {73,16}, {89,16}, {105,16}, {121,16}, {137,16}, {153,16}, {170,16}, {186,16}, {202,16}, {222,16}, - {6,32}, {28,32}, {44,32}, {61,32}, {77,32}, {93,32}, {109,32}, {125,32}, {141,32}, {157,32}, {174,32}, {190,32}, {216,32}, - {10,48}, {36,48}, {52,48}, {69,48}, {85,48}, {101,48}, {117,48}, {133,48}, {149,48}, {165,48}, {182,48}, {212,48}, - {2,64}, {22,64}, {42,64}, {103,64}, {163,64}, {184,64}, {204,64}, {224,64}, - }, - { - // RGB LED Index to Flag - 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 1, 8, 8, 8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 1, 1, 1, 4, 1, 4, 4, 1, - } -}; #endif diff --git a/keyboards/keychron/k12_pro/ansi/white/config.h b/keyboards/keychron/k12_pro/ansi/white/config.h index 9d998cdd76..6d384f56fb 100755 --- a/keyboards/keychron/k12_pro/ansi/white/config.h +++ b/keyboards/keychron/k12_pro/ansi/white/config.h @@ -24,51 +24,29 @@ /* Set to infinit, which is use in USB mode by default */ # define LED_MATRIX_TIMEOUT LED_MATRIX_TIMEOUT_INFINITE + /* Allow shutdown of led driver to save power */ # define LED_MATRIX_DRIVER_SHUTDOWN_ENABLE + /* Turn off backlight on low brightness to save power */ -# define LED_MATRIX_BRIGHTNESS_TURN_OFF_VAL 32 +# define LED_MATRIX_BRIGHTNESS_TURN_OFF_VAL 48 +/* Indication led */ # define DIM_CAPS_LOCK # define CAPS_LOCK_INDEX 28 # define LOW_BAT_IND_INDEX 56 -/* LED Matrix Animation modes. Explicitly enabled - * For full list of effects, see: - * https://docs.qmk.fm/#/feature_led_matrix?id=led-matrix-effects - */ +// LED Matrix Animation modes. Explicitly enabled +// For full list of effects, see: +// https://docs.qmk.fm/#/feature_led_matrix?id=led-matrix-effects +// #if defined(LED_MATRIX_KEYPRESSES) || defined(LED_MATRIX_KEYRELEASES) # define LED_MATRIX_KEYPRESSES - -# define ENABLE_LED_MATRIX_NONE -# define ENABLE_LED_MATRIX_SOLID -//# define ENABLE_LED_MATRIX_ALPHAS_MODS -# define ENABLE_LED_MATRIX_BREATHING -//# define ENABLE_LED_MATRIX_BAND -# define ENABLE_LED_MATRIX_BAND_PINWHEEL -# define ENABLE_LED_MATRIX_BAND_SPIRAL -# define ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT -# define ENABLE_LED_MATRIX_CYCLE_UP_DOWN -# define ENABLE_LED_MATRIX_CYCLE_OUT_IN -# define ENABLE_LED_MATRIX_DUAL_BEACON - -# define ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE -//# define ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE -# define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE -//# define ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS -//# define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS -//# define ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS -# define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS -# define ENABLE_LED_MATRIX_SOLID_SPLASH -//# define ENABLE_LED_MATRIX_SOLID_MULTISPLASH - -# define ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT -# define ENABLE_LED_MATRIX_WAVE_UP_DOWN -# define ENABLE_LED_MATRIX_EFFECT_MAX +# define LED_MATRIX_KEYRELEASES /* Use first 6 channels of LED driver */ # define PHASE_CHANNEL MSKPHASE_6CHANNEL /* Set LED driver current */ -# define CKLED2001_CURRENT_TUNE { 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28 } - +# define CKLED2001_CURRENT_TUNE \ + { 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28 } #endif diff --git a/keyboards/keychron/k12_pro/ansi/white/info.json b/keyboards/keychron/k12_pro/ansi/white/info.json index 4862eed4ca..a5924349fd 100755 --- a/keyboards/keychron/k12_pro/ansi/white/info.json +++ b/keyboards/keychron/k12_pro/ansi/white/info.json @@ -1,22 +1,13 @@ { - "keyboard_name": "Keychron K12 Pro", - "manufacturer": "Keychron", - "url": "https://github.com/Keychron", - "maintainer": "lalalademaxiya1", "usb": { - "vid": "0x3434", "pid": "0x02C3", "device_version": "1.0.0" }, - "matrix_pins": { - "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null ], - "rows": ["B4", "B3", "A15", "A14", "A13"] + "features": { + "led_matrix": true }, - "diode_direction": "ROW2COL", - "processor": "STM32L432", - "bootloader": "stm32-dfu", "layouts": { - "LAYOUT_ansi_61": { + "LAYOUT_61_ansi": { "layout": [ {"matrix":[0,0], "x":0, "y":0}, {"matrix":[0,1], "x":1, "y":0}, @@ -32,6 +23,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}, @@ -46,6 +38,7 @@ {"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}, {"matrix":[2,2], "x":2.75, "y":2}, @@ -59,6 +52,7 @@ {"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}, {"matrix":[3,3], "x":3.25, "y":3}, @@ -71,6 +65,7 @@ {"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}, @@ -81,5 +76,93 @@ {"matrix":[4,13], "x":13.75, "y":4, "w":1.25} ] } + }, + "led_matrix": { + "driver": "CKLED2001", + "animations": { + "none": true, + "solid": true, + "breathing": true, + "band_pinwheel": true, + "band_spiral": true, + "cycle_left_right": true, + "cycle_up_down": true, + "cycle_out_in": true, + "dual_beacon": true, + "solid_reactive_simple": true, + "solid_reactive_multiwide": true, + "solid_reactive_multinexus": true, + "solid_splash": true, + "wave_left_right": true, + "wave_up_down": true, + "effect_max": true + }, + "layout": [ + {"matrix":[0, 0], "flags":1, "x":0, "y":0}, + {"matrix":[0, 1], "flags":4, "x":16, "y":0}, + {"matrix":[0, 2], "flags":4, "x":32, "y":0}, + {"matrix":[0, 3], "flags":4, "x":48, "y":0}, + {"matrix":[0, 4], "flags":4, "x":65, "y":0}, + {"matrix":[0, 5], "flags":4, "x":81, "y":0}, + {"matrix":[0, 6], "flags":4, "x":97, "y":0}, + {"matrix":[0, 7], "flags":4, "x":113, "y":0}, + {"matrix":[0, 8], "flags":4, "x":129, "y":0}, + {"matrix":[0, 9], "flags":4, "x":145, "y":0}, + {"matrix":[0, 10], "flags":4, "x":161, "y":0}, + {"matrix":[0, 11], "flags":4, "x":178, "y":0}, + {"matrix":[0, 12], "flags":4, "x":194, "y":0}, + {"matrix":[0, 13], "flags":1, "x":218, "y":0}, + + {"matrix":[1, 0], "flags":1, "x":4, "y":16}, + {"matrix":[1, 1], "flags":8, "x":24, "y":16}, + {"matrix":[1, 2], "flags":8, "x":40, "y":16}, + {"matrix":[1, 3], "flags":8, "x":57, "y":16}, + {"matrix":[1, 4], "flags":4, "x":73, "y":16}, + {"matrix":[1, 5], "flags":4, "x":89, "y":16}, + {"matrix":[1, 6], "flags":4, "x":105, "y":16}, + {"matrix":[1, 7], "flags":4, "x":121, "y":16}, + {"matrix":[1, 8], "flags":4, "x":137, "y":16}, + {"matrix":[1, 9], "flags":4, "x":153, "y":16}, + {"matrix":[1, 10], "flags":4, "x":170, "y":16}, + {"matrix":[1, 11], "flags":4, "x":186, "y":16}, + {"matrix":[1, 12], "flags":4, "x":202, "y":16}, + {"matrix":[1, 13], "flags":1, "x":222, "y":16}, + + {"matrix":[2, 0], "flags":8, "x":6, "y":32}, + {"matrix":[2, 1], "flags":4, "x":28, "y":32}, + {"matrix":[2, 2], "flags":4, "x":44, "y":32}, + {"matrix":[2, 3], "flags":4, "x":61, "y":32}, + {"matrix":[2, 4], "flags":4, "x":77, "y":32}, + {"matrix":[2, 5], "flags":4, "x":93, "y":32}, + {"matrix":[2, 6], "flags":4, "x":109, "y":32}, + {"matrix":[2, 7], "flags":4, "x":125, "y":32}, + {"matrix":[2, 8], "flags":4, "x":141, "y":32}, + {"matrix":[2, 9], "flags":4, "x":157, "y":32}, + {"matrix":[2, 10], "flags":4, "x":174, "y":32}, + {"matrix":[2, 11], "flags":4, "x":190, "y":32}, + {"matrix":[2, 13], "flags":1, "x":216, "y":32}, + + {"matrix":[3, 0], "flags":1, "x":10, "y":48}, + {"matrix":[3, 2], "flags":4, "x":36, "y":48}, + {"matrix":[3, 3], "flags":4, "x":52, "y":48}, + {"matrix":[3, 4], "flags":4, "x":69, "y":48}, + {"matrix":[3, 5], "flags":4, "x":85, "y":48}, + {"matrix":[3, 6], "flags":4, "x":101, "y":48}, + {"matrix":[3, 7], "flags":4, "x":117, "y":48}, + {"matrix":[3, 8], "flags":4, "x":133, "y":48}, + {"matrix":[3, 9], "flags":4, "x":149, "y":48}, + {"matrix":[3, 10], "flags":4, "x":165, "y":48}, + {"matrix":[3, 11], "flags":4, "x":182, "y":48}, + {"matrix":[3, 13], "flags":1, "x":212, "y":48}, + + {"matrix":[4, 0], "flags":1, "x":2, "y":64}, + {"matrix":[4, 1], "flags":1, "x":22, "y":64}, + {"matrix":[4, 2], "flags":1, "x":42, "y":64}, + {"matrix":[4, 6], "flags":4, "x":103, "y":64}, + {"matrix":[4, 10], "flags":1, "x":163, "y":64}, + {"matrix":[4, 11], "flags":1, "x":184, "y":64}, + {"matrix":[4, 12], "flags":1, "x":204, "y":64}, + {"matrix":[4, 13], "flags":1, "x":224, "y":64} + ] } } diff --git a/keyboards/keychron/k12_pro/ansi/white/keymaps/default/keymap.c b/keyboards/keychron/k12_pro/ansi/white/keymaps/default/keymap.c index dcbea75c81..f9e24ea577 100755 --- a/keyboards/keychron/k12_pro/ansi/white/keymaps/default/keymap.c +++ b/keyboards/keychron/k12_pro/ansi/white/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.com) +/* Copyright 2023 @ 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 @@ -22,39 +22,39 @@ enum layers{ WIN_BASE, MAC_FN1, WIN_FN1, - FN2 + FN2, }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [MAC_BASE] = LAYOUT_ansi_61( + [MAC_BASE] = LAYOUT_61_ansi( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD,MO(MAC_FN1),MO(FN2), KC_RCTL), - [WIN_BASE] = LAYOUT_ansi_61( + [WIN_BASE] = LAYOUT_61_ansi( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN1),MO(FN2), KC_RCTL), - [MAC_FN1] = LAYOUT_ansi_61( - KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LNPD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, BL_STEP, + [MAC_FN1] = LAYOUT_61_ansi( + KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, BL_STEP, _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, KC_INS, KC_PGUP, KC_HOME, _______, BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, KC_UP, KC_SNAP, KC_PGDN, KC_END, _______, _______, _______, BL_DOWN, _______, _______, _______, NK_TOGG, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______), - [WIN_FN1] = LAYOUT_ansi_61( + [WIN_FN1] = LAYOUT_61_ansi( KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, BL_STEP, _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, KC_APP, KC_SCRL, KC_INS, KC_PGUP, KC_HOME, _______, BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, KC_UP, KC_PSCR, KC_PGDN, KC_END, _______, _______, _______, BL_DOWN, _______, _______, _______, NK_TOGG, KC_ |