diff options
author | Joshua T <joshua@sonofone.net> | 2016-10-15 15:14:10 -0500 |
---|---|---|
committer | Joshua T <joshua@sonofone.net> | 2016-10-15 15:14:10 -0500 |
commit | 2e6a1a53d73607030c470b88d3ed7223db5e0004 (patch) | |
tree | fd8ff310f0dba21f9135cdead49482af2276329b /tmk_core/common/keyboard.c | |
parent | 5520b0022fc6cd3dff805eb31ed4bb7e4385ee2a (diff) | |
parent | 0a9ad8f335f5b5b9d184d9e5e9ece6cda149df7e (diff) | |
download | firmware-2e6a1a53d73607030c470b88d3ed7223db5e0004.tar.gz firmware-2e6a1a53d73607030c470b88d3ed7223db5e0004.tar.bz2 firmware-2e6a1a53d73607030c470b88d3ed7223db5e0004.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tmk_core/common/keyboard.c')
-rw-r--r-- | tmk_core/common/keyboard.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c index c46a701b3..371d93f3e 100644 --- a/tmk_core/common/keyboard.c +++ b/tmk_core/common/keyboard.c @@ -57,6 +57,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. # include "visualizer/visualizer.h" #endif + + #ifdef MATRIX_HAS_GHOST static bool has_ghost_in_row(uint8_t row) { @@ -106,7 +108,7 @@ void keyboard_init(void) { rgblight_init(); #endif #if defined(NKRO_ENABLE) && defined(FORCE_NKRO) - keyboard_nkro = true; + keymap_config.nkro = 1; #endif } |