rvbc1 · rvbc1 · Feb 25, 2025 · Feb 26, 2025 · Mar 6, 2025 · Mar 7, 2025
diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml
@@ -36,11 +36,11 @@ jobs:
           #   lib_builder_branch: "release/v5.1"
           #   targets: "esp32,esp32s2,esp32s3,esp32c3,esp32c6,esp32h2"
           # - idf_branch: "release/v5.3"
-          #   lib_builder_branch: "master"
+          #   lib_builder_branch: "release/v5.3"
           #   targets: "esp32,esp32s2,esp32s3,esp32c3,esp32c6,esp32h2,esp32p4"
           - idf_branch: "release/v5.4"
             lib_builder_branch: "master"
             targets: "esp32,esp32s2,esp32s3,esp32c3,esp32c6,esp32h2,esp32p4"
-          - idf_branch: "master"
+          - idf_branch: "release/v5.5"
             lib_builder_branch: "release/v5.5"
             targets: "esp32,esp32s2,esp32s3,esp32c3,esp32c6,esp32h2,esp32p4,esp32c5"
diff --git a/.github/workflows/cron_build.yml b/.github/workflows/cron_build.yml
@@ -41,7 +41,8 @@ jobs:
       deploy_needed: ${{ steps.check.outputs.deploy_needed }}
       targets_list: ${{ steps.check.outputs.targets_list }}
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout ${{ inputs.lib_builder_branch }}
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ inputs.lib_builder_branch }}
 
@@ -65,7 +66,8 @@ jobs:
       matrix:
         target: ${{ fromJson(needs.check-if-needed.outputs.targets_list) }}
     steps:
-    - uses: actions/checkout@v4
+    - name: Checkout ${{ inputs.lib_builder_branch }}
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       with:
         ref: ${{ inputs.lib_builder_branch }}
 
@@ -88,13 +90,13 @@ jobs:
 
     - name: Upload build
       if: failure()
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
       with:
         name: build-${{ env.libs_branch }}-${{ matrix.target }}
         path: build
 
     - name: Upload library files
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
       with:
         name: libs-${{ env.libs_branch }}-${{ matrix.target }}
         path: dist
@@ -105,7 +107,8 @@ jobs:
     needs: [check-if-needed, build-libs]
     if: needs.check-if-needed.outputs.deploy_needed == '1'
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout ${{ inputs.lib_builder_branch }}
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ inputs.lib_builder_branch }}
 
@@ -115,7 +118,7 @@ jobs:
           echo "libs_branch=${branch//\//_}" >> $GITHUB_ENV
 
       - name: Download artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
         with:
           path: dist
           pattern: libs-${{ env.libs_branch }}-*
@@ -125,7 +128,7 @@ jobs:
         run: bash ./tools/combine-artifacts.sh
 
       - name: Upload full esp32-arduino-libs archive
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: esp32-arduino-libs-${{ env.libs_branch }}
           path: dist/esp32-arduino-libs.zip
@@ -154,7 +157,7 @@ jobs:
           bash ./tools/push-to-arduino.sh
 
       - name: Upload package_esp32_index.template.json
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: package-esp32-index-json-${{ env.libs_branch }}
           path: out/package_esp32_index.template.json
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -26,75 +26,81 @@ jobs:
     name: Build docker image and push if needed
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
       # Depending on the branch/tag, set CLONE_BRANCH_OR_TAG variable (used in the Dockerfile
-      # as a build arg) and TAG_NAME (used when tagging the image).
+      # as a build arg) and DOCKER_TAGS (used when tagging the image).
       #
       # The following 3 steps cover the alternatives (tag, release branch, master branch):
       - name: Set variables (tags)
         if: ${{ github.ref_type == 'tag' }}
         run: |
           echo "CLONE_BRANCH_OR_TAG=$GITHUB_REF_NAME" >> $GITHUB_ENV
