summaryrefslogtreecommitdiff
path: root/protocol/pjrc/usb_keyboard.c
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2014-04-25 15:32:21 +0900
committertmk <nobody@nowhere>2014-04-27 04:16:49 +0900
commit5e3f2d2b2e5065a04495f2c55fae0849966b5d23 (patch)
tree4e224b2a2d6a6445ae489ab0b1c150cc3c4a83e4 /protocol/pjrc/usb_keyboard.c
parent62117e7ea77bf036e4e08bb02d682311e3c3d401 (diff)
Make NKRO deafult when it is available
- NKRO is used only when keyboard_protocol = 1(report)
Diffstat (limited to 'protocol/pjrc/usb_keyboard.c')
-rw-r--r--protocol/pjrc/usb_keyboard.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/protocol/pjrc/usb_keyboard.c b/protocol/pjrc/usb_keyboard.c
index de798fcc22..c11995db6f 100644
--- a/protocol/pjrc/usb_keyboard.c
+++ b/protocol/pjrc/usb_keyboard.c
@@ -34,12 +34,12 @@
// protocol setting from the host. We use exactly the same report
// either way, so this variable only stores the setting since we
// are required to be able to report which setting is in use.
-uint8_t usb_keyboard_protocol=1;
+uint8_t keyboard_protocol=1;
// the idle configuration, how often we send the report to the
// host (ms * 4) even when it hasn't changed
// Windows and Linux set 0 while OS X sets 6(24ms) by SET_IDLE request.
-uint8_t usb_keyboard_idle_config=125;
+uint8_t keyobard_idle=125;
// count until idle timeout
uint8_t usb_keyboard_idle_count=0;
@@ -56,15 +56,12 @@ int8_t usb_keyboard_send_report(report_keyboard_t *report)
int8_t result = 0;
#ifdef NKRO_ENABLE
- if (keyboard_nkro)
+ if (keyboard_nkro && keyboard_protocol)
result = send_report(report, KBD2_ENDPOINT, 0, KBD2_SIZE);
else
#endif
{
- if (usb_keyboard_protocol)
- result = send_report(report, KBD_ENDPOINT, 0, KBD_SIZE);
- else
- result = send_report(report, KBD_ENDPOINT, 0, 6);
+ result = send_report(report, KBD_ENDPOINT, 0, KBD_SIZE);
}
if (result) return result;