diff options
author | Stephen Christie <undersampled@live.com> | 2016-09-19 18:05:58 -0400 |
---|---|---|
committer | Stephen Christie <undersampled@live.com> | 2016-09-19 18:05:58 -0400 |
commit | 57a6828a7a73d7b7c3dd9693e04d6873e2e3d1c2 (patch) | |
tree | bdabbdbdd9fd6de500728721d1865058468871e3 /tmk_core/common/action_util.c | |
parent | bf2b260429dbc015d49d005065a37441c8f15753 (diff) | |
parent | 5f9c2f63ffb2c58db73e67442134be58bfe2c129 (diff) |
Merge branch 'master' of http://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'tmk_core/common/action_util.c')
-rw-r--r-- | tmk_core/common/action_util.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tmk_core/common/action_util.c b/tmk_core/common/action_util.c index 61ff202bef..cb4b252648 100644 --- a/tmk_core/common/action_util.c +++ b/tmk_core/common/action_util.c @@ -20,6 +20,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "action_util.h" #include "action_layer.h" #include "timer.h" +#include "keycode_config.h" + +extern keymap_config_t keymap_config; + static inline void add_key_byte(uint8_t code); static inline void del_key_byte(uint8_t code); @@ -139,7 +143,7 @@ void send_keyboard_report(void) { void add_key(uint8_t key) { #ifdef NKRO_ENABLE - if (keyboard_protocol && keyboard_nkro) { + if (keyboard_protocol && keymap_config.nkro) { add_key_bit(key); return; } @@ -150,7 +154,7 @@ void add_key(uint8_t key) void del_key(uint8_t key) { #ifdef NKRO_ENABLE - if (keyboard_protocol && keyboard_nkro) { + if (keyboard_protocol && keymap_config.nkro) { del_key_bit(key); return; } @@ -231,7 +235,7 @@ uint8_t has_anymod(void) uint8_t get_first_key(void) { #ifdef NKRO_ENABLE - if (keyboard_protocol && keyboard_nkro) { + if (keyboard_protocol && keymap_config.nkro) { uint8_t i = 0; for (; i < KEYBOARD_REPORT_BITS && !keyboard_report->nkro.bits[i]; i++) ; |