|
12 | 12 | #include <stdio.h> |
13 | 13 | #include "bsp/input.h" |
14 | 14 | #include "esp_log.h" |
| 15 | +#include "usb/hid.h" |
15 | 16 | #include "usb/hid_host.h" |
16 | 17 | #include "usb/hid_usage_keyboard.h" |
17 | 18 | #include "usb/hid_usage_mouse.h" |
@@ -302,7 +303,9 @@ static void print_gamepad_report(const gamepad_report_t* rpt, int length) { |
302 | 303 | } |
303 | 304 | } |
304 | 305 |
|
305 | | - ESP_LOGI(TAG, "%s\n%s\n%s\n", button_line, line1, line2); |
| 306 | + ESP_LOGI(TAG, "%s", button_line); |
| 307 | + ESP_LOGI(TAG, "%s", line1); |
| 308 | + ESP_LOGI(TAG, "%s", line2); |
306 | 309 | } |
307 | 310 |
|
308 | 311 | /** |
@@ -605,19 +608,17 @@ static void hid_host_device_event(hid_host_device_handle_t hid_device_handle, co |
605 | 608 | ESP_LOGI(TAG, "HID Device, protocol '%s' CONNECTED", hid_proto_name_str[dev_params.proto]); |
606 | 609 |
|
607 | 610 | const hid_host_device_config_t dev_config = {.callback = hid_host_interface_callback, .callback_arg = NULL}; |
| 611 | + ESP_ERROR_CHECK(hid_host_device_open(hid_device_handle, &dev_config)); |
608 | 612 |
|
609 | | - if (dev_params.proto != HID_PROTOCOL_NONE) { |
610 | | - ESP_ERROR_CHECK(hid_host_device_open(hid_device_handle, &dev_config)); |
611 | | - if (HID_SUBCLASS_BOOT_INTERFACE == dev_params.sub_class) { |
612 | | - ESP_ERROR_CHECK(hid_class_request_set_protocol(hid_device_handle, HID_REPORT_PROTOCOL_BOOT)); |
613 | | - if (HID_PROTOCOL_KEYBOARD == dev_params.proto) { |
614 | | - ESP_ERROR_CHECK(hid_class_request_set_idle(hid_device_handle, 0, 0)); |
615 | | - } |
616 | | - if (HID_PROTOCOL_MOUSE == dev_params.proto) { // Luxury mouse support |
617 | | - // hid_class_request_set_protocol(hid_device_handle, HID_REPORT_PROTOCOL_REPORT); |
618 | | - |
619 | | - // print_report_descriptor(hid_device_handle); |
620 | | - } |
| 613 | + if (HID_SUBCLASS_BOOT_INTERFACE == dev_params.sub_class) { |
| 614 | + ESP_ERROR_CHECK(hid_class_request_set_protocol(hid_device_handle, HID_REPORT_PROTOCOL_BOOT)); |
| 615 | + if (HID_PROTOCOL_KEYBOARD == dev_params.proto) { |
| 616 | + ESP_ERROR_CHECK(hid_class_request_set_idle(hid_device_handle, 0, 0)); |
| 617 | + } |
| 618 | + if (HID_PROTOCOL_MOUSE == dev_params.proto) { // Luxury mouse support |
| 619 | + // hid_class_request_set_protocol(hid_device_handle, HID_REPORT_PROTOCOL_REPORT); |
| 620 | + |
| 621 | + // print_report_descriptor(hid_device_handle); |
621 | 622 | } |
622 | 623 | } |
623 | 624 | ESP_ERROR_CHECK(hid_host_device_start(hid_device_handle)); |
|
0 commit comments