Merge branch 'dd-config-bt-playground' of https://github.com/adophoxia/qmk_firmware into dd-config-bt-playground

8 files changed, 17 insertions, 18 deletions

diff --git a/keyboards/keychron/k10_pro/iso/rgb/info.json b/keyboards/keychron/k10_pro/iso/rgb/info.json
index ea304a9319..ecaa60d9c9 100644
--- a/keyboards/keychron/k10_pro/iso/rgb/info.json
+++ b/keyboards/keychron/k10_pro/iso/rgb/info.json
@@ -1,31 +1,35 @@
 {
     "usb": {
-        "vid": "0x3434",
         "pid": "0x02A1",
         "device_version": "1.0.0"
     },
     "features": {
-        "led_matrix": true
+        "rgb_matrix": true
     },
-    "led_matrix": {
+    "rgb_matrix": {
         "driver": "CKLED2001",
         "animations": {
-            "none": true,
-            "solid": true,
             "breathing": true,
-            "band_pinwheel": true,
-            "band_spiral": 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,
-            "solid_splash": true,
-            "wave_left_right": true,
-            "wave_up_down": true,
-            "effect_max": true
+            "splash": true,
+            "solid_splash": true
         }
     }
 }
diff --git a/keyboards/keychron/k10_pro/iso/white/info.json b/keyboards/keychron/k10_pro/iso/white/info.json
index b696572929..0201dd96b6 100644
--- a/keyboards/keychron/k10_pro/iso/white/info.json
+++ b/keyboards/keychron/k10_pro/iso/white/info.json
@@ -1,6 +1,5 @@
 {
     "usb": {
-        "vid": "0x3434",
         "pid": "0x02A4",
         "device_version": "1.0.0"
     },
diff --git a/keyboards/keychron/k13_pro/ansi/rgb/info.json b/keyboards/keychron/k13_pro/ansi/rgb/info.json
index 8c254bc16a..cc2056b816 100644
--- a/keyboards/keychron/k13_pro/ansi/rgb/info.json
+++ b/keyboards/keychron/k13_pro/ansi/rgb/info.json
@@ -1,6 +1,5 @@
 {
     "usb": {
-        "vid": "0x3434",
         "pid": "0x02D0",
         "device_version": "1.0.0"
     },
diff --git a/keyboards/keychron/k13_pro/ansi/white/info.json b/keyboards/keychron/k13_pro/ansi/white/info.json
index c86bf0a1dc..d8ecbc278b 100644
--- a/keyboards/keychron/k13_pro/ansi/white/info.json
+++ b/keyboards/keychron/k13_pro/ansi/white/info.json
@@ -1,6 +1,5 @@
 {
     "usb": {
-        "vid": "0x3434",
         "pid": "0x02D3",
         "device_version": "1.0.0"
     },
diff --git a/keyboards/keychron/k3_pro/info.json b/keyboards/keychron/k3_pro/info.json
index 9fe58bd5b9..c8eaeb4f88 100644
--- a/keyboards/keychron/k3_pro/info.json
+++ b/keyboards/keychron/k3_pro/info.json
@@ -187,7 +187,7 @@
                 {"matrix":[3,15], "x":15, "y":3},
 
                 {"matrix":[4, 0], "x":0, "y":4, "w":1.25},
-		        {"matrix":[4, 1], "x":1.25, "y":4},
+                {"matrix":[4, 1], "x":1.25, "y":4},
                 {"matrix":[4, 2], "x":2.25, "y":4},
                 {"matrix":[4, 3], "x":3.25, "y":4},
                 {"matrix":[4, 4], "x":4.25, "y":4},
diff --git a/keyboards/keychron/k5_pro/ansi/rgb/info.json b/keyboards/keychron/k5_pro/ansi/rgb/info.json
index 7ff8edb8c2..2c7946e4de 100644
--- a/keyboards/keychron/k5_pro/ansi/rgb/info.json
+++ b/keyboards/keychron/k5_pro/ansi/rgb/info.json
@@ -1,6 +1,5 @@
 {
     "usb": {
-        "vid": "0x3434",
         "pid": "0x0250",
         "device_version": "1.0.1"
     },
diff --git a/keyboards/keychron/k5_pro/ansi/white/info.json b/keyboards/keychron/k5_pro/ansi/white/info.json
index ecf8267fa6..0ef63baed4 100644
--- a/keyboards/keychron/k5_pro/ansi/white/info.json
+++ b/keyboards/keychron/k5_pro/ansi/white/info.json
@@ -1,6 +1,5 @@
 {
     "usb": {
-        "vid": "0x3434",
         "pid": "0x0253",
         "device_version": "1.0.1"
     },
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},