mirror/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-02-22 15:40:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename device keyboard api

Browse Source
This commit is contained in:
hathach 2018-07-24 16:52:24 +07:00
parent 3400dfdf4e
commit 3dc1d847b8
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/class/hid/hid_device.c
View File

@ -91,7 +91,7 @@ bool tud_hid_keyboard_busy(void)
return dcd_edpt_busy(TUD_OPT_RHPORT, _kbd_itf.ep_in); return dcd_edpt_busy(TUD_OPT_RHPORT, _kbd_itf.ep_in);
} }
bool tud_hid_keyboard_send_report(hid_keyboard_report_t const *p_report) bool tud_hid_keyboard_report(hid_keyboard_report_t const *p_report)
{ {
VERIFY( tud_mounted() && !tud_hid_keyboard_busy() ); VERIFY( tud_mounted() && !tud_hid_keyboard_busy() );
@ -109,17 +109,17 @@ bool tud_hid_keyboard_send_report(hid_keyboard_report_t const *p_report)
return dcd_edpt_xfer(TUD_OPT_RHPORT, p_hid->ep_in, p_hid->report_buf, sizeof(hid_keyboard_report_t)); return dcd_edpt_xfer(TUD_OPT_RHPORT, p_hid->ep_in, p_hid->report_buf, sizeof(hid_keyboard_report_t));
} }
bool tud_hid_keyboard_send_keycode(uint8_t modifier, uint8_t keycode[6]) bool tud_hid_keyboard_keycode(uint8_t modifier, uint8_t keycode[6])
{ {
hid_keyboard_report_t report = { .modifier = modifier }; hid_keyboard_report_t report = { .modifier = modifier };
memcpy(report.keycode, keycode, 6); memcpy(report.keycode, keycode, 6);
return tud_hid_keyboard_send_report(&report); return tud_hid_keyboard_report(&report);
} }
#if CFG_TUD_HID_ASCII_TO_KEYCODE_LOOKUP #if CFG_TUD_HID_ASCII_TO_KEYCODE_LOOKUP
bool tud_hid_keyboard_send_char(char ch) bool tud_hid_keyboard_key_press(char ch)
{ {
hid_keyboard_report_t report; hid_keyboard_report_t report;
varclr_(&report); varclr_(&report);
@ -127,10 +127,15 @@ bool tud_hid_keyboard_send_char(char ch)
report.modifier = ( HID_ASCII_TO_KEYCODE[(uint8_t)ch].shift ) ? KEYBOARD_MODIFIER_LEFTSHIFT : 0; report.modifier = ( HID_ASCII_TO_KEYCODE[(uint8_t)ch].shift ) ? KEYBOARD_MODIFIER_LEFTSHIFT : 0;
report.keycode[0] = HID_ASCII_TO_KEYCODE[(uint8_t)ch].keycode; report.keycode[0] = HID_ASCII_TO_KEYCODE[(uint8_t)ch].keycode;
return tud_hid_keyboard_send_report(&report); return tud_hid_keyboard_report(&report);
} }
bool tud_hid_keyboard_send_string(const char* str, uint32_t interval_ms) bool tud_hid_keyboard_key_release(void)
{
return tud_hid_keyboard_report(NULL);
}
bool tud_hid_keyboard_key_sequence(const char* str, uint32_t interval_ms)
{ {
// Send each key in string // Send each key in string
char ch; char ch;
@ -138,7 +143,7 @@ bool tud_hid_keyboard_send_string(const char* str, uint32_t interval_ms)
{ {
char lookahead = *str; char lookahead = *str;
tud_hid_keyboard_send_char(ch); tud_hid_keyboard_key_press(ch);
// Blocking delay // Blocking delay
tu_timeout_wait(interval_ms); tu_timeout_wait(interval_ms);
@ -147,7 +152,7 @@ bool tud_hid_keyboard_send_string(const char* str, uint32_t interval_ms)
* the current one, else no need to send */ * the current one, else no need to send */
if ( lookahead == ch || lookahead == 0 ) if ( lookahead == ch || lookahead == 0 )
{ {
tud_hid_keyboard_send_report(NULL); tud_hid_keyboard_report(NULL);
tu_timeout_wait(interval_ms); tu_timeout_wait(interval_ms);
} }
} }

10
src/class/hid/hid_device.h
View File

@ -67,13 +67,13 @@ bool tud_hid_keyboard_busy(void);
* \param[in,out] p_report Report data, if NULL, an empty report (all zeroes) is used * \param[in,out] p_report Report data, if NULL, an empty report (all zeroes) is used
* \returns true on success, false otherwise (not mounted or busy) * \returns true on success, false otherwise (not mounted or busy)
*/ */
bool tud_hid_keyboard_send_report(hid_keyboard_report_t const *p_report); bool tud_hid_keyboard_report(hid_keyboard_report_t const *p_report);
bool tud_hid_keyboard_keycode(uint8_t modifier, uint8_t keycode[6]);
bool tud_hid_keyboard_send_keycode(uint8_t modifier, uint8_t keycode[6]);
#if CFG_TUD_HID_ASCII_TO_KEYCODE_LOOKUP #if CFG_TUD_HID_ASCII_TO_KEYCODE_LOOKUP
bool tud_hid_keyboard_send_char(char ch); bool tud_hid_keyboard_key_press(char ch);
bool tud_hid_keyboard_send_string(const char* str, uint32_t interval_ms); bool tud_hid_keyboard_key_release(void);
bool tud_hid_keyboard_key_sequence(const char* str, uint32_t interval_ms);
typedef struct{ typedef struct{
uint8_t shift; uint8_t shift;