Migrate RGB Matrix config to info.json - B (#22806)

18 files changed, 88 insertions, 147 deletions

diff --git a/keyboards/bastardkb/charybdis/3x5/config.h b/keyboards/bastardkb/charybdis/3x5/config.h
index e373627d51..1c952759a7 100644
--- a/keyboards/bastardkb/charybdis/3x5/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/config.h
@@ -20,10 +20,3 @@
 
 /* Trackball angle adjustment. */
 #define ROTATIONAL_TRANSFORM_ANGLE -25
-
-/* RGB settings. */
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_COUNT 36
-#    define RGB_MATRIX_SPLIT \
-        { 18, 18 }
-#endif
diff --git a/keyboards/bastardkb/charybdis/3x5/info.json b/keyboards/bastardkb/charybdis/3x5/info.json
index cc233f3568..9627b9852f 100644
--- a/keyboards/bastardkb/charybdis/3x5/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/info.json
@@ -5,6 +5,9 @@
         "pid": "0x1832",
         "vid": "0xA8F8"
     },
+    "rgb_matrix": {
+        "split_count": [18, 18]
+    },
     "layout_aliases": {
         "LAYOUT_charybdis_3x5": "LAYOUT"
     },
diff --git a/keyboards/bastardkb/charybdis/3x6/config.h b/keyboards/bastardkb/charybdis/3x6/config.h
index ba729aee3e..1c952759a7 100644
--- a/keyboards/bastardkb/charybdis/3x6/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/config.h
@@ -20,10 +20,3 @@
 
 /* Trackball angle adjustment. */
 #define ROTATIONAL_TRANSFORM_ANGLE -25
-
-/* RGB settings. */
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_COUNT 42
-#    define RGB_MATRIX_SPLIT \
-        { 21, 21 }
-#endif
diff --git a/keyboards/bastardkb/charybdis/3x6/info.json b/keyboards/bastardkb/charybdis/3x6/info.json
index 787e3bdf14..3597e72534 100644
--- a/keyboards/bastardkb/charybdis/3x6/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/info.json
@@ -3,10 +3,13 @@
     "usb": {
         "pid": "0x1834"
     },
+    "rgb_matrix": {
+        "split_count": [21, 21]
+    },
     "layout_aliases": {
         "LAYOUT_charybdis_3x6": "LAYOUT"
     },
