X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=usb_keyboard.c;h=57e23d5fce951a61c52a73e1636f88bf48a86291;hb=c07408a44784c0fdbca33567926a2c0aa4e8e17e;hp=dc781f01722f32f65c07cf1ae162fe5e8b5c2534;hpb=461e0d3d8c82cc78d29d3115af3c417bb51bb50f;p=max%2Ftmk_keyboard.git diff --git a/usb_keyboard.c b/usb_keyboard.c index dc781f01..57e23d5f 100644 --- a/usb_keyboard.c +++ b/usb_keyboard.c @@ -1,121 +1,253 @@ #include #include +#include "usb_keycodes.h" #include "usb_keyboard.h" #include "print.h" #include "debug.h" +#include "util.h" -static bool is_sent = false; - -// which modifier keys are currently pressed -// 1=left ctrl, 2=left shift, 4=left alt, 8=left gui -// 16=right ctrl, 32=right shift, 64=right alt, 128=right gui -uint8_t keyboard_modifier_keys=0; - -// which keys are currently pressed, up to 6 keys may be down at once -uint8_t keyboard_keys[6]={0,0,0,0,0,0}; +// keyboard report. +static usb_keyboard_report_t _report0 = { {0}, 0, false }; +static usb_keyboard_report_t _report1 = { {0}, 0, false }; +usb_keyboard_report_t *usb_keyboard_report = &_report0; +usb_keyboard_report_t *usb_keyboard_report_prev = &_report1; // 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 keyboard_protocol=1; +uint8_t usb_keyboard_protocol=1; // the idle configuration, how often we send the report to the // host (ms * 4) even when it hasn't changed -uint8_t keyboard_idle_config=125; +uint8_t usb_keyboard_idle_config=125; // count until idle timeout -uint8_t keyboard_idle_count=0; +uint8_t usb_keyboard_idle_count=0; // 1=num lock, 2=caps lock, 4=scroll lock, 8=compose, 16=kana -volatile uint8_t keyboard_leds=0; +volatile uint8_t usb_keyboard_leds=0; + +// enable USB NKRO +bool usb_keyboard_nkro = false; -// perform a single keystroke -int8_t usb_keyboard_press(uint8_t key, uint8_t modifier) +int8_t usb_keyboard_send(void) +{ + return usb_keyboard_send_report(usb_keyboard_report); +} + +static inline int8_t _send_report(usb_keyboard_report_t *report, uint8_t endpoint, uint8_t keys_start, uint8_t keys_end); +int8_t usb_keyboard_send_report(usb_keyboard_report_t *report) { - int8_t r; + int8_t result = 0; + +#ifdef USB_NKRO_ENABLE + if (usb_keyboard_nkro) + result = _send_report(report, KBD2_ENDPOINT, 0, KBD2_REPORT_KEYS); + else +#endif + { + if (usb_keyboard_protocol) + result = _send_report(report, KBD_ENDPOINT, 0, KBD_REPORT_KEYS); + else + result = _send_report(report, KBD_ENDPOINT, 0, 6); + } + + if (result) return result; + usb_keyboard_idle_count = 0; + report->is_sent =true; + usb_keyboard_print_report(report); + return 0; +} - keyboard_modifier_keys = modifier; - keyboard_keys[0] = key; - r = usb_keyboard_send(); - if (r) return r; - keyboard_modifier_keys = 0; - keyboard_keys[0] = 0; - return usb_keyboard_send(); +void usb_keyboard_swap_report(void) { + usb_keyboard_report_t *tmp = usb_keyboard_report_prev; + usb_keyboard_report_prev = usb_keyboard_report; + usb_keyboard_report = tmp; } -// send the contents of keyboard_keys and keyboard_modifier_keys -int8_t usb_keyboard_send(void) +void usb_keyboard_clear_report(void) { + usb_keyboard_clear_keys(); + usb_keyboard_clear_mods(); + usb_keyboard_report->is_sent = false; +} + +void usb_keyboard_clear_keys(void) { + for (int i = 0; i < KEYS_MAX; i++) usb_keyboard_report->keys[i] = 0; +} + +void usb_keyboard_clear_mods(void) +{ + usb_keyboard_report->mods = 0; +} + +void usb_keyboard_set_keys(uint8_t *keys) { - uint8_t i, intr_state, timeout; + for (int i = 0; i < KEYS_MAX; i++) + usb_keyboard_report->keys[i] = keys[i]; +} + +void usb_keyboard_set_mods(uint8_t mods) +{ + usb_keyboard_report->mods = mods; +} + +void usb_keyboard_add_code(uint8_t code) +{ + if (IS_MOD(code)) { + usb_keyboard_add_mod(code); + } else { + usb_keyboard_add_key(code); + } +} - if (!usb_configured()) return -1; - intr_state = SREG; - cli(); - UENUM = KEYBOARD_ENDPOINT; - timeout = UDFNUML + 50; - while (1) { - // are we ready to transmit? - if (UEINTX & (1<mods |= MOD_BIT(code); } -void usb_keyboard_clear(void) { - usb_keyboard_clear_key(); - usb_keyboard_clear_mod(); +void usb_keyboard_del_code(uint8_t code) +{ + if (IS_MOD(code)) { + usb_keyboard_del_mod(code); + } else { + usb_keyboard_del_key(code); + } } -void usb_keyboard_clear_key(void) { - for (int i = 0; i < 6; i++) keyboard_keys[i] = 0; +void usb_keyboard_del_key(uint8_t code) +{ +#ifdef USB_NKRO_ENABLE + if ((code>>3) < KEYS_MAX) { + usb_keyboard_keys[code>>3] &= ~(1<<(code&7)); + } +#else + for (int i = 0; i < KEYS_MAX; i++) { + if (usb_keyboard_report->keys[i] == code) { + usb_keyboard_report->keys[i] = KB_NO; + return; + } + } +#endif } -void usb_keyboard_clear_mod(void) { - keyboard_modifier_keys = 0; +void usb_keyboard_del_mod(uint8_t code) +{ + usb_keyboard_report->mods &= ~MOD_BIT(code); } -bool usb_keyboard_is_sent(void) { - return is_sent; +bool usb_keyboard_is_sent(void) +{ + return usb_keyboard_report->is_sent; } -bool usb_keyboard_has_key(void) { +bool usb_keyboard_has_key(void) +{ uint8_t keys = 0; - for (int i = 0; i < 6; i++) keys |= keyboard_keys[i]; + for (int i = 0; i < KEYS_MAX; i++) keys |= usb_keyboard_report->keys[i]; return keys ? true : false; } -bool usb_keyboard_has_mod(void) { - return keyboard_modifier_keys ? true : false; +bool usb_keyboard_has_mod(void) +{ + return usb_keyboard_report->mods ? true : false; +} + +uint8_t usb_keyboard_get_key(void) +{ +#ifdef USB_NKRO_ENABLE + if (usb_keyboard_nkro) { + uint8_t i = 0; + for (; i < KEYS_MAX && !usb_keyboard_keys[i]; i++); + return i<<3 | biton(usb_keyboard_keys[i]); + } +#endif + return usb_keyboard_keys[0]; } -void usb_keyboard_print(void) { +void usb_keyboard_print_report(usb_keyboard_report_t *report) +{ if (!debug_keyboard) return; - print("\nkeys: "); - for (int i = 0; i < 6; i++) { phex(keyboard_keys[i]); print(" "); } - print("\n"); - print("mods: "); phex(keyboard_modifier_keys); print("\n"); + print("keys: "); + for (int i = 0; i < KEYS_MAX; i++) { phex(report->keys[i]); print(" "); } + print(" mods: "); phex(report->mods); print("\n"); } + + +static inline int8_t _send_report(usb_keyboard_report_t *report, uint8_t endpoint, uint8_t keys_start, uint8_t keys_end) +{ + uint8_t intr_state, timeout; + + if (!usb_configured()) return -1; + intr_state = SREG; + cli(); + UENUM = endpoint; + timeout = UDFNUML + 50; + while (1) { + // are we ready to transmit? + if (UEINTX & (1<mods; + if (!usb_keyboard_nkro) + UEDATX = 0; + for (uint8_t i = keys_start; i < keys_end; i++) { + UEDATX = report->keys[i]; + } + UEINTX = 0x3A; + SREG = intr_state; + return 0; +} + +static inline void _add_key_byte(uint8_t code) +{ + // TODO: fix ugly code + int8_t i = 0; + int8_t empty = -1; + for (; i < KEYS_MAX; i++) { + if (usb_keyboard_keys_prev[i] == code) { + usb_keyboard_keys[i] = code; + break; + } + if (empty == -1 && + usb_keyboard_keys_prev[i] == 0 && + usb_keyboard_keys[i] == 0) { + empty = i; + } + } + if (i == KEYS_MAX) { + if (empty != -1) { + usb_keyboard_keys[empty] = code; + } + } +} + +static inline void _add_key_bit(uint8_t code) +{ + if ((code>>3) < KEYS_MAX) { + usb_keyboard_keys[code>>3] |= 1<<(code&7); + } +} +