diff options
| author | Joel Challis <git@zvecr.com> | 2024-02-01 18:10:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-01 18:10:14 +0000 |
| commit | 2f37a7854ddb0055eff7cb605492a57ff5061eb2 (patch) | |
| tree | 95a990fb8cb1ec8b47c8760708d7541fa042f4ba | |
| parent | 7d5b4adc502df7cd9e20ba96027fbfe728171b2e (diff) | |
Migrate lighting defaults to info.json (#22920)
141 files changed, 312 insertions, 338 deletions
diff --git a/keyboards/0xcb/1337/config.h b/keyboards/0xcb/1337/config.h index 9527d6abae..5791b324b6 100644 --- a/keyboards/0xcb/1337/config.h +++ b/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 - #define RGBLIGHT_DEFAULT_HUE 152 - #define RGBLIGHT_DEFAULT_SAT 232 - #define RGBLIGHT_DEFAULT_VAR 255 - #define RGBLIGHT_DEFAULT_SPD 2 -// clang-format on +/* default setup after eeprom reset */ +#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_EFFECT_BREATHING + 2 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/0xcb/1337/info.json b/keyboards/0xcb/1337/info.json index 30b806aedc..d492f8e3be 100644 --- a/keyboards/0xcb/1337/info.json +++ b/keyboards/0xcb/1337/info.json @@ -40,6 +40,11 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "hue": 152, + "sat": 232, + "speed": 2 } }, "ws2812": { diff --git a/keyboards/anavi/arrows/config.h b/keyboards/anavi/arrows/config.h index 02e7781e57..59b2a11aae 100644 --- a/keyboards/anavi/arrows/config.h +++ b/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 diff --git a/keyboards/anavi/arrows/info.json b/keyboards/anavi/arrows/info.json index bdda15695a..48dae7b2ea 100644 --- a/keyboards/anavi/arrows/info.json +++ b/keyboards/anavi/arrows/info.json @@ -35,6 +35,9 @@ "snake": true, "static_gradient": true, "twinkle": true + }, + "default": { + "animation": "rainbow_mood" } }, "ws2812": { diff --git a/keyboards/anavi/knob1/config.h b/keyboards/anavi/knob1/config.h index 338f5d8dbe..07cea802b3 100644 --- a/keyboards/anavi/knob1/config.h +++ b/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 diff --git a/keyboards/anavi/knob1/info.json b/keyboards/anavi/knob1/info.json index 06acec583f..551d059bad 100644 --- a/keyboards/anavi/knob1/info.json +++ b/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": { diff --git a/keyboards/anavi/macropad12/config.h b/keyboards/anavi/macropad12/config.h index 02e7781e57..59b2a11aae 100644 --- a/keyboards/anavi/macropad12/config.h +++ b/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 diff --git a/keyboards/anavi/macropad12/info.json b/keyboards/anavi/macropad12/info.json index f0f6d6ca60..3a1a07a0a1 100644 --- a/keyboards/anavi/macropad12/info.json +++ b/keyboards/anavi/macropad12/info.json @@ -34,6 +34,9 @@ "snake": true, "static_gradient": true, "twinkle": true + }, + "default": { + "animation": "rainbow_mood" } }, "ws2812": { diff --git a/keyboards/dztech/duo_s/config.h b/keyboards/dztech/duo_s/config.h index 361706e576..14d66caf12 100644 --- a/keyboards/dztech/duo_s/config.h +++ b/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 diff --git a/keyboards/dztech/duo_s/info.json b/keyboards/dztech/duo_s/info.json index 0277675018..ef5af799be 100644 --- a/keyboards/dztech/duo_s/info.json +++ b/keyboards/dztech/duo_s/info.json @@ -25,6 +25,9 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "speed": 15 } }, "ws2812": { diff --git a/keyboards/dztech/endless80/config.h b/keyboards/dztech/endless80/config.h index a8851d8913..8d6b35eae4 100644 --- a/keyboards/dztech/endless80/config.h +++ b/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 diff --git a/keyboards/dztech/endless80/info.json b/keyboards/dztech/endless80/info.json index 2391faf495..4572b091fa 100644 --- a/keyboards/dztech/endless80/info.json +++ b/keyboards/dztech/endless80/info.json @@ -37,6 +37,9 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "speed": 10 } }, "processor": "atmega32u4", diff --git a/keyboards/ffkeebs/puca/config.h b/keyboards/ffkeebs/puca/config.h index 19b030cdc1..ced239c833 100644 --- a/keyboards/ffkeebs/puca/config.h +++ b/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 */ diff --git a/keyboards/fjlabs/avalon/config.h b/keyboards/fjlabs/avalon/config.h index d1875f650f..46df2a0d6a 100644 --- a/keyboards/fjlabs/avalon/config.h +++ b/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 - diff --git a/keyboards/fjlabs/avalon/info.json b/keyboards/fjlabs/avalon/info.json index 96f969146f..77b5fbe956 100644 --- a/keyboards/fjlabs/avalon/info.json +++ b/keyboards/fjlabs/avalon/info.json @@ -30,6 +30,10 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "animation": "rainbow_swirl", + "speed": 144 } }, "ws2812": { diff --git a/keyboards/fjlabs/kyuu/config.h b/keyboards/fjlabs/kyuu/config.h index 9bee316792..084c49212c 100644 --- a/keyboards/fjlabs/kyuu/config.h +++ b/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 */ /* diff --git a/keyboards/fjlabs/kyuu/info.json b/keyboards/fjlabs/kyuu/info.json index 9028c3dc8d..ed02d7d3b4 100644 --- a/keyboards/fjlabs/kyuu/info.json +++ b/keyboards/fjlabs/kyuu/info.json @@ -26,6 +26,10 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "animation": "rainbow_swirl", + "speed": 144 } }, "ws2812": { diff --git a/keyboards/fjlabs/mk61rgbansi/config.h b/keyboards/fjlabs/mk61rgbansi/config.h index afdacdd080..b352868d2d 100644 --- a/keyboards/fjlabs/mk61rgbansi/config.h +++ b/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 */ /* diff --git a/keyboards/fjlabs/mk61rgbansi/info.json b/keyboards/fjlabs/mk61rgbansi/info.json index 01a859e0ba..8c42aa97b6 100644 --- a/keyboards/fjlabs/mk61rgbansi/info.json +++ b/keyboards/fjlabs/mk61rgbansi/info.json @@ -30,6 +30,10 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "animation": "rainbow_swirl", + "speed": 144 } }, "processor": "atmega32u4", diff --git a/keyboards/fjlabs/tf60ansi/config.h b/keyboards/fjlabs/tf60ansi/config.h index afdacdd080..b352868d2d 100644 --- a/keyboards/fjlabs/tf60ansi/config.h +++ b/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 */ /* diff --git a/keyboards/fjlabs/tf60ansi/info.json b/keyboards/fjlabs/tf60ansi/info.json index b45f7258b6..f161284ae0 100644 --- a/keyboards/fjlabs/tf60ansi/info.json +++ b/keyboards/fjlabs/tf60ansi/info.json @@ -30,6 +30,10 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "animation": "rainbow_swirl", + "speed": 144 } }, "processor": "atmega32u4", diff --git a/keyboards/fjlabs/tf60v2/config.h b/keyboards/fjlabs/tf60v2/config.h index afdacdd080..b352868d2d 100644 --- a/keyboards/fjlabs/tf60v2/config.h +++ b/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 */ /* diff --git a/keyboards/fjlabs/tf60v2/info.json b/keyboards/fjlabs/tf60v2/info.json index 7f6b3ce970..e3051c0da7 100644 --- a/keyboards/fjlabs/tf60v2/info.json +++ b/keyboards/fjlabs/tf60v2/info.json @@ -30,6 +30,10 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "animation": "rainbow_swirl", + "speed": 144 } }, "processor": "atmega32u4", diff --git a/keyboards/fjlabs/tf65rgbv2/config.h b/keyboards/fjlabs/tf65rgbv2/config.h index afdacdd080..b352868d2d 100644 --- a/keyboards/fjlabs/tf65rgbv2/config.h +++ b/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 */ /* diff --git a/keyboards/fjlabs/tf65rgbv2/info.json b/keyboards/fjlabs/tf65rgbv2/info.json index 2101e17f03..ab105ff4a9 100644 --- a/keyboards/fjlabs/tf65rgbv2/info.json +++ b/keyboards/fjlabs/tf65rgbv2/info.json @@ -30,6 +30,10 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "animation": "rainbow_swirl", + "speed": 144 } }, "processor": "atmega32u4", diff --git a/keyboards/frooastboard/nano/config.h b/keyboards/frooastboard/nano/config.h index d28c057500..b316a918d4 100644 --- a/keyboards/frooastboard/nano/config.h +++ b/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 diff --git a/keyboards/frooastboard/nano/info.json b/keyboards/frooastboard/nano/info.json index 6112c4832c..c81d7a3dfb 100644 --- a/keyboards/frooastboard/nano/info.json +++ b/keyboards/frooastboard/nano/info.json @@ -35,6 +35,10 @@ "rainbow_swirl": true, "snake": true, "twinkle": true + }, + "default": { + "hue": 234, + "val": 190 } }, "ws2812": { diff --git a/keyboards/gray_studio/aero75/config.h b/keyboards/gray_studio/aero75/config.h index d00df8f11f..57da6a8ac1 100644 --- a/keyboards/gray_studio/aero75/config.h +++ b/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 */ diff --git a/keyboards/gray_studio/aero75/info.json b/keyboards/gray_studio/aero75/info.json index 476ee33d61..06d11e8467 100644 --- a/keyboards/gray_studio/aero75/info.json +++ b/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": { diff --git a/keyboards/gray_studio/apollo80/config.h b/keyboards/gray_studio/apollo80/config.h deleted file mode 100644 index d8a6abbc38..0000000000 --- a/keyboards/gray_studio/apollo80/config.h +++ /dev/null @@ -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 diff --git a/keyboards/gray_studio/apollo80/info.json b/keyboards/gray_studio/apollo80/info.json index bbaa577c92..21fa7c72d2 100644 --- a/keyboards/gray_studio/apollo80/info.json +++ b/keyboards/gray_studio/apollo80/info.json @@ -28,6 +28,9 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "animation": "rainbow_mood" } }, "matrix_pins": { diff --git a/keyboards/gray_studio/space65r3/config.h b/keyboards/gray_studio/space65r3/config.h index 27d4b4a6e5..67315123e5 100644 --- a/keyboards/gray_studio/space65r3/config.h +++ b/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 */ diff --git a/keyboards/gray_studio/space65r3/info.json b/keyboards/gray_studio/space65r3/info.json index 85e0978a59..7e559ab3fa 100644 --- a/keyboards/gray_studio/space65r3/info.json +++ b/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": { diff --git a/keyboards/gray_studio/think65v3/config.h b/keyboards/gray_studio/think65v3/config.h index 0a0596e64c..6b1f49b592 100644 --- a/keyboards/gray_studio/think65v3/config.h +++ b/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 */ diff --git a/keyboards/gray_studio/think65v3/info.json b/keyboards/gray_studio/think65v3/info.json index 8fba691fa4..a61dd5efe1 100644 --- a/keyboards/gray_studio/think65v3/info.json +++ b/keyboards/gray_studio/think65v3/info.json @@ -46,6 +46,9 @@ "snake": true, "static_gradient": true, "twinkle": true + }, + "default": { + "animation": "rainbow_mood" } }, "layout_aliases": { diff --git a/keyboards/handwired/uthol/rev2/config.h b/keyboards/handwired/uthol/rev2/config.h deleted file mode 100644 index f4c4fda7cf..0000000000 --- a/keyboards/handwired/uthol/rev2/config.h +++ /dev/null @@ -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 diff --git a/keyboards/handwired/uthol/rev2/info.json b/keyboards/handwired/uthol/rev2/info.json index 89515a8fef..9185e97c43 100644 --- a/keyboards/handwired/uthol/rev2/info.json +++ b/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" diff --git a/keyboards/handwired/uthol/rev3/config.h b/keyboards/handwired/uthol/rev3/config.h index a3a2eb1ca0..569a38c699 100644 --- a/keyboards/handwired/uthol/rev3/config.h +++ b/keyboards/handwired/uthol/rev3/config.h @@ -32,5 +32,3 @@ #define LOCKING_RESYNC_ENABLE #define PERMISSIVE_HOLD - -#define RGBLIGHT_DEFAULT_HUE 201 diff --git a/keyboards/handwired/uthol/rev3/info.json b/keyboards/handwired/uthol/rev3/info.json index 79818d4670..dbbce9139d 100644 --- a/keyboards/handwired/uthol/rev3/info.json +++ b/keyboards/handwired/uthol/rev3/info.json @@ -16,6 +16,9 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "hue": 201 } }, "tapping": { diff --git a/keyboards/jacky_studio/bear_65/config.h b/keyboards/jacky_studio/bear_65/config.h index 17cd8ea9ab..805f9ad054 100644 --- a/keyboards/jacky_studio/bear_65/config.h +++ b/keyboards/jacky_studio/bear_65/config.h @@ -8,5 +8,3 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#define RGBLIGHT_DEFAULT_VAL 50 diff --git a/keyboards/jacky_studio/bear_65/rev1/info.json b/keyboards/jacky_studio/bear_65/rev1/info.json index 325bc3c6d7..098817dedb 100644 --- a/keyboards/jacky_studio/bear_65/rev1/info.json +++ b/keyboards/jacky_studio/bear_65/rev1/info.json @@ -41,6 +41,9 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "val": 50 } }, "indicators": { diff --git a/keyboards/jacky_studio/bear_65/rev2/info.json b/keyboards/jacky_studio/bear_65/rev2/info.json index d853b3a320..52e8354fab 100644 --- a/keyboards/jacky_studio/bear_65/rev2/info.json +++ b/keyboards/jacky_studio/bear_65/rev2/info.json @@ -41,6 +41,9 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "val": 50 } }, "indicators": { diff --git a/keyboards/jels/jels60/v2/config.h b/keyboards/jels/jels60/v2/config.h index c9c1ba2c0e..274e7fcf62 100644 --- a/keyboards/jels/jels60/v2/config.h +++ b/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 */ diff --git a/keyboards/jels/jels60/v2/info.json b/keyboards/jels/jels60/v2/info.json index 1945b101cf..69ec00193a 100644 --- a/keyboards/jels/jels60/v2/info.json +++ b/keyboards/jels/jels60/v2/info.json @@ -31,6 +31,9 @@ "snake": true, "static_gradient": true, "twinkle": true + }, + "default": { + "val": 0 } }, "indicators": { diff --git a/keyboards/jels/jels88/config.h b/keyboards/jels/jels88/config.h index 0b1d115495..2d5641fa69 100644 --- a/keyboards/jels/jels88/config.h +++ b/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 */ diff --git a/keyboards/jels/jels88/info.json b/keyboards/jels/jels88/info.json index cc8e525525..598075fd42 100644 --- a/keyboards/jels/jels88/info.json +++ b/keyboards/jels/jels88/info.json @@ -34,6 +34,9 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "val": 0 } }, "processor": "atmega32u4", diff --git a/keyboards/jpe230/big_knob/config.h b/keyboards/jpe230/big_knob/config.h index a7d6b2382c..c4001447d2 100644 --- a/keyboards/jpe230/big_knob/config.h +++ b/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 diff --git a/keyboards/jpe230/big_knob/info.json b/keyboards/jpe230/big_knob/info.json index 4f72cfca48..083a1ae690 100644 --- a/keyboards/jpe230/big_knob/info.json +++ b/keyboards/jpe230/big_knob/info.json @@ -31,7 +31,9 @@ "backlight": { "pin": "GP7", "levels": 7, - "breathing": false + "default": { + "brightness": 6 + } }, "rgblight": { "driver": "ws2812", diff --git a/keyboards/kbdfans/bounce/75/hotswap/config.h b/keyboards/kbdfans/bounce/75/hotswap/config.h index 79f79fdf50..56a23d8321 100644 --- a/keyboards/kbdfans/bounce/75/hotswap/config.h +++ b/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
\ No newline at end of file diff --git a/keyboards/kbdfans/bounce/75/hotswap/info.json b/keyboards/kbdfans/bounce/75/hotswap/info.json index ee6f380e4e..f467e2a909 100644 --- a/keyboards/kbdfans/bounce/75/hotswap/info.json +++ b/keyboards/kbdfans/bounce/75/hotswap/info.json @@ -33,6 +33,9 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "speed": 15 } }, "ws2812": { diff --git a/keyboards/kbdfans/bounce/75/soldered/config.h b/keyboards/kbdfans/bounce/75/soldered/config.h index 79f79fdf50..56a23d8321 100644 --- a/keyboards/kbdfans/bounce/75/soldered/config.h +++ b/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
\ No newline at end of file diff --git a/keyboards/kbdfans/bounce/75/soldered/info.json b/keyboards/kbdfans/bounce/75/soldered/info.json index 8dd809d5c8..5fc246655d 100644 --- a/keyboards/kbdfans/bounce/75/soldered/info.json +++ b/keyboards/kbdfans/bounce/75/soldered/info.json @@ -34,6 +34,9 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "speed": 15 } }, "ws2812": { diff --git a/keyboards/kbdfans/kbd75hs/config.h b/keyboards/kbdfans/kbd75hs/config.h index 6a5b35b5b6..05ad34d3f5 100644 --- a/keyboards/kbdfans/kbd75hs/config.h +++ b/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 diff --git a/keyboards/kbdfans/kbd75hs/info.json b/keyboards/kbdfans/kbd75hs/info.json index fc2310993c..097bb6003a 100644 --- a/keyboards/kbdfans/kbd75hs/info.json +++ b/keyboards/kbdfans/kbd75hs/info.json @@ -33,6 +33,9 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "speed": 15 } }, "ws2812": { diff --git a/keyboards/kbdfans/odin/v2/config.h b/keyboards/kbdfans/odin/v2/config.h deleted file mode 100644 index e47ec47523..0000000000 --- a/keyboards/kbdfans/odin/v2/config.h +++ /dev/null @@ -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 diff --git a/keyboards/kbdfans/odin/v2/info.json b/keyboards/kbdfans/odin/v2/info.json index 7714d2407f..9425537125 100644 --- a/keyboards/kbdfans/odin/v2/info.json +++ b/keyboards/kbdfans/odin/v2/info.json @@ -34,6 +34,9 @@ "snake": true, "christmas": true, "static_gradient": true + }, + "default": { + "animation": "rainbow_swirl" } }, "processor": "STM32F072", diff --git a/keyboards/kbdfans/phaseone/config.h b/keyboards/kbdfans/phaseone/config.h index 2dba9f5d35..b090729a50 100644 --- a/keyboards/kbdfans/phaseone/config.h +++ b/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
\ No newline at end of file diff --git a/keyboards/kbdfans/phaseone/info.json b/keyboards/kbdfans/phaseone/info.json index 14150a1cdd..aea255aaf4 100644 --- a/keyboards/kbdfans/phaseone/info.json +++ b/keyboards/kbdfans/phaseone/info.json @@ -35,6 +35,9 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "speed": 15 } }, "ws2812": { diff --git a/keyboards/kbdfans/tiger80/config.h b/keyboards/kbdfans/tiger80/config.h index b2ffcbfd27..b58aa329ec 100644 --- a/keyboards/kbdfans/tiger80/config.h +++ b/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 diff --git a/keyboards/kbdfans/tiger80/info.json b/keyboards/kbdfans/tiger80/info.json index 9bdccc5817..1a2258deea 100644 --- a/keyboards/kbdfans/tiger80/info.json +++ b/keyboards/kbdfans/tiger80/info.json @@ -42,6 +42,9 @@ "snake": true, "static_gradient": true, "twinkle": true + }, + "default": { + "speed": 15 } }, "ws2812": { diff --git a/keyboards/keebio/bamfk4/config.h b/keyboards/keebio/bamfk4/config.h index 6c07504e74..21ce4672bf 100644 --- a/keyboards/keebio/bamfk4/config.h +++ b/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 */ diff --git a/keyboards/keebio/bamfk4/info.json b/keyboards/keebio/bamfk4/info.json index b6ac353d0a..769f288c51 100644 --- a/keyboards/keebio/bamfk4/info.json +++ b/keyboards/keebio/bamfk4/info.json @@ -70,6 +70,9 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "val": 120 } }, "matrix_pins": { diff --git a/keyboards/keebio/iris/rev5/config.h b/keyboards/keebio/iris/rev5/config.h index 63610ecac5..4b67b6632f 100644 --- a/keyboards/keebio/iris/rev5/config.h +++ b/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) diff --git a/keyboards/keebio/iris/rev5/info.json b/keyboards/keebio/iris/rev5/info.json index 72b8da80d0..4bb4554f7c 100644 --- a/keyboards/keebio/iris/rev5/info.json +++ b/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": { diff --git a/keyboards/keebio/iris/rev6/config.h b/keyboards/keebio/iris/rev6/config.h index 519316fcdf..f52c020dee 100644 --- a/keyboards/keebio/iris/rev6/config.h +++ b/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) diff --git a/keyboards/keebio/iris/rev6/info.json b/keyboards/keebio/iris/rev6/info.json index b9b13d30d7..8563ba64ab 100644 --- a/keyboards/keebio/iris/rev6/info.json +++ b/keyboards/keebio/iris/rev6/info.json @@ -78,6 +78,9 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "val": 120 } }, "split": { diff --git a/keyboards/keebio/iris/rev7/config.h b/keyboards/keebio/iris/rev7/config.h index 7d0b85ca37..eec56a2620 100644 --- a/keyboards/keebio/iris/rev7/config.h +++ b/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) diff --git a/keyboards/keebio/iris/rev7/info.json b/keyboards/keebio/iris/rev7/info.json index 2f5798df14..a7b81f9224 100644 --- a/keyboards/keebio/iris/rev7/info.json +++ b/keyboards/keebio/iris/rev7/info.json @@ -77,6 +77,9 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "val": 120 } }, "split": { diff --git a/keyboards/keygem/kg60ansi/config.h b/keyboards/keygem/kg60ansi/config.h index 388a273f7c..13c17d597d 100644 --- a/keyboards/keygem/kg60ansi/config.h +++ b/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 */ /* diff --git a/keyboards/keygem/kg60ansi/info.json b/keyboards/keygem/kg60ansi/info.json index 9d8cbd485e..73d31b8da1 100644 --- a/keyboards/keygem/kg60ansi/info.json +++ b/keyboards/keygem/kg60ansi/info.json @@ -25,6 +25,10 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "animation": "rainbow_swirl", + "speed": 144 } }, "matrix_pins": { diff --git a/keyboards/keygem/kg65rgbv2/config.h b/keyboards/keygem/kg65rgbv2/config.h index 388a273f7c..13c17d597d 100644 --- a/keyboards/keygem/kg65rgbv2/config.h +++ b/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 */ /* diff --git a/keyboards/keygem/kg65rgbv2/info.json b/keyboards/keygem/kg65rgbv2/info.json index 674b629577..e7b48dcbb0 100644 --- a/keyboards/keygem/kg65rgbv2/info.json +++ b/keyboards/keygem/kg65rgbv2/info.json @@ -25,6 +25,10 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "animation": "rainbow_swirl", + "speed": 144 } }, "matrix_pins": { diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/config.h b/keyboards/kprepublic/bm60hsrgb/rev2/config.h index 5644300e93..1d2b071fc1 100644 --- a/keyboards/kprepublic/bm60hsrgb/rev2/config.h +++ b/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 diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/info.json b/keyboards/kprepublic/bm60hsrgb/rev2/info.json index 27aace1f7b..9a77549e68 100644 --- a/keyboards/kprepublic/bm60hsrgb/rev2/info.json +++ b/keyboards/kprepublic/bm60hsrgb/rev2/info.json @@ -71,6 +71,9 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "animation": "rainbow_mood" } }, "matrix_pins": { diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h index 2bc8f04779..5edcec6eb4 100644 --- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h +++ b/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) diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json index b1c79d2854..3b97f904ab 100644 --- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json +++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json @@ -56,7 +56,10 @@ "rgb_test": true, "alternating": true, "twinkle": true - } + }, + "default": { + "animation": "rainbow_mood" + } }, "matrix_pins": { "cols": ["B2", "B3", "B7", "B0", "B1", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h index e665916def..ea594e53cf 100644 --- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h +++ b/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 diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json index b8a7ed73f1..111534b0f8 100644 --- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json +++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json @@ -79,6 +79,9 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "animation": "rainbow_mood" } }, "matrix_pins": { diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h index c2184ee0f8..b5ff897b18 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h +++ b/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 diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json index 69cb814cae..9f16eb2121 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json +++ b/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": { diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/config.h b/keyboards/kprepublic/bm68hsrgb/rev2/config.h index aa11c68d14..df6f089922 100644 --- a/keyboards/kprepublic/bm68hsrgb/rev2/config.h +++ b/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) diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/info.json b/keyboards/kprepublic/bm68hsrgb/rev2/info.json index c732137cf7..41cb0fc4ee 100644 --- a/keyboards/kprepublic/bm68hsrgb/rev2/info.json +++ b/keyboards/kprepublic/bm68hsrgb/rev2/info.json @@ -62,6 +62,9 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "animation": "rainbow_mood" } }, "matrix_pins": { diff --git a/keyboards/melgeek/mj6xy/rev3/config.h b/keyboards/melgeek/mj6xy/rev3/config.h index 288c8e3a3e..b3932491c1 100755 --- a/keyboards/melgeek/mj6xy/rev3/config.h +++ b/keyboards/melgeek/mj6xy/rev3/config.h @@ -16,5 +16,4 @@ #pragma once -# define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6) -# define RGBLIGHT_DEFAULT_SPD 10 +#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6) diff --git a/keyboards/melgeek/mj6xy/rev3/info.json b/keyboards/melgeek/mj6xy/rev3/info.json index dba086e493..e690065639 100644 --- a/keyboards/melgeek/mj6xy/rev3/info.json +++ b/keyboards/melgeek/mj6xy/rev3/info.json @@ -24,6 +24,9 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "speed": 10 } }, "ws2812": { diff --git a/keyboards/mlego/m60_split/rev1/config.h b/keyboards/mlego/m60_split/rev1/config.h index 90ea0bd56c..564add296d 100644 --- a/keyboards/mlego/m60_split/rev1/config.h +++ b/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 diff --git a/keyboards/mlego/m60_split/rev1/info.json b/keyboards/mlego/m60_split/rev1/info.json index 89744c8b86..8280ffa022 100644 --- a/keyboards/mlego/m60_split/rev1/info.json +++ b/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": { diff --git a/keyboards/mode/m60h/config.h b/keyboards/mode/m60h/config.h index 04fda276e6..f984cf28de 100644 --- a/keyboards/mode/m60h/config.h +++ b/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 diff --git a/keyboards/mode/m60h/info.json b/keyboards/mode/m60h/info.json index 5fee979149..b33ea3a9c3 100644 --- a/keyboards/mode/m60h/info.json +++ b/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, diff --git a/keyboards/mode/m60h_f/config.h b/keyboards/mode/m60h_f/config.h index 04fda276e6..f984cf28de 100644 --- a/keyboards/mode/m60h_f/config.h +++ b/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 diff --git a/keyboards/mode/m60h_f/info.json b/keyboards/mode/m60h_f/info.json index f4bcddfe75..014472bc68 100644 --- a/keyboards/mode/m60h_f/info.json +++ b/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, diff --git a/keyboards/mode/m60s/config.h b/keyboards/mode/m60s/config.h index 04fda276e6..f984cf28de 100644 --- a/keyboards/mode/m60s/config.h +++ b/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 diff --git a/keyboards/mode/m60s/info.json b/keyboards/mode/m60s/info.json index 368f2fff82..6a03219427 100644 --- a/keyboards/mode/m60s/info.json +++ b/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, diff --git a/keyboards/mode/m75s/config.h b/keyboards/mode/m75s/config.h index 4d3a7d5ca4..5672c10fc5 100644 --- a/keyboards/mode/m75s/config.h +++ b/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 diff --git a/keyboards/mtbkeys/mtb60/hotswap/config.h b/keyboards/mtbkeys/mtb60/hotswap/config.h index 56a9edf0aa..19881718ef 100644 --- a/keyboards/mtbkeys/mtb60/hotswap/config.h +++ b/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 diff --git a/keyboards/mtbkeys/mtb60/hotswap/info.json b/keyboards/mtbkeys/mtb60/hotswap/info.json index deb6f6a0fe..554587e816 100644 --- a/keyboards/mtbkeys/mtb60/hotswap/info.json +++ b/keyboards/mtbkeys/mtb60/hotswap/info.json @@ -24,6 +24,9 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "animation": "rainbow_swirl" } }, "ws2812": { diff --git a/keyboards/mtbkeys/mtb60/solder/config.h b/keyboards/mtbkeys/mtb60/solder/config.h index 56a9edf0aa..19881718ef 100644 --- a/keyboards/mtbkeys/mtb60/solder/config.h +++ b/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 diff --git a/keyboards/mtbkeys/mtb60/solder/info.json b/keyboards/mtbkeys/mtb60/solder/info.json index 9fdca32a3e..dae43e6969 100644 --- a/keyboards/mtbkeys/mtb60/solder/info.json +++ b/keyboards/mtbkeys/mtb60/solder/info.json @@ -24,6 +24,9 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "animation": "rainbow_swirl" } }, "ws2812": { diff --git a/keyboards/owlab/spring/config.h b/keyboards/owlab/spring/config.h deleted file mode 100644 index 461903ea2e..0000000000 --- a/keyboards/owlab/spring/config.h +++ /dev/null @@ -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 diff --git a/keyboards/owlab/spring/info.json b/keyboards/owlab/spring/info.json index d5813e78c8..f55f08addc 100644 --- a/keyboards/owlab/spring/info.json +++ b/keyboards/owlab/spring/info.json @@ -29,6 +29,10 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "animation": "rainbow_swirl", + "val": 127 } }, "ws2812": { diff --git a/keyboards/prototypist/oceanographer/config.h b/keyboards/prototypist/oceanographer/config.h index e5719bb137..ed9c00df90 100644 --- a/keyboards/prototypist/oceanographer/config.h +++ b/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 diff --git a/keyboards/prototypist/oceanographer/info.json b/keyboards/prototypist/oceanographer/info.json index 488f17eeb9..d7117d6abc 100644 --- a/keyboards/prototypist/oceanographer/info.json +++ b/keyboards/prototypist/oceanographer/info.json @@ -30,6 +30,13 @@ "animations": { "alternating": true, "breathing": true + }, + "default": { + "val": 155 + }, + "layers": { + "enabled": true, + "max": 4 } }, "matrix_pins": { diff --git a/keyboards/qpockets/space_space/rev2/config.h b/keyboards/qpockets/space_space/rev2/config.h index 02bd670f71..9f86bdabd7 100644 --- a/keyboards/qpockets/space_space/rev2/config.h +++ b/keyboards/qpockets/space_space/rev2/config.h @@ -17,5 +17,3 @@ #pragma once #define LOCKING_SUPPORT_ENABLE - -#define RGBLIGHT_DEFAULT_HUE 130 diff --git a/keyboards/qpockets/space_space/rev2/info.json b/keyboards/qpockets/space_space/rev2/info.json index 45cdb5870a..3fe0f71497 100644 --- a/keyboards/qpockets/space_space/rev2/info.json +++ b/keyboards/qpockets/space_space/rev2/info.json @@ -20,7 +20,10 @@ ] }, "rgblight": { - "led_count": 4 + "led_count": 4, + "default": { + "hue": 130 + } }, "ws2812": { "pin": "F0" diff --git a/keyboards/qvex/lynepad2/config.h b/keyboards/qvex/lynepad2/config.h index 9e1f70b38b..c6fad65c97 100644 --- a/keyboards/qvex/lynepad2/config.h +++ b/keyboards/qvex/lynepad2/config.h @@ -25,9 +25,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //Thumbwheel #define PIN_TC D2 - -//Backlighting -#define BACKLIGHT_DEFAULT_LEVEL 5 - -//RGB arc -#define RGBLIGHT_DEFAULT_VAL 64
\ No newline at end of file diff --git a/keyboards/qvex/lynepad2/info.json b/keyboards/qvex/lynepad2/info.json index 7919c2adc2..3107640792 100644 --- a/keyboards/qvex/lynepad2/info.json +++ b/keyboards/qvex/lynepad2/info.json @@ -35,7 +35,10 @@ "rgblight": { "led_count": 5, "max_brightness": 192, - "sleep": true + "sleep": true, + "default": { + "val": 64 + } }, "ws2812": { "pin": "D3" @@ -44,7 +47,10 @@ "breathing": true, "levels": 8, "max_brightness": 192, - "pin": "B7" + "pin": "B7", + "default": { + "brightness": 5 + } }, "layouts": { "LAYOUT": { diff --git a/keyboards/qwertykeys/qk100/ansi/config.h b/keyboards/qwertykeys/qk100/ansi/config.h index c179795b1f..041dbdb928 100644 --- a/keyboards/qwertykeys/qk100/ansi/config.h +++ b/keyboards/qwertykeys/qk100/ansi/config.h @@ -17,16 +17,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -# define RGBLIGHT_LAYERS -# define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF -# define RGBLIGHT_LAYERS_RETAIN_VAL -# define RGBLIGHT_DEFAULT_VAL 10 -# define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 5 -# define RGBLIGHT_SLEEP +#define RGBLIGHT_LAYERS_RETAIN_VAL +#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 5 + /*== customize breathing effect ==*/ -# define RGBLIGHT_BREATHE_TABLE_SIZE 128 -# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.0 -# define RGBLIGHT_EFFECT_BREATHE_MAX 60 +#define RGBLIGHT_BREATHE_TABLE_SIZE 128 +#define RGBLIGHT_EFFECT_BREATHE_CENTER 1.0 +#define RGBLIGHT_EFFECT_BREATHE_MAX 60 /* RGB matrix */ #define I2C1_CLOCK_SPEED 400000 diff --git a/keyboards/qwertykeys/qk100/info.json b/keyboards/qwertykeys/qk100/info.json index c8498f3eaf..d020ca8ad2 100644 --- a/keyboards/qwertykeys/qk100/info.json +++ b/keyboards/qwertykeys/qk100/info.json @@ -34,8 +34,15 @@ "brightness_steps": 10, "saturation_steps": 8, "led_count": 6, - "max_brightness": 120 - + "max_brightness": 120, + "default": { + "val": 10 + }, + "layers": { + "enabled": true, + "override_rgb": true + }, + "sleep": true }, "dynamic_keymap": { "layer_count": 2 diff --git a/keyboards/qwertykeys/qk100/solder/config.h b/keyboards/qwertykeys/qk100/solder/config.h index 714f01a1da..6a16c99f05 100644 --- a/keyboards/qwertykeys/qk100/solder/config.h +++ b/keyboards/qwertykeys/qk100/solder/config.h @@ -17,13 +17,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -# define RGBLIGHT_LAYERS -# define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF -# define RGBLIGHT_LAYERS_RETAIN_VAL -# define RGBLIGHT_DEFAULT_VAL 10 -# define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 5 -# define RGBLIGHT_SLEEP +#define RGBLIGHT_LAYERS_RETAIN_VAL +#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 5 + /*== customize breathing effect ==*/ -# define RGBLIGHT_BREATHE_TABLE_SIZE 128 -# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.0 -# define RGBLIGHT_EFFECT_BREATHE_MAX 60
\ No newline at end of file +#define RGBLIGHT_BREATHE_TABLE_SIZE 128 +#define RGBLIGHT_EFFECT_BREATHE_CENTER 1.0 +#define RGBLIGHT_EFFECT_BREATHE_MAX 60
\ No newline at end of file diff --git a/keyboards/salicylic_acid3/naked48/rev1/config.h b/keyboards/salicylic_acid3/naked48/rev1/config.h index 84dbacba54..2f62289261 100644 --- a/keyboards/salicylic_acid3/naked48/rev1/config.h +++ b/keyboards/salicylic_acid3/naked48/rev1/config.h @@ -21,5 +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_VAL 50 diff --git a/keyboards/salicylic_acid3/naked48/rev1/info.json b/keyboards/salicylic_acid3/naked48/rev1/info.json index a2d7b0c849..f0aa33b962 100644 --- a/keyboards/salicylic_acid3/naked48/rev1/info.json +++ b/keyboards/salicylic_acid3/naked48/rev1/info.json @@ -39,6 +39,9 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "val": 50 } }, "ws2812": { diff --git a/keyboards/skippys_custom_pcs/rooboard65/config.h b/keyboards/skippys_custom_pcs/rooboard65/config.h index afdacdd080..b352868d2d 100644 --- a/keyboards/skippys_custom_pcs/rooboard65/config.h +++ b/keyboards/skippys_custom_pcs/rooboard65/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 */ /* diff --git a/keyboards/skippys_custom_pcs/rooboard65/info.json b/keyboards/skippys_custom_pcs/rooboard65/info.json index 11a50e87b1..b6151a303c 100644 --- a/keyboards/skippys_custom_pcs/rooboard65/info.json +++ b/keyboards/skippys_custom_pcs/rooboard65/info.json @@ -25,6 +25,10 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "animation": "rainbow_swirl", + "speed": 144 } }, "matrix_pins": { diff --git a/keyboards/smithrune/iron160/iron160_h/config.h b/keyboards/smithrune/iron160/iron160_h/config.h deleted file mode 100644 index 4edf24a4d9..0000000000 --- a/keyboards/smithrune/iron160/iron160_h/config.h +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2022 Gondolindrim -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 - -/* Defining RGB default brightness to zero */ -#define RGBLIGHT_DEFAULT_VAL 0 diff --git a/keyboards/smithrune/iron160/iron160_h/info.json b/keyboards/smithrune/iron160/iron160_h/info.json index ae65246d26..3fb14989d6 100644 --- a/keyboards/smithrune/iron160/iron160_h/info.json +++ b/keyboards/smithrune/iron160/iron160_h/info.json @@ -17,9 +17,12 @@ "ws2812": { "pin": "B15" }, - "rgblight": { - "led_count": 1 - }, + "rgblight": { + "led_count": 1, + "default": { + "val": 50 + } + }, "diode_direction": "COL2ROW", "layout_aliases": { "LAYOUT": "LAYOUT_60_tsangan_hhkb" diff --git a/keyboards/smithrune/iron165r2/config.h b/keyboards/smithrune/iron165r2/config.h index 9749d68d72..b803959d13 100644 --- a/keyboards/smithrune/iron165r2/config.h +++ b/keyboards/smithrune/iron165r2/config.h @@ -39,5 +39,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. # define RGBLIGHT_LED_MAP {21 , 2 , 3 , 4 , 5 , 1 , 20 , 0 , 6 , 7 , 8 , 9 , 10 , 11 , 12 , 13 , 19 , 14 , 15 , 16 , 17 , 18 } // D18, D19, D20, D21, D22, D23, D24, D25, D26, D27, D28, D29, D60, D61, D62, D63, D64, D65, D66, D67, D68, D69} #endif - -#define RGBLIGHT_DEFAULT_VAL 0 diff --git a/keyboards/smithrune/iron165r2/f072/info.json b/keyboards/smithrune/iron165r2/f072/info.json index 209266ad10..2cbbaa84f3 100644 --- a/keyboards/smithrune/iron165r2/f072/info.json +++ b/keyboards/smithrune/iron165r2/f072/info.json @@ -17,6 +17,9 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "val": 0 } }, "ws2812": { diff --git a/keyboards/smithrune/iron165r2/f411/info.json b/keyboards/smithrune/iron165r2/f411/info.json index 72547e955e..ff685e3cdd 100644 --- a/keyboards/smithrune/iron165r2/f411/info.json +++ b/keyboards/smithrune/iron165r2/f411/info.json @@ -20,6 +20,9 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "val": 0 } }, "ws2812": { diff --git a/keyboards/tweetydabird/lotus58/config.h b/keyboards/tweetydabird/lotus58/config.h deleted file mode 100644 index 4175568d40..0000000000 --- a/keyboards/tweetydabird/lotus58/config.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2022 Markus Knutsson (@TweetyDaBird) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -// Options not yet fully implemented in info.json -#define RGBLIGHT_DEFAULT_VAL 87 - -#define SPLIT_HAND_PIN B5 diff --git a/keyboards/tweetydabird/lotus58/info.json b/keyboards/tweetydabird/lotus58/info.json index 751f57c519..646843e765 100644 --- a/keyboards/tweetydabird/lotus58/info.json +++ b/keyboards/tweetydabird/lotus58/info.json @@ -32,6 +32,9 @@ "pin_compatible": "promicro", "processor": "atmega32u4", "rgblight": { + "default": { + "val": 87 + }, "led_count": 70, "max_brightness": 175, "sleep": true, @@ -50,6 +53,9 @@ ] } }, + "handedness": { + "pin": "B5" + }, "soft_serial_pin": "D2", "transport": { "protocol": "serial", diff --git a/keyboards/viendi8l/config.h b/keyboards/viendi8l/config.h index 0538906ecc..050a0cca22 100644 --- a/keyboards/viendi8l/config.h +++ b/keyboards/viendi8l/config.h @@ -33,8 +33,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE -#define RGBLIGHT_DEFAULT_VAL 0 - #define WS2812_PWM_COMPLEMENTARY_OUTPUT #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 diff --git a/keyboards/viendi8l/info.json b/keyboards/viendi8l/info.json index d50b96a887..29dbd5b25a 100644 --- a/keyboards/viendi8l/info.json +++ b/keyboards/viendi8l/info.json @@ -9,7 +9,10 @@ "device_version": "0.0.1" }, "rgblight": { - "led_count": 4 + "led_count": 4, + "default": { + "val": 0 + } }, "ws2812": { "pin": "B15", diff --git a/keyboards/wolf/ts60/config.h b/keyboards/wolf/ts60/config.h deleted file mode 100644 index 81e0b787cb..0000000000 --- a/keyboards/wolf/ts60/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2020 <me@homedrop.org> - -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 BACKLIGHT_DEFAULT_LEVEL 6 diff --git a/keyboards/wolf/ts60/info.json b/keyboards/wolf/ts60/info.json index 5e883d2bf1..8f6d9318ea 100644 --- a/keyboards/wolf/ts60/info.json +++ b/keyboards/wolf/ts60/info.json @@ -31,6 +31,9 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "animation": "rainbow_swirl" } }, "ws2812": { diff --git a/keyboards/work_louder/loop/config.h b/keyboards/work_louder/loop/config.h index 6853707067..25d390cecf 100644 --- a/keyboards/work_louder/loop/config.h +++ b/keyboards/work_louder/loop/config.h @@ -19,9 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_DI_PIN E6 -#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_STATIC_LIGHT -#define RGBLIGHT_DEFAULT_HUE 36 - #define RGB_MATRIX_DISABLE_KEYCODES /* diff --git a/keyboards/work_louder/loop/info.json b/keyboards/work_louder/loop/info.json index 7c62f7f854..3c395e057a 100644 --- a/keyboards/work_louder/loop/info.json +++ b/keyboards/work_louder/loop/info.json @@ -77,6 +77,9 @@ "christmas": true, "static_gradient": true, "twinkle": true + }, + "default": { + "hue": 36 } }, "processor": "atmega32u4", diff --git a/keyboards/work_louder/micro/config.h b/keyboards/work_louder/micro/config.h index 3fe4cb5b32..733b226f69 100644 --- a/keyboards/work_louder/micro/config.h +++ b/keyboards/work_louder/micro/config.h @@ -7,7 +7,6 @@ #define RGBLIGHT_DI_PIN D2 #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_STATIC_GRADIENT + 9 -#define RGBLIGHT_DEFAULT_HUE 213 /* disable debug print */ //#define NO_DEBUG diff --git a/keyboards/work_louder/micro/info.json b/keyboards/work_louder/micro/info.json index 95fdb5ab15..1b57ca82e8 100644 --- a/keyboards/work_louder/micro/info.json +++ b/keyboards/work_louder/micro/info.json @@ -34,6 +34,9 @@ "static_gradient": true, "twinkle": true }, + "default": { + "hue": 213 + }, "brightness_steps": 8, "hue_steps": 8, "led_count": 8, diff --git a/keyboards/work_louder/nano/config.h b/keyboards/work_louder/nano/config.h index ace674c509..e50f6a7e43 100644 --- a/keyboards/work_louder/nano/config.h +++ b/keyboards/work_louder/nano/config.h @@ -19,9 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_DI_PIN C7 -#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_STATIC_LIGHT -#define RGBLIGHT_DEFAULT_HUE 170 - #define RGB_MATRIX_DISABLE_KEYCODES /* diff --git a/keyboards/work_louder/nano/info.json b/keyboards/work_louder/nano/info.json index 01bfc0ce46..61c48b3e80 100644 --- a/keyboards/work_louder/nano/info.json +++ b/keyboards/work_louder/nano/info.json @@ -74,6 +74,9 @@ "christmas": true, "static_gradient": true, "twinkle": true + }, + "default": { + "hue": 170 } }, "bootmagic": { diff --git a/keyboards/work_louder/numpad/config.h b/keyboards/work_louder/numpad/config.h index da59b51670..f7d0039653 100644 --- a/keyboards/work_louder/numpad/config.h +++ b/keyboards/work_louder/numpad/config.h @@ -23,4 +23,3 @@ #define RGBLIGHT_DI_PIN D2 #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_STATIC_GRADIENT + 9 -#define RGBLIGHT_DEFAULT_HUE 213 diff --git a/keyboards/work_louder/numpad/info.json b/keyboards/work_louder/numpad/info.json index e9a20613c6..bd615c4080 100644 --- a/keyboards/work_louder/numpad/info.json +++ b/keyboards/work_louder/numpad/info.json @@ -95,6 +95,9 @@ "static_gradient": true, "twinkle": true }, + "default": { + "hue": 213 + }, "brightness_steps": 8, "hue_steps": 8, "led_count": 8, diff --git a/keyboards/work_louder/work_board/config.h b/keyboards/work_louder/work_board/config.h index c698ad42ca..57f309513b 100644 --- a/keyboards/work_louder/work_board/config.h +++ b/keyboards/work_louder/work_board/config.h @@ -20,7 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_DI_PIN D2 #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_STATIC_GRADIENT + 9 -#define RGBLIGHT_DEFAULT_HUE 213 #define RGB_MATRIX_LED_COUNT 49 #define RGB_MATRIX_DISABLE_KEYCODES diff --git a/keyboards/work_louder/work_board/info.json b/keyboards/work_louder/work_board/info.json index d920837209..8714133ae7 100644 --- a/keyboards/work_louder/work_board/info.json +++ b/keyboards/work_louder/work_board/info.json @@ -74,6 +74,9 @@ "christmas": true, "static_gradient": true, "twinkle": true + }, + "default": { + "hue": 213 } }, "processor": "atmega32u4", diff --git a/keyboards/yandrstudio/eau_r2/config.h b/keyboards/yandrstudio/eau_r2/config.h index 6985b4b8bb..aa9b295e02 100644 --- a/keyboards/yandrstudio/eau_r2/config.h +++ b/keyboards/yandrstudio/eau_r2/config.h @@ -15,13 +15,7 @@ */ #pragma once -#ifdef RGBLIGHT_ENABLE - -# define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD - -# define WS2812_PWM_DRIVER PWMD1 -# define WS2812_PWM_CHANNEL 1 -# define WS2812_DMA_STREAM STM32_DMA1_STREAM5 -# define WS2812_DMA_CHANNEL 5 - -#endif +#define WS2812_PWM_DRIVER PWMD1 +#define WS2812_PWM_CHANNEL 1 +#define WS2812_DMA_STREAM STM32_DMA1_STREAM5 +#define WS2812_DMA_CHANNEL 5 diff --git a/keyboards/yandrstudio/eau_r2/info.json b/keyboards/yandrstudio/eau_r2/info.json index a1b5a0e9cf..c3aaf39e2d 100644 --- a/keyboards/yandrstudio/eau_r2/info.json +++ b/keyboards/yandrstudio/eau_r2/info.json @@ -30,6 +30,9 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "animation": "rainbow_mood" } }, "debounce": 8, diff --git a/keyboards/yandrstudio/nightstar75/config.h b/keyboards/yandrstudio/nightstar75/config.h index 98480b2687..4d5c662999 100644 --- a/keyboards/yandrstudio/nightstar75/config.h +++ b/keyboards/yandrstudio/nightstar75/config.h @@ -15,14 +15,10 @@ */ #pragma once -# define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD +#define RGBLIGHT_LAYERS_RETAIN_VAL -# define RGBLIGHT_LAYERS -# define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF -# define RGBLIGHT_LAYERS_RETAIN_VAL - -# define WS2812_PWM_DRIVER PWMD3 // default: PWMD2 -# define WS2812_PWM_CHANNEL 2 // default: 2 -# define WS2812_PWM_PAL_MODE 2 -# define WS2812_DMA_STREAM STM32_DMA1_STREAM3 -# define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DRIVER PWMD3 // default: PWMD2 +#define WS2812_PWM_CHANNEL 2 // default: 2 +#define WS2812_PWM_PAL_MODE 2 +#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_DMA_CHANNEL 3 diff --git a/keyboards/yandrstudio/nightstar75/info.json b/keyboards/yandrstudio/nightstar75/info.json index 2bf8cd36b3..956016a7e6 100644 --- a/keyboards/yandrstudio/nightstar75/info.json +++ b/keyboards/yandrstudio/nightstar75/info.json @@ -24,6 +24,13 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "animation": "rainbow_mood" + }, + "layers": { + "enabled": true, + "override_rgb": true } }, "matrix_pins": { diff --git a/keyboards/yandrstudio/yr6095/config.h b/keyboards/yandrstudio/yr6095/config.h index 592953720f..05a8922788 100644 --- a/keyboards/yandrstudio/yr6095/config.h +++ b/keyboards/yandrstudio/yr6095/config.h @@ -15,13 +15,9 @@ */ #pragma once -# define RGBLIGHT_LAYERS -# define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF -# define RGBLIGHT_LAYERS_RETAIN_VAL +#define RGBLIGHT_LAYERS_RETAIN_VAL -# define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD - -# define WS2812_PWM_DRIVER PWMD3 -# define WS2812_PWM_CHANNEL 2 -# define WS2812_DMA_STREAM STM32_DMA1_STREAM3 -# define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DRIVER PWMD3 +#define WS2812_PWM_CHANNEL 2 +#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_DMA_CHANNEL 3 diff --git a/keyboards/yandrstudio/yr6095/info.json b/keyboards/yandrstudio/yr6095/info.json index 0ea82bd3ad..7f5308f50a 100644 --- a/keyboards/yandrstudio/yr6095/info.json +++ b/keyboards/yandrstudio/yr6095/info.json @@ -19,6 +19,13 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "animation": "rainbow_mood" + }, + "layers": { + "enabled": true, + "override_rgb": true } }, "ws2812": { diff --git a/keyboards/yandrstudio/yr80/config.h b/keyboards/yandrstudio/yr80/config.h index a0841c469c..08e10e243e 100644 --- a/keyboards/yandrstudio/yr80/config.h +++ b/keyboards/yandrstudio/yr80/config.h @@ -16,14 +16,10 @@ #pragma once -# define RGBLIGHT_LAYERS -# define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF -# define RGBLIGHT_LAYERS_RETAIN_VAL +#define RGBLIGHT_LAYERS_RETAIN_VAL -# define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD - -# define WS2812_PWM_DRIVER PWMD3 -# define WS2812_PWM_CHANNEL 2 -# define WS2812_PWM_PAL_MODE 2 -# define WS2812_DMA_STREAM STM32_DMA1_STREAM3 -# define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DRIVER PWMD3 +#define WS2812_PWM_CHANNEL 2 +#define WS2812_PWM_PAL_MODE 2 +#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_DMA_CHANNEL 3 diff --git a/keyboards/yandrstudio/yr80/info.json b/keyboards/yandrstudio/yr80/info.json index ce9f4bc379..3581fa9d1c 100644 --- a/keyboards/yandrstudio/yr80/info.json +++ b/keyboards/yandrstudio/yr80/info.json @@ -19,6 +19,13 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "animation": "rainbow_mood" + }, + "layers": { + "enabled": true, + "override_rgb": true } }, "ws2812": { |