diff options
| author | Joel Challis <git@zvecr.com> | 2021-02-28 15:50:15 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-28 15:50:15 +0000 |
| commit | a3cbc8a004f6ec5b0e1df326353a2a2fc8221129 (patch) | |
| tree | a124699fd5e949703b24abea49df14c34b89f43a /quantum/quantum.c | |
| parent | 02dc3b672217a4bc28b68c944863efd34dc28108 (diff) | |
Overhaul bootmagic logic to have single entrypoint (#8532)
* Relocate bootmagic logic to have single entrypoint
* Align init of layer state
Diffstat (limited to 'quantum/quantum.c')
| -rw-r--r-- | quantum/quantum.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/quantum/quantum.c b/quantum/quantum.c index db99e80fa0..7345ab0d5a 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -16,6 +16,7 @@ #include <ctype.h> #include "quantum.h" +#include "magic.h" #ifdef BLUETOOTH_ENABLE # include "outputselect.h" @@ -601,12 +602,7 @@ void tap_random_base64(void) { } void matrix_init_quantum() { -#ifdef BOOTMAGIC_LITE - bootmagic_lite(); -#endif - if (!eeconfig_is_enabled()) { - eeconfig_init(); - } + magic(); #if defined(LED_NUM_LOCK_PIN) || defined(LED_CAPS_LOCK_PIN) || defined(LED_SCROLL_LOCK_PIN) || defined(LED_COMPOSE_PIN) || defined(LED_KANA_PIN) // TODO: remove calls to led_init_ports from keyboards and remove ifdef led_init_ports(); |