Add K6 Pro;Fix PID of K8 Pro ISO RGB

8 files changed, 41 insertions, 5 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