-          echo "TAG_NAME=$GITHUB_REF_NAME" >> $GITHUB_ENV
+          echo "DOCKER_TAGS=${{ env.DOCKERHUB_REPO }}:$GITHUB_REF_NAME" >> $GITHUB_ENV
           echo "URL=${{ github.server_url }}/${{ github.repository }}.git" >> $GITHUB_ENV
 
       - name: Set variables (release branches)
         if: ${{ github.ref_type == 'branch' && startsWith(github.ref_name, 'release/') }}
         run: |
           echo "CLONE_BRANCH_OR_TAG=$GITHUB_REF_NAME" >> $GITHUB_ENV
-          echo "TAG_NAME=release-${GITHUB_REF_NAME##release/}" >> $GITHUB_ENV
+          echo "DOCKER_TAGS=${{ env.DOCKERHUB_REPO }}:release-${GITHUB_REF_NAME##release/}" >> $GITHUB_ENV
           echo "URL=${{ github.server_url }}/${{ github.repository }}.git" >> $GITHUB_ENV
 
       - name: Set variables (main branch)
         if: ${{ github.ref_type == 'branch' && github.ref_name == 'master' }}
         run: |
+          source ./tools/config.sh
           echo "CLONE_BRANCH_OR_TAG=master" >> $GITHUB_ENV
-          echo "TAG_NAME=latest" >> $GITHUB_ENV
+          echo "DOCKER_TAGS<<EOF" >> $GITHUB_ENV
+          echo "${{ env.DOCKERHUB_REPO }}:latest" >> $GITHUB_ENV
+          echo "${{ env.DOCKERHUB_REPO }}:release-${IDF_BRANCH##release/}" >> $GITHUB_ENV
+          echo "EOF" >> $GITHUB_ENV
           echo "URL=${{ github.server_url }}/${{ github.repository }}.git" >> $GITHUB_ENV
 
       - name: Set variables (pull requests)
         if: ${{ github.event_name == 'pull_request' }}
         run: |
           echo "CLONE_BRANCH_OR_TAG=${{ github.event.pull_request.head.ref }}" >> $GITHUB_ENV
-          echo "TAG_NAME=PR_${{ github.event.number }}" >> $GITHUB_ENV
+          echo "DOCKER_TAGS=${{ env.DOCKERHUB_REPO }}:PR_${{ github.event.number }}" >> $GITHUB_ENV
           echo "URL=${{ github.server_url }}/${{ github.event.pull_request.head.repo.full_name }}.git" >> $GITHUB_ENV
 
       # Display the variables set above, just in case.
       - name: Check variables
         run: |
           echo "CLONE_BRANCH_OR_TAG: $CLONE_BRANCH_OR_TAG"
-          echo "TAG_NAME: $TAG_NAME"
           echo "URL: $URL"
-
-      - name: Checkout
-        uses: actions/checkout@v4
+          echo "DOCKER_TAGS:"
+          echo "$DOCKER_TAGS"
 
       - name: Login to Docker Hub
         if: ${{ github.event_name == 'push' }}
-        uses: docker/login-action@v3
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Set up QEMU for multiarch builds
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
 
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
         with:
           context: tools/docker
           push: ${{ github.event_name == 'push' }}
-          tags: ${{ env.DOCKERHUB_REPO }}:${{ env.TAG_NAME }}
+          tags: |
+            ${{ env.DOCKER_TAGS }}
           platforms: ${{ env.BUILD_PLATFORMS }}
           build-args: |
             LIBBUILDER_CLONE_URL=${{ env.URL }}
             LIBBUILDER_CLONE_BRANCH_OR_TAG=${{ env.CLONE_BRANCH_OR_TAG }}
 
       - name: Update Docker Hub repository description (master branch)
         if: ${{ github.event_name == 'push' && github.ref_type == 'branch' && github.ref_name == 'master' }}
-        uses: peter-evans/dockerhub-description@v4
+        uses: peter-evans/dockerhub-description@e98e4d1628a5f3be2be7c231e50981aee98723ae # v4.0.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
     - master
+    - gtw
   pull_request:
     paths:
       - "**"
