summary refs log tree commit diff
path: root/quantum/eeconfig.c
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@drashna.net>2023-05-08 10:56:03 -0700
committerGitHub <noreply@github.com>2023-05-08 10:56:03 -0700
commit5c4b53a1437adde49871752d8015bfc042b97c20 (patch)
treee67534e42cf3cdf95df869f8f66e23cfeba78524 /quantum/eeconfig.c
parent01be98184363591656ed6bd5baac21e6a5d61132 (diff)
[Bug] Realign and size check EECONFIG structures (#20541)
Co-authored-by: Nick Brassel <nick@tzarc.org>
Diffstat (limited to 'quantum/eeconfig.c')
-rw-r--r--quantum/eeconfig.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/quantum/eeconfig.c b/quantum/eeconfig.c
index 21bcce2654..84de025f0e 100644
--- a/quantum/eeconfig.c
+++ b/quantum/eeconfig.c
@@ -46,6 +46,7 @@ void eeconfig_init_quantum(void) {
 #if defined(EEPROM_DRIVER)
     eeprom_driver_erase();
 #endif
+
     eeprom_update_word(EECONFIG_MAGIC, EECONFIG_MAGIC_NUMBER);
     eeprom_update_byte(EECONFIG_DEBUG, 0);
     eeprom_update_byte(EECONFIG_DEFAULT_LAYER, 0);
@@ -55,19 +56,15 @@ void eeconfig_init_quantum(void) {
     eeprom_update_byte(EECONFIG_BACKLIGHT, 0);
     eeprom_update_byte(EECONFIG_AUDIO, 0xFF); // On by default
     eeprom_update_dword(EECONFIG_RGBLIGHT, 0);
+    eeprom_update_byte(EECONFIG_RGBLIGHT_EXTENDED, 0);
+    eeprom_update_byte(EECONFIG_VELOCIKEY, 0);
+    eeprom_update_byte(EECONFIG_UNICODEMODE, 0);
     eeprom_update_byte(EECONFIG_STENOMODE, 0);
+    uint64_t dummy = 0;
+    eeprom_update_block(&dummy, EECONFIG_RGB_MATRIX, sizeof(uint64_t));
     eeprom_update_dword(EECONFIG_HAPTIC, 0);
-    eeprom_update_byte(EECONFIG_VELOCIKEY, 0);
-    eeprom_update_dword(EECONFIG_RGB_MATRIX, 0);
-    eeprom_update_word(EECONFIG_RGB_MATRIX_EXTENDED, 0);
-
 #if defined(HAPTIC_ENABLE)
     haptic_reset();
-#else
-    // this is used in case haptic is disabled, but we still want sane defaults
-    // in the haptic configuration eeprom. All zero will trigger a haptic_reset
-    // when a haptic-enabled firmware is loaded onto the keyboard.
-    eeprom_update_dword(EECONFIG_HAPTIC, 0);
 #endif
 
 #if (EECONFIG_KB_DATA_SIZE) > 0