Merge branch 'temp' into keychron_q6_pro

23 files changed, 394 insertions, 662 deletions

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..002e792a42 100644
--- a/keyboards/keychron/k6_pro/ansi/rgb/info.json
+++ b/keyboards/keychron/k6_pro/ansi/rgb/info.json
@@ -1,89 +1,35 @@
 {
-    "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..889b38509a 100644
--- a/keyboards/keychron/k6_pro/ansi/white/info.json
+++ b/keyboards/keychron/k6_pro/ansi/white/info.json
@@ -1,89 +1,30 @@
 {
-    "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/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
--- /dev/null
+++ b/keyboards/keychron/k6_pro/firmware/keychron_k6_pro_ansi_rgb_via.bin
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
--- /dev/null
+++ b/keyboards/keychron/k6_pro/firmware/keychron_k6_pro_ansi_white_via.bin
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
--- /dev/null
+++ b/keyboards/keychron/k6_pro/firmware/keychron_k6_pro_iso_rgb_via.bin
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
--- /dev/null
+++ b/keyboards/keychron/k6_pro/firmware/keychron_k6_pro_iso_white_via.bin
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
--- /dev/null
+++ b/keyboards/keychron/k6_pro/firmware/keychron_k6_pro_jis_rgb_via.bin
diff --git a/keyboards/keychron/k6_pro/info.json b/keyboards/keychron/k6_pro/info.json
new file mode 100644
index 0000000000..162e40a482
--- /dev/null
+++ b/keyboards/keychron/k6_pro/info.json
@@ -0,0 +1,264 @@
+{
+    "keyboard_name": "Keychron K6 Pro",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lokher",
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "usb": {
+    	"vid": "0x3434"
+    },
+    "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": true,
+        "custom_lite": true
+    },
+    "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}
+            ]
+        }
+    }
+}
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