mirror of
https://github.com/hathach/tinyusb.git
synced 2025-02-20 18:40:57 +00:00
update example to test with mouse
This commit is contained in:
parent
f7cf8cdf27
commit
9531e47d10
@ -111,6 +111,7 @@ void cdc_task(void)
|
|||||||
//--------------------------------------------------------------------+
|
//--------------------------------------------------------------------+
|
||||||
#if CFG_TUH_HID_KEYBOARD
|
#if CFG_TUH_HID_KEYBOARD
|
||||||
|
|
||||||
|
CFG_TUSB_MEM_SECTION static hid_keyboard_report_t usb_keyboard_report;
|
||||||
uint8_t const keycode2ascii[128][2] = { HID_KEYCODE_TO_ASCII };
|
uint8_t const keycode2ascii[128][2] = { HID_KEYCODE_TO_ASCII };
|
||||||
|
|
||||||
// look up new key in previous keys
|
// look up new key in previous keys
|
||||||
@ -153,21 +154,6 @@ static inline void process_kbd_report(hid_keyboard_report_t const *p_new_report)
|
|||||||
prev_report = *p_new_report;
|
prev_report = *p_new_report;
|
||||||
}
|
}
|
||||||
|
|
||||||
CFG_TUSB_MEM_SECTION static hid_keyboard_report_t usb_keyboard_report;
|
|
||||||
|
|
||||||
void hid_task(void)
|
|
||||||
{
|
|
||||||
uint8_t const addr = 1;
|
|
||||||
if ( tuh_hid_keyboard_is_mounted(addr) )
|
|
||||||
{
|
|
||||||
if ( !tuh_hid_keyboard_is_busy(addr) )
|
|
||||||
{
|
|
||||||
process_kbd_report(&usb_keyboard_report);
|
|
||||||
tuh_hid_keyboard_get_report(addr, &usb_keyboard_report);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void tuh_hid_keyboard_mounted_cb(uint8_t dev_addr)
|
void tuh_hid_keyboard_mounted_cb(uint8_t dev_addr)
|
||||||
{
|
{
|
||||||
// application set-up
|
// application set-up
|
||||||
@ -192,6 +178,58 @@ void tuh_hid_keyboard_isr(uint8_t dev_addr, xfer_result_t event)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if CFG_TUH_HID_MOUSE
|
#if CFG_TUH_HID_MOUSE
|
||||||
|
|
||||||
|
CFG_TUSB_MEM_SECTION static hid_mouse_report_t usb_mouse_report;
|
||||||
|
|
||||||
|
void cursor_movement(int8_t x, int8_t y, int8_t wheel)
|
||||||
|
{
|
||||||
|
//------------- X -------------//
|
||||||
|
if ( x < 0)
|
||||||
|
{
|
||||||
|
printf(ANSI_CURSOR_BACKWARD(%d), (-x)); // move left
|
||||||
|
}else if ( x > 0)
|
||||||
|
{
|
||||||
|
printf(ANSI_CURSOR_FORWARD(%d), x); // move right
|
||||||
|
}else { }
|
||||||
|
|
||||||
|
//------------- Y -------------//
|
||||||
|
if ( y < 0)
|
||||||
|
{
|
||||||
|
printf(ANSI_CURSOR_UP(%d), (-y)); // move up
|
||||||
|
}else if ( y > 0)
|
||||||
|
{
|
||||||
|
printf(ANSI_CURSOR_DOWN(%d), y); // move down
|
||||||
|
}else { }
|
||||||
|
|
||||||
|
//------------- wheel -------------//
|
||||||
|
if (wheel < 0)
|
||||||
|
{
|
||||||
|
printf(ANSI_SCROLL_UP(%d), (-wheel)); // scroll up
|
||||||
|
}else if (wheel > 0)
|
||||||
|
{
|
||||||
|
printf(ANSI_SCROLL_DOWN(%d), wheel); // scroll down
|
||||||
|
}else { }
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline void process_mouse_report(hid_mouse_report_t const * p_report)
|
||||||
|
{
|
||||||
|
static hid_mouse_report_t prev_report = { 0 };
|
||||||
|
|
||||||
|
//------------- button state -------------//
|
||||||
|
uint8_t button_changed_mask = p_report->buttons ^ prev_report.buttons;
|
||||||
|
if ( button_changed_mask & p_report->buttons)
|
||||||
|
{
|
||||||
|
printf(" %c%c%c ",
|
||||||
|
p_report->buttons & MOUSE_BUTTON_LEFT ? 'L' : '-',
|
||||||
|
p_report->buttons & MOUSE_BUTTON_MIDDLE ? 'M' : '-',
|
||||||
|
p_report->buttons & MOUSE_BUTTON_RIGHT ? 'R' : '-');
|
||||||
|
}
|
||||||
|
|
||||||
|
//------------- cursor movement -------------//
|
||||||
|
cursor_movement(p_report->x, p_report->y, p_report->wheel);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
void tuh_hid_mouse_mounted_cb(uint8_t dev_addr)
|
void tuh_hid_mouse_mounted_cb(uint8_t dev_addr)
|
||||||
{
|
{
|
||||||
// application set-up
|
// application set-up
|
||||||
@ -212,6 +250,35 @@ void tuh_hid_mouse_isr(uint8_t dev_addr, xfer_result_t event)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
void hid_task(void)
|
||||||
|
{
|
||||||
|
uint8_t const addr = 1;
|
||||||
|
|
||||||
|
#if CFG_TUH_HID_KEYBOARD
|
||||||
|
if ( tuh_hid_keyboard_is_mounted(addr) )
|
||||||
|
{
|
||||||
|
if ( !tuh_hid_keyboard_is_busy(addr) )
|
||||||
|
{
|
||||||
|
process_kbd_report(&usb_keyboard_report);
|
||||||
|
tuh_hid_keyboard_get_report(addr, &usb_mouse_report);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if CFG_TUH_HID_MOUSE
|
||||||
|
if ( tuh_hid_mouse_is_mounted(addr) )
|
||||||
|
{
|
||||||
|
if ( !tuh_hid_mouse_is_busy(addr) )
|
||||||
|
{
|
||||||
|
process_mouse_report(&usb_mouse_report);
|
||||||
|
tuh_hid_mouse_get_report(addr, &usb_mouse_report);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------+
|
//--------------------------------------------------------------------+
|
||||||
// tinyusb callbacks
|
// tinyusb callbacks
|
||||||
//--------------------------------------------------------------------+
|
//--------------------------------------------------------------------+
|
||||||
|
@ -173,7 +173,8 @@ bool hidh_open_subtask(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t c
|
|||||||
tusb_desc_endpoint_t const * p_endpoint_desc = (tusb_desc_endpoint_t const *) p_desc;
|
tusb_desc_endpoint_t const * p_endpoint_desc = (tusb_desc_endpoint_t const *) p_desc;
|
||||||
TU_ASSERT(TUSB_DESC_ENDPOINT == p_endpoint_desc->bDescriptorType, TUSB_ERROR_INVALID_PARA);
|
TU_ASSERT(TUSB_DESC_ENDPOINT == p_endpoint_desc->bDescriptorType, TUSB_ERROR_INVALID_PARA);
|
||||||
|
|
||||||
//------------- SET IDLE (0) request -------------//
|
// SET IDLE = 0 request
|
||||||
|
// Device can stall if not support this request
|
||||||
tusb_control_request_t request = {
|
tusb_control_request_t request = {
|
||||||
.bmRequestType_bit = { .recipient = TUSB_REQ_RCPT_INTERFACE, .type = TUSB_REQ_TYPE_CLASS, .direction = TUSB_DIR_OUT },
|
.bmRequestType_bit = { .recipient = TUSB_REQ_RCPT_INTERFACE, .type = TUSB_REQ_TYPE_CLASS, .direction = TUSB_DIR_OUT },
|
||||||
.bRequest = HID_REQ_CONTROL_SET_IDLE,
|
.bRequest = HID_REQ_CONTROL_SET_IDLE,
|
||||||
@ -181,7 +182,7 @@ bool hidh_open_subtask(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t c
|
|||||||
.wIndex = p_interface_desc->bInterfaceNumber,
|
.wIndex = p_interface_desc->bInterfaceNumber,
|
||||||
.wLength = 0
|
.wLength = 0
|
||||||
};
|
};
|
||||||
TU_ASSERT( usbh_control_xfer( dev_addr, &request, NULL ) );
|
usbh_control_xfer( dev_addr, &request, NULL ); // TODO stall is valid
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
//------------- Get Report Descriptor TODO HID parser -------------//
|
//------------- Get Report Descriptor TODO HID parser -------------//
|
||||||
|
Loading…
x
Reference in New Issue
Block a user