Migrate lighting defaults to info.json (#22920)

keyboards/0xcb/1337/config.h

@@ -16,15 +16,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-// clang-format off
+/* default setup after eeprom reset */
-
+#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_EFFECT_BREATHING + 2
-  /* default setup after eeprom reset */
-  #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_EFFECT_BREATHING + 2
-  #define RGBLIGHT_DEFAULT_HUE 152
-  #define RGBLIGHT_DEFAULT_SAT 232
-  #define RGBLIGHT_DEFAULT_VAR 255
-  #define RGBLIGHT_DEFAULT_SPD 2
-// clang-format on
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE

keyboards/0xcb/1337/info.json

@@ -40,6 +40,11 @@
       "rgb_test": true,
       "alternating": true,
       "twinkle": true
+    },
+    "default": {
+      "hue": 152,
+      "sat": 232,
+      "speed": 2
     }
   },
   "ws2812": {

keyboards/anavi/arrows/config.h

@@ -3,8 +3,6 @@
 
 #pragma once
 
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
-
 /* Double tap reset button to enter bootloader */
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17

keyboards/anavi/arrows/info.json

@@ -35,6 +35,9 @@
             "snake": true,
             "static_gradient": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_mood"
         }
     },
     "ws2812": {

keyboards/anavi/knob1/config.h

@@ -3,14 +3,11 @@
 
 #pragma once
 
-#define RGBLIGHT_DEFAULT_MODE 9
-
 /* Double tap reset button to enter bootloader */
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
 
-
 #define I2C_DRIVER I2CD1
 #define I2C1_SDA_PIN GP6
 #define I2C1_SCL_PIN GP7

keyboards/anavi/knob1/info.json

@@ -17,9 +17,6 @@
     "rgblight": {
         "led_count": 1,
         "hue_steps": 10,
-        "saturation_steps": 17,
-        "brightness_steps": 17,
-        "max_brightness": 255,
         "animations": {
             "alternating": true,
             "breathing": true,
@@ -31,6 +28,9 @@
             "snake": true,
             "static_gradient": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl"
         }
     },
     "ws2812": {

keyboards/anavi/macropad12/config.h

@@ -3,8 +3,6 @@
 
 #pragma once
 
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
-
 /* Double tap reset button to enter bootloader */
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17

keyboards/anavi/macropad12/info.json

@@ -34,6 +34,9 @@
             "snake": true,
             "static_gradient": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_mood"
         }
     },
     "ws2812": {

keyboards/dztech/duo_s/config.h

@@ -17,7 +17,6 @@
 #pragma once
 
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6) 
-#define RGBLIGHT_DEFAULT_SPD 15
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE

keyboards/dztech/duo_s/info.json

@@ -25,6 +25,9 @@
       "rgb_test": true,
       "alternating": true,
       "twinkle": true
+    },
+    "default": {
+      "speed": 15
     }
   },
   "ws2812": {

keyboards/dztech/endless80/config.h

@@ -16,4 +16,3 @@
 #pragma once
 
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6) 
-#define RGBLIGHT_DEFAULT_SPD 10

keyboards/dztech/endless80/info.json

@@ -37,6 +37,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "speed": 10
         }
     },
     "processor": "atmega32u4",

keyboards/ffkeebs/puca/config.h

@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-    #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_STATIC_LIGHT  
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */

keyboards/fjlabs/avalon/config.h

@@ -21,7 +21,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define RGBLIGHT_DEFAULT_SPD 144
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
-

keyboards/fjlabs/avalon/info.json

