diff options
| author | tmk <tmk@users.noreply.github.com> | 2014-07-07 05:01:01 +0200 |
|---|---|---|
| committer | tmk <tmk@users.noreply.github.com> | 2014-07-07 05:01:01 +0200 |
| commit | 3eeb0a96232af825962fa1e9b05b80ac1cfd1868 (patch) | |
| tree | 9efb1e78f73998755bfe49df9a2f99ffceada33b /common/bootmagic.c | |
| parent | 326e559719505e64b4dd4cc4020c4656252cba64 (diff) | |
| parent | e5bafff725f7b9cbfc364e64c74ea7f68bfc9900 (diff) | |
| download | qmk_firmware-3eeb0a96232af825962fa1e9b05b80ac1cfd1868.tar.gz qmk_firmware-3eeb0a96232af825962fa1e9b05b80ac1cfd1868.tar.xz | |
Merge pull request #112 from shayneholmes/ee_nkro_use_reserved_bit
Adding NKRO virtual dip-switch, using existing bit in keymap byte.
Diffstat (limited to 'common/bootmagic.c')
| -rw-r--r-- | common/bootmagic.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/common/bootmagic.c b/common/bootmagic.c index 036d49044..642d5face 100644 --- a/common/bootmagic.c +++ b/common/bootmagic.c @@ -5,6 +5,7 @@ #include "bootloader.h" #include "debug.h" #include "keymap.h" +#include "host.h" #include "action_layer.h" #include "eeconfig.h" #include "bootmagic.h" @@ -76,8 +77,15 @@ void bootmagic(void) if (bootmagic_scan_keycode(BOOTMAGIC_KEY_SWAP_BACKSLASH_BACKSPACE)) { keymap_config.swap_backslash_backspace = !keymap_config.swap_backslash_backspace; } + 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 + /* default layer */ uint8_t default_layer = 0; if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEFAULT_LAYER_0)) { default_layer |= (1<<0); } |