rvbc1 · rvbc1 · Sep 18, 2024 · Sep 18, 2024 · Oct 2, 2024 · Oct 2, 2024
diff --git a/.github/workflows/cron.yml b/.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 }}

diff --git a/.github/workflows/cron_build.yml b/.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 }}

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -34,7 +34,4 @@ add_custom_command(
 )
 add_custom_target(mem-variant DEPENDS "mem_variant")
 
-##################
-### ESP Matter ###
-##################
-idf_build_set_property(CXX_COMPILE_OPTIONS "-std=gnu++17;-DCHIP_HAVE_CONFIG_H" APPEND)
+idf_build_set_property(COMPILE_DEFINITIONS "-DESP32_ARDUINO_LIB_BUILDER" APPEND)
diff --git a/build.sh b/build.sh
@@ -22,7 +22,7 @@ CCACHE_ENABLE=1
 
 TARGET="all"
 BUILD_TYPE="all"
-BUILD_DEBUG="default"
+BUILD_DEBUG="none"
 SKIP_ENV=0
 COPY_OUT=0
 ARCHIVE_OUT=0

diff --git a/components/arduino_tinyusb/CMakeLists.txt b/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"

diff --git a/components/arduino_tinyusb/patches/dcd_dwc2.patch b/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,14 +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);
-@@ -336,7 +346,18 @@
-     dwc2->epout[epnum].doepctl = dxepctl;
-     dwc2->daintmsk |= TU_BIT(DAINTMSK_OEPM_Pos + epnum);
-   } else {
--    dwc2->epin[epnum].diepctl = dxepctl | (epnum << DIEPCTL_TXFNUM_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) {
+-    depctl.bm.tx_fifo_num = epnum;
++    //depctl.bm.tx_fifo_num = epnum;
 +    uint8_t fifo_num = epnum;
 +#if defined(TUP_USBIP_DWC2_ESP32)
 +    // Special Case for EP5, which is used by CDC but not actually called by the driver
@@ -31,14 +33,13 @@
 +    } else {
 +      fifo_num = get_free_fifo();
 +    }
-+    //TU_ASSERT(fifo_num != 0);
 +#endif
-+    dwc2->epin[epnum].diepctl = dxepctl | (fifo_num << DIEPCTL_TXFNUM_Pos);
-     dwc2->daintmsk |= TU_BIT(DAINTMSK_IEPM_Pos + epnum);
++    depctl.bm.tx_fifo_num = fifo_num;
    }
- }
-@@ -850,6 +871,10 @@
-     xfer_status[n][TUSB_DIR_IN].max_size = 0;
+
+   dwc2_dep_t* dep = &dwc2->ep[dir == TUSB_DIR_IN ? 0 : 1][epnum];
+@@ -557,6 +579,10 @@
+     }
    }
 
 +#if defined(TUP_USBIP_DWC2_ESP32)
@@ -48,19 +49,19 @@
    dfifo_flush_tx(dwc2, 0x10); // all tx fifo
    dfifo_flush_rx(dwc2);
 
-@@ -1204,6 +1229,9 @@
-   if (int_status & GINTSTS_USBRST) {
+@@ -997,6 +1023,9 @@
+   if (gintsts & GINTSTS_USBRST) {
      // USBRST is start of reset.
      dwc2->gintsts = GINTSTS_USBRST;
 +#if defined(TUP_USBIP_DWC2_ESP32)
 +    _allocated_fifos = 1;
 +#endif
-     bus_reset(rhport);
+     handle_bus_reset(rhport);
    }
 
-@@ -1235,7 +1263,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);
@@ -70,8 +71,8 @@
 +#endif
    }
 
-   if (int_status & GINTSTS_WKUINT) {
-@@ -1252,6 +1284,9 @@
+   if (gintsts & GINTSTS_WKUINT) {
+@@ -1025,6 +1058,9 @@
 
      if (otg_int & GOTGINT_SEDET) {
        dcd_event_bus_signal(rhport, DCD_EVENT_UNPLUGGED, true);