DD-conversion for odd K-Pro series

6 files changed, 52 insertions, 283 deletions

diff --git a/keyboards/keychron/k1_pro/ansi/rgb/config.h b/keyboards/keychron/k1_pro/ansi/rgb/config.h
index e6227054cc..5a97419722 100644
--- a/keyboards/keychron/k1_pro/ansi/rgb/config.h
+++ b/keyboards/keychron/k1_pro/ansi/rgb/config.h
@@ -41,55 +41,7 @@
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
 
 #    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
+#    define RGB_MATRIX_FRAMEBUFFER_EFFECT
 
 /* Use first 9 channels of LED driver */
 #    define PHASE_CHANNEL MSKPHASE_9CHANNEL
diff --git a/keyboards/keychron/k1_pro/ansi/rgb/info.json b/keyboards/keychron/k1_pro/ansi/rgb/info.json
index ca4b4d079d..1d7bee6f69 100644
--- a/keyboards/keychron/k1_pro/ansi/rgb/info.json
+++ b/keyboards/keychron/k1_pro/ansi/rgb/info.json
@@ -1,111 +1,36 @@
 {
-    "keyboard_name": "Keychron K1 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
     "usb": {
         "vid": "0x3434",
         "pid": "0x0210",
         "device_version": "1.0.1"
     },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_tkl_ansi": {
-            "layout": [
-                {"matrix":[0,0], "x":0, "y":0},
-                {"matrix":[0,1], "x":2, "y":0},
-                {"matrix":[0,2], "x":3, "y":0},
-                {"matrix":[0,3], "x":4, "y":0},
-                {"matrix":[0,4], "x":5, "y":0},
-                {"matrix":[0,5], "x":6.5, "y":0},
-                {"matrix":[0,6], "x":7.5, "y":0},
-                {"matrix":[0,7], "x":8.5, "y":0},
-                {"matrix":[0,8], "x":9.5, "y":0},
-                {"matrix":[0,9], "x":11, "y":0},
-                {"matrix":[0,10], "x":12, "y":0},
-                {"matrix":[0,11], "x":13, "y":0},
-                {"matrix":[0,12], "x":14, "y":0},
-                {"matrix":[0,14], "x":15.25, "y":0},
-                {"matrix":[0,15], "x":16.25, "y":0},
-                {"matrix":[0,16], "x":17.25, "y":0},
-
-                {"matrix":[1,0], "x":0, "y":1.25},
-                {"matrix":[1,1], "x":1, "y":1.25},
-                {"matrix":[1,2], "x":2, "y":1.25},
-                {"matrix":[1,3], "x":3, "y":1.25},
-                {"matrix":[1,4], "x":4, "y":1.25},
-                {"matrix":[1,5], "x":5, "y":1.25},
-                {"matrix":[1,6], "x":6, "y":1.25},
-                {"matrix":[1,7], "x":7, "y":1.25},
-                {"matrix":[1,8], "x":8, "y":1.25},
-                {"matrix":[1,9], "x":9, "y":1.25},
-                {"matrix":[1,10], "x":10, "y":1.25},
-                {"matrix":[1,11], "x":11, "y":1.25},
-                {"matrix":[1,12], "x":12, "y":1.25},
-                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1,14], "x":15.25, "y":1.25},
-                {"matrix":[1,15], "x":16.25, "y":1.25},
-                {"matrix":[1,16], "x":17.25, "y":1.25},
-
-                {"matrix":[2,0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2,1], "x":1.5, "y":2.25},
-                {"matrix":[2,2], "x":2.5, "y":2.25},
-                {"matrix":[2,3], "x":3.5, "y":2.25},
-                {"matrix":[2,4], "x":4.5, "y":2.25},
-                {"matrix":[2,5], "x":5.5, "y":2.25},
-                {"matrix":[2,6], "x":6.5, "y":2.25},
-                {"matrix":[2,7], "x":7.5, "y":2.25},
-                {"matrix":[2,8], "x":8.5, "y":2.25},
-                {"matrix":[2,9], "x":9.5, "y":2.25},
-                {"matrix":[2,10], "x":10.5, "y":2.25},
-                {"matrix":[2,11], "x":11.5, "y":2.25},
-                {"matrix":[2,12], "x":12.5, "y":2.25},
-                {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
-                {"matrix":[2,14], "x":15.25, "y":2.25},
-                {"matrix":[2,15], "x":16.25, "y":2.25},
-                {"matrix":[2,16], "x":17.25, "y":2.25},
-
-                {"matrix":[3,0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3,1], "x":1.75, "y":3.25},
-                {"matrix":[3,2], "x":2.75, "y":3.25},
-                {"matrix":[3,3], "x":3.75, "y":3.25},
-                {"matrix":[3,4], "x":4.75, "y":3.25},
-                {"matrix":[3,5], "x":5.75, "y":3.25},
-                {"matrix":[3,6], "x":6.75, "y":3.25},
-                {"matrix":[3,7], "x":7.75, "y":3.25},
-                {"matrix":[3,8], "x":8.75, "y":3.25},
-                {"matrix":[3,9], "x":9.75, "y":3.25},
-                {"matrix":[3,10], "x":10.75, "y":3.25},
-                {"matrix":[3,11], "x":11.75, "y":3.25},
-                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
-
-                {"matrix":[4,0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4,2], "x":2.25, "y":4.25},
-                {"matrix":[4,3], "x":3.25, "y":4.25},
-                {"matrix":[4,4], "x":4.25, "y":4.25},
-                {"matrix":[4,5], "x":5.25, "y":4.25},
-                {"matrix":[4,6], "x":6.25, "y":4.25},
-                {"matrix":[4,7], "x":7.25, "y":4.25},
-                {"matrix":[4,8], "x":8.25, "y":4.25},
-                {"matrix":[4,9], "x":9.25, "y":4.25},
-                {"matrix":[4,10], "x":10.25, "y":4.25},
-                {"matrix":[4,11], "x":11.25, "y":4.25},
-                {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
-                {"matrix":[4,15], "x":16.25, "y":4.25},
-
-                {"matrix":[5,0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5,1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5,2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5,6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5,10], "x":10, "y":5.25, "w":1.25},
-                {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
-                {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
-                {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5,14], "x":15.25, "y":5.25},
-                {"matrix":[5,15], "x":16.25, "y":5.25},
-                {"matrix":[5,16], "x":17.25, "y":5.25}
-            ]
+    "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/k1_pro/ansi/rgb/rules.mk b/keyboards/keychron/k1_pro/ansi/rgb/rules.mk
index 7af34ccd60..f886ea2e8e 100644
--- a/keyboards/keychron/k1_pro/ansi/rgb/rules.mk
+++ b/keyboards/keychron/k1_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/k1_pro/ansi/white/config.h b/keyboards/keychron/k1_pro/ansi/white/config.h
index ac29af2439..bfd714a2c1 100644
--- a/keyboards/keychron/k1_pro/ansi/white/config.h
+++ b/keyboards/keychron/k1_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/k1_pro/ansi/white/info.json b/keyboards/keychron/k1_pro/ansi/white/info.json
index 8b7ad7c4b8..9d626291c5 100644
--- a/keyboards/keychron/k1_pro/ansi/white/info.json
+++ b/keyboards/keychron/k1_pro/ansi/white/info.json
@@ -1,111 +1,31 @@
 {
-    "keyboard_name": "Keychron K1 Pro",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
     "usb": {
         "vid": "0x3434",
         "pid": "0x0213",
         "device_version": "1.0.1"
     },
-    "processor": "STM32L432",
-    "bootloader": "stm32-dfu",
-    "layouts": {
-        "LAYOUT_tkl_ansi": {
-            "layout": [
-                {"matrix":[0,0], "x":0, "y":0},
-                {"matrix":[0,1], "x":2, "y":0},
-                {"matrix":[0,2], "x":3, "y":0},
-                {"matrix":[0,3], "x":4, "y":0},
-                {"matrix":[0,4], "x":5, "y":0},
-                {"matrix":[0,5], "x":6.5, "y":0},
-                {"matrix":[0,6], "x":7.5, "y":0},
-                {"matrix":[0,7], "x":8.5, "y":0},
-                {"matrix":[0,8], "x":9.5, "y":0},
-                {"matrix":[0,9], "x":11, "y":0},
-                {"matrix":[0,10], "x":12, "y":0},
-                {"matrix":[0,11], "x":13, "y":0},
-                {"matrix":[0,12], "x":14, "y":0},
-                {"matrix":[0,14], "x":15.25, "y":0},
-                {"matrix":[0,15], "x":16.25, "y":0},
-                {"matrix":[0,16], "x":17.25, "y":0},
-
-                {"matrix":[1,0], "x":0, "y":1.25},
-                {"matrix":[1,1], "x":1, "y":1.25},
-                {"matrix":[1,2], "x":2, "y":1.25},
-                {"matrix":[1,3], "x":3, "y":1.25},
-                {"matrix":[1,4], "x":4, "y":1.25},
-                {"matrix":[1,5], "x":5, "y":1.25},
-                {"matrix":[1,6], "x":6, "y":1.25},
-                {"matrix":[1,7], "x":7, "y":1.25},
-                {"matrix":[1,8], "x":8, "y":1.25},
-                {"matrix":[1,9], "x":9, "y":1.25},
-                {"matrix":[1,10], "x":10, "y":1.25},
-                {"matrix":[1,11], "x":11, "y":1.25},
-                {"matrix":[1,12], "x":12, "y":1.25},
-                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1,14], "x":15.25, "y":1.25},
-                {"matrix":[1,15], "x":16.25, "y":1.25},
-                {"matrix":[1,16], "x":17.25, "y":1.25},
-
-                {"matrix":[2,0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2,1], "x":1.5, "y":2.25},
-                {"matrix":[2,2], "x":2.5, "y":2.25},
-                {"matrix":[2,3], "x":3.5, "y":2.25},
-                {"matrix":[2,4], "x":4.5, "y":2.25},
-                {"matrix":[2,5], "x":5.5, "y":2.25},
-                {"matrix":[2,6], "x":6.5, "y":2.25},
-                {"matrix":[2,7], "x":7.5, "y":2.25},
-                {"matrix":[2,8], "x":8.5, "y":2.25},
-                {"matrix":[2,9], "x":9.5, "y":2.25},
-                {"matrix":[2,10], "x":10.5, "y":2.25},
-                {"matrix":[2,11], "x":11.5, "y":2.25},
-                {"matrix":[2,12], "x":12.5, "y":2.25},
-                {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
-                {"matrix":[2,14], "x":15.25, "y":2.25},
-                {"matrix":[2,15], "x":16.25, "y":2.25},
-                {"matrix":[2,16], "x":17.25, "y":2.25},
-
-                {"matrix":[3,0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3,1], "x":1.75, "y":3.25},
-                {"matrix":[3,2], "x":2.75, "y":3.25},
-                {"matrix":[3,3], "x":3.75, "y":3.25},
-                {"matrix":[3,4], "x":4.75, "y":3.25},
-                {"matrix":[3,5], "x":5.75, "y":3.25},
-                {"matrix":[3,6], "x":6.75, "y":3.25},
-                {"matrix":[3,7], "x":7.75, "y":3.25},
-                {"matrix":[3,8], "x":8.75, "y":3.25},
-                {"matrix":[3,9], "x":9.75, "y":3.25},
-                {"matrix":[3,10], "x":10.75, "y":3.25},
-                {"matrix":[3,11], "x":11.75, "y":3.25},
-                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
-
-                {"matrix":[4,0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4,2], "x":2.25, "y":4.25},
-                {"matrix":[4,3], "x":3.25, "y":4.25},
-                {"matrix":[4,4], "x":4.25, "y":4.25},
-                {"matrix":[4,5], "x":5.25, "y":4.25},
-                {"matrix":[4,6], "x":6.25, "y":4.25},
-                {"matrix":[4,7], "x":7.25, "y":4.25},
-                {"matrix":[4,8], "x":8.25, "y":4.25},
-                {"matrix":[4,9], "x":9.25, "y":4.25},
-                {"matrix":[4,10], "x":10.25, "y":4.25},
-                {"matrix":[4,11], "x":11.25, "y":4.25},
-                {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
-                {"matrix":[4,15], "x":16.25, "y":4.25},
-
-                {"matrix":[5,0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5,1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5,2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5,6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5,10], "x":10, "y":5.25, "w":1.25},
-                {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
-                {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
-                {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5,14], "x":15.25, "y":5.25},
-                {"matrix":[5,15], "x":16.25, "y":5.25},
-                {"matrix":[5,16], "x":17.25, "y":5.25}
-            ]
+    "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/k1_pro/ansi/white/rules.mk b/keyboards/keychron/k1_pro/ansi/white/rules.mk
index 290c1bb47a..f886ea2e8e 100644
--- a/keyboards/keychron/k1_pro/ansi/white/rules.mk
+++ b/keyboards/keychron/k1_pro/ansi/white/rules.mk
@@ -1,2 +1 @@
-LED_MATRIX_ENABLE = yes
-LED_MATRIX_DRIVER = CKLED2001
+# This file intentionally blank
\ No newline at end of file