Browse Source

Convert `eeconfig_init_kb` implementations to config (#24087)

Joel Challis 2 years ago
parent
commit
52ee9f2ce1

+ 0 - 27
keyboards/0xcb/1337/1337.c

@@ -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 <http://www.gnu.org/licenses/>.
-*/
-#include "quantum.h"
-
-void eeconfig_init_kb(void) {
-#ifdef BACKLIGHT_ENABLE
-    backlight_enable();
-    backlight_level(5);
-#endif
-
-    eeconfig_update_kb(0);
-    eeconfig_init_user();
-}

+ 3 - 0
keyboards/0xcb/1337/keyboard.json

@@ -9,6 +9,9 @@
     "device_version": "0.0.1"
   },
   "backlight": {
+    "default": {
+      "brightness": 5
+    },
     "pin": "B5",
     "levels": 7,
     "breathing": true

+ 3 - 10
keyboards/xelus/akis/akis.c → keyboards/handwired/bento/rev1/config.h

@@ -1,4 +1,4 @@
-/* Copyright 2021 Harrison Chan (Xelus)
+/* Copyright 2020 GhostSeven <work@ghost7.com>
  *
  * 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 <http://www.gnu.org/licenses/>.
  */
+#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)

+ 0 - 28
keyboards/handwired/bento/rev1/rev1.c

@@ -1,28 +0,0 @@
-/* Copyright 2020 GhostSeven <work@ghost7.com>
- *
- * 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/>.
- */
-#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();
-}

+ 2 - 9
keyboards/hineybush/h87a/h87a.c → 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 <http://www.gnu.org/licenses/>.
  */
-#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)

+ 3 - 0
keyboards/hineybush/h660s/keyboard.json

@@ -35,6 +35,9 @@
         "breathing": true
     },
     "rgblight": {
+        "default": {
+            "val": 128
+        },
         "saturation_steps": 8,
         "brightness_steps": 8,
         "led_count": 16,

+ 2 - 10
keyboards/hineybush/h75_singa/h75_singa.c → 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 <http://www.gnu.org/licenses/>.
  */
+#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)

+ 3 - 0
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,

+ 2 - 11
keyboards/hineybush/h660s/h660s.c → 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 <http://www.gnu.org/licenses/>.
  */
+#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)

+ 3 - 0
keyboards/hineybush/h87a/keyboard.json

@@ -44,6 +44,9 @@
         "pin": "D3"
     },
     "rgblight": {
+        "default": {
+            "val": 128
+        },
         "saturation_steps": 8,
         "brightness_steps": 8,
         "led_count": 24,

+ 2 - 9
keyboards/hineybush/h88/h88.c → 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 <http://www.gnu.org/licenses/>.
  */
-#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)

+ 3 - 0
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,

+ 2 - 0
keyboards/hineybush/hbcp/config.h

@@ -34,3 +34,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #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)

+ 0 - 9
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) {

+ 3 - 0
keyboards/hineybush/hbcp/keyboard.json

@@ -16,6 +16,9 @@
         "pin": "B0"
     },
     "rgblight": {
+        "default": {
+            "val": 128
+        },
         "saturation_steps": 8,
         "brightness_steps": 8,
         "led_count": 27,

+ 3 - 0
keyboards/keebio/sinc/rev1/keyboard.json

@@ -57,6 +57,9 @@
         ]
     },
     "backlight": {
+        "default": {
+            "brightness": 3
+        },
         "pin": "B5"
     },
     "rgblight": {

+ 3 - 0
keyboards/keebio/sinc/rev2/keyboard.json

@@ -57,6 +57,9 @@
         ]
     },
     "backlight": {
+        "default": {
+            "brightness": 3
+        },
         "pin": "B5"
     },
     "rgblight": {

+ 0 - 9
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; }

+ 0 - 6
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; }

+ 3 - 0
keyboards/kumaokobo/kudox_full/rev1/keyboard.json

@@ -29,6 +29,9 @@
             "knight": true,
             "christmas": true,
             "static_gradient": true
+        },
+        "default": {
+            "animation": "rainbow_swirl"
         }
     },
     "ws2812": {

+ 2 - 0
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

+ 0 - 14
keyboards/mixi/mixi.c

@@ -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();
-}

+ 2 - 10
keyboards/nix_studio/oxalys80/oxalys80.c → 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 <http://www.gnu.org/licenses/>.
  */
+#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)

+ 3 - 0
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,

+ 2 - 10
keyboards/senselessclay/gos65/gos65.c → 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 <http://www.gnu.org/licenses/>.
  */
+#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();
-}
+#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 5)

+ 3 - 0
keyboards/senselessclay/gos65/keyboard.json

@@ -12,6 +12,9 @@
       "pin": "B0"
     },
     "rgblight": {
+      "default": {
+        "val": 125
+      },
       "led_count": 68,
       "max_brightness": 125,
       "sleep": true,

+ 5 - 0
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"]

+ 0 - 20
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);
 

+ 3 - 0
keyboards/xelus/akis/keyboard.json

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

+ 3 - 0
keyboards/xelus/ninjin/keyboard.json

@@ -26,6 +26,9 @@
             "rgb_test": true,
             "alternating": true,
             "twinkle": true
+        },
+        "default": {
+            "animation": "rgb_test"
         }
     },
     "features": {

+ 0 - 28
keyboards/xelus/ninjin/ninjin.c

@@ -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 <http://www.gnu.org/licenses/>.
- */
-
-#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"); }