@@ -30,6 +30,10 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl",
+            "speed": 144
         }
     },
     "ws2812": {

keyboards/fjlabs/kyuu/config.h

@@ -22,9 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLIGHT_DEFAULT_SPD 144
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
-
 /* Define less important options */
 
 /*

keyboards/fjlabs/kyuu/info.json

@@ -26,6 +26,10 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl",
+            "speed": 144
         }
     },
     "ws2812": {

keyboards/fjlabs/mk61rgbansi/config.h

@@ -22,9 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLIGHT_DEFAULT_SPD 144
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
-
 /* Define less important options */
 
 /*

keyboards/fjlabs/mk61rgbansi/info.json

@@ -30,6 +30,10 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl",
+            "speed": 144
         }
     },
     "processor": "atmega32u4",

keyboards/fjlabs/tf60ansi/config.h

@@ -22,9 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLIGHT_DEFAULT_SPD 144
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
-
 /* Define less important options */
 
 /*

keyboards/fjlabs/tf60ansi/info.json

@@ -30,6 +30,10 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl",
+            "speed": 144
         }
     },
     "processor": "atmega32u4",

keyboards/fjlabs/tf60v2/config.h

@@ -22,9 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLIGHT_DEFAULT_SPD 144
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
-
 /* Define less important options */
 
 /*

keyboards/fjlabs/tf60v2/info.json

@@ -30,6 +30,10 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl",
+            "speed": 144
         }
     },
     "processor": "atmega32u4",

keyboards/fjlabs/tf65rgbv2/config.h

@@ -22,9 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLIGHT_DEFAULT_SPD 144
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
-
 /* Define less important options */
 
 /*

keyboards/fjlabs/tf65rgbv2/info.json

@@ -30,6 +30,10 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl",
+            "speed": 144
         }
     },
     "processor": "atmega32u4",

keyboards/frooastboard/nano/config.h

@@ -16,8 +16,4 @@
 
 #pragma once
 
-#define RGBLIGHT_DEFAULT_HUE 234
-
-#define RGBLIGHT_DEFAULT_VAL 190
-
 #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD + 2

keyboards/frooastboard/nano/info.json

@@ -35,6 +35,10 @@
             "rainbow_swirl": true,
             "snake": true,
             "twinkle": true
+        },
+        "default": {
+            "hue": 234,
+            "val": 190
         }
     },
     "ws2812": {

keyboards/gray_studio/aero75/config.h

@@ -3,10 +3,6 @@
 
 #pragma once
 
-#define RGBLIGHT_LAYERS
-#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */

keyboards/gray_studio/aero75/info.json

@@ -28,6 +28,13 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_mood"
+        },
+        "layers": {
+            "enabled": true,
+            "override_rgb": true
         }
     },
     "matrix_pins": {

keyboards/gray_studio/apollo80/config.h

@@ -1,19 +0,0 @@
-/* Copyright 2020 Demo Studio <https://www.instagram.com/demostudio01>
-
-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
-
-    #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD

keyboards/gray_studio/apollo80/info.json

@@ -28,6 +28,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_mood"
         }
     },
     "matrix_pins": {

keyboards/gray_studio/space65r3/config.h

@@ -2,10 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #pragma once
 
-#define RGBLIGHT_LAYERS
-#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */

keyboards/gray_studio/space65r3/info.json

@@ -28,6 +28,13 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_mood"
+        },
+        "layers": {
+            "enabled": true,
+            "override_rgb": true
         }
     },
     "matrix_pins": {

keyboards/gray_studio/think65v3/config.h

@@ -1,7 +1,7 @@
 // Copyright 2023 Yizhen Liu (@edwardslau)
 // SPDX-License-Identifier: GPL-2.0
 #pragma once
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
+
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */

keyboards/gray_studio/think65v3/info.json

@@ -46,6 +46,9 @@
             "snake": true,
             "static_gradient": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_mood"
         }
     },
     "layout_aliases": {

keyboards/handwired/uthol/rev2/config.h

@@ -1,21 +0,0 @@
-/*
- * Copyright 2022 Uthol
- *
- * 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 Stuff
-#define RGBLIGHT_DEFAULT_HUE 201

keyboards/handwired/uthol/rev2/info.json

@@ -4,7 +4,10 @@
         "device_version": "0.0.2"
     },
     "rgblight": {
-        "led_count": 39
+        "led_count": 39,
+        "default": {
+            "hue": 201
+        }
     },
     "ws2812": {
         "pin": "E6"

keyboards/handwired/uthol/rev3/config.h

@@ -32,5 +32,3 @@
 #define LOCKING_RESYNC_ENABLE
 
 #define PERMISSIVE_HOLD
-
-#define RGBLIGHT_DEFAULT_HUE 201

keyboards/handwired/uthol/rev3/info.json

@@ -16,6 +16,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "hue": 201
         }
     },
     "tapping": {

keyboards/jacky_studio/bear_65/config.h

@@ -8,5 +8,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define RGBLIGHT_DEFAULT_VAL 50

keyboards/jacky_studio/bear_65/rev1/info.json

@@ -41,6 +41,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "val": 50
         }
     },
     "indicators": {

keyboards/jacky_studio/bear_65/rev2/info.json

@@ -41,6 +41,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "val": 50
         }
     },
     "indicators": {

keyboards/jels/jels60/v2/config.h

@@ -16,8 +16,6 @@
 
 #pragma once
 
-#define RGBLIGHT_DEFAULT_VAL 0
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */

keyboards/jels/jels60/v2/info.json

@@ -31,6 +31,9 @@
             "snake": true,
             "static_gradient": true,
             "twinkle": true
+        },
+        "default": {
+            "val": 0
         }
     },
     "indicators": {

keyboards/jels/jels88/config.h

@@ -16,8 +16,6 @@
 
 #pragma once
 
-#define RGBLIGHT_DEFAULT_VAL 0  // start off
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */

keyboards/jels/jels88/info.json

@@ -34,6 +34,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "val": 0
         }
     },
     "processor": "atmega32u4",

