Merge pull request #510 from adafruit/fix-esp32-max3421e

Fix esp32 max3421e
2025-03-20 20:09:29 +07:00 · 2025-03-20 20:09:29 +07:00 · 4b9a629a55
commit 4b9a629a55
parent 76a551be81 55a0283b48
42 changed files with 46 additions and 7 deletions
--- a/.github/workflows/githubci.yml
+++ b/.github/workflows/githubci.yml
@ -48,6 +48,7 @@ jobs:
      matrix:
        arduino-platform:
           # ESP32 ci use dev json
+           - 'feather_esp32_v2'
           - 'feather_esp32s2'
           - 'feather_esp32s3'
           - 'esp32p4'
--- a/examples/CDC/cdc_multi/.skip.txt
+++ b/examples/CDC/cdc_multi/.skip.txt
@ -1,3 +1,4 @@
+feather_esp32_v2
 feather_esp32s2
 feather_esp32s3
 funhouse
--- a/examples/CDC/no_serial/.pico_rp2040_tinyusb_host.test.skip
+++ b/examples/CDC/no_serial/.pico_rp2040_tinyusb_host.test.skip
--- a/examples/CDC/no_serial/.skip.txt
+++ b/examples/CDC/no_serial/.skip.txt
@ -0,0 +1,2 @@
+feather_esp32_v2
+pico_rp2040_tinyusb_host
--- a/examples/CDC/serial_echo/.pico_rp2040_tinyusb_host.test.skip
+++ b/examples/CDC/serial_echo/.pico_rp2040_tinyusb_host.test.skip
--- a/examples/CDC/serial_echo/.skip.txt
+++ b/examples/CDC/serial_echo/.skip.txt
@ -0,0 +1,2 @@
+feather_esp32_v2
+pico_rp2040_tinyusb_host
--- a/examples/Composite/mouse_ramdisk/.pico_rp2040_tinyusb_host.test.skip
+++ b/examples/Composite/mouse_ramdisk/.pico_rp2040_tinyusb_host.test.skip
--- a/examples/Composite/mouse_ramdisk/.skip.txt
+++ b/examples/Composite/mouse_ramdisk/.skip.txt
@ -0,0 +1,2 @@
+feather_esp32_v2
+pico_rp2040_tinyusb_host
--- a/examples/DualRole/HID/hid_mouse_log_filter/.skip.txt
+++ b/examples/DualRole/HID/hid_mouse_log_filter/.skip.txt
@ -1,2 +1,3 @@
+feather_esp32_v2
 pico_rp2040_tinyusb_host
 CH32V20x_EVT
--- a/examples/DualRole/HID/hid_mouse_log_filter/hid_mouse_log_filter.ino
+++ b/examples/DualRole/HID/hid_mouse_log_filter/hid_mouse_log_filter.ino
@ -42,8 +42,7 @@ uint8_t const desc_hid_report[] = {
    TUD_HID_REPORT_DESC_MOUSE()
 };

