diff options
72 files changed, 5480 insertions, 30 deletions
diff --git a/keyboards/keychron/k11_pro/k11_pro.c b/keyboards/keychron/k11_pro/k11_pro.c index 9189ef8586..6ad7649bab 100755 --- a/keyboards/keychron/k11_pro/k11_pro.c +++ b/keyboards/keychron/k11_pro/k11_pro.c @@ -135,8 +135,8 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { return true; } -#if defined(KC_BLUETOOTH_ENABLE) && defined(ENCODER_ENBALE) -static void encoder0_pad_cb(void *param) { +#if defined(ENCODER_ENABLE) +static void encoder_pad_cb(void *param) { encoder_inerrupt_read((uint32_t)param & 0xFF); } #endif @@ -156,16 +156,16 @@ void keyboard_post_init_kb(void) { ckbt51_init(false); bluetooth_init(); - #endif -#ifdef ENCODER_ENBALE + +#ifdef ENCODER_ENABLE pin_t encoders_pad_a[NUM_ENCODERS] = ENCODERS_PAD_A; pin_t encoders_pad_b[NUM_ENCODERS] = ENCODERS_PAD_B; - for (uint8_t i = 0; i < NUM_ENCODERS; i++) { + for (uint32_t i = 0; i < NUM_ENCODERS; i++) { palEnableLineEvent(encoders_pad_a[i], PAL_EVENT_MODE_BOTH_EDGES); palEnableLineEvent(encoders_pad_b[i], PAL_EVENT_MODE_BOTH_EDGES); - palSetLineCallback(encoders_pad_a[i], encoder_pad_cb, &i); - palSetLineCallback(encoders_pad_b[i], encoder_pad_cb, &i); + palSetLineCallback(encoders_pad_a[i], encoder_pad_cb, (void *)i); + palSetLineCallback(encoders_pad_b[i], encoder_pad_cb, (void *)i); } #endif diff --git a/keyboards/keychron/k11_pro/via_json/k11_pro_ansi_encoder_rgb.json b/keyboards/keychron/k11_pro/via_json/k11_pro_ansi_encoder_rgb.json index 5c6acd35ba..e0e3a10a84 100755 --- a/keyboards/keychron/k11_pro/via_json/k11_pro_ansi_encoder_rgb.json +++ b/keyboards/keychron/k11_pro/via_json/k11_pro_ansi_encoder_rgb.json @@ -290,8 +290,7 @@ }, "4,3", { - "c": "#aaaaaa", - "w": 1.25 + "c": "#aaaaaa" }, "4,6" ], diff --git a/keyboards/keychron/k11_pro/via_json/k11_pro_ansi_encoder_white.json b/keyboards/keychron/k11_pro/via_json/k11_pro_ansi_encoder_white.json index a0288b2601..49279b4765 100755 --- a/keyboards/keychron/k11_pro/via_json/k11_pro_ansi_encoder_white.json +++ b/keyboards/keychron/k11_pro/via_json/k11_pro_ansi_encoder_white.json @@ -229,8 +229,7 @@ }, "4,3", { - "c": "#aaaaaa", - "w": 1.25 + "c": "#aaaaaa" }, "4,6" ], diff --git a/keyboards/keychron/k11_pro/via_json/k11_pro_ansi_rgb.json b/keyboards/keychron/k11_pro/via_json/k11_pro_ansi_rgb.json index 2e181484c6..55a3d2153c 100755 --- a/keyboards/keychron/k11_pro/via_json/k11_pro_ansi_rgb.json +++ b/keyboards/keychron/k11_pro/via_json/k11_pro_ansi_rgb.json @@ -290,8 +290,7 @@ }, "4,3", { - "c": "#aaaaaa", - "w": 1.25 + "c": "#aaaaaa" }, "4,6" ], diff --git a/keyboards/keychron/k11_pro/via_json/k11_pro_ansi_white.json b/keyboards/keychron/k11_pro/via_json/k11_pro_ansi_white.json index 5d856f4f1f..c1ad185bee 100755 --- a/keyboards/keychron/k11_pro/via_json/k11_pro_ansi_white.json +++ b/keyboards/keychron/k11_pro/via_json/k11_pro_ansi_white.json @@ -229,8 +229,7 @@ }, "4,3", { - "c": "#aaaaaa", - "w": 1.25 + "c": "#aaaaaa" }, "4,6" ], diff --git a/keyboards/keychron/k14_pro/ansi/rgb/config.h b/keyboards/keychron/k14_pro/ansi/rgb/config.h new file mode 100755 index 0000000000..68a07e6437 --- /dev/null +++ b/keyboards/keychron/k14_pro/ansi/rgb/config.h @@ -0,0 +1,52 @@ +/* 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 + * 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 + +#ifdef RGB_MATRIX_ENABLE +/* RGB Matrix Driver Configuration */ +# define DRIVER_COUNT 2 +# define DRIVER_ADDR_1 0b1110111 +# define DRIVER_ADDR_2 0b1110100 + +/* RGB Matrix Configuration */ +# define DRIVER_1_LED_COUNT 47 +# define DRIVER_2_LED_COUNT 40 +# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_COUNT + DRIVER_2_LED_COUNT) + +/* 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 + +/* Indication led */ +# define CAPS_LOCK_INDEX 50 +# define LOW_BAT_IND_INDEX 79 + +# define RGB_MATRIX_FRAMEBUFFER_EFFECTS +# define RGB_MATRIX_KEYPRESSES + +/* Use the first 9 channels of led driver */ +# define PHASE_CHANNEL MSKPHASE_9CHANNEL + +/* 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/k14_pro/ansi/rgb/info.json b/keyboards/keychron/k14_pro/ansi/rgb/info.json new file mode 100755 index 0000000000..29579b49dc --- /dev/null +++ b/keyboards/keychron/k14_pro/ansi/rgb/info.json @@ -0,0 +1,195 @@ +{ + "usb": { + "pid": "0x02E0", + "device_version": "1.0.0" + }, + "features": { + "rgb_matrix": true + }, + "layouts": { + "LAYOUT_72_ansi": { + "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,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}, + {"matrix":[1,2], "x":2.5, "y":1}, + {"matrix":[1,3], "x":3.5, "y":1}, + {"matrix":[1,4], "x":4.5, "y":1}, + {"matrix":[1,5], "x":5.5, "y":1}, + {"matrix":[1,6], "x":6.5, "y":1}, + {"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":[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}, + {"matrix":[2,3], "x":3.75, "y":2}, + {"matrix":[2,4], "x":4.75, "y":2}, + {"matrix":[2,5], "x":5.75, "y":2}, + {"matrix":[2,6], "x":6.75, "y":2}, + {"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":[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}, + {"matrix":[3,4], "x":4.25, "y":3}, + {"matrix":[3,5], "x":5.25, "y":3}, + {"matrix":[3,6], "x":6.25, "y":3}, + {"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":[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} + ] + } + }, + "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":14, "y":0}, + {"matrix":[0, 2], "flags":4, "x":28, "y":0}, + {"matrix":[0, 3], "flags":4, "x":42, "y":0}, + {"matrix":[0, 4], "flags":4, "x":56, "y":0}, + {"matrix":[0, 5], "flags":4, "x":70, "y":0}, + {"matrix":[0, 6], "flags":4, "x":84, "y":0}, + {"matrix":[0, 7], "flags":4, "x":98, "y":0}, + {"matrix":[0, 8], "flags":4, "x":112, "y":0}, + {"matrix":[0, 9], "flags":4, "x":126, "y":0}, + {"matrix":[0, 10], "flags":4, "x":140, "y":0}, + {"matrix":[0, 11], "flags":4, "x":154, "y":0}, + {"matrix":[0, 12], "flags":4, "x":168, "y":0}, + {"matrix":[0, 13], "flags":1, "x":189, "y":0}, + {"matrix":[0, 14], "flags":1, "x":210, "y":0}, + {"matrix":[0, 15], "flags":1, "x":224, "y":0}, + + {"matrix":[1, 0], "flags":1, "x":3, "y":13}, + {"matrix":[1, 1], "flags":8, "x":21, "y":13}, + {"matrix":[1, 2], "flags":8, "x":35, "y":13}, + {"matrix":[1, 3], "flags":8, "x":49, "y":13}, + {"matrix":[1, 4], "flags":4, "x":63, "y":13}, + {"matrix":[1, 5], "flags":4, "x":77, "y":13}, + {"matrix":[1, 6], "flags":4, "x":91, "y":13}, + {"matrix":[1, 7], "flags":4, "x":105, "y":13}, + {"matrix":[1, 8], "flags":4, "x":119, "y":13}, + {"matrix":[1, 9], "flags":4, "x":133, "y":13}, + {"matrix":[1, 10], "flags":4, "x":147, "y":13}, + {"matrix":[1, 11], "flags":4, "x":161, "y":13}, + {"matrix":[1, 12], "flags":4, "x":175, "y":13}, + {"matrix":[1, 13], "flags":1, "x":193, "y":13}, + {"matrix":[1, 14], "flags":1, "x":220, "y":13}, + {"matrix":[1, 15], "flags":1, "x":224, "y":13}, + + {"matrix":[2, 0], "flags":8, "x":5, "y":32}, + {"matrix":[2, 1], "flags":4, "x":24, "y":32}, + {"matrix":[2, 2], "flags":4, "x":38, "y":32}, + {"matrix":[2, 3], "flags":4, "x":52, "y":32}, + {"matrix":[2, 4], "flags":4, "x":66, "y":32}, + {"matrix":[2, 5], "flags":4, "x":80, "y":32}, + {"matrix":[2, 6], "flags":4, "x":94, "y":32}, + {"matrix":[2, 7], "flags":4, "x":108, "y":32}, + {"matrix":[2, 8], "flags":4, "x":122, "y":32}, + {"matrix":[2, 9], "flags":4, "x":136, "y":32}, + {"matrix":[2, 10], "flags":4, "x":150, "y":32}, + {"matrix":[2, 11], "flags":4, "x":164, "y":32}, + {"matrix":[2, 13], "flags":1, "x":187, "y":32}, + {"matrix":[2, 14], "flags":1, "x":210, "y":32}, + {"matrix":[2, 15], "flags":1, "x":224, "y":32}, + + {"matrix":[3, 0], "flags":1, "x":9, "y":48}, + {"matrix":[3, 2], "flags":4, "x":31, "y":48}, + {"matrix":[3, 3], "flags":4, "x":45, "y":48}, + {"matrix":[3, 4], "flags":4, "x":59, "y":48}, + {"matrix":[3, 5], "flags":4, "x":73, "y":48}, + {"matrix":[3, 6], "flags":4, "x":87, "y":48}, + {"matrix":[3, 7], "flags":4, "x":101, "y":48}, + {"matrix":[3, 8], "flags":4, "x":115, "y":48}, + {"matrix":[3, 9], "flags":4, "x":129, "y":48}, + {"matrix":[3, 10], "flags":4, "x":143, "y":48}, + {"matrix":[3, 11], "flags":4, "x":157, "y":48}, + {"matrix":[3, 13], "flags":1, "x":184, "y":48}, + {"matrix":[3, 14], "flags":1, "x":210, "y":48}, + {"matrix":[3, 15], "flags":1, "x":224, "y":48}, + + {"matrix":[4, 0], "flags":1, "x":0, "y":64}, + {"matrix":[4, 1], "flags":1, "x":19, "y":64}, + {"matrix":[4, 2], "flags":1, "x":37, "y":64}, + {"m |