diff options
| author | Drashna Jaelre <drashna@live.com> | 2020-06-02 16:32:02 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-03 00:32:02 +0100 |
| commit | 1110fe6c6f86a684ba098d9c87665887278b068a (patch) | |
| tree | 5ad3b5c6bc8a6eca8ca25462188351d8307e956f | |
| parent | eefc05e07849dec8587faba29f3708172d8c3218 (diff) | |
Move dip switch init to back of the init process (#9233)0.9.6
| -rw-r--r-- | quantum/quantum.c | 3 | ||||
| -rw-r--r-- | 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 */ } |