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 /tmk_core | |
| parent | eefc05e07849dec8587faba29f3708172d8c3218 (diff) | |
| download | qmk_firmware-1110fe6c6f86a684ba098d9c87665887278b068a.tar.gz qmk_firmware-1110fe6c6f86a684ba098d9c87665887278b068a.zip | |
Move dip switch init to back of the init process (#9233)
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/common/keyboard.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c index 53d08959e..e2110363a 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/>. | |||
| 86 | #ifdef VIA_ENABLE | 86 | #ifdef VIA_ENABLE |
| 87 | # include "via.h" | 87 | # include "via.h" |
| 88 | #endif | 88 | #endif |
| 89 | #ifdef DIP_SWITCH_ENABLE | ||
| 90 | # include "dip_switch.h" | ||
| 91 | #endif | ||
| 89 | 92 | ||
| 90 | // Only enable this if console is enabled to print to | 93 | // Only enable this if console is enabled to print to |
| 91 | #if defined(DEBUG_MATRIX_SCAN_RATE) && defined(CONSOLE_ENABLE) | 94 | #if defined(DEBUG_MATRIX_SCAN_RATE) && defined(CONSOLE_ENABLE) |
| @@ -269,6 +272,10 @@ void keyboard_init(void) { | |||
| 269 | keymap_config.nkro = 1; | 272 | keymap_config.nkro = 1; |
| 270 | eeconfig_update_keymap(keymap_config.raw); | 273 | eeconfig_update_keymap(keymap_config.raw); |
| 271 | #endif | 274 | #endif |
| 275 | #ifdef DIP_SWITCH_ENABLE | ||
| 276 | dip_switch_init(); | ||
| 277 | #endif | ||
| 278 | |||
| 272 | keyboard_post_init_kb(); /* Always keep this last */ | 279 | keyboard_post_init_kb(); /* Always keep this last */ |
| 273 | } | 280 | } |
| 274 | 281 | ||
