Migrate RGB Matrix config to info.json - RS (#22909)

14 files changed, 46 insertions, 57 deletions

diff --git a/keyboards/splitkb/aurora/corne/rev1/config.h b/keyboards/splitkb/aurora/corne/rev1/config.h
index 340aff824a..f37b59a952 100644
--- a/keyboards/splitkb/aurora/corne/rev1/config.h
+++ b/keyboards/splitkb/aurora/corne/rev1/config.h
@@ -25,11 +25,3 @@
 #    define OLED_DISPLAY_128X32
 #    define SPLIT_OLED_ENABLE
 #endif
-
-// Not yet available in `info.json`
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 128
-#    define RGB_MATRIX_LED_COUNT 54
-#    define RGB_MATRIX_SPLIT { 27, 27 }
-#    define SPLIT_TRANSPORT_MIRROR
-#endif
diff --git a/keyboards/splitkb/aurora/corne/rev1/info.json b/keyboards/splitkb/aurora/corne/rev1/info.json
index d1725f215e..2e0b74b5a8 100644
--- a/keyboards/splitkb/aurora/corne/rev1/info.json
+++ b/keyboards/splitkb/aurora/corne/rev1/info.json
@@ -95,6 +95,11 @@
                     {"pin_a": "F6", "pin_b": "F7"}
                 ]
             }
+        },
+        "transport": {
+            "sync": {
+                "matrix_state": true
+            }
         }
     },
     "rgblight": {
@@ -164,6 +169,7 @@
             {"flags": 4, "matrix": [5, 0], "x": 224, "y": 24}, // R SW12
             {"flags": 4, "matrix": [6, 0], "x": 224, "y": 41}  // R SW18
         ],
-        "max_brightness": 128
+        "max_brightness": 128,
+        "split_count": [27, 27]
     }
 }
diff --git a/keyboards/splitkb/aurora/helix/rev1/config.h b/keyboards/splitkb/aurora/helix/rev1/config.h
index bbf6c50073..f8b8a190fe 100644
--- a/keyboards/splitkb/aurora/helix/rev1/config.h
+++ b/keyboards/splitkb/aurora/helix/rev1/config.h
@@ -20,5 +20,3 @@
 
 #define OLED_DISPLAY_128X32
 #define SPLIT_OLED_ENABLE
-
-#define RGB_MATRIX_LED_COUNT 76
\ No newline at end of file
diff --git a/keyboards/splitkb/aurora/lily58/rev1/config.h b/keyboards/splitkb/aurora/lily58/rev1/config.h
index 1356c62ea1..08a61a2978 100644
--- a/keyboards/splitkb/aurora/lily58/rev1/config.h
+++ b/keyboards/splitkb/aurora/lily58/rev1/config.h
@@ -25,10 +25,3 @@
 #    define OLED_DISPLAY_128X32
 #    define SPLIT_OLED_ENABLE
 #endif
-
-// Not yet available in `info.json`
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_COUNT 68
-#    define RGB_MATRIX_SPLIT { 34, 34 }
-#    define SPLIT_TRANSPORT_MIRROR
-#endif
diff --git a/keyboards/splitkb/aurora/lily58/rev1/info.json b/keyboards/splitkb/aurora/lily58/rev1/info.json
index 6a7bfdd26d..f81da08464 100644
--- a/keyboards/splitkb/aurora/lily58/rev1/info.json
+++ b/keyboards/splitkb/aurora/lily58/rev1/info.json
@@ -106,6 +106,11 @@
                     {"pin_a": "F7", "pin_b": "F6"}
                 ]
             }
+        },
+        "transport": {
+            "sync": {
+                "matrix_state": true
+            }
         }
     },
     "rgblight": {
@@ -189,6 +194,7 @@
             {"flags": 4, "matrix": [9, 3], "x": 173, "y": 62}, // R SW27
             {"flags": 4, "matrix": [9, 2], "x": 188, "y": 62}  // R SW26
         ],
-        "max_brightness": 128
+        "max_brightness": 128,
+        "split_count": [34, 34]
     }
 }
diff --git a/keyboards/splitkb/aurora/sofle_v2/rev1/config.h b/keyboards/splitkb/aurora/sofle_v2/rev1/config.h
index 1896af3cb5..7292b3d8b0 100644
--- a/keyboards/splitkb/aurora/sofle_v2/rev1/config.h
+++ b/keyboards/splitkb/aurora/sofle_v2/rev1/config.h
@@ -20,5 +20,3 @@
 
 #define OLED_DISPLAY_128X32
 #define SPLIT_OLED_ENABLE
-
-#define RGB_MATRIX_LED_COUNT 70
\ No newline at end of file
diff --git a/keyboards/splitkb/aurora/sweep/rev1/config.h b/keyboards/splitkb/aurora/sweep/rev1/config.h
index a3b2cc893e..f37b59a952 100644
--- a/keyboards/splitkb/aurora/sweep/rev1/config.h
+++ b/keyboards/splitkb/aurora/sweep/rev1/config.h
@@ -25,10 +25,3 @@
 #    define OLED_DISPLAY_128X32
 #    define SPLIT_OLED_ENABLE
 #endif
-
-// Not yet available in `info.json`
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_COUNT 46
-#    define RGB_MATRIX_SPLIT { 23, 23 }
-#    define SPLIT_TRANSPORT_MIRROR
-#endif
diff --git a/keyboards/splitkb/aurora/sweep/rev1/info.json b/keyboards/splitkb/aurora/sweep/rev1/info.json
index 74de07ceda..0d235cd5b2 100644
--- a/keyboards/splitkb/aurora/sweep/rev1/info.json
+++ b/keyboards/splitkb/aurora/sweep/rev1/info.json
@@ -92,6 +92,11 @@
                     {"pin_a": "F5", "pin_b": "D4"}
                 ]
             }
