diff options
| author | QMK Bot <hello@qmk.fm> | 2022-08-10 03:01:41 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-08-10 03:01:41 +0000 |
| commit | 663b250e2f2853fef824e37a5e6ba0ff48ece68e (patch) | |
| tree | 0b345dc8655864c85847a91e18059bb7f8bc32a3 | |
| parent | 9bbc0cbb3bcd32a5eb56aa2310fc09802256eccb (diff) | |
| parent | 8a24fbbdaea4f3ff9bdcdf76036bedca6e335bce (diff) | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | keyboards/cannonkeys/satisfaction75/satisfaction75.c | 6 | ||||
| -rw-r--r-- | keyboards/mxss/mxss_frontled.c | 6 | ||||
| -rw-r--r-- | keyboards/wilba_tech/wt70_jb/wt70_jb.c | 6 | ||||
| -rw-r--r-- | keyboards/wilba_tech/wt_main.c | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/keyboards/cannonkeys/satisfaction75/satisfaction75.c b/keyboards/cannonkeys/satisfaction75/satisfaction75.c index 9435377839..3cd52d5f23 100644 --- a/keyboards/cannonkeys/satisfaction75/satisfaction75.c +++ b/keyboards/cannonkeys/satisfaction75/satisfaction75.c @@ -348,9 +348,9 @@ void custom_config_load(){ // Called from matrix_init_kb() if not VIA_ENABLE void via_init_kb(void) { - // If the EEPROM has the magic, the data is good. - // OK to load from EEPROM. - if (via_eeprom_is_valid()) { + // This checks both an EEPROM reset (from bootmagic lite, keycodes) + // and also firmware build date (from via_eeprom_is_valid()) + if (eeconfig_is_enabled()) { custom_config_load(); } else { #ifdef DYNAMIC_KEYMAP_ENABLE diff --git a/keyboards/mxss/mxss_frontled.c b/keyboards/mxss/mxss_frontled.c index f5e4613dfb..8bb93d5fd8 100644 --- a/keyboards/mxss/mxss_frontled.c +++ b/keyboards/mxss/mxss_frontled.c @@ -39,9 +39,9 @@ __attribute__ ((weak)) size_t lc_size = sizeof(layer_colors) / sizeof(hs_set); void fled_init(void) { - // If EEPROM config exists, load it - // If VIA EEPROM exists, FLED config should too - if (via_eeprom_is_valid()) { + // This checks both an EEPROM reset (from bootmagic lite, keycodes) + // and also firmware build date (from via_eeprom_is_valid()) + if (eeconfig_is_enabled()) { fled_load_conf(); // Else, default config } else { diff --git a/keyboards/wilba_tech/wt70_jb/wt70_jb.c b/keyboards/wilba_tech/wt70_jb/wt70_jb.c index 0bb9aca092..d4f2c5c8da 100644 --- a/keyboards/wilba_tech/wt70_jb/wt70_jb.c +++ b/keyboards/wilba_tech/wt70_jb/wt70_jb.c @@ -38,9 +38,9 @@ bool led_update_kb(led_t led_state) { // Called from matrix_init_kb() if not VIA_ENABLE void via_init_kb(void) { - // If the EEPROM has the magic, the data is good. - // OK to load from EEPROM - if (via_eeprom_is_valid()) { + // This checks both an EEPROM reset (from bootmagic lite, keycodes) + // and also firmware build date (from via_eeprom_is_valid()) + if (eeconfig_is_enabled()) { } else { // Cache "first execution" state so we can do something // specific after QMK initialization has done its thing. diff --git a/keyboards/wilba_tech/wt_main.c b/keyboards/wilba_tech/wt_main.c index a8ad795446..a7afeb5907 100644 --- a/keyboards/wilba_tech/wt_main.c +++ b/keyboards/wilba_tech/wt_main.c @@ -35,9 +35,9 @@ // Called from matrix_init_kb() if not VIA_ENABLE void via_init_kb(void) { - // If the EEPROM has the magic, the data is good. - // OK to load from EEPROM - if (via_eeprom_is_valid()) { + // This checks both an EEPROM reset (from bootmagic lite, keycodes) + // and also firmware build date (from via_eeprom_is_valid()) + if (eeconfig_is_enabled()) { #if RGB_BACKLIGHT_ENABLED || MONO_BACKLIGHT_ENABLED backlight_config_load(); #endif // RGB_BACKLIGHT_ENABLED || MONO_BACKLIGHT_ENABLED |