aboutsummaryrefslogtreecommitdiff
path: root/quantum/quantum.c
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2021-02-28 15:50:15 +0000
committerGitHub <noreply@github.com>2021-02-28 15:50:15 +0000
commita3cbc8a004f6ec5b0e1df326353a2a2fc8221129 (patch)
treea124699fd5e949703b24abea49df14c34b89f43a /quantum/quantum.c
parent02dc3b672217a4bc28b68c944863efd34dc28108 (diff)
downloadqmk_firmware-a3cbc8a004f6ec5b0e1df326353a2a2fc8221129.tar.gz
qmk_firmware-a3cbc8a004f6ec5b0e1df326353a2a2fc8221129.zip
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.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/quantum/quantum.c b/quantum/quantum.c
index db99e80fa..7345ab0d5 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -16,6 +16,7 @@
16 16
17#include <ctype.h> 17#include <ctype.h>
18#include "quantum.h" 18#include "quantum.h"
19#include "magic.h"
19 20
20#ifdef BLUETOOTH_ENABLE 21#ifdef BLUETOOTH_ENABLE
21# include "outputselect.h" 22# include "outputselect.h"
@@ -601,12 +602,7 @@ void tap_random_base64(void) {
601} 602}
602 603
603void matrix_init_quantum() { 604void matrix_init_quantum() {
604#ifdef BOOTMAGIC_LITE 605 magic();
605 bootmagic_lite();
606#endif
607 if (!eeconfig_is_enabled()) {
608 eeconfig_init();
609 }
610#if defined(LED_NUM_LOCK_PIN) || defined(LED_CAPS_LOCK_PIN) || defined(LED_SCROLL_LOCK_PIN) || defined(LED_COMPOSE_PIN) || defined(LED_KANA_PIN) 606#if defined(LED_NUM_LOCK_PIN) || defined(LED_CAPS_LOCK_PIN) || defined(LED_SCROLL_LOCK_PIN) || defined(LED_COMPOSE_PIN) || defined(LED_KANA_PIN)
611 // TODO: remove calls to led_init_ports from keyboards and remove ifdef 607 // TODO: remove calls to led_init_ports from keyboards and remove ifdef
612 led_init_ports(); 608 led_init_ports();