Merge branch 'release/v5.3' of https://github.com/espressif/esp32-arduino-lib-builder into release/v5.3

Author: HamzaHajeir

.github/workflows/cron.yml

@@ -12,7 +12,7 @@ on:
 #             │ │ │ │ │
 #             * * * * *
     - cron:  '0 */6 * * *'
-  workflow_dispatch: # For testing
+  workflow_dispatch: # For manually rebuilding the libraries
 
 defaults:
   run:
@@ -21,6 +21,7 @@ defaults:
 jobs:
   build-libs:
     name: Build with IDF ${{ matrix.idf_branch }}
+    if: github.repository_owner == 'espressif'
     uses: ./.github/workflows/cron_build.yml
     with:
       idf_branch: ${{ matrix.idf_branch }}
@@ -31,9 +32,15 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - idf_branch: "release/v5.1"
-            lib_builder_branch: "release/v5.1"
-            targets: "esp32,esp32s2,esp32s3,esp32c3,esp32c6,esp32h2"
+          # - idf_branch: "release/v5.1"
+          #   lib_builder_branch: "release/v5.1"
+          #   targets: "esp32,esp32s2,esp32s3,esp32c3,esp32c6,esp32h2"
           - idf_branch: "release/v5.3"
             lib_builder_branch: "release/v5.3"
             targets: "esp32,esp32s2,esp32s3,esp32c3,esp32c6,esp32h2,esp32p4"
+          - idf_branch: "release/v5.4"
+            lib_builder_branch: "release/v5.4"
+            targets: "esp32,esp32s2,esp32s3,esp32c3,esp32c6,esp32h2,esp32p4"
+          - idf_branch: "master"
+            lib_builder_branch: "release/v5.5"
+            targets: "esp32,esp32s2,esp32s3,esp32c3,esp32c6,esp32h2,esp32p4,esp32c5"

.github/workflows/cron_build.yml

@@ -132,7 +132,6 @@ jobs:
           compression-level: 0
 
       - name: Push changes
-        if: github.repository == 'espressif/esp32-arduino-lib-builder'
         env:
           GITHUB_TOKEN: ${{ secrets.PUSH_TOKEN }}
           GIT_AUTHOR_EMAIL: ${{ secrets.PUSH_EMAIL }}

build.sh

@@ -305,14 +305,14 @@ if [ "$BUILD_TYPE" = "all" ]; then
     if [ $? -ne 0 ]; then exit 1; fi
 fi
 
-# Generate PlatformIO manifest file
+# Generate pioarduino manifest file
 if [ "$BUILD_TYPE" = "all" ]; then
-    echo "* Generating PlatformIO manifest file..."
+    echo "* Generating pioarduino manifest file..."
     pushd $IDF_PATH
     ibr=$(git describe --all 2>/dev/null)
     ic=$(git -C "$IDF_PATH" rev-parse --short HEAD)
     popd
-    python3 ./tools/gen_platformio_manifest.py -o "$TOOLS_JSON_OUT/" -s "$ibr" -c "$ic"
+    python3 ./tools/gen_pioarduino_manifest.py -o "$TOOLS_JSON_OUT/" -s "$ibr" -c "$ic"
     if [ $? -ne 0 ]; then exit 1; fi
 fi
 

components/arduino_tinyusb/CMakeLists.txt

@@ -27,7 +27,8 @@ if(CONFIG_TINYUSB_ENABLED)
       # espressif:
       "${COMPONENT_DIR}/src/dcd_dwc2.c"
       # tusb:
-      #"{COMPONENT_DIR}/tinyusb/src/portable/synopsys/dwc2/dcd_dwc2.c"
+      #"${COMPONENT_DIR}/tinyusb/src/portable/synopsys/dwc2/dcd_dwc2.c"
+      "${COMPONENT_DIR}/tinyusb/src/portable/synopsys/dwc2/dwc2_common.c"
       "${COMPONENT_DIR}/tinyusb/src/class/cdc/cdc_device.c"
       "${COMPONENT_DIR}/tinyusb/src/class/hid/hid_device.c"
       "${COMPONENT_DIR}/tinyusb/src/class/midi/midi_device.c"

components/arduino_tinyusb/Kconfig.projbuild

@@ -42,6 +42,14 @@ menu "Arduino TinyUSB"
             help
                 CDC FIFO size of TX
 
+        config TINYUSB_CDC_MAX_PORTS
+            int "Maximum enabled CDC ports"
+            range 1 2
+            default 1
+            depends on TINYUSB_CDC_ENABLED
+            help
+                Maximum enabled CDC ports
+
     endmenu
 
     menu "Mass Storage (MSC) driver"

components/arduino_tinyusb/include/tusb_config.h