+        },
+        "transport": {
+            "sync": {
+                "matrix_state": true
+            }
         }
     },
     "rgblight": {
@@ -153,6 +158,7 @@
             {"flags": 4, "matrix": [7, 0], "x": 132, "y": 64},
             {"flags": 4, "matrix": [7, 1], "x": 153, "y": 60}
         ],
-        "max_brightness": 128
+        "max_brightness": 128,
+        "split_count": [23, 23]
     }
 }
diff --git a/keyboards/splitkb/kyria/rev1/config.h b/keyboards/splitkb/kyria/rev1/config.h
index 2938523aee..d666099135 100644
--- a/keyboards/splitkb/kyria/rev1/config.h
+++ b/keyboards/splitkb/kyria/rev1/config.h
@@ -45,12 +45,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define OLED_DISPLAY_128X64
 #    define SPLIT_OLED_ENABLE
 #endif
-
-/* RGB matrix support */
-#ifdef RGB_MATRIX_ENABLE
-#    define SPLIT_TRANSPORT_MIRROR
-#    define RGB_MATRIX_LED_COUNT 20 // Number of LEDs
-#    define RGB_MATRIX_SPLIT { 10, 10 }
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 170
-#    define RGB_MATRIX_SLEEP
-#endif
diff --git a/keyboards/splitkb/kyria/rev1/info.json b/keyboards/splitkb/kyria/rev1/info.json
index aa38a7dd0c..38a2e6bf3f 100644
--- a/keyboards/splitkb/kyria/rev1/info.json
+++ b/keyboards/splitkb/kyria/rev1/info.json
@@ -9,7 +9,10 @@
         "split_count": [10, 10]
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "driver": "ws2812",
+        "max_brightness": 170,
+        "sleep": true,
+        "split_count": [10, 10]
     },
     "matrix_pins": {
         "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
@@ -28,6 +31,11 @@
                     {"pin_a": "B5", "pin_b": "C6"}
                 ]
             }
+        },
+        "transport": {
+            "sync": {
+                "matrix_state": true
+            }
         }
     },
     "layout_aliases": {
diff --git a/keyboards/splitkb/kyria/rev2/config.h b/keyboards/splitkb/kyria/rev2/config.h
index 5aa142f90b..452e011f0a 100644
--- a/keyboards/splitkb/kyria/rev2/config.h
+++ b/keyboards/splitkb/kyria/rev2/config.h
@@ -50,12 +50,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define OLED_DISPLAY_128X64
 #    define SPLIT_OLED_ENABLE
 #endif
-
-/* RGB matrix support */
-#ifdef RGB_MATRIX_ENABLE
-#    define SPLIT_TRANSPORT_MIRROR
-#    define RGB_MATRIX_LED_COUNT 20 // Number of LEDs
-#    define RGB_MATRIX_SPLIT { 10, 10 }
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 170
-#    define RGB_MATRIX_SLEEP
-#endif
diff --git a/keyboards/splitkb/kyria/rev2/info.json b/keyboards/splitkb/kyria/rev2/info.json
index 6e362d9548..0290153f4a 100644
--- a/keyboards/splitkb/kyria/rev2/info.json
+++ b/keyboards/splitkb/kyria/rev2/info.json
@@ -9,7 +9,10 @@
         "split_count": [10, 10]
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "driver": "ws2812",
+        "max_brightness": 170,
+        "sleep": true,
+        "split_count": [10, 10]
     },
     "matrix_pins": {
         "cols": ["B2", "B6", "B5", "B4", "E6", "D7", "C6", "D4"],
@@ -34,6 +37,11 @@
                 "cols": ["B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6"],
                 "rows": ["D4", "C6", "D7", "E6"]
             }
+        },
+        "transport": {
+            "sync": {
+                "matrix_state": true
+            }
         }
     },
     "layout_aliases": {
diff --git a/keyboards/splitkb/kyria/rev3/config.h b/keyboards/splitkb/kyria/rev3/config.h
index 5168e8678e..b0a64320c6 100644
--- a/keyboards/splitkb/kyria/rev3/config.h
+++ b/keyboards/splitkb/kyria/rev3/config.h
@@ -25,10 +25,3 @@
 #    define OLED_DISPLAY_128X64
 #    define SPLIT_OLED_ENABLE
 #endif
-
-// Not yet available in `info.json`
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_COUNT 62
-#    define RGB_MATRIX_SPLIT { 31, 31 }
-#    define SPLIT_TRANSPORT_MIRROR
-#endif
diff --git a/keyboards/splitkb/kyria/rev3/info.json b/keyboards/splitkb/kyria/rev3/info.json
index 07713f9658..4a426cb206 100644
--- a/keyboards/splitkb/kyria/rev3/info.json
+++ b/keyboards/splitkb/kyria/rev3/info.json
@@ -110,6 +110,11 @@
                     {"pin_a": "F4", "pin_b": "F5"}
                 ]
             }
+        },
+        "transport": {
+            "sync": {
+                "matrix_state": true
+            }
         }
     },
     "rgblight": {
@@ -187,6 +192,7 @@
             {"flags": 4, "matrix": [4, 5], "x": 210, "y": 11}, // R SW05
             {"flags": 4, "matrix": [4, 6], "x": 224, "y": 11}  // R SW06
         ],
-        "max_brightness": 128
+        "max_brightness": 128,
+        "split_count": [31, 31]
     }
 }