keyboards/jpe230/big_knob/config.h

@@ -30,7 +30,6 @@
 // Backlight configuration
 #define BACKLIGHT_PWM_DRIVER PWMD3
 #define BACKLIGHT_PWM_CHANNEL 2
-#define BACKLIGHT_DEFAULT_LEVEL 6
 
 // Timeout configuration
 #define QUANTUM_PAINTER_DISPLAY_TIMEOUT 10000

keyboards/jpe230/big_knob/info.json

@@ -31,7 +31,9 @@
     "backlight": {
         "pin": "GP7",
         "levels": 7,
-        "breathing": false
+        "default": {
+            "brightness": 6
+        }
     },
     "rgblight": {
         "driver": "ws2812",

keyboards/kbdfans/bounce/75/hotswap/config.h

@@ -17,6 +17,5 @@
 #pragma once
 
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD +8 ) 
-#define RGBLIGHT_DEFAULT_SPD 15
 
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2

keyboards/kbdfans/bounce/75/hotswap/info.json

@@ -33,6 +33,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "speed": 15
         }
     },
     "ws2812": {

keyboards/kbdfans/bounce/75/soldered/config.h

@@ -17,6 +17,5 @@
 #pragma once
 
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD +8 ) 
-#define RGBLIGHT_DEFAULT_SPD 15
 
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2

keyboards/kbdfans/bounce/75/soldered/info.json

@@ -34,6 +34,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "speed": 15
         }
     },
     "ws2812": {

keyboards/kbdfans/kbd75hs/config.h

@@ -17,6 +17,5 @@
 #pragma once
 
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6) 
-#define RGBLIGHT_DEFAULT_SPD 15
 
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2

keyboards/kbdfans/kbd75hs/info.json

@@ -33,6 +33,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "speed": 15
         }
     },
     "ws2812": {

keyboards/kbdfans/odin/v2/config.h

@@ -1,19 +0,0 @@
-/* Copyright 2022 lexbrugman
- *
- * 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
-
-    #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL

keyboards/kbdfans/odin/v2/info.json

@@ -34,6 +34,9 @@
             "snake": true,
             "christmas": true,
             "static_gradient": true
+        },
+        "default": {
+            "animation": "rainbow_swirl"
         }
     },
     "processor": "STM32F072",

keyboards/kbdfans/phaseone/config.h

@@ -22,6 +22,5 @@
 #define LOCKING_RESYNC_ENABLE
 
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6) 
-#define RGBLIGHT_DEFAULT_SPD 15
 
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2

keyboards/kbdfans/phaseone/info.json

@@ -35,6 +35,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "speed": 15
         }
     },
     "ws2812": {

keyboards/kbdfans/tiger80/config.h

@@ -17,6 +17,5 @@
 #pragma once
 
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6)
-#define RGBLIGHT_DEFAULT_SPD 15
 
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2

keyboards/kbdfans/tiger80/info.json

@@ -42,6 +42,9 @@
             "snake": true,
             "static_gradient": true,
             "twinkle": true
+        },
+        "default": {
+            "speed": 15
         }
     },
     "ws2812": {

keyboards/keebio/bamfk4/config.h

@@ -3,7 +3,6 @@
 
 #pragma once
 
-#define RGBLIGHT_DEFAULT_VAL 120
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */

keyboards/keebio/bamfk4/info.json

@@ -70,6 +70,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "val": 120
         }
     },
     "matrix_pins": {

keyboards/keebio/iris/rev5/config.h

@@ -19,7 +19,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define SPLIT_HAND_PIN D5
 
-#define BACKLIGHT_DEFAULT_LEVEL 3
-
-#define RGBLIGHT_DEFAULT_VAL 128
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)

