diff options
| author | Didier Loiseau <didierloiseau+git@gmail.com> | 2016-09-11 01:26:47 +0200 |
|---|---|---|
| committer | Didier Loiseau <didierloiseau+git@gmail.com> | 2016-09-11 01:26:47 +0200 |
| commit | b9014c757599ca288be07629ad1d00ef66c033f1 (patch) | |
| tree | ba056e704e76327c597e25d1be200c4c991efeb8 /tmk_core/common/bootmagic.c | |
| parent | 60a826923d5a6b0dbe416b0837608149ab82e470 (diff) | |
| parent | 5010df3d8b68a53c382b853c7c2e45922975b631 (diff) | |
| download | firmware-b9014c757599ca288be07629ad1d00ef66c033f1.tar.gz firmware-b9014c757599ca288be07629ad1d00ef66c033f1.tar.bz2 firmware-b9014c757599ca288be07629ad1d00ef66c033f1.zip | |
Merge remote-tracking branch 'remotes/jackhumbert/master' into bépo
Diffstat (limited to 'tmk_core/common/bootmagic.c')
| -rw-r--r-- | tmk_core/common/bootmagic.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/tmk_core/common/bootmagic.c b/tmk_core/common/bootmagic.c index b002a5856..2c6bcbae5 100644 --- a/tmk_core/common/bootmagic.c +++ b/tmk_core/common/bootmagic.c @@ -1,6 +1,6 @@ #include <stdint.h> #include <stdbool.h> -#include <util/delay.h> +#include "wait.h" #include "matrix.h" #include "bootloader.h" #include "debug.h" @@ -10,6 +10,7 @@ #include "eeconfig.h" #include "bootmagic.h" +keymap_config_t keymap_config; void bootmagic(void) { @@ -19,9 +20,9 @@ void bootmagic(void) } /* do scans in case of bounce */ - print("boogmagic scan: ... "); + print("bootmagic scan: ... "); uint8_t scan = 100; - while (scan--) { matrix_scan(); _delay_ms(10); } + while (scan--) { matrix_scan(); wait_ms(10); } print("done.\n"); /* bootmagic skip */ @@ -52,7 +53,7 @@ void bootmagic(void) debug_config.enable = !debug_config.enable; } } - eeconfig_write_debug(debug_config.raw); + eeconfig_update_debug(debug_config.raw); /* keymap config */ keymap_config.raw = eeconfig_read_keymap(); @@ -80,11 +81,7 @@ void bootmagic(void) if (bootmagic_scan_keycode(BOOTMAGIC_HOST_NKRO)) { keymap_config.nkro = !keymap_config.nkro; } - eeconfig_write_keymap(keymap_config.raw); - -#ifdef NKRO_ENABLE - keyboard_nkro = keymap_config.nkro; -#endif + eeconfig_update_keymap(keymap_config.raw); /* default layer */ uint8_t default_layer = 0; @@ -97,7 +94,7 @@ void bootmagic(void) if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEFAULT_LAYER_6)) { default_layer |= (1<<6); } if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEFAULT_LAYER_7)) { default_layer |= (1<<7); } if (default_layer) { - eeconfig_write_default_layer(default_layer); + eeconfig_update_default_layer(default_layer); default_layer_set((uint32_t)default_layer); } else { default_layer = eeconfig_read_default_layer(); @@ -125,4 +122,4 @@ bool bootmagic_scan_keycode(uint8_t keycode) if (!scan_keycode(BOOTMAGIC_KEY_SALT)) return false; return scan_keycode(keycode); -} +}
\ No newline at end of file |