summaryrefslogtreecommitdiffstats
path: root/keyboards/keychron/k8_pro
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/keychron/k8_pro')
-rw-r--r--keyboards/keychron/k8_pro/ansi/rgb/config.h24
-rw-r--r--keyboards/keychron/k8_pro/ansi/rgb/keymaps/default/keymap.c1
-rw-r--r--keyboards/keychron/k8_pro/ansi/rgb/keymaps/via/keymap.c1
-rw-r--r--keyboards/keychron/k8_pro/ansi/rgb/rgb.c2
-rw-r--r--keyboards/keychron/k8_pro/ansi/white/config.h15
-rw-r--r--keyboards/keychron/k8_pro/ansi/white/keymaps/default/keymap.c1
-rw-r--r--keyboards/keychron/k8_pro/ansi/white/keymaps/via/keymap.c1
-rw-r--r--keyboards/keychron/k8_pro/ansi/white/white.c1
-rw-r--r--keyboards/keychron/k8_pro/iso/rgb/config.h26
-rw-r--r--keyboards/keychron/k8_pro/iso/rgb/info.json2
-rw-r--r--keyboards/keychron/k8_pro/iso/rgb/keymaps/default/keymap.c1
-rw-r--r--keyboards/keychron/k8_pro/iso/rgb/keymaps/via/keymap.c1
-rw-r--r--keyboards/keychron/k8_pro/iso/white/config.h15
-rw-r--r--keyboards/keychron/k8_pro/iso/white/white.c1
-rw-r--r--keyboards/keychron/k8_pro/k8_pro.h2
15 files changed, 82 insertions, 12 deletions
diff --git a/keyboards/keychron/k8_pro/ansi/rgb/config.h b/keyboards/keychron/k8_pro/ansi/rgb/config.h
index f6f92da294..f8e36e4649 100644
--- a/keyboards/keychron/k8_pro/ansi/rgb/config.h
+++ b/keyboards/keychron/k8_pro/ansi/rgb/config.h
@@ -43,7 +43,15 @@
# 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
@@ -55,8 +63,15 @@
# 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
@@ -64,12 +79,19 @@
/* 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}
+# define CKLED2001_CURRENT_TUNE {0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38}
#endif
diff --git a/keyboards/keychron/k8_pro/ansi/rgb/keymaps/default/keymap.c b/keyboards/keychron/k8_pro/ansi/rgb/keymaps/default/keymap.c
index e8fb59cc4c..feb3c860be 100644
--- a/keyboards/keychron/k8_pro/ansi/rgb/keymaps/default/keymap.c
+++ b/keyboards/keychron/k8_pro/ansi/rgb/keymaps/default/keymap.c
@@ -16,6 +16,7 @@
#include QMK_KEYBOARD_H
+// clang-format off
enum layers{
MAC_BASE,
MAC_FN,
diff --git a/keyboards/keychron/k8_pro/ansi/rgb/keymaps/via/keymap.c b/keyboards/keychron/k8_pro/ansi/rgb/keymaps/via/keymap.c
index 058e7f396c..51daaeeadc 100644
--- a/keyboards/keychron/k8_pro/ansi/rgb/keymaps/via/keymap.c
+++ b/keyboards/keychron/k8_pro/ansi/rgb/keymaps/via/keymap.c
@@ -16,6 +16,7 @@
#include QMK_KEYBOARD_H
+// clang-format off
enum layers{
MAC_BASE,
MAC_FN,
diff --git a/keyboards/keychron/k8_pro/ansi/rgb/rgb.c b/keyboards/keychron/k8_pro/ansi/rgb/rgb.c
index dfbbdc9d70..a89d1e7f95 100644
--- a/keyboards/keychron/k8_pro/ansi/rgb/rgb.c
+++ b/keyboards/keychron/k8_pro/ansi/rgb/rgb.c
@@ -16,6 +16,7 @@
#include "quantum.h"
+// clang-format off
#ifdef RGB_MATRIX_ENABLE
const ckled2001_led g_ckled2001_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations
@@ -118,7 +119,6 @@ const ckled2001_led g_ckled2001_leds[DRIVER_LED_TOTAL] = {
{1, A_4, B_4, C_4}
};
-
led_config_t g_led_config = {
{
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, NO_LED, 13, 14, 15 },
diff --git a/keyboards/keychron/k8_pro/ansi/white/config.h b/keyboards/keychron/k8_pro/ansi/white/config.h
index 3f2ed81a41..a7848f29f9 100644
--- a/keyboards/keychron/k8_pro/ansi/white/config.h
+++ b/keyboards/keychron/k8_pro/ansi/white/config.h
@@ -21,7 +21,7 @@
# define DRIVER_LED_TOTAL 87
/* Set to infinit, which is use in USB mode by default */
-#define LED_DISABLE_TIMEOUT LED_DISABLE_TIME_INFINITE
+# define LED_DISABLE_TIMEOUT LED_DISABLE_TIME_INFINITE
/* Allow shutdown of led driver to save power */
# define LED_MATRIX_DRIVER_SHUTDOWN_ENABLE
/* Turn off backlight on low brightness to save power */
@@ -35,26 +35,35 @@
# 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
+# define PHASE_CHANNEL MSKPHASE_6CHANNEL
/* Set LED driver current */
-#define CKLED2001_CURRENT_TUNE { 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60 }
+# define CKLED2001_CURRENT_TUNE { 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60 }
#endif
diff --git a/keyboards/keychron/k8_pro/ansi/white/keymaps/default/keymap.c b/keyboards/keychron/k8_pro/ansi/white/keymaps/default/keymap.c
index 508cea5648..4c99ef1348 100644
--- a/keyboards/keychron/k8_pro/ansi/white/keymaps/default/keymap.c
+++ b/keyboards/keychron/k8_pro/ansi/white/keymaps/default/keymap.c
@@ -16,6 +16,7 @@
#include QMK_KEYBOARD_H
+// clang-format off
enum layers{
MAC_BASE,
MAC_FN,
diff --git a/keyboards/keychron/k8_pro/ansi/white/keymaps/via/keymap.c b/keyboards/keychron/k8_pro/ansi/white/keymaps/via/keymap.c
index 4ec6db80fd..64a1bf5723 100644
--- a/keyboards/keychron/k8_pro/ansi/white/keymaps/via/keymap.c
+++ b/keyboards/keychron/k8_pro/ansi/white/keymaps/via/keymap.c
@@ -16,6 +16,7 @@
#include QMK_KEYBOARD_H
+// clang-format off
enum layers{
MAC_BASE,
MAC_FN,
diff --git a/keyboards/keychron/k8_pro/ansi/white/white.c b/keyboards/keychron/k8_pro/ansi/white/white.c
index 2b8cd893d6..c813f45d09 100644
--- a/keyboards/keychron/k8_pro/ansi/white/white.c
+++ b/keyboards/keychron/k8_pro/ansi/white/white.c
@@ -16,6 +16,7 @@
#include "quantum.h"
+// clang-format off
#ifdef LED_MATRIX_ENABLE
const ckled2001_led g_ckled2001_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations
diff --git a/keyboards/keychron/k8_pro/iso/rgb/config.h b/keyboards/keychron/k8_pro/iso/rgb/config.h
index 6bbf1e3cbb..f66597aea1 100644
--- a/keyboards/keychron/k8_pro/iso/rgb/config.h
+++ b/keyboards/keychron/k8_pro/iso/rgb/config.h
@@ -25,7 +25,7 @@
# define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
/* Set to infinit, which is use in USB mode by default */
-#define RGB_DISABLE_TIMEOUT RGB_DISABLE_TIME_INFINITE
+# define RGB_DISABLE_TIMEOUT RGB_DISABLE_TIME_INFINITE
/* Allow shutdown of led driver to save power */
# define RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE
/* Turn off backlight on low brightness to save power */
@@ -42,7 +42,15 @@
# 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
@@ -54,8 +62,15 @@
# 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
@@ -63,12 +78,19 @@
/* 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}
+# define CKLED2001_CURRENT_TUNE {0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38}
#endif
diff --git a/keyboards/keychron/k8_pro/iso/rgb/info.json b/keyboards/keychron/k8_pro/iso/rgb/info.json
index 8595f268f2..8fe3d49b3b 100644
--- a/keyboards/keychron/k8_pro/iso/rgb/info.json
+++ b/keyboards/keychron/k8_pro/iso/rgb/info.json
@@ -4,7 +4,7 @@
"maintainer": "lokher",
"usb": {
"vid": "0x3434",
- "pid": "0x0282",
+ "pid": "0x0281",
"device_version": "1.0.0"
},
"layouts": {
diff --git a/keyboards/keychron/k8_pro/iso/rgb/keymaps/default/keymap.c b/keyboards/keychron/k8_pro/iso/rgb/keymaps/default/keymap.c
index 379a01d456..df42bd924e 100644
--- a/keyboards/keychron/k8_pro/iso/rgb/keymaps/default/keymap.c
+++ b/keyboards/keychron/k8_pro/iso/rgb/keymaps/default/keymap.c
@@ -16,6 +16,7 @@
#include QMK_KEYBOARD_H
+// clang-format off
enum layers{
MAC_BASE,
MAC_FN,
diff --git a/keyboards/keychron/k8_pro/iso/rgb/keymaps/via/keymap.c b/keyboards/keychron/k8_pro/iso/rgb/keymaps/via/keymap.c
index 379a01d456..df42bd924e 100644
--- a/keyboards/keychron/k8_pro/iso/rgb/keymaps/via/keymap.c
+++ b/keyboards/keychron/k8_pro/iso/rgb/keymaps/via/keymap.c
@@ -16,6 +16,7 @@
#include QMK_KEYBOARD_H
+// clang-format off
enum layers{
MAC_BASE,
MAC_FN,
diff --git a/keyboards/keychron/k8_pro/iso/white/config.h b/keyboards/keychron/k8_pro/iso/white/config.h
index 489307c5cd..86146deddf 100644
--- a/keyboards/keychron/k8_pro/iso/white/config.h
+++ b/keyboards/keychron/k8_pro/iso/white/config.h
@@ -21,7 +21,7 @@
# define DRIVER_LED_TOTAL 88
/* Set to infinit, which is use in USB mode by default */
-#define LED_DISABLE_TIMEOUT LED_DISABLE_TIME_INFINITE
+# define LED_DISABLE_TIMEOUT LED_DISABLE_TIME_INFINITE
/* Allow shutdown of led driver to save power */
# define LED_MATRIX_DRIVER_SHUTDOWN_ENABLE
/* Turn off backlight on low brightness to save power */
@@ -35,25 +35,34 @@
# 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
+# define PHASE_CHANNEL MSKPHASE_6CHANNEL
/* Set LED driver current */
-#define CKLED2001_CURRENT_TUNE { 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60 }
+# define CKLED2001_CURRENT_TUNE { 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60 }
#endif
diff --git a/keyboards/keychron/k8_pro/iso/white/white.c b/keyboards/keychron/k8_pro/iso/white/white.c
index 33736f8780..452bba180d 100644
--- a/keyboards/keychron/k8_pro/iso/white/white.c
+++ b/keyboards/keychron/k8_pro/iso/white/white.c
@@ -16,6 +16,7 @@
#include "quantum.h"
+// clang-format off
#ifdef LED_MATRIX_ENABLE
const ckled2001_led g_ckled2001_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations
diff --git a/keyboards/keychron/k8_pro/k8_pro.h b/keyboards/keychron/k8_pro/k8_pro.h
index 310ea6ab70..371b49110f 100644
--- a/keyboards/keychron/k8_pro/k8_pro.h
+++ b/keyboards/keychron/k8_pro/k8_pro.h
@@ -29,6 +29,7 @@
# define USER_START SAFE_RANGE
#endif
+// clang-format off
enum {
KC_LOPTN = USER_START,
KC_ROPTN,
@@ -49,7 +50,6 @@ enum {
BAT_LVL,
};
-
#define LAYOUT_ansi_87( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0F, K0G, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \