diff options
| author | Drashna Jael're <drashna@live.com> | 2021-06-29 12:23:03 -0700 |
|---|---|---|
| committer | Drashna Jael're <drashna@live.com> | 2021-06-29 12:24:07 -0700 |
| commit | acf2c323e2927f6007b17ded577cf49fd86fec6c (patch) | |
| tree | 8334dc5c71e6ab9bf33c76143eac7bb0e60159b0 /tmk_core/common/eeconfig.c | |
| parent | ec7a7beeed3046e9144d4c4ce0ef3b2c4f9e4341 (diff) | |
| parent | f55e39e8a2246f6f96fd5d4a84a866e2615cde7b (diff) | |
Merge upstream QMK Firmware at '0.12.52~1'
Diffstat (limited to 'tmk_core/common/eeconfig.c')
| -rw-r--r-- | tmk_core/common/eeconfig.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tmk_core/common/eeconfig.c b/tmk_core/common/eeconfig.c index 9bdf926a5a..60b2dcb7e7 100644 --- a/tmk_core/common/eeconfig.c +++ b/tmk_core/common/eeconfig.c @@ -6,6 +6,7 @@ #ifdef ORYX_ENABLE # include "oryx.h" #endif + #ifdef STM32_EEPROM_ENABLE # include <hal.h> # include "eeprom_stm32.h" @@ -60,19 +61,18 @@ void eeconfig_init_quantum(void) { eeprom_update_byte(EECONFIG_VELOCIKEY, 0); eeprom_update_dword(EECONFIG_RGB_MATRIX, 0); eeprom_update_byte(EECONFIG_RGB_MATRIX_SPEED, 0); - +#ifdef ORYX_ENABLE + eeconfig_init_oryx(); +#endif // TODO: Remove once ARM has a way to configure EECONFIG_HANDEDNESS // within the emulated eeprom via dfu-util or another tool #if defined INIT_EE_HANDS_LEFT - #pragma message "Faking EE_HANDS for left hand" +# pragma message "Faking EE_HANDS for left hand" eeprom_update_byte(EECONFIG_HANDEDNESS, 1); #elif defined INIT_EE_HANDS_RIGHT - #pragma message "Faking EE_HANDS for right hand" +# pragma message "Faking EE_HANDS for right hand" eeprom_update_byte(EECONFIG_HANDEDNESS, 0); #endif -#ifdef ORYX_ENABLE - eeconfig_init_oryx(); -#endif #if defined(HAPTIC_ENABLE) haptic_reset(); |