di0ib/tmk_keyboard_custom
Archived
1
0
Fork 0
Code Releases Activity

Fix compatibility with NKRO

Browse Source
This commit is contained in:
Kai Ryu 2014-05-13 14:10:56 +09:00
parent 4f1caf1a90
commit 5ccabc844c
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common/action_util.c
View File

@ -145,7 +145,13 @@ void clear_oneshot_mods(void)
uint8_t has_anykey(void) uint8_t has_anykey(void)
{ {
#ifdef USB_6KRO_ENABLE #ifdef USB_6KRO_ENABLE
return cb_count; #ifdef NKRO_ENABLE
if (!keyboard_nkro) {
#endif
return cb_count;
#ifdef NKRO_ENABLE
}
#endif
#else #else
uint8_t cnt = 0; uint8_t cnt = 0;
for (uint8_t i = 1; i < REPORT_SIZE; i++) { for (uint8_t i = 1; i < REPORT_SIZE; i++) {
@ -172,7 +178,14 @@ uint8_t get_first_key(void)
} }
#endif #endif
#ifdef USB_6KRO_ENABLE #ifdef USB_6KRO_ENABLE
return keyboard_report->keys[cb_head]; uint8_t i = cb_head;
do {
if (keyboard_report->keys[i] != 0) {
break;
}
i = RO_INC(i);
} while (i != cb_tail);
return keyboard_report->keys[i];
#else #else
return keyboard_report->keys[0]; return keyboard_report->keys[0];
#endif #endif