1 files changed, 11 insertions, 7 deletions
diff --git a/pjrc/host.c b/pjrc/host.c
index 7247288bd7..8da88517b5 100644
--- a/pjrc/host.c
+++ b/pjrc/host.c
@@ -4,6 +4,7 @@
 #include "usb_mouse.h"
 #include "debug.h"
 #include "host.h"
+#include "util.h"
 
 
 #ifdef USB_NKRO_ENABLE
@@ -80,14 +81,17 @@ uint8_t host_has_anykey(void)
     return cnt;
 }
 
-uint8_t *host_get_keys(void)
+uint8_t host_get_first_key(void)
 {
-    return keyboard_report->keys;
-}
-
-uint8_t host_get_mods(void)
-{
-    return keyboard_report->mods;
+#ifdef USB_NKRO_ENABLE
+    if (keyboard_nkro) {
+        uint8_t i = 0;
+        for (; i < REPORT_KEYS && !keyboard_report->keys[i]; i++)
+            ;
+        return i<<3 | biton(keyboard_report->keys[i]);
+    }
+#endif
+    return keyboard_report->keys[0];
 }