-
由 RefactorFactory 提交于
Arduino-esp32 2.0.4 was released with a version of TinyUSB hid_device.h that uses uint16_t for the last argument: https://github.com/espressif/arduino-esp32/blob/2.0.4/tools/sdk/esp32s2/include/arduino_tinyusb/tinyusb/src/class/hid/hid_device.h TU_ATTR_WEAK void tud_hid_report_complete_cb(uint8_t instance, uint8_t const* report, uint16_t len); But USBHID implements this callback with uint8_t: https://github.com/espressif/arduino-esp32/blob/2.0.4/libraries/USB/src/USBHID.cpp void tud_hid_report_complete_cb(uint8_t instance, uint8_t const* report, uint8_t len){ if (tinyusb_hid_device_input_sem) { xSemaphoreGive(tinyusb_hid_device_input_sem); } } The result is that when USBHIDKeyboard sends a report to the host, it times out, waiting 100 ms for the callback to be called. It does this once for pressing the key and once for releasing the key, so 100 ms * 2 = 200 ms. The latest version of hid_device.h reverts the last argument to uint8_t: https://github.com/espressif/arduino-esp32/blob/860b104691a28f77896ac544c7745de1ba53642d/tools/sdk/esp32s2/include/arduino_tinyusb/tinyusb/src/class/hid/hid_device.h TU_ATTR_WEAK void tud_hid_report_complete_cb(uint8_t instance, uint8_t const* report, /*uint16_t*/ uint8_t len ); But these commits suggest that the last argument will eventually be changed to uint16_t: https://github.com/hathach/tinyusb/commit/556b5d5044bd02e89d6b6c6f21e95d46f5fcdfc1 change report len in hid API from uint8_t to uint16_t since HS interrupt endpoint can be up to 1024, 8-bit is not enough. affected APIs are: - tud_hid_n_report() / tud_hid_report() - tud_hid_report_complete_cb() https://github.com/hathach/tinyusb/commit/b495d6f8ec263e51b0683ab85ff9e54dab6f5fd3 temporarily revert len back to uint8_t in tud_hid_report_complete_cb() for up coming release To prevent this from becoming broken again, in preparation for the change to uint16_t, make USBHID resilient to any type for the last argument for tud_hid_report_complete_cb() by using some C++ template metaprogramming, adapted from https://stackoverflow.com/a/22632571. Co-authored-by: NRodrigo Garcia <rodrigo.garcia@espressif.com>
2e72894a