@@ -28,7 +29,8 @@ jobs:
         target: [esp32, esp32s2, esp32s3, esp32c2, esp32c3, esp32c6, esp32h2, esp32p4]
       fail-fast: false
     steps:
-    - uses: actions/checkout@v4
+    - name: Checkout repository
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
     - name: Install dependencies
       run: bash ./tools/prepare-ci.sh
@@ -38,13 +40,13 @@ jobs:
 
     - name: Upload build
       if: failure()
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
       with:
         name: build-${{ matrix.target }}
         path: build
 
     - name: Upload archive
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
       with:
         name: artifacts-${{ matrix.target }}
         path: dist
@@ -55,7 +57,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
         with:
           path: dist
           pattern: artifacts-*
@@ -69,13 +71,13 @@ jobs:
           cp out/package_esp32_index.template.json dist/package_esp32_index.template.json
 
       - name: Upload full esp32-arduino-libs archive
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: esp32-arduino-libs
           path: dist/esp32-arduino-libs.tar.gz
 
       - name: Upload package_esp32_index.template.json
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: package-esp32-index-json
           path: dist/package_esp32_index.template.json

diff --git a/.github/workflows/repository_dispatch.yml b/.github/workflows/repository_dispatch.yml
@@ -7,25 +7,30 @@ jobs:
     name: Dispatch Event
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - name: Checkout repository
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       with:
         fetch-depth: 0
+
     - name: Install dependencies
       run: bash ./tools/prepare-ci.sh
+
     - name: Handle Event
       env:
         GITHUB_TOKEN: ${{ secrets.PUSH_TOKEN }}
         GIT_AUTHOR_EMAIL: ${{ secrets.PUSH_EMAIL }}
         GIT_COMMITTER_EMAIL: ${{ secrets.PUSH_EMAIL }}
       run: bash ./tools/repository_dispatch.sh
+
     - name: Upload build
       if: failure()
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
       with:
         name: build
         path: build
+
     - name: Upload archive
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
       with:
         name: artifacts
         path: dist
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -39,4 +39,4 @@ idf_build_set_property(COMPILE_DEFINITIONS "-DESP32_ARDUINO_LIB_BUILDER" APPEND)
 ##################
 ### ESP Matter ###
 ##################
-idf_build_set_property(CXX_COMPILE_OPTIONS "-std=gnu++17;-DCHIP_HAVE_CONFIG_H" APPEND)
+idf_build_set_property(CXX_COMPILE_OPTIONS "-std=gnu++2a;-DCHIP_HAVE_CONFIG_H" 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/patches/dcd_dwc2.patch b/components/arduino_tinyusb/patches/dcd_dwc2.patch
@@ -19,11 +19,11 @@
    dwc2_regs_t* dwc2 = DWC2_REG(rhport);
    const uint8_t epnum = tu_edpt_number(p_endpoint_desc->bEndpointAddress);
 @@ -266,7 +277,18 @@
-     depctl.bm.set_data0_iso_even = 1;
+     depctl.set_data0_iso_even = 1;
    }
    if (dir == TUSB_DIR_IN) {
--    depctl.bm.tx_fifo_num = epnum;
-+    //depctl.bm.tx_fifo_num = epnum;
+-    depctl.tx_fifo_num = epnum;
++    //depctl.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
@@ -34,7 +34,7 @@
 +      fifo_num = get_free_fifo();
 +    }
 +#endif
-+    depctl.bm.tx_fifo_num = fifo_num;
++    depctl.tx_fifo_num = fifo_num;
    }
 
    dwc2_dep_t* dep = &dwc2->ep[dir == TUSB_DIR_IN ? 0 : 1][epnum];
@@ -56,9 +56,9 @@
 +#if TU_CHECK_MCU(OPT_MCU_ESP32S2, OPT_MCU_ESP32S3)
 +    _allocated_fifos = 1;
 +#endif
+
+     usbd_spin_lock(true);
      handle_bus_reset(rhport);
-   }
-
 @@ -1008,7 +1037,11 @@
 
    if (gintsts & GINTSTS_USBSUSP) {