From 52ee9f2ce1dd7b67a9cd1332d198b63c1d0dc7c8 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 12 Jul 2024 08:06:19 +0100 Subject: [PATCH] Convert `eeconfig_init_kb` implementations to config (#24087) --- keyboards/0xcb/1337/1337.c | 27 ------------------ keyboards/0xcb/1337/keyboard.json | 3 ++ .../akis.c => handwired/bento/rev1/config.h} | 13 ++------- keyboards/handwired/bento/rev1/rev1.c | 28 ------------------- .../hineybush/{h87a/h87a.c => h660s/config.h} | 11 ++------ keyboards/hineybush/h660s/keyboard.json | 3 ++ .../h75_singa/{h75_singa.c => config.h} | 12 ++------ keyboards/hineybush/h75_singa/keyboard.json | 3 ++ .../{h660s/h660s.c => h87a/config.h} | 13 ++------- keyboards/hineybush/h87a/keyboard.json | 3 ++ keyboards/hineybush/h88/{h88.c => config.h} | 11 ++------ keyboards/hineybush/h88/keyboard.json | 3 ++ keyboards/hineybush/hbcp/config.h | 2 ++ keyboards/hineybush/hbcp/hbcp.c | 9 ------ keyboards/hineybush/hbcp/keyboard.json | 3 ++ keyboards/keebio/sinc/rev1/keyboard.json | 3 ++ keyboards/keebio/sinc/rev2/keyboard.json | 3 ++ keyboards/keebio/sinc/sinc.c | 9 ------ keyboards/kumaokobo/kudox_full/kudox_full.c | 6 ---- .../kumaokobo/kudox_full/rev1/keyboard.json | 3 ++ keyboards/mixi/config.h | 2 ++ keyboards/mixi/mixi.c | 14 ---------- .../oxalys80/{oxalys80.c => config.h} | 12 ++------ keyboards/nix_studio/oxalys80/keyboard.json | 3 ++ .../senselessclay/gos65/{gos65.c => config.h} | 12 ++------ keyboards/senselessclay/gos65/keyboard.json | 3 ++ keyboards/wilba_tech/wt60_xt/keyboard.json | 5 ++++ keyboards/wilba_tech/wt60_xt/wt60_xt.c | 20 ------------- keyboards/xelus/akis/keyboard.json | 3 ++ keyboards/xelus/ninjin/keyboard.json | 3 ++ keyboards/xelus/ninjin/ninjin.c | 28 ------------------- 31 files changed, 63 insertions(+), 210 deletions(-) delete mode 100644 keyboards/0xcb/1337/1337.c rename keyboards/{xelus/akis/akis.c => handwired/bento/rev1/config.h} (66%) delete mode 100644 keyboards/handwired/bento/rev1/rev1.c rename keyboards/hineybush/{h87a/h87a.c => h660s/config.h} (65%) rename keyboards/hineybush/h75_singa/{h75_singa.c => config.h} (65%) rename keyboards/hineybush/{h660s/h660s.c => h87a/config.h} (65%) rename keyboards/hineybush/h88/{h88.c => config.h} (65%) delete mode 100644 keyboards/mixi/mixi.c rename keyboards/nix_studio/oxalys80/{oxalys80.c => config.h} (64%) rename keyboards/senselessclay/gos65/{gos65.c => config.h} (65%) delete mode 100644 keyboards/xelus/ninjin/ninjin.c diff --git a/keyboards/0xcb/1337/1337.c b/keyboards/0xcb/1337/1337.c deleted file mode 100644 index d5937540b2c..00000000000 --- a/keyboards/0xcb/1337/1337.c +++ /dev/null @@ -1,27 +0,0 @@ -/* -Copyright 2021 0xCB - Conor Burns - -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 . -*/ -#include "quantum.h" - -void eeconfig_init_kb(void) { -#ifdef BACKLIGHT_ENABLE - backlight_enable(); - backlight_level(5); -#endif - - eeconfig_update_kb(0); - eeconfig_init_user(); -} diff --git a/keyboards/0xcb/1337/keyboard.json b/keyboards/0xcb/1337/keyboard.json index f264d4ed065..b2ef00906b1 100644 --- a/keyboards/0xcb/1337/keyboard.json +++ b/keyboards/0xcb/1337/keyboard.json @@ -9,6 +9,9 @@ "device_version": "0.0.1" }, "backlight": { + "default": { + "brightness": 5 + }, "pin": "B5", "levels": 7, "breathing": true diff --git a/keyboards/xelus/akis/akis.c b/keyboards/handwired/bento/rev1/config.h similarity index 66% rename from keyboards/xelus/akis/akis.c rename to keyboards/handwired/bento/rev1/config.h index 0409f909d2d..aeb48915b9f 100644 --- a/keyboards/xelus/akis/akis.c +++ b/keyboards/handwired/bento/rev1/config.h @@ -1,4 +1,4 @@ -/* Copyright 2021 Harrison Chan (Xelus) +/* Copyright 2020 GhostSeven * * 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 @@ -13,13 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ +#pragma once -#include "quantum.h" - -void eeconfig_init_kb(void) { // EEPROM is getting reset! - rgblight_enable(); // Enable RGB by default - rgblight_mode(RGBLIGHT_MODE_RGB_TEST); // set to RGBLIGHT_MODE_RGB_TEST by default - - eeconfig_update_kb(0); - eeconfig_init_user(); -} +#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2) diff --git a/keyboards/handwired/bento/rev1/rev1.c b/keyboards/handwired/bento/rev1/rev1.c deleted file mode 100644 index 1dd5b683f18..00000000000 --- a/keyboards/handwired/bento/rev1/rev1.c +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright 2020 GhostSeven - * - * 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 . - */ -#include "quantum.h" - -void eeconfig_init_kb(void) { -#ifdef RGBLIGHT_ENABLE - rgblight_enable(); // Enable RGB by default - rgblight_sethsv(0, 255, 255); // Set default HSV - red hue, full saturation, full brightness -#ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL - rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 2); // set to RGB_RAINBOW_SWIRL by default -#endif -#endif - - eeconfig_init_user(); -} diff --git a/keyboards/hineybush/h87a/h87a.c b/keyboards/hineybush/h660s/config.h similarity index 65% rename from keyboards/hineybush/h87a/h87a.c rename to keyboards/hineybush/h660s/config.h index 8c10b68ca0e..2ac1c1bae55 100644 --- a/keyboards/hineybush/h87a/h87a.c +++ b/keyboards/hineybush/h660s/config.h @@ -13,13 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "quantum.h" +#pragma once -void eeconfig_init_kb(void) { // EEPROM is getting reset! - rgblight_enable(); // Enable RGB by default - rgblight_sethsv(0, 255, 128); // Set default HSV - red hue, full saturation, medium brightness - rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 2); // set to RGB_RAINBOW_SWIRL by default - - eeconfig_update_kb(0); - eeconfig_init_user(); -} +#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2) diff --git a/keyboards/hineybush/h660s/keyboard.json b/keyboards/hineybush/h660s/keyboard.json index d76664080e6..44e8c8c21ab 100644 --- a/keyboards/hineybush/h660s/keyboard.json +++ b/keyboards/hineybush/h660s/keyboard.json @@ -35,6 +35,9 @@ "breathing": true }, "rgblight": { + "default": { + "val": 128 + }, "saturation_steps": 8, "brightness_steps": 8, "led_count": 16, diff --git a/keyboards/hineybush/h75_singa/h75_singa.c b/keyboards/hineybush/h75_singa/config.h similarity index 65% rename from keyboards/hineybush/h75_singa/h75_singa.c rename to keyboards/hineybush/h75_singa/config.h index badd12849d4..6be72d4d9ff 100644 --- a/keyboards/hineybush/h75_singa/h75_singa.c +++ b/keyboards/hineybush/h75_singa/config.h @@ -13,14 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ +#pragma once -#include "quantum.h" - -void eeconfig_init_kb(void) { // EEPROM is getting reset! - rgblight_enable(); // Enable RGB by default - rgblight_sethsv(0, 255, 128); // Set default HSV - red hue, full saturation, medium brightness - rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 2); // set to RGB_RAINBOW_SWIRL by default - - eeconfig_update_kb(0); - eeconfig_init_user(); -} +#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2) diff --git a/keyboards/hineybush/h75_singa/keyboard.json b/keyboards/hineybush/h75_singa/keyboard.json index 30dbd8d6a1f..0c3ca31e280 100644 --- a/keyboards/hineybush/h75_singa/keyboard.json +++ b/keyboards/hineybush/h75_singa/keyboard.json @@ -34,6 +34,9 @@ "breathing": true }, "rgblight": { + "default": { + "val": 128 + }, "saturation_steps": 8, "brightness_steps": 8, "led_count": 22, diff --git a/keyboards/hineybush/h660s/h660s.c b/keyboards/hineybush/h87a/config.h similarity index 65% rename from keyboards/hineybush/h660s/h660s.c rename to keyboards/hineybush/h87a/config.h index 0e774b9c570..9ff1e426bdc 100644 --- a/keyboards/hineybush/h660s/h660s.c +++ b/keyboards/hineybush/h87a/config.h @@ -13,15 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ +#pragma once -#include "quantum.h" - -void eeconfig_init_kb(void) { // EEPROM is getting reset! - rgblight_enable(); // Enable RGB by default - rgblight_sethsv(0, 255, 128); // Set default HSV - red hue, full saturation, medium brightness - rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 2); // set to RGB_RAINBOW_SWIRL by default - - eeconfig_update_kb(0); - eeconfig_init_user(); -} - +#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2) diff --git a/keyboards/hineybush/h87a/keyboard.json b/keyboards/hineybush/h87a/keyboard.json index 987d1a60fdb..42a50bf001b 100644 --- a/keyboards/hineybush/h87a/keyboard.json +++ b/keyboards/hineybush/h87a/keyboard.json @@ -44,6 +44,9 @@ "pin": "D3" }, "rgblight": { + "default": { + "val": 128 + }, "saturation_steps": 8, "brightness_steps": 8, "led_count": 24, diff --git a/keyboards/hineybush/h88/h88.c b/keyboards/hineybush/h88/config.h similarity index 65% rename from keyboards/hineybush/h88/h88.c rename to keyboards/hineybush/h88/config.h index 7c634467511..2537b3f36cf 100644 --- a/keyboards/hineybush/h88/h88.c +++ b/keyboards/hineybush/h88/config.h @@ -13,13 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "quantum.h" +#pragma once -void eeconfig_init_kb(void) { // EEPROM is getting reset! - rgblight_enable(); // Enable RGB by default - rgblight_sethsv(0, 255, 128); // Set default HSV - red hue, full saturation, medium brightness - rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 2); // set to RGB_RAINBOW_SWIRL by default - - eeconfig_update_kb(0); - eeconfig_init_user(); -} +#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2) diff --git a/keyboards/hineybush/h88/keyboard.json b/keyboards/hineybush/h88/keyboard.json index b1bb8423035..6a9b3142e3e 100644 --- a/keyboards/hineybush/h88/keyboard.json +++ b/keyboards/hineybush/h88/keyboard.json @@ -41,6 +41,9 @@ "on_state": 0 }, "rgblight": { + "default": { + "val": 128 + }, "saturation_steps": 8, "brightness_steps": 8, "led_count": 24, diff --git a/keyboards/hineybush/hbcp/config.h b/keyboards/hineybush/hbcp/config.h index bde356232d8..d3274f8c5a8 100644 --- a/keyboards/hineybush/hbcp/config.h +++ b/keyboards/hineybush/hbcp/config.h @@ -34,3 +34,5 @@ along with this program. If not, see . */ #define MATRIX_ROW_PINS { B1, B6, D0, C7, C6, C5 } #define MATRIX_COL_PINS { F0, F1, F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, B5, B4, B3, B2 } + +#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2) diff --git a/keyboards/hineybush/hbcp/hbcp.c b/keyboards/hineybush/hbcp/hbcp.c index e422b46fdcb..a9eff650300 100644 --- a/keyboards/hineybush/hbcp/hbcp.c +++ b/keyboards/hineybush/hbcp/hbcp.c @@ -34,15 +34,6 @@ // #define HSV_custom_color H, S, V -void eeconfig_init_kb(void) { // EEPROM is getting reset! - rgblight_enable(); // Enable RGB by default - rgblight_sethsv(0, 255, 128); // Set default HSV - red hue, full saturation, medium brightness - rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 2); // set to RGB_RAINBOW_SWIRL by default - - eeconfig_update_kb(0); - eeconfig_init_user(); -} - #ifdef RGBLIGHT_ENABLE bool led_update_kb(led_t led_state) { diff --git a/keyboards/hineybush/hbcp/keyboard.json b/keyboards/hineybush/hbcp/keyboard.json index f03c4d57540..e8771ea9a70 100644 --- a/keyboards/hineybush/hbcp/keyboard.json +++ b/keyboards/hineybush/hbcp/keyboard.json @@ -16,6 +16,9 @@ "pin": "B0" }, "rgblight": { + "default": { + "val": 128 + }, "saturation_steps": 8, "brightness_steps": 8, "led_count": 27, diff --git a/keyboards/keebio/sinc/rev1/keyboard.json b/keyboards/keebio/sinc/rev1/keyboard.json index a026aea0079..7a5cb292987 100644 --- a/keyboards/keebio/sinc/rev1/keyboard.json +++ b/keyboards/keebio/sinc/rev1/keyboard.json @@ -57,6 +57,9 @@ ] }, "backlight": { + "default": { + "brightness": 3 + }, "pin": "B5" }, "rgblight": { diff --git a/keyboards/keebio/sinc/rev2/keyboard.json b/keyboards/keebio/sinc/rev2/keyboard.json index 77f8f3c9caf..e68370cb6c2 100644 --- a/keyboards/keebio/sinc/rev2/keyboard.json +++ b/keyboards/keebio/sinc/rev2/keyboard.json @@ -57,6 +57,9 @@ ] }, "backlight": { + "default": { + "brightness": 3 + }, "pin": "B5" }, "rgblight": { diff --git a/keyboards/keebio/sinc/sinc.c b/keyboards/keebio/sinc/sinc.c index c1ebd1a206b..faa3540af9a 100644 --- a/keyboards/keebio/sinc/sinc.c +++ b/keyboards/keebio/sinc/sinc.c @@ -28,15 +28,6 @@ bool led_update_kb(led_t led_state) { } #endif -void eeconfig_init_kb(void) { -#ifdef BACKLIGHT_ENABLE - backlight_enable(); - backlight_level(3); -#endif - eeconfig_update_kb(0); - eeconfig_init_user(); -} - #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { if (!encoder_update_user(index, clockwise)) { return false; } diff --git a/keyboards/kumaokobo/kudox_full/kudox_full.c b/keyboards/kumaokobo/kudox_full/kudox_full.c index d69f679822b..caa21906001 100644 --- a/keyboards/kumaokobo/kudox_full/kudox_full.c +++ b/keyboards/kumaokobo/kudox_full/kudox_full.c @@ -3,12 +3,6 @@ #include "quantum.h" -#ifdef RGBLIGHT_ENABLE -void eeconfig_init_kb(void) { - rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL); -}; -#endif - #ifdef OLED_ENABLE bool oled_task_kb(void) { if (!oled_task_user()) { return false; } diff --git a/keyboards/kumaokobo/kudox_full/rev1/keyboard.json b/keyboards/kumaokobo/kudox_full/rev1/keyboard.json index 09d1cd152c7..2919cbf0867 100644 --- a/keyboards/kumaokobo/kudox_full/rev1/keyboard.json +++ b/keyboards/kumaokobo/kudox_full/rev1/keyboard.json @@ -29,6 +29,9 @@ "knight": true, "christmas": true, "static_gradient": true + }, + "default": { + "animation": "rainbow_swirl" } }, "ws2812": { diff --git a/keyboards/mixi/config.h b/keyboards/mixi/config.h index e5c829d8117..cf7c89abb15 100644 --- a/keyboards/mixi/config.h +++ b/keyboards/mixi/config.h @@ -1,4 +1,6 @@ #pragma once +#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 5) + #define RGBLIGHT_LAYERS #define RGBLIGHT_LAYER_BLINK diff --git a/keyboards/mixi/mixi.c b/keyboards/mixi/mixi.c deleted file mode 100644 index e8da7fdac2d..00000000000 --- a/keyboards/mixi/mixi.c +++ /dev/null @@ -1,14 +0,0 @@ -#include "quantum.h" - -void eeconfig_init_kb(void) { -#ifdef RGBLIGHT_ENABLE - rgblight_enable(); // Enable RGB underglow by default - rgblight_sethsv(0, 255, 255); -#ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL - rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 5); // Set to RGB_RAINBOW_SWIRL animation by default -#endif -#endif - - eeconfig_update_kb(0); - eeconfig_init_user(); -} diff --git a/keyboards/nix_studio/oxalys80/oxalys80.c b/keyboards/nix_studio/oxalys80/config.h similarity index 64% rename from keyboards/nix_studio/oxalys80/oxalys80.c rename to keyboards/nix_studio/oxalys80/config.h index cfebb710432..7943ea4a251 100644 --- a/keyboards/nix_studio/oxalys80/oxalys80.c +++ b/keyboards/nix_studio/oxalys80/config.h @@ -13,14 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ +#pragma once -#include "quantum.h" - -void eeconfig_init_kb(void) { // EEPROM is getting reset! - rgblight_enable(); // Enable RGB by default - rgblight_sethsv(0, 255, 128); // Set default HSV - red hue, full saturation, medium brightness - rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 2); // set to RGB_RAINBOW_SWIRL by default - - eeconfig_update_kb(0); - eeconfig_init_user(); -} +#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2) diff --git a/keyboards/nix_studio/oxalys80/keyboard.json b/keyboards/nix_studio/oxalys80/keyboard.json index 5fa489f72bf..470c43ea2fa 100644 --- a/keyboards/nix_studio/oxalys80/keyboard.json +++ b/keyboards/nix_studio/oxalys80/keyboard.json @@ -39,6 +39,9 @@ "pin": "B3" }, "rgblight": { + "default": { + "val": 128 + }, "saturation_steps": 8, "brightness_steps": 8, "led_count": 24, diff --git a/keyboards/senselessclay/gos65/gos65.c b/keyboards/senselessclay/gos65/config.h similarity index 65% rename from keyboards/senselessclay/gos65/gos65.c rename to keyboards/senselessclay/gos65/config.h index e769608c899..ef2b83ef3eb 100644 --- a/keyboards/senselessclay/gos65/gos65.c +++ b/keyboards/senselessclay/gos65/config.h @@ -13,14 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ +#pragma once -#include "quantum.h" - -void eeconfig_init_kb(void) { // EEPROM is getting reset! - rgblight_enable(); // Enable RGB by default - rgblight_sethsv(0, 255, 125); // Set default HSV - red hue, full saturation, medium brightness - rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 5); // set to RGB_RAINBOW_SWIRL by default - - eeconfig_update_kb(0); - eeconfig_init_user(); -} \ No newline at end of file +#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 5) diff --git a/keyboards/senselessclay/gos65/keyboard.json b/keyboards/senselessclay/gos65/keyboard.json index b869d913015..ee6bb5727aa 100644 --- a/keyboards/senselessclay/gos65/keyboard.json +++ b/keyboards/senselessclay/gos65/keyboard.json @@ -12,6 +12,9 @@ "pin": "B0" }, "rgblight": { + "default": { + "val": 125 + }, "led_count": 68, "max_brightness": 125, "sleep": true, diff --git a/keyboards/wilba_tech/wt60_xt/keyboard.json b/keyboards/wilba_tech/wt60_xt/keyboard.json index 8afafd93143..ba8e8000dbb 100644 --- a/keyboards/wilba_tech/wt60_xt/keyboard.json +++ b/keyboards/wilba_tech/wt60_xt/keyboard.json @@ -23,6 +23,11 @@ "resync": true } }, + "audio": { + "default": { + "clicky": false + } + }, "matrix_pins": { "cols": ["B7", "B0", "F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "E6", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt60_xt/wt60_xt.c b/keyboards/wilba_tech/wt60_xt/wt60_xt.c index 7c6a2fafc43..53b822e58f9 100644 --- a/keyboards/wilba_tech/wt60_xt/wt60_xt.c +++ b/keyboards/wilba_tech/wt60_xt/wt60_xt.c @@ -30,26 +30,6 @@ float tone_device_indication[][2] = SONG(FANTASIE_IMPROMPTU); #endif -// We want to enable audio clicky (i.e. compile it into firmware), -// but not have it "turned on" by default. -#ifdef AUDIO_CLICKY - -#include "process_clicky.h" -extern audio_config_t audio_config; - -void eeconfig_init_kb(void) { - // Reset Keyboard EEPROM value to blank, rather than to a set value - eeconfig_update_kb(0); - - // Need to read here because this isn't done before calling eeconfig_init_kb() - audio_config.raw = eeconfig_read_audio(); - // ...and this call needs audio_config initialized. - clicky_off(); - - eeconfig_init_user(); -} -#endif // AUDIO_CLICKY - void keyboard_pre_init_kb(void) { gpio_set_pin_output(F1); diff --git a/keyboards/xelus/akis/keyboard.json b/keyboards/xelus/akis/keyboard.json index 23a8178b265..da072b6379f 100644 --- a/keyboards/xelus/akis/keyboard.json +++ b/keyboards/xelus/akis/keyboard.json @@ -21,6 +21,9 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "animation": "rgb_test" } }, "ws2812": { diff --git a/keyboards/xelus/ninjin/keyboard.json b/keyboards/xelus/ninjin/keyboard.json index 34032ea4269..2e7b1640dfb 100644 --- a/keyboards/xelus/ninjin/keyboard.json +++ b/keyboards/xelus/ninjin/keyboard.json @@ -26,6 +26,9 @@ "rgb_test": true, "alternating": true, "twinkle": true + }, + "default": { + "animation": "rgb_test" } }, "features": { diff --git a/keyboards/xelus/ninjin/ninjin.c b/keyboards/xelus/ninjin/ninjin.c deleted file mode 100644 index b5a4ee83a7e..00000000000 --- a/keyboards/xelus/ninjin/ninjin.c +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright 2021 Harrison Chan (Xelus) - * - * 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 . - */ - -#include "quantum.h" - -void eeconfig_init_kb(void) { // EEPROM is getting reset! - rgblight_enable(); // Enable RGB by default - rgblight_mode(RGBLIGHT_MODE_RGB_TEST); // set to RGBLIGHT_MODE_RGB_TEST by default - - eeconfig_update_kb(0); - eeconfig_init_user(); -} - -// Tested and verified working on Ninjin -void matrix_io_delay(void) { __asm__ volatile("nop\nnop\nnop\n"); }