andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

enhance device hid

Browse Source 
- add CFG_TUD_HID_ASCII_TO_KEYCODE_LOOKUP
- add tud_hid_keyboard_send_keycode(), tud_hid_keyboard_send_char(),
tud_hid_keyboard_send_string()
- add timeout_blocking_wait()
This commit is contained in:
hathach
2018-07-23 17:46:07 +07:00
parent 262be103e0
commit 3e209f9c20
6 changed files with 385 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,6 +45,7 @@
// INCLUDE
//--------------------------------------------------------------------+
#include "common/tusb_common.h"
#include "common/timeout_timer.h"
#include "hid_device.h"
#include "device/usbd_pvt.h"
@@ -91,16 +92,71 @@ bool tud_hid_keyboard_busy(void)
return dcd_edpt_busy(TUD_OPT_RHPORT, _kbd_itf.ep_in);
}
tusb_error_t tud_hid_keyboard_send(hid_keyboard_report_t const *p_report)
bool tud_hid_keyboard_send_report(hid_keyboard_report_t const *p_report)
{
VERIFY(tud_mounted(), TUSB_ERROR_USBD_DEVICE_NOT_CONFIGURED);
VERIFY( tud_mounted() && !tud_hid_keyboard_busy() );
hidd_interface_t * p_kbd = &_kbd_itf;
hidd_interface_t * p_hid = &_kbd_itf;
TU_ASSERT( dcd_edpt_xfer(TUD_OPT_RHPORT, p_kbd->ep_in, (void*) p_report, sizeof(hid_keyboard_report_t)), TUSB_ERROR_DCD_EDPT_XFER ) ;
if ( p_report )
{
memcpy(p_hid->report_buf, p_report, sizeof(hid_keyboard_report_t));
}else
{
// empty report
arrclr_(p_hid->report_buf);
}
return TUSB_ERROR_NONE;
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])
{
hid_keyboard_report_t report = { .modifier = modifier };
memcpy(report.keycode, keycode, 6);
return tud_hid_keyboard_send_report(&report);
}
#if CFG_TUD_HID_ASCII_TO_KEYCODE_LOOKUP
bool tud_hid_keyboard_send_char(char ch)
{
hid_keyboard_report_t report;
varclr_(&report);
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;
return tud_hid_keyboard_send_report(&report);
}
bool tud_hid_keyboard_send_string(const char* str, uint32_t interval_ms)
{
// Send each key in string
char ch;
while( (ch = *str++) != 0 )
{
char lookahead = *str;
tud_hid_keyboard_send_char(ch);
// Blocking delay
timeout_blocking_wait(interval_ms);
/* Only need to empty report if the next character is NULL or the same with
* the current one, else no need to send */
if ( lookahead == ch || lookahead == 0 )
{
tud_hid_keyboard_send_report(NULL);
timeout_blocking_wait(interval_ms);
}
}
}
#endif // CFG_TUD_HID_ASCII_TO_KEYCODE_LOOKUP
#endif
//--------------------------------------------------------------------+
@@ -112,15 +168,14 @@ bool tud_hid_mouse_is_busy(void)
return dcd_edpt_busy(TUD_OPT_RHPORT, _mse_itf.ep_in);
}
tusb_error_t tud_hid_mouse_send(hid_mouse_report_t const *p_report)
bool tud_hid_mouse_send(hid_mouse_report_t const *p_report)
{
VERIFY(tud_mounted(), TUSB_ERROR_USBD_DEVICE_NOT_CONFIGURED);
VERIFY( tud_mounted() && !tud_hid_mouse_is_busy() );
hidd_interface_t * p_mouse = &_mse_itf;
hidd_interface_t * p_hid = &_mse_itf;
memcpy(p_hid->report_buf, p_report, sizeof(hid_mouse_report_t));
TU_ASSERT( dcd_edpt_xfer(TUD_OPT_RHPORT, p_mouse->ep_in, (void*) p_report, sizeof(hid_mouse_report_t)), TUSB_ERROR_DCD_EDPT_XFER ) ;
return TUSB_ERROR_NONE;
return dcd_edpt_xfer(TUD_OPT_RHPORT, p_hid->ep_in, p_hid->report_buf, sizeof(hid_mouse_report_t));
}
#endif
@@ -327,4 +382,143 @@ tusb_error_t hidd_xfer_cb(uint8_t rhport, uint8_t edpt_addr, tusb_event_t event,
return TUSB_ERROR_NONE;
}
/*------------------------------------------------------------------*/
/* Ascii to Keycode
*------------------------------------------------------------------*/
const hid_ascii_to_keycode_entry_t HID_ASCII_TO_KEYCODE[128] =
{
{0, 0 }, // 0x00 Null
{0, 0 }, // 0x01
{0, 0 }, // 0x02
{0, 0 }, // 0x03
{0, 0 }, // 0x04
{0, 0 }, // 0x05
{0, 0 }, // 0x06
{0, 0 }, // 0x07
{0, HID_KEY_BACKSPACE }, // 0x08 Backspace
{0, HID_KEY_TAB }, // 0x09 Horizontal Tab
{0, HID_KEY_RETURN }, // 0x0A Line Feed
{0, 0 }, // 0x0B
{0, 0 }, // 0x0C
{0, HID_KEY_RETURN }, // 0x0D Carriage return
{0, 0 }, // 0x0E
{0, 0 }, // 0x0F
{0, 0 }, // 0x10
{0, 0 }, // 0x11
{0, 0 }, // 0x12
{0, 0 }, // 0x13
{0, 0 }, // 0x14
{0, 0 }, // 0x15
{0, 0 }, // 0x16
{0, 0 }, // 0x17
{0, 0 }, // 0x18
{0, 0 }, // 0x19
{0, 0 }, // 0x1A
{0, HID_KEY_ESCAPE }, // 0x1B Escape
{0, 0 }, // 0x1C
{0, 0 }, // 0x1D
{0, 0 }, // 0x1E
{0, 0 }, // 0x1F
{0, HID_KEY_SPACE }, // 0x20
{1, HID_KEY_1 }, // 0x21 !
{1, HID_KEY_APOSTROPHE }, // 0x22 "
{1, HID_KEY_3 }, // 0x23 #
{1, HID_KEY_4 }, // 0x24 $
{1, HID_KEY_5 }, // 0x25 %
{1, HID_KEY_7 }, // 0x26 &
{0, HID_KEY_APOSTROPHE }, // 0x27 '
{1, HID_KEY_9 }, // 0x28 (
{1, HID_KEY_0 }, // 0x29 )
{1, HID_KEY_8 }, // 0x2A *
{1, HID_KEY_EQUAL }, // 0x2B +
{0, HID_KEY_COMMA }, // 0x2C ,
{0, HID_KEY_MINUS }, // 0x2D -
{0, HID_KEY_PERIOD }, // 0x2E .
{0, HID_KEY_SLASH }, // 0x2F /
{0, HID_KEY_0 }, // 0x30 0
{0, HID_KEY_1 }, // 0x31 1
{0, HID_KEY_2 }, // 0x32 2
{0, HID_KEY_3 }, // 0x33 3
{0, HID_KEY_4 }, // 0x34 4
{0, HID_KEY_5 }, // 0x35 5
{0, HID_KEY_6 }, // 0x36 6
{0, HID_KEY_7 }, // 0x37 7
{0, HID_KEY_8 }, // 0x38 8
{0, HID_KEY_9 }, // 0x39 9
{1, HID_KEY_SEMICOLON }, // 0x3A :
{0, HID_KEY_SEMICOLON }, // 0x3B ;
{1, HID_KEY_COMMA }, // 0x3C <
{0, HID_KEY_EQUAL }, // 0x3D =
{1, HID_KEY_PERIOD }, // 0x3E >
{1, HID_KEY_SLASH }, // 0x3F ?
{1, HID_KEY_2 }, // 0x40 @
{1, HID_KEY_A }, // 0x41 A
{1, HID_KEY_B }, // 0x42 B
{1, HID_KEY_C }, // 0x43 C
{1, HID_KEY_D }, // 0x44 D
{1, HID_KEY_E }, // 0x45 E
{1, HID_KEY_F }, // 0x46 F
{1, HID_KEY_G }, // 0x47 G
{1, HID_KEY_H }, // 0x48 H
{1, HID_KEY_I }, // 0x49 I
{1, HID_KEY_J }, // 0x4A J
{1, HID_KEY_K }, // 0x4B K
{1, HID_KEY_L }, // 0x4C L
{1, HID_KEY_M }, // 0x4D M
{1, HID_KEY_N }, // 0x4E N
{1, HID_KEY_O }, // 0x4F O
{1, HID_KEY_P }, // 0x50 P
{1, HID_KEY_Q }, // 0x51 Q
{1, HID_KEY_R }, // 0x52 R
{1, HID_KEY_S }, // 0x53 S
{1, HID_KEY_T }, // 0x55 T
{1, HID_KEY_U }, // 0x55 U
{1, HID_KEY_V }, // 0x56 V
{1, HID_KEY_W }, // 0x57 W
{1, HID_KEY_X }, // 0x58 X
{1, HID_KEY_Y }, // 0x59 Y
{1, HID_KEY_Z }, // 0x5A Z
{0, HID_KEY_BRACKET_LEFT }, // 0x5B [
{0, HID_KEY_BACKSLASH }, // 0x5C '\'
{0, HID_KEY_BRACKET_RIGHT }, // 0x5D ]
{1, HID_KEY_6 }, // 0x5E ^
{1, HID_KEY_MINUS }, // 0x5F _
{0, HID_KEY_GRAVE }, // 0x60 `
{0, HID_KEY_A }, // 0x61 a
{0, HID_KEY_B }, // 0x62 b
{0, HID_KEY_C }, // 0x63 c
{0, HID_KEY_D }, // 0x66 d
{0, HID_KEY_E }, // 0x65 e
{0, HID_KEY_F }, // 0x66 f
{0, HID_KEY_G }, // 0x67 g
{0, HID_KEY_H }, // 0x68 h
{0, HID_KEY_I }, // 0x69 i
{0, HID_KEY_J }, // 0x6A j
{0, HID_KEY_K }, // 0x6B k
{0, HID_KEY_L }, // 0x6C l
{0, HID_KEY_M }, // 0x6D m
{0, HID_KEY_N }, // 0x6E n
{0, HID_KEY_O }, // 0x6F o
{0, HID_KEY_P }, // 0x70 p
{0, HID_KEY_Q }, // 0x71 q
{0, HID_KEY_R }, // 0x72 r
{0, HID_KEY_S }, // 0x73 s
{0, HID_KEY_T }, // 0x75 t
{0, HID_KEY_U }, // 0x75 u
{0, HID_KEY_V }, // 0x76 v
{0, HID_KEY_W }, // 0x77 w
{0, HID_KEY_X }, // 0x78 x
{0, HID_KEY_Y }, // 0x79 y
{0, HID_KEY_Z }, // 0x7A z
{1, HID_KEY_BRACKET_LEFT }, // 0x7B {
{1, HID_KEY_BACKSLASH }, // 0x7C |
{1, HID_KEY_BRACKET_RIGHT }, // 0x7D }
{1, HID_KEY_GRAVE }, // 0x7E ~
{0, HID_KEY_DELETE } // 0x7F Delete
};
#endif