From 1110fe6c6f86a684ba098d9c87665887278b068a Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Tue, 2 Jun 2020 16:32:02 -0700
Subject: [PATCH] Move dip switch init to back of the init process (#9233)
---
quantum/quantum.c | 3 ---
tmk_core/common/keyboard.c | 7 +++++++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/quantum/quantum.c b/quantum/quantum.c
index 2053a1a5f4..346ea4e03a 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -630,9 +630,6 @@ void matrix_init_quantum() {
#ifdef OUTPUT_AUTO_ENABLE
set_output(OUTPUT_AUTO);
#endif
-#ifdef DIP_SWITCH_ENABLE
- dip_switch_init();
-#endif
matrix_init_kb();
}
diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c
index 53d08959e8..e2110363a6 100644
--- a/tmk_core/common/keyboard.c
+++ b/tmk_core/common/keyboard.c
@@ -86,6 +86,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef VIA_ENABLE
# include "via.h"
#endif
+#ifdef DIP_SWITCH_ENABLE
+# include "dip_switch.h"
+#endif
// Only enable this if console is enabled to print to
#if defined(DEBUG_MATRIX_SCAN_RATE) && defined(CONSOLE_ENABLE)
@@ -269,6 +272,10 @@ void keyboard_init(void) {
keymap_config.nkro = 1;
eeconfig_update_keymap(keymap_config.raw);
#endif
+#ifdef DIP_SWITCH_ENABLE
+ dip_switch_init();
+#endif
+
keyboard_post_init_kb(); /* Always keep this last */
}