keyboards/keebio/iris/rev5/info.json

@@ -16,7 +16,10 @@
     },
     "backlight": {
         "pin": "B5",
-        "levels": 5
+        "levels": 5,
+        "default": {
+            "brightness": 3
+        }
     },
     "rgblight": {
         "led_count": 12,
@@ -32,6 +35,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "val": 128
         }
     },
     "ws2812": {

keyboards/keebio/iris/rev6/config.h

@@ -19,5 +19,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define SPLIT_HAND_PIN D5
 
-#define RGBLIGHT_DEFAULT_VAL 120
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)

keyboards/keebio/iris/rev6/info.json

@@ -78,6 +78,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "val": 120
         }
     },
     "split": {

keyboards/keebio/iris/rev7/config.h

@@ -19,5 +19,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define SPLIT_HAND_PIN D5
 
-#define RGBLIGHT_DEFAULT_VAL 120
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)

keyboards/keebio/iris/rev7/info.json

@@ -77,6 +77,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "val": 120
         }
     },
     "split": {

keyboards/keygem/kg60ansi/config.h

@@ -22,9 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLIGHT_DEFAULT_SPD 144
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
-
 /* Define less important options */
 
 /*

keyboards/keygem/kg60ansi/info.json

@@ -25,6 +25,10 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl",
+            "speed": 144
         }
     },
     "matrix_pins": {

keyboards/keygem/kg65rgbv2/config.h

@@ -22,9 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define RGBLIGHT_DEFAULT_SPD 144
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
-
 /* Define less important options */
 
 /*

keyboards/keygem/kg65rgbv2/info.json

@@ -25,6 +25,10 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl",
+            "speed": 144
         }
     },
     "matrix_pins": {

keyboards/kprepublic/bm60hsrgb/rev2/config.h

@@ -15,8 +15,6 @@
  */
 #pragma once
 
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
-
 #define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
 #define IS31FL3733_LED_COUNT 63
 

keyboards/kprepublic/bm60hsrgb/rev2/info.json

@@ -71,6 +71,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_mood"
         }
     },
     "matrix_pins": {

keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h

@@ -15,8 +15,6 @@
  */
 #pragma once
 
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
-
 #define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
 
 #if defined(RGB_MATRIX_ENABLE) && defined(RGBLIGHT_ENABLE)

keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json

@@ -56,6 +56,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_mood"
         }   
     },
     "matrix_pins": {

keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h

@@ -17,8 +17,6 @@
  */
 #pragma once
 
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
-
 #define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
 #define IS31FL3733_LED_COUNT 64
 

keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json

@@ -79,6 +79,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_mood"
         }
     },
     "matrix_pins": {

keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h

@@ -15,8 +15,6 @@
  */
 #pragma once
 
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
-
 #define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
 #define IS31FL3733_LED_COUNT 61
 

keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json

@@ -75,6 +75,9 @@
             "static_gradient": true,
             "rgb_test": true,
             "alternating": true
+        },
+        "default": {
+            "animation": "rainbow_mood"
         }
     },
     "matrix_pins": {

keyboards/kprepublic/bm68hsrgb/rev2/config.h

@@ -16,8 +16,6 @@
   */
 #pragma once
 
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
-
 #define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
 
 #if defined(RGB_MATRIX_ENABLE) && defined(RGBLIGHT_ENABLE)

keyboards/kprepublic/bm68hsrgb/rev2/info.json

@@ -62,6 +62,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_mood"
         }
     },
     "matrix_pins": {

keyboards/melgeek/mj6xy/rev3/config.h

@@ -16,5 +16,4 @@
 
 #pragma once
 
-#    define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6)
+#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6)
-#    define RGBLIGHT_DEFAULT_SPD 10

keyboards/melgeek/mj6xy/rev3/info.json

@@ -24,6 +24,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "speed": 10
         }
     },
     "ws2812": {

keyboards/mlego/m60_split/rev1/config.h

@@ -18,6 +18,3 @@
 #define SPLIT_HAND_PIN B9
 #define SERIAL_USART_TX_PIN B6
 #define SERIAL_USART_SPEED 921600
-
-#define RGBLIGHT_LAYERS
-#define RGBLIGHT_DEFAULT_HUE 213

keyboards/mlego/m60_split/rev1/info.json

@@ -36,6 +36,12 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "hue": 213
+        },
+        "layers": {
+            "enabled": true
         }
     },
     "split": {

keyboards/mode/m60h/config.h

@@ -3,8 +3,6 @@
 
 #pragma once
 
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
-
 #define WS2812_PWM_DRIVER PWMD4
 #define WS2812_PWM_CHANNEL 4
 #define WS2812_DMA_STREAM STM32_DMA1_STREAM6

keyboards/mode/m60h/info.json

@@ -31,6 +31,9 @@
             "static_gradient": true,
             "twinkle": true
         },