@@ -115,7 +115,11 @@ extern "C" {
 #define CFG_TUD_ENDOINT0_SIZE 		64
 
 // Enabled Drivers
-#define CFG_TUD_CDC 				CONFIG_TINYUSB_CDC_ENABLED
+#ifdef CONFIG_TINYUSB_CDC_MAX_PORTS
+#define CFG_TUD_CDC 				CONFIG_TINYUSB_CDC_MAX_PORTS
+#else
+#define CFG_TUD_CDC 				0
+#endif
 #define CFG_TUD_MSC 				CONFIG_TINYUSB_MSC_ENABLED
 #define CFG_TUD_HID 				CONFIG_TINYUSB_HID_ENABLED
 #define CFG_TUD_MIDI 				CONFIG_TINYUSB_MIDI_ENABLED

components/arduino_tinyusb/patches/dcd_dwc2.patch

@@ -1,6 +1,6 @@
 --- a/components/arduino_tinyusb/src/dcd_dwc2.c	2024-10-02 12:17:40.000000000 +0300
 +++ b/components/arduino_tinyusb/src/dcd_dwc2.c	2024-10-02 12:19:48.000000000 +0300
-@@ -316,6 +316,16 @@
+@@ -243,6 +243,17 @@
  //--------------------------------------------------------------------
  // Endpoint
  //--------------------------------------------------------------------
@@ -14,15 +14,16 @@
 +  return 0;
 +}
 +#endif
- 
- static void edpt_activate(uint8_t rhport, tusb_desc_endpoint_t const * p_endpoint_desc) {
++
+ static void edpt_activate(uint8_t rhport, const tusb_desc_endpoint_t* p_endpoint_desc) {
    dwc2_regs_t* dwc2 = DWC2_REG(rhport);
-@@ -332,7 +342,19 @@
-                    (p_endpoint_desc->bmAttributes.xfer != TUSB_XFER_ISOCHRONOUS ? DOEPCTL_SD0PID_SEVNFRM : 0) |
-                    (xfer->max_size << DOEPCTL_MPSIZ_Pos);
+   const uint8_t epnum = tu_edpt_number(p_endpoint_desc->bEndpointAddress);
+@@ -266,7 +277,18 @@
+     depctl.bm.set_data0_iso_even = 1;
+   }
    if (dir == TUSB_DIR_IN) {
--    epctl |= (epnum << DIEPCTL_TXFNUM_Pos);
-+    //epctl |= (epnum << DIEPCTL_TXFNUM_Pos);
+-    depctl.bm.tx_fifo_num = epnum;
++    //depctl.bm.tx_fifo_num = epnum;
 +    uint8_t fifo_num = epnum;
 +#if TU_CHECK_MCU(OPT_MCU_ESP32S2, OPT_MCU_ESP32S3)
 +    // Special Case for EP5, which is used by CDC but not actually called by the driver
@@ -32,13 +33,12 @@
 +    } else {
 +      fifo_num = get_free_fifo();
 +    }
-+    //TU_ASSERT(fifo_num != 0);
 +#endif
-+    epctl |= (fifo_num << DIEPCTL_TXFNUM_Pos);
++    depctl.bm.tx_fifo_num = fifo_num;
    }
 
-   dwc2_dep_t* dep = &dwc2->ep[1 - dir][epnum];
-@@ -840,6 +862,10 @@
+   dwc2_dep_t* dep = &dwc2->ep[dir == TUSB_DIR_IN ? 0 : 1][epnum];
+@@ -557,6 +579,10 @@
      }
    }
 
@@ -49,19 +49,19 @@
    dfifo_flush_tx(dwc2, 0x10); // all tx fifo
    dfifo_flush_rx(dwc2);
 
-@@ -1186,6 +1212,9 @@
-   if (int_status & GINTSTS_USBRST) {
+@@ -997,6 +1023,9 @@
+   if (gintsts & GINTSTS_USBRST) {
      // USBRST is start of reset.
      dwc2->gintsts = GINTSTS_USBRST;
 +#if TU_CHECK_MCU(OPT_MCU_ESP32S2, OPT_MCU_ESP32S3)
 +    _allocated_fifos = 1;
 +#endif
-     bus_reset(rhport);
+     handle_bus_reset(rhport);
    }
 
-@@ -1217,7 +1246,11 @@
+@@ -1008,7 +1037,11 @@
 
-   if (int_status & GINTSTS_USBSUSP) {
+   if (gintsts & GINTSTS_USBSUSP) {
      dwc2->gintsts = GINTSTS_USBSUSP;
 -    dcd_event_bus_signal(rhport, DCD_EVENT_SUSPEND, true);
 +    //dcd_event_bus_signal(rhport, DCD_EVENT_SUSPEND, true);
@@ -71,8 +71,8 @@
 +#endif
    }
 
-   if (int_status & GINTSTS_WKUINT) {
-@@ -1234,6 +1267,9 @@
+   if (gintsts & GINTSTS_WKUINT) {
+@@ -1025,6 +1058,9 @@
 
      if (otg_int & GOTGINT_SEDET) {
        dcd_event_bus_signal(rhport, DCD_EVENT_UNPLUGGED, true);