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 /keyboards/cannonkeys | |
| parent | 9bbc0cbb3bcd32a5eb56aa2310fc09802256eccb (diff) | |
| parent | 8a24fbbdaea4f3ff9bdcdf76036bedca6e335bce (diff) | |
| download | qmk_firmware-663b250e2f2853fef824e37a5e6ba0ff48ece68e.tar.gz qmk_firmware-663b250e2f2853fef824e37a5e6ba0ff48ece68e.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/cannonkeys')
| -rw-r--r-- | keyboards/cannonkeys/satisfaction75/satisfaction75.c | 6 |
1 files changed, 3 insertions, 3 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 |