+        "default": {
+            "animation": "rainbow_swirl"
+        },
         "driver": "ws2812",
         "led_count": 20,
         "max_brightness": 120,

keyboards/mode/m60h_f/config.h

@@ -3,8 +3,6 @@
 
 #pragma once
 
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
-
 #define WS2812_PWM_DRIVER PWMD4
 #define WS2812_PWM_CHANNEL 4
 #define WS2812_DMA_STREAM STM32_DMA1_STREAM6

keyboards/mode/m60h_f/info.json

@@ -31,6 +31,9 @@
             "static_gradient": true,
             "twinkle": true
         },
+        "default": {
+            "animation": "rainbow_swirl"
+        },
         "driver": "ws2812",
         "led_count": 20,
         "max_brightness": 120,

keyboards/mode/m60s/config.h

@@ -3,8 +3,6 @@
 
 #pragma once
 
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
-
 #define WS2812_PWM_DRIVER PWMD4
 #define WS2812_PWM_CHANNEL 4
 #define WS2812_DMA_STREAM STM32_DMA1_STREAM6

keyboards/mode/m60s/info.json

@@ -31,6 +31,9 @@
             "static_gradient": true,
             "twinkle": true
         },
+        "default": {
+            "animation": "rainbow_swirl"
+        },
         "driver": "ws2812",
         "led_count": 20,
         "max_brightness": 120,

keyboards/mode/m75s/config.h

@@ -17,6 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define BACKLIGHT_DEFAULT_LEVEL 20
 #define BACKLIGHT_PWM_DRIVER PWMD3
 #define BACKLIGHT_PWM_CHANNEL 1

keyboards/mtbkeys/mtb60/hotswap/config.h

@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#   define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL /* Set default RGB */
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 

keyboards/mtbkeys/mtb60/hotswap/info.json

@@ -24,6 +24,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl"
         }
     },
     "ws2812": {

keyboards/mtbkeys/mtb60/solder/config.h

@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#   define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL /* Set default RGB */
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 

keyboards/mtbkeys/mtb60/solder/info.json

@@ -24,6 +24,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl"
         }
     },
     "ws2812": {

keyboards/owlab/spring/config.h

@@ -1,21 +0,0 @@
-/* 
-Copyright 2021 OwLab
-
-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
-
-#    define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
-#    define RGBLIGHT_DEFAULT_VAL 127

keyboards/owlab/spring/info.json

@@ -29,6 +29,10 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rainbow_swirl",
+            "val": 127
         }
     },
     "ws2812": {

keyboards/prototypist/oceanographer/config.h

@@ -3,12 +3,6 @@
 
 #pragma once
 
-// RGB Light settings
-#define RGBLIGHT_LAYERS
-
-#define RGBLIGHT_MAX_LAYERS 4
-#define RGBLIGHT_DEFAULT_VAL 155
-
 // Audio Settings
 #ifdef AUDIO_ENABLE