From 3c9944d9ea8b71e46301579dde758e90f9dafba6 Mon Sep 17 00:00:00 2001 From: Adophoxia Date: Fri, 28 Apr 2023 20:40:16 -0700 Subject: DD-conversion for even K-Pro series --- keyboards/keychron/k6_pro/ansi/rgb/config.h | 48 ----- keyboards/keychron/k6_pro/ansi/rgb/info.json | 107 +++------- keyboards/keychron/k6_pro/ansi/rgb/rules.mk | 3 +- keyboards/keychron/k6_pro/ansi/white/config.h | 26 --- keyboards/keychron/k6_pro/ansi/white/info.json | 102 +++------- keyboards/keychron/k6_pro/ansi/white/rules.mk | 3 +- keyboards/keychron/k6_pro/config.h | 16 -- keyboards/keychron/k6_pro/info.json | 263 +++++++++++++++++++++++++ keyboards/keychron/k6_pro/iso/rgb/config.h | 48 ----- keyboards/keychron/k6_pro/iso/rgb/info.json | 108 +++------- keyboards/keychron/k6_pro/iso/rgb/rules.mk | 3 +- keyboards/keychron/k6_pro/iso/white/config.h | 26 --- keyboards/keychron/k6_pro/iso/white/info.json | 103 +++------- keyboards/keychron/k6_pro/iso/white/rules.mk | 3 +- keyboards/keychron/k6_pro/jis/rgb/config.h | 48 ----- keyboards/keychron/k6_pro/jis/rgb/info.json | 112 +++-------- keyboards/keychron/k6_pro/jis/rgb/rules.mk | 3 +- keyboards/keychron/k6_pro/rules.mk | 26 --- 18 files changed, 393 insertions(+), 655 deletions(-) create mode 100644 keyboards/keychron/k6_pro/info.json (limited to 'keyboards/keychron/k6_pro') diff --git a/keyboards/keychron/k6_pro/ansi/rgb/config.h b/keyboards/keychron/k6_pro/ansi/rgb/config.h index d3254ec33b..e76da758c9 100644 --- a/keyboards/keychron/k6_pro/ansi/rgb/config.h +++ b/keyboards/keychron/k6_pro/ansi/rgb/config.h @@ -46,54 +46,6 @@ # 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 \ { 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38 } diff --git a/keyboards/keychron/k6_pro/ansi/rgb/info.json b/keyboards/keychron/k6_pro/ansi/rgb/info.json index 9e8a9fa87d..0173358d64 100644 --- a/keyboards/keychron/k6_pro/ansi/rgb/info.json +++ b/keyboards/keychron/k6_pro/ansi/rgb/info.json @@ -1,89 +1,36 @@ { - "keyboard_name": "Keychron K6 Pro", - "manufacturer": "Keychron", - "url": "https://github.com/Keychron", - "maintainer": "lokher", "usb": { "vid": "0x3434", "pid": "0x0260", "device_version": "1.0.0" }, - "layouts": { - "LAYOUT_ansi_68": { - "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":[1, 0], "x":0, "y":2, "w":1.5}, - {"matrix":[1, 1], "x":1.5, "y":2}, - {"matrix":[1, 2], "x":2.5, "y":2}, - {"matrix":[1, 3], "x":3.5, "y":2}, - {"matrix":[1, 4], "x":4.5, "y":2}, - {"matrix":[1, 5], "x":5.5, "y":2}, - {"matrix":[1, 6], "x":6.5, "y":2}, - {"matrix":[1, 7], "x":7.5, "y":2}, - {"matrix":[1, 8], "x":8.5, "y":2}, - {"matrix":[1, 9], "x":9.5, "y":2}, - {"matrix":[1,10], "x":10.5, "y":2}, - {"matrix":[1,11], "x":11.5, "y":2}, - {"matrix":[1,12], "x":12.5, "y":2}, - {"matrix":[1,13], "x":13.5, "y":2, "w":1.5}, - {"matrix":[1,14], "x":15, "y":2}, - - {"matrix":[2, 0], "x":0, "y":3, "w":1.75}, - {"matrix":[2, 1], "x":1.75, "y":3}, - {"matrix":[2, 2], "x":2.75, "y":3}, - {"matrix":[2, 3], "x":3.75, "y":3}, - {"matrix":[2, 4], "x":4.75, "y":3}, - {"matrix":[2, 5], "x":5.75, "y":3}, - {"matrix":[2, 6], "x":6.75, "y":3}, - {"matrix":[2, 7], "x":7.75, "y":3}, - {"matrix":[2, 8], "x":8.75, "y":3}, - {"matrix":[2, 9], "x":9.75, "y":3}, - {"matrix":[2,10], "x":10.75, "y":3}, - {"matrix":[2,11], "x":11.75, "y":3}, - {"matrix":[2,13], "x":12.75, "y":3, "w":2.25}, - {"matrix":[2,14], "x":15, "y":3, "w":2.25}, - - {"matrix":[3, 0], "x":0, "y":4, "w":2.25}, - {"matrix":[3, 2], "x":2.25, "y":4}, - {"matrix":[3, 3], "x":3.25, "y":4}, - {"matrix":[3, 4], "x":4.25, "y":4}, - {"matrix":[3, 5], "x":5.25, "y":4}, - {"matrix":[3, 6], "x":6.25, "y":4}, - {"matrix":[3, 7], "x":7.25, "y":4}, - {"matrix":[3, 8], "x":8.25, "y":4}, - {"matrix":[3, 9], "x":9.25, "y":4}, - {"matrix":[3,10], "x":10.25, "y":4}, - {"matrix":[3,11], "x":11.25, "y":4}, - {"matrix":[3,12], "x":11.25, "y":4, "w":1.75}, - {"matrix":[3,13], "x":14, "y":4}, - {"matrix":[3,14], "x":15, "y":4}, - - {"matrix":[4, 0], "x":0, "y":5, "w":1.25}, - {"matrix":[4, 1], "x":1.25, "y":5, "w":1.25}, - {"matrix":[4, 2], "x":2.5, "y":5, "w":1.25}, - {"matrix":[4, 6], "x":3.75, "y":5, "w":6.25}, - {"matrix":[4, 9], "x":10, "y":5}, - {"matrix":[4,10], "x":11, "y":5}, - {"matrix":[4,11], "x":12, "y":5}, - {"matrix":[4,12], "x":13, "y":5}, - {"matrix":[4,13], "x":14, "y":5}, - {"matrix":[4,14], "x":15, "y":5} - ] + "features": { + "rgb_matrix": true + }, + "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 } } } diff --git a/keyboards/keychron/k6_pro/ansi/rgb/rules.mk b/keyboards/keychron/k6_pro/ansi/rgb/rules.mk index 7af34ccd60..f886ea2e8e 100644 --- a/keyboards/keychron/k6_pro/ansi/rgb/rules.mk +++ b/keyboards/keychron/k6_pro/ansi/rgb/rules.mk @@ -1,2 +1 @@ -RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 +# This file intentionally blank \ No newline at end of file diff --git a/keyboards/keychron/k6_pro/ansi/white/config.h b/keyboards/keychron/k6_pro/ansi/white/config.h index 8631928d19..ce82be861a 100644 --- a/keyboards/keychron/k6_pro/ansi/white/config.h +++ b/keyboards/keychron/k6_pro/ansi/white/config.h @@ -40,32 +40,6 @@ */ # 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 - /* Use first 6 channels of LED driver */ # define PHASE_CHANNEL MSKPHASE_6CHANNEL diff --git a/keyboards/keychron/k6_pro/ansi/white/info.json b/keyboards/keychron/k6_pro/ansi/white/info.json index 456efcdaf1..ef85ca63e4 100644 --- a/keyboards/keychron/k6_pro/ansi/white/info.json +++ b/keyboards/keychron/k6_pro/ansi/white/info.json @@ -1,89 +1,31 @@ { - "keyboard_name": "Keychron K6 Pro", - "manufacturer": "Keychron", - "url": "https://github.com/Keychron", - "maintainer": "lokher", "usb": { "vid": "0x3434", "pid": "0x0263", "device_version": "1.0.0" }, - "layouts": { - "LAYOUT_ansi_68": { - "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":[1, 0], "x":0, "y":2, "w":1.5}, - {"matrix":[1, 1], "x":1.5, "y":2}, - {"matrix":[1, 2], "x":2.5, "y":2}, - {"matrix":[1, 3], "x":3.5, "y":2}, - {"matrix":[1, 4], "x":4.5, "y":2}, - {"matrix":[1, 5], "x":5.5, "y":2}, - {"matrix":[1, 6], "x":6.5, "y":2}, - {"matrix":[1, 7], "x":7.5, "y":2}, - {"matrix":[1, 8], "x":8.5, "y":2}, - {"matrix":[1, 9], "x":9.5, "y":2}, - {"matrix":[1,10], "x":10.5, "y":2}, - {"matrix":[1,11], "x":11.5, "y":2}, - {"matrix":[1,12], "x":12.5, "y":2}, - {"matrix":[1,13], "x":13.5, "y":2, "w":1.5}, - {"matrix":[1,14], "x":15, "y":2}, - - {"matrix":[2, 0], "x":0, "y":3, "w":1.75}, - {"matrix":[2, 1], "x":1.75, "y":3}, - {"matrix":[2, 2], "x":2.75, "y":3}, - {"matrix":[2, 3], "x":3.75, "y":3}, - {"matrix":[2, 4], "x":4.75, "y":3}, - {"matrix":[2, 5], "x":5.75, "y":3}, - {"matrix":[2, 6], "x":6.75, "y":3}, - {"matrix":[2, 7], "x":7.75, "y":3}, - {"matrix":[2, 8], "x":8.75, "y":3}, - {"matrix":[2, 9], "x":9.75, "y":3}, - {"matrix":[2,10], "x":10.75, "y":3}, - {"matrix":[2,11], "x":11.75, "y":3}, - {"matrix":[2,13], "x":12.75, "y":3, "w":2.25}, - {"matrix":[2,14], "x":15, "y":3, "w":2.25}, - - {"matrix":[3, 0], "x":0, "y":4, "w":2.25}, - {"matrix":[3, 2], "x":2.25, "y":4}, - {"matrix":[3, 3], "x":3.25, "y":4}, - {"matrix":[3, 4], "x":4.25, "y":4}, - {"matrix":[3, 5], "x":5.25, "y":4}, - {"matrix":[3, 6], "x":6.25, "y":4}, - {"matrix":[3, 7], "x":7.25, "y":4}, - {"matrix":[3, 8], "x":8.25, "y":4}, - {"matrix":[3, 9], "x":9.25, "y":4}, - {"matrix":[3,10], "x":10.25, "y":4}, - {"matrix":[3,11], "x":11.25, "y":4}, - {"matrix":[3,12], "x":11.25, "y":4, "w":1.75}, - {"matrix":[3,13], "x":14, "y":4}, - {"matrix":[3,14], "x":15, "y":4}, - - {"matrix":[4, 0], "x":0, "y":5, "w":1.25}, - {"matrix":[4, 1], "x":1.25, "y":5, "w":1.25}, - {"matrix":[4, 2], "x":2.5, "y":5, "w":1.25}, - {"matrix":[4, 6], "x":3.75, "y":5, "w":6.25}, - {"matrix":[4, 9], "x":10, "y":5}, - {"matrix":[4,10], "x":11, "y":5}, - {"matrix":[4,11], "x":12, "y":5}, - {"matrix":[4,12], "x":13, "y":5}, - {"matrix":[4,13], "x":14, "y":5}, - {"matrix":[4,14], "x":15, "y":5} - ] + "features": { + "led_matrix": true + }, + "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 } } } diff --git a/keyboards/keychron/k6_pro/ansi/white/rules.mk b/keyboards/keychron/k6_pro/ansi/white/rules.mk index 6b0c2a0769..f886ea2e8e 100644 --- a/keyboards/keychron/k6_pro/ansi/white/rules.mk +++ b/keyboards/keychron/k6_pro/ansi/white/rules.mk @@ -1,2 +1 @@ -LED_MATRIX_ENABLE = yes -LED_MATRIX_DRIVER = CKLED2001 \ No newline at end of file +# This file intentionally blank \ No newline at end of file diff --git a/keyboards/keychron/k6_pro/config.h b/keyboards/keychron/k6_pro/config.h index 04f320780d..30d5e3176c 100644 --- a/keyboards/keychron/k6_pro/config.h +++ b/keyboards/keychron/k6_pro/config.h @@ -16,26 +16,10 @@ #pragma once -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 15 - -/* Key matrix pins */ -#define MATRIX_ROW_PINS \ - { B4, B3, A15, A14, A13 } -#define MATRIX_COL_PINS \ - { NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* Turn off effects when suspended */ #define RGB_DISABLE_WHEN_USB_SUSPENDED #define LED_DISABLE_WHEN_USB_SUSPENDED -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - /* DIP switch for Mac/win OS switch */ #define DIP_SWITCH_PINS \ { A8 } diff --git a/keyboards/keychron/k6_pro/info.json b/keyboards/keychron/k6_pro/info.json new file mode 100644 index 0000000000..5fa52ec7c5 --- /dev/null +++ b/keyboards/keychron/k6_pro/info.json @@ -0,0 +1,263 @@ +{ + "keyboard_name": "Keychron K6 Pro", + "manufacturer": "Keychron", + "url": "https://github.com/Keychron", + "maintainer": "lokher", + "processor": "STM32L432", + "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "dip_switch": true, + "raw": true + }, + "diode_direction": "ROW2COL", + "matrix_size": { + "rows": 5, + "cols": 15 + }, + "matrix_pins": { + "rows": ["B4", "B3", "A15", "A14", "A13"], + "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null], + "custom_lite": true + }, + "bluetooth": { + "driver": "custom" + }, + "layouts": { + "LAYOUT_ansi_68": { + "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":[1, 0], "x":0, "y":2, "w":1.5}, + {"matrix":[1, 1], "x":1.5, "y":2}, + {"matrix":[1, 2], "x":2.5, "y":2}, + {"matrix":[1, 3], "x":3.5, "y":2}, + {"matrix":[1, 4], "x":4.5, "y":2}, + {"matrix":[1, 5], "x":5.5, "y":2}, + {"matrix":[1, 6], "x":6.5, "y":2}, + {"matrix":[1, 7], "x":7.5, "y":2}, + {"matrix":[1, 8], "x":8.5, "y":2}, + {"matrix":[1, 9], "x":9.5, "y":2}, + {"matrix":[1,10], "x":10.5, "y":2}, + {"matrix":[1,11], "x":11.5, "y":2}, + {"matrix":[1,12], "x":12.5, "y":2}, + {"matrix":[1,13], "x":13.5, "y":2, "w":1.5}, + {"matrix":[1,14], "x":15, "y":2}, + + {"matrix":[2, 0], "x":0, "y":3, "w":1.75}, + {"matrix":[2, 1], "x":1.75, "y":3}, + {"matrix":[2, 2], "x":2.75, "y":3}, + {"matrix":[2, 3], "x":3.75, "y":3}, + {"matrix":[2, 4], "x":4.75, "y":3}, + {"matrix":[2, 5], "x":5.75, "y":3}, + {"matrix":[2, 6], "x":6.75, "y":3}, + {"matrix":[2, 7], "x":7.75, "y":3}, + {"matrix":[2, 8], "x":8.75, "y":3}, + {"matrix":[2, 9], "x":9.75, "y":3}, + {"matrix":[2,10], "x":10.75, "y":3}, + {"matrix":[2,11], "x":11.75, "y":3}, + {"matrix":[2,13], "x":12.75, "y":3, "w":2.25}, + {"matrix":[2,14], "x":15, "y":3, "w":2.25}, + + {"matrix":[3, 0], "x":0, "y":4, "w":2.25}, + {"matrix":[3, 2], "x":2.25, "y":4}, + {"matrix":[3, 3], "x":3.25, "y":4}, + {"matrix":[3, 4], "x":4.25, "y":4}, + {"matrix":[3, 5], "x":5.25, "y":4}, + {"matrix":[3, 6], "x":6.25, "y":4}, + {"matrix":[3, 7], "x":7.25, "y":4}, + {"matrix":[3, 8], "x":8.25, "y":4}, + {"matrix":[3, 9], "x":9.25, "y":4}, + {"matrix":[3,10], "x":10.25, "y":4}, + {"matrix":[3,11], "x":11.25, "y":4}, + {"matrix":[3,12], "x":11.25, "y":4, "w":1.75}, + {"matrix":[3,13], "x":14, "y":4}, + {"matrix":[3,14], "x":15, "y":4}, + + {"matrix":[4, 0], "x":0, "y":5, "w":1.25}, + {"matrix":[4, 1], "x":1.25, "y":5, "w":1.25}, + {"matrix":[4, 2], "x":2.5, "y":5, "w":1.25}, + {"matrix":[4, 6], "x":3.75, "y":5, "w":6.25}, + {"matrix":[4, 9], "x":10, "y":5}, + {"matrix":[4,10], "x":11, "y":5}, + {"matrix":[4,11], "x":12, "y":5}, + {"matrix":[4,12], "x":13, "y":5}, + {"matrix":[4,13], "x":14, "y":5}, + {"matrix":[4,14], "x":15, "y":5} + ] + }, + "LAYOUT_iso_69": { + "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":[1, 0], "x":0, "y":2, "w":1.5}, + {"matrix":[1, 1], "x":1.5, "y":2}, + {"matrix":[1, 2], "x":2.5, "y":2}, + {"matrix":[1, 3], "x":3.5, "y":2}, + {"matrix":[1, 4], "x":4.5, "y":2}, + {"matrix":[1, 5], "x":5.5, "y":2}, + {"matrix":[1, 6], "x":6.5, "y":2}, + {"matrix":[1, 7], "x":7.5, "y":2}, + {"matrix":[1, 8], "x":8.5, "y":2}, + {"matrix":[1, 9], "x":9.5, "y":2}, + {"matrix":[1,10], "x":10.5, "y":2}, + {"matrix":[1,11], "x":11.5, "y":2}, + {"matrix":[1,12], "x":12.5, "y":2}, + {"matrix":[1,13], "x":13.5, "y":2, "w":1.5}, + {"matrix":[1,14], "x":15, "y":2}, + + {"matrix":[2, 0], "x":0, "y":3, "w":1.75}, + {"matrix":[2, 1], "x":1.75, "y":3}, + {"matrix":[2, 2], "x":2.75, "y":3}, + {"matrix":[2, 3], "x":3.75, "y":3}, + {"matrix":[2, 4], "x":4.75, "y":3}, + {"matrix":[2, 5], "x":5.75, "y":3}, + {"matrix":[2, 6], "x":6.75, "y":3}, + {"matrix":[2, 7], "x":7.75, "y":3}, + {"matrix":[2, 8], "x":8.75, "y":3}, + {"matrix":[2, 9], "x":9.75, "y":3}, + {"matrix":[2,10], "x":10.75, "y":3}, + {"matrix":[2,11], "x":11.75, "y":3}, + {"matrix":[2,13], "x":12.75, "y":3, "w":2.25}, + {"matrix":[2,14], "x":15, "y":3, "w":2.25}, + + {"matrix":[3, 0], "x":0, "y":4, "w":1.25}, + {"matrix":[3, 1], "x":1.25, "y":4}, + {"matrix":[3, 2], "x":2.25, "y":4}, + {"matrix":[3, 3], "x":3.25, "y":4}, + {"matrix":[3, 4], "x":4.25, "y":4}, + {"matrix":[3, 5], "x":5.25, "y":4}, + {"matrix":[3, 6], "x":6.25, "y":4}, + {"matrix":[3, 7], "x":7.25, "y":4}, + {"matrix":[3, 8], "x":8.25, "y":4}, + {"matrix":[3, 9], "x":9.25, "y":4}, + {"matrix":[3,10], "x":10.25, "y":4}, + {"matrix":[3,11], "x":11.25, "y":4}, + {"matrix":[3,12], "x":11.25, "y":4, "w":1.75}, + {"matrix":[3,13], "x":14, "y":4}, + {"matrix":[3,14], "x":15, "y":4}, + + {"matrix":[4, 0], "x":0, "y":5, "w":1.25}, + {"matrix":[4, 1], "x":1.25, "y":5, "w":1.25}, + {"matrix":[4, 2], "x":2.5, "y":5, "w":1.25}, + {"matrix":[4, 6], "x":3.75, "y":5, "w":6.25}, + {"matrix":[4, 9], "x":10, "y":5}, + {"matrix":[4,10], "x":11, "y":5}, + {"matrix":[4,11], "x":12, "y":5}, + {"matrix":[4,12], "x":13, "y":5}, + {"matrix":[4,13], "x":14, "y":5}, + {"matrix":[4,14], "x":15, "y":5} + ] + }, + "LAYOUT": { + "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":[2,12], "x":13, "y":0}, + {"matrix":[0,13], "x":14, "y":0}, + {"matrix":[0,14], "x":15, "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,14], "x":15, "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}, + {"matrix":[1,13], "x":13.75, "y":1, "w":1.25, "h":2}, + {"matrix":[2,14], "x":15, "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,12], "x":12.25, "y":3}, + {"matrix":[3,13], "x":13.25, "y":3, "w":1.75}, + {"matrix":[3,14], "x":15, "y":3}, + + {"matrix":[4,0], "x":0, "y":4, "w":1.25}, + {"matrix":[4,1], "x":1.25, "y":4}, + {"matrix":[4,2], "x":2.25, "y":4, "w":1.25}, + {"matrix":[4,3], "x":3.5, "y":4}, + {"matrix":[4,6], "x":4.5, "y":4, "w":4.5}, + {"matrix":[4,8], "x":9, "y":4}, + {"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} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/keychron/k6_pro/iso/rgb/config.h b/keyboards/keychron/k6_pro/iso/rgb/config.h index af3eda73dd..2494f3c612 100644 --- a/keyboards/keychron/k6_pro/iso/rgb/config.h +++ b/keyboards/keychron/k6_pro/iso/rgb/config.h @@ -43,54 +43,6 @@ # 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 \ { 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38 } diff --git a/keyboards/keychron/k6_pro/iso/rgb/info.json b/keyboards/keychron/k6_pro/iso/rgb/info.json index 579a0c271c..859c3e695a 100644 --- a/keyboards/keychron/k6_pro/iso/rgb/info.json +++ b/keyboards/keychron/k6_pro/iso/rgb/info.json @@ -1,90 +1,36 @@ { - "keyboard_name": "Keychron K6 Pro", - "manufacturer": "Keychron", - "url": "https://github.com/Keychron", - "maintainer": "lokher", "usb": { "vid": "0x3434", "pid": "0x0261", "device_version": "1.0.0" }, - "layouts": { - "LAYOUT_iso_69": { - "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":[1, 0], "x":0, "y":2, "w":1.5}, - {"matrix":[1, 1], "x":1.5, "y":2}, - {"matrix":[1, 2], "x":2.5, "y":2}, - {"matrix":[1, 3], "x":3.5, "y":2}, - {"matrix":[1, 4], "x":4.5, "y":2}, - {"matrix":[1, 5], "x":5.5, "y":2}, - {"matrix":[1, 6], "x":6.5, "y":2}, - {"matrix":[1, 7], "x":7.5, "y":2}, - {"matrix":[1, 8], "x":8.5, "y":2}, - {"matrix":[1, 9], "x":9.5, "y":2}, - {"matrix":[1,10], "x":10.5, "y":2}, - {"matrix":[1,11], "x":11.5, "y":2}, - {"matrix":[1,12], "x":12.5, "y":2}, - {"matrix":[1,13], "x":13.5, "y":2, "w":1.5}, - {"matrix":[1,14], "x":15, "y":2}, - - {"matrix":[2, 0], "x":0, "y":3, "w":1.75}, - {"matrix":[2, 1], "x":1.75, "y":3}, - {"matrix":[2, 2], "x":2.75, "y":3}, - {"matrix":[2, 3], "x":3.75, "y":3}, - {"matrix":[2, 4], "x":4.75, "y":3}, - {"matrix":[2, 5], "x":5.75, "y":3}, - {"matrix":[2, 6], "x":6.75, "y":3}, - {"matrix":[2, 7], "x":7.75, "y":3}, - {"matrix":[2, 8], "x":8.75, "y":3}, - {"matrix":[2, 9], "x":9.75, "y":3}, - {"matrix":[2,10], "x":10.75, "y":3}, - {"matrix":[2,11], "x":11.75, "y":3}, - {"matrix":[2,13], "x":12.75, "y":3, "w":2.25}, - {"matrix":[2,14], "x":15, "y":3, "w":2.25}, - - {"matrix":[3, 0], "x":0, "y":4, "w":1.25}, - {"matrix":[3, 1], "x":1.25, "y":4}, - {"matrix":[3, 2], "x":2.25, "y":4}, - {"matrix":[3, 3], "x":3.25, "y":4}, - {"matrix":[3, 4], "x":4.25, "y":4}, - {"matrix":[3, 5], "x":5.25, "y":4}, - {"matrix":[3, 6], "x":6.25, "y":4}, - {"matrix":[3, 7], "x":7.25, "y":4}, - {"matrix":[3, 8], "x":8.25, "y":4}, - {"matrix":[3, 9], "x":9.25, "y":4}, - {"matrix":[3,10], "x":10.25, "y":4}, - {"matrix":[3,11], "x":11.25, "y":4}, - {"matrix":[3,12], "x":11.25, "y":4, "w":1.75}, - {"matrix":[3,13], "x":14, "y":4}, - {"matrix":[3,14], "x":15, "y":4}, - - {"matrix":[4, 0], "x":0, "y":5, "w":1.25}, - {"matrix":[4, 1], "x":1.25, "y":5, "w":1.25}, - {"matrix":[4, 2], "x":2.5, "y":5, "w":1.25}, - {"matrix":[4, 6], "x":3.75, "y":5, "w":6.25}, - {"matrix":[4, 9], "x":10, "y":5}, - {"matrix":[4,10], "x":11, "y":5}, - {"matrix":[4,11], "x":12, "y":5}, - {"matrix":[4,12], "x":13, "y":5}, - {"matrix":[4,13], "x":14, "y":5}, - {"matrix":[4,14], "x":15, "y":5} - ] + "features": { + "rgb_matrix": true + }, + "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 } } } diff --git a/keyboards/keychron/k6_pro/iso/rgb/rules.mk b/keyboards/keychron/k6_pro/iso/rgb/rules.mk index f5f4192470..f886ea2e8e 100644 --- a/keyboards/keychron/k6_pro/iso/rgb/rules.mk +++ b/keyboards/keychron/k6_pro/iso/rgb/rules.mk @@ -1,2 +1 @@ -RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 \ No newline at end of file +# This file intentionally blank \ No newline at end of file diff --git a/keyboards/keychron/k6_pro/iso/white/config.h b/keyboards/keychron/k6_pro/iso/white/config.h index 2898bce8d5..7fb303a468 100644 --- a/keyboards/keychron/k6_pro/iso/white/config.h +++ b/keyboards/keychron/k6_pro/iso/white/config.h @@ -37,32 +37,6 @@ */ # 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 - /* Use first 6 channels of LED driver */ # define PHASE_CHANNEL MSKPHASE_6CHANNEL diff --git a/keyboards/keychron/k6_pro/iso/white/info.json b/keyboards/keychron/k6_pro/iso/white/info.json index b961951a79..2057173fa8 100644 --- a/keyboards/keychron/k6_pro/iso/white/info.json +++ b/keyboards/keychron/k6_pro/iso/white/info.json @@ -1,90 +1,31 @@ { - "keyboard_name": "Keychron K6 Pro", - "manufacturer": "Keychron", - "url": "https://github.com/Keychron", - "maintainer": "lokher", "usb": { "vid": "0x3434", "pid": "0x0264", "device_version": "1.0.0" }, - "layouts": { - "LAYOUT_iso_69": { - "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":[1, 0], "x":0, "y":2, "w":1.5}, - {"matrix":[1, 1], "x":1.5, "y":2}, - {"matrix":[1, 2], "x":2.5, "y":2}, - {"matrix":[1, 3], "x":3.5, "y":2}, - {"matrix":[1, 4], "x":4.5, "y":2}, - {"matrix":[1, 5], "x":5.5, "y":2}, - {"matrix":[1, 6], "x":6.5, "y":2}, - {"matrix":[1, 7], "x":7.5, "y":2}, - {"matrix":[1, 8], "x":8.5, "y":2}, - {"matrix":[1, 9], "x":9.5, "y":2}, - {"matrix":[1,10], "x":10.5, "y":2}, - {"matrix":[1,11], "x":11.5, "y":2}, - {"matrix":[1,12], "x":12.5, "y":2}, - {"matrix":[1,13], "x":13.5, "y":2, "w":1.5}, - {"matrix":[1,14], "x":15, "y":2}, - - {"matrix":[2, 0], "x":0, "y":3, "w":1.75}, - {"matrix":[2, 1], "x":1.75, "y":3}, - {"matrix":[2, 2], "x":2.75, "y":3}, - {"matrix":[2, 3], "x":3.75, "y":3}, - {"matrix":[2, 4], "x":4.75, "y":3}, - {"matrix":[2, 5], "x":5.75, "y":3}, - {"matrix":[2, 6], "x":6.75, "y":3}, - {"matrix":[2, 7], "x":7.75, "y":3}, - {"matrix":[2, 8], "x":8.75, "y":3}, - {"matrix":[2, 9], "x":9.75, "y":3}, - {"matrix":[2,10], "x":10.75, "y":3}, - {"matrix":[2,11], "x":11.75, "y":3}, - {"matrix":[2,13], "x":12.75, "y":3, "w":2.25}, - {"matrix":[2,14], "x":15, "y":3, "w":2.25}, - - {"matrix":[3, 0], "x":0, "y":4, "w":1.25}, - {"matrix":[3, 1], "x":1.25, "y":4}, - {"matrix":[3, 2], "x":2.25, "y":4}, - {"matrix":[3, 3], "x":3.25, "y":4}, - {"matrix":[3, 4], "x":4.25, "y":4}, - {"matrix":[3, 5], "x":5.25, "y":4}, - {"matrix":[3, 6], "x":6.25, "y":4}, - {"matrix":[3, 7], "x":7.25, "y":4}, - {"matrix":[3, 8], "x":8.25, "y":4}, - {"matrix":[3, 9], "x":9.25, "y":4}, - {"matrix":[3,10], "x":10.25, "y":4}, - {"matrix":[3,11], "x":11.25, "y":4}, - {"matrix":[3,12], "x":11.25, "y":4, "w":1.75}, - {"matrix":[3,13], "x":14, "y":4}, - {"matrix":[3,14], "x":15, "y":4}, - - {"matrix":[4, 0], "x":0, "y":5, "w":1.25}, - {"matrix":[4, 1], "x":1.25, "y":5, "w":1.25}, - {"matrix":[4, 2], "x":2.5, "y":5, "w":1.25}, - {"matrix":[4, 6], "x":3.75, "y":5, "w":6.25}, - {"matrix":[4, 9], "x":10, "y":5}, - {"matrix":[4,10], "x":11, "y":5}, - {"matrix":[4,11], "x":12, "y":5}, - {"matrix":[4,12], "x":13, "y":5}, - {"matrix":[4,13], "x":14, "y":5}, - {"matrix":[4,14], "x":15, "y":5} - ] + "features": { + "led_matrix": true + }, + "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 } } } diff --git a/keyboards/keychron/k6_pro/iso/white/rules.mk b/keyboards/keychron/k6_pro/iso/white/rules.mk index 6b0c2a0769..f886ea2e8e 100644 --- a/keyboards/keychron/k6_pro/iso/white/rules.mk +++ b/keyboards/keychron/k6_pro/iso/white/rules.mk @@ -1,2 +1 @@ -LED_MATRIX_ENABLE = yes -LED_MATRIX_DRIVER = CKLED2001 \ No newline at end of file +# This file intentionally blank \ No newline at end of file diff --git a/keyboards/keychron/k6_pro/jis/rgb/config.h b/keyboards/keychron/k6_pro/jis/rgb/config.h index cae428a714..2212c6843e 100644 --- a/keyboards/keychron/k6_pro/jis/rgb/config.h +++ b/keyboards/keychron/k6_pro/jis/rgb/config.h @@ -42,54 +42,6 @@ # 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 \ { 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38 } diff --git a/keyboards/keychron/k6_pro/jis/rgb/info.json b/keyboards/keychron/k6_pro/jis/rgb/info.json index fde6618319..9f6a2282f8 100644 --- a/keyboards/keychron/k6_pro/jis/rgb/info.json +++ b/keyboards/keychron/k6_pro/jis/rgb/info.json @@ -1,94 +1,36 @@ { - "keyboard_name": "Keychron K6 Pro", - "manufacturer": "Keychron", - "url": "https://github.com/Keychron", - "maintainer": "lokher", "usb": { "vid": "0x3434", "pid": "0x0262", "device_version": "1.0.0" }, - "processor": "STM32L432", - "bootloader": "stm32-dfu", - "layouts": { - "LAYOUT": { - "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":[2,12], "x":13, "y":0}, - {"matrix":[0,13], "x":14, "y":0}, - {"matrix":[0,14], "x":15, "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,14], "x":15, "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}, - {"matrix":[1,13], "x":13.75, "y":1, "w":1.25, "h":2}, - {"matrix":[2,14], "x":15, "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,12], "x":12.25, "y":3}, - {"matrix":[3,13], "x":13.25, "y":3, "w":1.75}, - {"matrix":[3,14], "x":15, "y":3}, - - {"matrix":[4,0], "x":0, "y":4, "w":1.25}, - {"matrix":[4,1], "x":1.25, "y":4}, - {"matrix":[4,2], "x":2.25, "y":4, "w":1.25}, - {"matrix":[4,3], "x":3.5, "y":4}, - {"matrix":[4,6], "x":4.5, "y":4, "w":4.5}, - {"matrix":[4,8], "x":9, "y":4}, - {"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} - ] + "features": { + "rgb_matrix": true + }, + "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 } } } diff --git a/keyboards/keychron/k6_pro/jis/rgb/rules.mk b/keyboards/keychron/k6_pro/jis/rgb/rules.mk index f5f4192470..f886ea2e8e 100644 --- a/keyboards/keychron/k6_pro/jis/rgb/rules.mk +++ b/keyboards/keychron/k6_pro/jis/rgb/rules.mk @@ -1,2 +1 @@ -RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 \ No newline at end of file +# This file intentionally blank \ No newline at end of file diff --git a/keyboards/keychron/k6_pro/rules.mk b/keyboards/keychron/k6_pro/rules.mk index 7244d12fd2..be03bd962c 100644 --- a/keyboards/keychron/k6_pro/rules.mk +++ b/keyboards/keychron/k6_pro/rules.mk @@ -1,29 +1,3 @@ -# MCU name -MCU = STM32L432 - -# Bootloader selection -BOOTLOADER = stm32-dfu - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable boot magic -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 -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE = yes # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -BLUETOOTH_ENABLE = no # Enable Bluetooth with -BLUETOOTH_DRIVER = custom -AUDIO_ENABLE = no # Audio output on port C6 -DIP_SWITCH_ENABLE = yes -RAW_ENABLE = yes - # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST -- cgit v1.2.3 From 6e114ceebdfb5605460804b6314027b73ac71557 Mon Sep 17 00:00:00 2001 From: Adophoxia Date: Sat, 29 Apr 2023 13:18:38 -0700 Subject: Move `vid` into main `info.json` for K and Q Pro --- keyboards/keychron/k6_pro/ansi/rgb/info.json | 1 - keyboards/keychron/k6_pro/ansi/white/info.json | 1 - keyboards/keychron/k6_pro/info.json | 3 +++ keyboards/keychron/k6_pro/iso/rgb/info.json | 1 - keyboards/keychron/k6_pro/iso/white/info.json | 1 - keyboards/keychron/k6_pro/jis/rgb/info.json | 1 - 6 files changed, 3 insertions(+), 5 deletions(-) (limited to 'keyboards/keychron/k6_pro') diff --git a/keyboards/keychron/k6_pro/ansi/rgb/info.json b/keyboards/keychron/k6_pro/ansi/rgb/info.json index 0173358d64..002e792a42 100644 --- a/keyboards/keychron/k6_pro/ansi/rgb/info.json +++ b/keyboards/keychron/k6_pro/ansi/rgb/info.json @@ -1,6 +1,5 @@ { "usb": { - "vid": "0x3434", "pid": "0x0260", "device_version": "1.0.0" }, diff --git a/keyboards/keychron/k6_pro/ansi/white/info.json b/keyboards/keychron/k6_pro/ansi/white/info.json index ef85ca63e4..889b38509a 100644 --- a/keyboards/keychron/k6_pro/ansi/white/info.json +++ b/keyboards/keychron/k6_pro/ansi/white/info.json @@ -1,6 +1,5 @@ { "usb": { - "vid": "0x3434", "pid": "0x0263", "device_version": "1.0.0" }, diff --git a/keyboards/keychron/k6_pro/info.json b/keyboards/keychron/k6_pro/info.json index 5fa52ec7c5..a8ddc0cfa5 100644 --- a/keyboards/keychron/k6_pro/info.json +++ b/keyboards/keychron/k6_pro/info.json @@ -5,6 +5,9 @@ "maintainer": "lokher", "processor": "STM32L432", "bootloader": "stm32-dfu", + "usb": { + "vid": "0x3434" + }, "features": { "bootmagic": true, "mousekey": true, diff --git a/keyboards/keychron/k6_pro/iso/rgb/info.json b/keyboards/keychron/k6_pro/iso/rgb/info.json index 859c3e695a..e133e5cf86 100644 --- a/keyboards/keychron/k6_pro/iso/rgb/info.json +++ b/keyboards/keychron/k6_pro/iso/rgb/info.json @@ -1,6 +1,5 @@ { "usb": { - "vid": "0x3434", "pid": "0x0261", "device_version": "1.0.0" }, diff --git a/keyboards/keychron/k6_pro/iso/white/info.json b/keyboards/keychron/k6_pro/iso/white/info.json index 2057173fa8..a41ddd9455 100644 --- a/keyboards/keychron/k6_pro/iso/white/info.json +++ b/keyboards/keychron/k6_pro/iso/white/info.json @@ -1,6 +1,5 @@ { "usb": { - "vid": "0x3434", "pid": "0x0264", "device_version": "1.0.0" }, diff --git a/keyboards/keychron/k6_pro/jis/rgb/info.json b/keyboards/keychron/k6_pro/jis/rgb/info.json index 9f6a2282f8..5e6bd85fa1 100644 --- a/keyboards/keychron/k6_pro/jis/rgb/info.json +++ b/keyboards/keychron/k6_pro/jis/rgb/info.json @@ -1,6 +1,5 @@ { "usb": { - "vid": "0x3434", "pid": "0x0262", "device_version": "1.0.0" }, -- cgit v1.2.3 From 06d108b2bb4766085ac6d4a7ad5fc8120436b955 Mon Sep 17 00:00:00 2001 From: Adophoxia Date: Sun, 14 May 2023 16:22:33 -0700 Subject: Move `custom_lite` options from `rules.mk` to `info.json` --- keyboards/keychron/k6_pro/rules.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'keyboards/keychron/k6_pro') diff --git a/keyboards/keychron/k6_pro/rules.mk b/keyboards/keychron/k6_pro/rules.mk index be03bd962c..15ebea7eb8 100644 --- a/keyboards/keychron/k6_pro/rules.mk +++ b/keyboards/keychron/k6_pro/rules.mk @@ -3,7 +3,6 @@ OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST OPT_DEFS += -DKC_BLUETOOTH_ENABLE -CUSTOM_MATRIX = lite SRC += matrix.c include keyboards/keychron/bluetooth/bluetooth.mk -- cgit v1.2.3 From 29e430208ee32de118ebaa0580c3aaa975bb3998 Mon Sep 17 00:00:00 2001 From: adophoxia <100170946+adophoxia@users.noreply.github.com> Date: Thu, 25 May 2023 21:09:41 -0700 Subject: Update keyboards/keychron/k6_pro/info.json Co-authored-by: lokher --- keyboards/keychron/k6_pro/info.json | 3 --- 1 file changed, 3 deletions(-) (limited to 'keyboards/keychron/k6_pro') diff --git a/keyboards/keychron/k6_pro/info.json b/keyboards/keychron/k6_pro/info.json index a8ddc0cfa5..9aaa9ac6df 100644 --- a/keyboards/keychron/k6_pro/info.json +++ b/keyboards/keychron/k6_pro/info.json @@ -26,9 +26,6 @@ "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null], "custom_lite": true }, - "bluetooth": { - "driver": "custom" - }, "layouts": { "LAYOUT_ansi_68": { "layout": [ -- cgit v1.2.3 From 358fb61811361d1c0c6eec0d2867e99a260d70ea Mon Sep 17 00:00:00 2001 From: adophoxia <100170946+adophoxia@users.noreply.github.com> Date: Fri, 26 May 2023 01:04:34 -0700 Subject: Update keyboards/keychron/k6_pro/info.json Co-authored-by: lokher --- keyboards/keychron/k6_pro/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/keychron/k6_pro') diff --git a/keyboards/keychron/k6_pro/info.json b/keyboards/keychron/k6_pro/info.json index 9aaa9ac6df..e545466376 100644 --- a/keyboards/keychron/k6_pro/info.json +++ b/keyboards/keychron/k6_pro/info.json @@ -153,7 +153,7 @@ {"matrix":[2,14], "x":15, "y":3, "w":2.25}, {"matrix":[3, 0], "x":0, "y":4, "w":1.25}, - {"matrix":[3, 1], "x":1.25, "y":4}, + {"matrix":[3, 1], "x":1.25, "y":4}, {"matrix":[3, 2], "x":2.25, "y":4}, {"matrix":[3, 3], "x":3.25, "y":4}, {"matrix":[3, 4], "x":4.25, "y":4}, -- cgit v1.2.3 From 5856c95340be1f855fcd342ecb2f8446a7adbcda Mon Sep 17 00:00:00 2001 From: lokher Date: Tue, 13 Jun 2023 10:58:50 +0800 Subject: move OPT_DEFS += -DKC_BLUETOOTH_ENABLE to bluetooth.mk --- keyboards/keychron/k6_pro/info.json | 5 +++-- keyboards/keychron/k6_pro/rules.mk | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'keyboards/keychron/k6_pro') diff --git a/keyboards/keychron/k6_pro/info.json b/keyboards/keychron/k6_pro/info.json index e545466376..162e40a482 100644 --- a/keyboards/keychron/k6_pro/info.json +++ b/keyboards/keychron/k6_pro/info.json @@ -24,7 +24,8 @@ "matrix_pins": { "rows": ["B4", "B3", "A15", "A14", "A13"], "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null], - "custom_lite": true + "custom": true, + "custom_lite": true }, "layouts": { "LAYOUT_ansi_68": { @@ -260,4 +261,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/keychron/k6_pro/rules.mk b/keyboards/keychron/k6_pro/rules.mk index 15ebea7eb8..8e536fc345 100644 --- a/keyboards/keychron/k6_pro/rules.mk +++ b/keyboards/keychron/k6_pro/rules.mk @@ -1,7 +1,6 @@ # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST -OPT_DEFS += -DKC_BLUETOOTH_ENABLE SRC += matrix.c -- cgit v1.2.3 From 98b5af8936667585820f110da9ca56376c246e14 Mon Sep 17 00:00:00 2001 From: lokher Date: Thu, 15 Jun 2023 15:39:00 +0800 Subject: add compiled firmware --- .../k6_pro/firmware/keychron_k6_pro_ansi_rgb_via.bin | Bin 0 -> 57996 bytes .../k6_pro/firmware/keychron_k6_pro_ansi_white_via.bin | Bin 0 -> 49044 bytes .../k6_pro/firmware/keychron_k6_pro_iso_rgb_via.bin | Bin 0 -> 58008 bytes .../k6_pro/firmware/keychron_k6_pro_iso_white_via.bin | Bin 0 -> 49044 bytes .../k6_pro/firmware/keychron_k6_pro_jis_rgb_via.bin | Bin 0 -> 57988 bytes 5 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 keyboards/keychron/k6_pro/firmware/keychron_k6_pro_ansi_rgb_via.bin create mode 100644 keyboards/keychron/k6_pro/firmware/keychron_k6_pro_ansi_white_via.bin create mode 100644 keyboards/keychron/k6_pro/firmware/keychron_k6_pro_iso_rgb_via.bin create mode 100644 keyboards/keychron/k6_pro/firmware/keychron_k6_pro_iso_white_via.bin create mode 100644 keyboards/keychron/k6_pro/firmware/keychron_k6_pro_jis_rgb_via.bin (limited to 'keyboards/keychron/k6_pro') diff --git a/keyboards/keychron/k6_pro/firmware/keychron_k6_pro_ansi_rgb_via.bin b/keyboards/keychron/k6_pro/firmware/keychron_k6_pro_ansi_rgb_via.bin new file mode 100644 index 0000000000..319d540dc2 Binary files /dev/null and b/keyboards/keychron/k6_pro/firmware/keychron_k6_pro_ansi_rgb_via.bin differ diff --git a/keyboards/keychron/k6_pro/firmware/keychron_k6_pro_ansi_white_via.bin b/keyboards/keychron/k6_pro/firmware/keychron_k6_pro_ansi_white_via.bin new file mode 100644 index 0000000000..ee0aa8f33b Binary files /dev/null and b/keyboards/keychron/k6_pro/firmware/keychron_k6_pro_ansi_white_via.bin differ diff --git a/keyboards/keychron/k6_pro/firmware/keychron_k6_pro_iso_rgb_via.bin b/keyboards/keychron/k6_pro/firmware/keychron_k6_pro_iso_rgb_via.bin new file mode 100644 index 0000000000..f79494d025 Binary files /dev/null and b/keyboards/keychron/k6_pro/firmware/keychron_k6_pro_iso_rgb_via.bin differ diff --git a/keyboards/keychron/k6_pro/firmware/keychron_k6_pro_iso_white_via.bin b/keyboards/keychron/k6_pro/firmware/keychron_k6_pro_iso_white_via.bin new file mode 100644 index 0000000000..86c521e2dc Binary files /dev/null and b/keyboards/keychron/k6_pro/firmware/keychron_k6_pro_iso_white_via.bin differ diff --git a/keyboards/keychron/k6_pro/firmware/keychron_k6_pro_jis_rgb_via.bin b/keyboards/keychron/k6_pro/firmware/keychron_k6_pro_jis_rgb_via.bin new file mode 100644 index 0000000000..57bf98be7e Binary files /dev/null and b/keyboards/keychron/k6_pro/firmware/keychron_k6_pro_jis_rgb_via.bin differ -- cgit v1.2.3