-   "layouts": {
+    "layouts": {
         "LAYOUT": {
             "layout": [
                 {"label": "L00", "matrix": [0, 0], "x": 0, "y": 0},
diff --git a/keyboards/bastardkb/charybdis/4x6/config.h b/keyboards/bastardkb/charybdis/4x6/config.h
index 64b5158698..1c952759a7 100644
--- a/keyboards/bastardkb/charybdis/4x6/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/config.h
@@ -20,10 +20,3 @@
 
 /* Trackball angle adjustment. */
 #define ROTATIONAL_TRANSFORM_ANGLE -25
-
-/* RGB settings. */
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_LED_COUNT 58
-#    define RGB_MATRIX_SPLIT \
-        { 29, 29 }
-#endif
diff --git a/keyboards/bastardkb/charybdis/4x6/info.json b/keyboards/bastardkb/charybdis/4x6/info.json
index 8259e96141..54bb564306 100644
--- a/keyboards/bastardkb/charybdis/4x6/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/info.json
@@ -5,6 +5,9 @@
         "pid": "0x1833",
         "vid": "0xA8F8"
     },
+    "rgb_matrix": {
+        "split_count": [29, 29]
+    },
     "layout_aliases": {
         "LAYOUT_charybdis_4x6": "LAYOUT"
     },
diff --git a/keyboards/bastardkb/charybdis/config.h b/keyboards/bastardkb/charybdis/config.h
index 7da14beb8d..32ab7b0ebb 100644
--- a/keyboards/bastardkb/charybdis/config.h
+++ b/keyboards/bastardkb/charybdis/config.h
@@ -18,7 +18,6 @@
 
 #pragma once
 
-
 /* Pointing device configuration. */
 
 // Enable use of pointing device on slave split.
@@ -35,21 +34,6 @@
 
 /* RGB matrix support. */
 #ifdef RGB_MATRIX_ENABLE
-#    define SPLIT_TRANSPORT_MIRROR
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
-#    define RGB_MATRIX_SLEEP
-#    define RGB_MATRIX_KEYPRESSES
-
-// Startup values.
-#    define RGB_MATRIX_DEFAULT_VAL 64
-
-// Rainbow swirl as startup mode.
-#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
-
-// Slow swirl at startup.
-#    define RGB_MATRIX_DEFAULT_SPD 32
-
 #    ifndef __arm__
 // Disable control of RGB matrix by keycodes (must use firmware implementation
 // to control the feature).
diff --git a/keyboards/bastardkb/charybdis/info.json b/keyboards/bastardkb/charybdis/info.json
new file mode 100644
index 0000000000..6a4ed7c9f7
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/info.json
@@ -0,0 +1,19 @@
+{
+    "rgb_matrix": {
+        "animations": {
+            "cycle_left_right": true
+        },
+        "default": {
+            "speed": 32,
+            "val": 64
+        },
+        "sleep": true
+    },
+    "split": {
+        "transport": {
+            "sync": {
+                "matrix_state": true
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/bastardkb/dilemma/3x5_3/config.h b/keyboards/bastardkb/dilemma/3x5_3/config.h
index 5488579dee..7276c6181f 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/config.h
+++ b/keyboards/bastardkb/dilemma/3x5_3/config.h
@@ -42,15 +42,3 @@
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
-
-/* RGB matrix support. */
-#ifdef RGB_MATRIX_ENABLE
-#    define SPLIT_TRANSPORT_MIRROR
-#    define RGB_MATRIX_SLEEP
-#    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
-// Startup values.
-#    define RGB_MATRIX_DEFAULT_VAL 128
-#    define RGB_MATRIX_DEFAULT_SPD 32
-#endif
diff --git a/keyboards/bastardkb/dilemma/3x5_3/info.json b/keyboards/bastardkb/dilemma/3x5_3/info.json
index f3a3961330..861a15e636 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_3/info.json
@@ -17,6 +17,11 @@
         "soft_serial_pin": "GP1",
         "bootmagic": {
             "matrix": [4, 0]
+        },
+        "transport":{
+            "sync": {
+                "matrix_state": true
+            }
         }
     },
     "encoder": {
@@ -90,6 +95,10 @@
             "solid_splash": true,
             "solid_multisplash": true
         },
+        "default": {
+            "speed": 32,
+            "val": 128
+        },
         "layout": [
             {"x": 82, "y": 0, "flags": 2},
             {"x": 60, "y": 0, "flags": 2},
@@ -180,7 +189,8 @@
             {"matrix": [7, 2], "x": 179, "y": 51, "flags": 4},
             {"matrix": [7, 0], "x": 160, "y": 53, "flags": 4},
             {"matrix": [7, 1], "x": 143, "y": 60, "flags": 4}
-        ]
+        ],
+        "sleep": true
     },
     "community_layouts": ["split_3x5_3"],
     "layouts": {
diff --git a/keyboards/bastardkb/dilemma/4x6_4/config.h b/keyboards/bastardkb/dilemma/4x6_4/config.h
index bd595385b0..549965444d 100644
--- a/keyboards/bastardkb/dilemma/4x6_4/config.h
+++ b/keyboards/bastardkb/dilemma/4x6_4/config.h
@@ -44,11 +44,4 @@
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
 
 /* RGB matrix support. */
-#define SPLIT_TRANSPORT_MIRROR
-#define RGB_MATRIX_SLEEP
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
-// Startup values.
-#define RGB_MATRIX_DEFAULT_VAL 64
-#define RGB_MATRIX_DEFAULT_SPD 32
+#define SPLIT_TRANSPORT_MIRROR
\ No newline at end of file
diff --git a/keyboards/bastardkb/dilemma/4x6_4/info.json b/keyboards/bastardkb/dilemma/4x6_4/info.json
index ba07a7fccf..23ccd533aa 100644
--- a/keyboards/bastardkb/dilemma/4x6_4/info.json
+++ b/keyboards/bastardkb/dilemma/4x6_4/info.json
@@ -17,6 +17,11 @@
         "soft_serial_pin": "GP1",
         "bootmagic": {
             "matrix": [5, 0]
+        },
+        "transport":{
+            "sync": {
+                "matrix_state": true
+            }
         }
     },
     "encoder": {
@@ -91,6 +96,10 @@
             "solid_splash": true,
             "solid_multisplash": true
         },
+        "default": {
+            "speed": 32,
+            "val": 128
+        },
         "layout": [
             {"x": 81, "y": 4, "flags": 2},
             {"x": 65, "y": 2, "flags": 2},
@@ -199,7 +208,8 @@
             {"matrix": [9, 2], "x": 156, "y": 53, "flags": 4},
             {"matrix": [9, 1], "x": 143, "y": 57, "flags": 4},
             {"matrix": [9, 3], "x": 132, "y": 64, "flags": 4}
-        ]
+        ],
+        "sleep": true
     },
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/bastardkb/scylla/config.h b/keyboards/bastardkb/scylla/config.h
deleted file mode 100644
index bc3bcb4833..0000000000
--- a/keyboards/bastardkb/scylla/config.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
- * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* RGB matrix support. */
-#ifdef RGB_MATRIX_ENABLE
-#    define SPLIT_TRANSPORT_MIRROR
-#    define RGB_MATRIX_LED_COUNT 58
-#    define RGB_MATRIX_SPLIT { 29, 29 }
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
-#    define RGB_MATRIX_SLEEP
-#    define RGB_MATRIX_KEYPRESSES
-#endif
diff --git a/keyboards/bastardkb/scylla/info.json b/keyboards/bastardkb/scylla/info.json
index 24a0262bee..6508c15b5a 100644
--- a/keyboards/bastardkb/scylla/info.json
+++ b/keyboards/bastardkb/scylla/info.json
@@ -3,10 +3,22 @@
     "usb": {
         "pid": "0x1829"
     },
+    "rgb_matrix": {
+        "max_brightness": 50,
+        "sleep": true,
+        "split_count": [29, 29]
+    },
     "rgblight": {
         "led_count": 58,
         "split_count": [29, 29]
     },
+    "split": {
+        "transport": {
+            "sync": {
+                "matrix_state": true
+            }
+        }
+    },
     "layouts": {
         "LAYOUT_split_4x6_5": {
             "layout": [
diff --git a/keyboards/bastardkb/skeletyl/config.h b/keyboards/bastardkb/skeletyl/config.h
deleted file mode 100644
index 48254935cb..0000000000
--- a/keyboards/bastardkb/skeletyl/config.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
- * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* RGB matrix support. */
-#ifdef RGB_MATRIX_ENABLE
-#    define SPLIT_TRANSPORT_MIRROR
-#    define RGB_MATRIX_LED_COUNT 36
-#    define RGB_MATRIX_SPLIT { 18, 18 }
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
-#    define RGB_MATRIX_SLEEP
-#    define RGB_MATRIX_KEYPRESSES
-#endif
diff --git a/keyboards/bastardkb/skeletyl/info.json b/keyboards/bastardkb/skeletyl/info.json
index b4bb9ea78e..e4ac29207d 100644
--- a/keyboards/bastardkb/skeletyl/info.json
+++ b/keyboards/bastardkb/skeletyl/info.json
@@ -3,10 +3,22 @@
     "usb": {
         "pid": "0x1830"
     },
+    "rgb_matrix": {
+        "max_brightness": 50,
+        "sleep": true,
+        "split_count": [18, 18]
+    },
     "rgblight": {
         "led_count": 36,
         "split_count": [18, 18]
     },
+    "split": {
+        "transport": {
+            "sync": {
+                "matrix_state": true
+            }
+        }
+    },
     "community_layouts": ["split_3x5_3"],
     "layouts": {
         "LAYOUT_split_3x5_3": {
diff --git a/keyboards/bastardkb/tbkmini/config.h b/keyboards/bastardkb/tbkmini/config.h
deleted file mode 100644
index 6705619ee3..0000000000
--- a/keyboards/bastardkb/tbkmini/config.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
- * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* RGB matrix support. */
-#ifdef RGB_MATRIX_ENABLE
-#    define SPLIT_TRANSPORT_MIRROR
-#    define RGB_MATRIX_LED_COUNT 42
-#    define RGB_MATRIX_SPLIT { 21, 21 }
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
-#    define RGB_MATRIX_SLEEP
-#    define RGB_MATRIX_KEYPRESSES
-#endif
diff --git a/keyboards/bastardkb/tbkmini/info.json b/keyboards/bastardkb/tbkmini/info.json
index ec0433d387..ff2df9cdd6 100644
--- a/keyboards/bastardkb/tbkmini/info.json
+++ b/keyboards/bastardkb/tbkmini/info.json
@@ -3,10 +3,22 @@
     "usb": {
         "pid": "0x1828"
     },
+    "rgb_matrix": {
+        "max_brightness": 50,
+        "sleep": true,
+        "split_count": [21, 21]
+    },
     "rgblight": {
         "led_count": 42,
         "split_count": [21, 21]
     },
+    "split": {
+        "transport": {
+            "sync": {
+                "matrix_state": true
+            }
+        }
+    },
     "community_layouts": ["split_3x6_3"],
     "layouts": {
         "LAYOUT_split_3x6_3": {