-// USB HID object. For ESP32 these values cannot be changed after this declaration
-// desc report, desc len, protocol, interval, use out endpoint
+// USB HID object: desc report, desc len, protocol, interval, use out endpoint
 Adafruit_USBD_HID usb_hid(desc_hid_report, sizeof(desc_hid_report), HID_ITF_PROTOCOL_MOUSE, 2, false);

 /* Adjustable parameters for the log_filter() method.
--- a/examples/DualRole/HID/hid_mouse_tremor_filter/.skip.txt
+++ b/examples/DualRole/HID/hid_mouse_tremor_filter/.skip.txt
@ -1,2 +1,3 @@
+feather_esp32_v2
 pico_rp2040_tinyusb_host
 CH32V20x_EVT
--- a/examples/DualRole/HID/hid_mouse_tremor_filter/hid_mouse_tremor_filter.ino
+++ b/examples/DualRole/HID/hid_mouse_tremor_filter/hid_mouse_tremor_filter.ino
@ -40,8 +40,7 @@ uint8_t const desc_hid_report[] = {
    TUD_HID_REPORT_DESC_MOUSE()
 };

-// USB HID object. For ESP32 these values cannot be changed after this declaration
-// desc report, desc len, protocol, interval, use out endpoint
+// USB HID object: desc report, desc len, protocol, interval, use out endpoint
 Adafruit_USBD_HID usb_hid(desc_hid_report, sizeof(desc_hid_report), HID_ITF_PROTOCOL_MOUSE, 2, false);

 //------------- Low pass filter with Butterworth -------------//
--- a/examples/DualRole/HID/hid_remapper/.skip.txt
+++ b/examples/DualRole/HID/hid_remapper/.skip.txt
@ -1,2 +1,3 @@
+feather_esp32_v2
 pico_rp2040_tinyusb_host
 CH32V20x_EVT
--- a/examples/DualRole/HID/hid_remapper/hid_remapper.ino
+++ b/examples/DualRole/HID/hid_remapper/hid_remapper.ino
@ -42,11 +42,9 @@ uint8_t const desc_hid_report[] = {
    TUD_HID_REPORT_DESC_KEYBOARD()
 };

-// USB HID object. For ESP32 these values cannot be changed after this declaration
-// desc report, desc len, protocol, interval, use out endpoint
+// USB HID object: desc report, desc len, protocol, interval, use out endpoint
 Adafruit_USBD_HID usb_hid(desc_hid_report, sizeof(desc_hid_report), HID_ITF_PROTOCOL_KEYBOARD, 2, false);

-
 void setup() {
  Serial.begin(115200);
  usb_hid.begin();
--- a/examples/HID/hid_boot_keyboard/.pico_rp2040_tinyusb_host.test.skip
+++ b/examples/HID/hid_boot_keyboard/.pico_rp2040_tinyusb_host.test.skip
--- a/examples/HID/hid_boot_keyboard/.skip.txt
+++ b/examples/HID/hid_boot_keyboard/.skip.txt
@ -0,0 +1,2 @@
+feather_esp32_v2
+pico_rp2040_tinyusb_host
--- a/examples/HID/hid_boot_mouse/.pico_rp2040_tinyusb_host.test.skip
+++ b/examples/HID/hid_boot_mouse/.pico_rp2040_tinyusb_host.test.skip
--- a/examples/HID/hid_boot_mouse/.skip.txt
+++ b/examples/HID/hid_boot_mouse/.skip.txt
@ -0,0 +1,2 @@
+feather_esp32_v2
+pico_rp2040_tinyusb_host
--- a/examples/HID/hid_composite/.pico_rp2040_tinyusb_host.test.skip
+++ b/examples/HID/hid_composite/.pico_rp2040_tinyusb_host.test.skip
--- a/examples/HID/hid_composite/.skip.txt
+++ b/examples/HID/hid_composite/.skip.txt
@ -0,0 +1,2 @@
+feather_esp32_v2
+pico_rp2040_tinyusb_host
--- a/examples/HID/hid_composite_joy_featherwing/.skip.txt
+++ b/examples/HID/hid_composite_joy_featherwing/.skip.txt
@ -1,2 +1,3 @@
+feather_esp32_v2
 pico_rp2040_tinyusb_host
 CH32V20x_EVT
--- a/examples/HID/hid_dual_interfaces/.pico_rp2040_tinyusb_host.test.skip
+++ b/examples/HID/hid_dual_interfaces/.pico_rp2040_tinyusb_host.test.skip
--- a/examples/HID/hid_dual_interfaces/.skip.txt
+++ b/examples/HID/hid_dual_interfaces/.skip.txt
@ -0,0 +1,2 @@
+feather_esp32_v2
+pico_rp2040_tinyusb_host
--- a/examples/HID/hid_gamepad/.pico_rp2040_tinyusb_host.test.skip
+++ b/examples/HID/hid_gamepad/.pico_rp2040_tinyusb_host.test.skip
--- a/examples/HID/hid_gamepad/.skip.txt
+++ b/examples/HID/hid_gamepad/.skip.txt
@ -0,0 +1,2 @@
+feather_esp32_v2
+pico_rp2040_tinyusb_host
--- a/examples/HID/hid_generic_inout/.pico_rp2040_tinyusb_host.test.skip
+++ b/examples/HID/hid_generic_inout/.pico_rp2040_tinyusb_host.test.skip
--- a/examples/HID/hid_generic_inout/.skip.txt
+++ b/examples/HID/hid_generic_inout/.skip.txt
@ -0,0 +1,2 @@
+feather_esp32_v2
+pico_rp2040_tinyusb_host
--- a/examples/MIDI/midi_multi_ports/.pico_rp2040_tinyusb_host.test.skip
+++ b/examples/MIDI/midi_multi_ports/.pico_rp2040_tinyusb_host.test.skip
--- a/examples/MIDI/midi_multi_ports/.skip.txt
+++ b/examples/MIDI/midi_multi_ports/.skip.txt
@ -0,0 +1,2 @@
+feather_esp32_v2
+pico_rp2040_tinyusb_host
--- a/examples/MIDI/midi_test/.pico_rp2040_tinyusb_host.test.skip
+++ b/examples/MIDI/midi_test/.pico_rp2040_tinyusb_host.test.skip
--- a/examples/MIDI/midi_test/.skip.txt
+++ b/examples/MIDI/midi_test/.skip.txt
@ -0,0 +1,2 @@
+feather_esp32_v2
+pico_rp2040_tinyusb_host
--- a/examples/MassStorage/msc_external_flash/.skip.txt
+++ b/examples/MassStorage/msc_external_flash/.skip.txt
@ -1,2 +1,3 @@
+feather_esp32_v2
 pico_rp2040_tinyusb_host
 CH32V20x_EVT
--- a/examples/MassStorage/msc_external_flash_sdcard/.skip.txt
+++ b/examples/MassStorage/msc_external_flash_sdcard/.skip.txt
@ -1,2 +1,3 @@
+feather_esp32_v2
 pico_rp2040_tinyusb_host
 CH32V20x_EVT
--- a/examples/MassStorage/msc_ramdisk/.skip.txt
+++ b/examples/MassStorage/msc_ramdisk/.skip.txt
@ -1 +1,2 @@
+feather_esp32_v2
 pico_rp2040_tinyusb_host
--- a/examples/MassStorage/msc_ramdisk_dual/.skip.txt
+++ b/examples/MassStorage/msc_ramdisk_dual/.skip.txt
@ -1,2 +1,3 @@
+feather_esp32_v2
 pico_rp2040_tinyusb_host
 CH32V20x_EVT
--- a/examples/MassStorage/msc_sd/.skip.txt
+++ b/examples/MassStorage/msc_sd/.skip.txt
@ -1,3 +1,4 @@
+feather_esp32_v2
 feather_esp32s2
 feather_esp32s3
 funhouse
--- a/examples/MassStorage/msc_sdfat/.skip.txt
+++ b/examples/MassStorage/msc_sdfat/.skip.txt
@ -1 +1,2 @@
+feather_esp32_v2
 pico_rp2040_tinyusb_host
--- a/examples/Vendor/i2c_tiny_usb_adapter/.skip.txt
+++ b/examples/Vendor/i2c_tiny_usb_adapter/.skip.txt
@ -1,2 +1,3 @@
+feather_esp32_v2
 pico_rp2040_tinyusb_host
 CH32V20x_EVT
--- a/examples/Video/video_capture/.skip.txt
+++ b/examples/Video/video_capture/.skip.txt
@ -1,2 +1,3 @@
+feather_esp32_v2
 pico_rp2040_tinyusb_host
 CH32V20x_EVT
--- a/examples/WebUSB/webusb_rgb/.skip.txt
+++ b/examples/WebUSB/webusb_rgb/.skip.txt
@ -1,3 +1,4 @@
+feather_esp32_v2
 pico_rp2040_tinyusb_host
 CH32V20x_EVT
 # CH32V20x_EVT is not supported due to Adafruit_Neopixel
--- a/examples/WebUSB/webusb_serial/.skip.txt
+++ b/examples/WebUSB/webusb_serial/.skip.txt
@ -1,3 +1,4 @@
+feather_esp32_v2
 pico_rp2040_tinyusb_host
 CH32V20x_EVT
 # CH32V20x_EVT is not supported due to lacking of HardwareSerial::read(uint8_t [64], int)
--- a/src/arduino/ports/esp32/tusb_config_esp32.h
+++ b/src/arduino/ports/esp32/tusb_config_esp32.h
@ -99,8 +99,13 @@ extern "C" {

 //--------------------------------------------------------------------
 // DEVICE CONFIGURATION
+// only enabled if USB OTG is supported
 //--------------------------------------------------------------------
+#if defined(CONFIG_USB_OTG_SUPPORTED) && CONFIG_USB_OTG_SUPPORTED
 #define CFG_TUD_ENABLED 1
+#else
+#define CFG_TUD_ENABLED 0
+#endif

 #define CFG_TUD_CDC 2
 #define CFG_TUD_MSC 1