From 833a7f515b95c9450473a1f5c9bb907b0e23cdb0 Mon Sep 17 00:00:00 2001
From: Lucas Saavedra Vaz <32426024+lucasssvaz@users.noreply.github.com>
Date: Tue, 4 Feb 2025 10:59:04 -0300
Subject: [PATCH 01/26] fix(upload): Add delays and improve error checking
 (#265)

---
 tools/config.sh          |  7 +++++--
 tools/push-to-arduino.sh | 20 +++++++++++++++-----
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/tools/config.sh b/tools/config.sh
index 89cd9856a..3349e4553 100755
--- a/tools/config.sh
+++ b/tools/config.sh
@@ -203,8 +203,11 @@ function github_release_asset_upload(){ # github_release_asset_upload <repo-path
 function github_release_asset_delete(){ # github_release_asset_delete <repo-path> <release-asset-id>
     local repo_path="$1"
     local release_asset_id="$2"
-    local res=$(curl -s -k -o /dev/null -w "%{http_code}" -X DELETE -H "Authorization: token $GITHUB_TOKEN" -H "Accept: application/vnd.github.v3.raw+json" "https://api.github.com/repos/$repo_path/releases/assets/$release_asset_id")
-    if [ "$res" -eq 204 ]; then echo 1; else echo 0; fi
+    local res
+    local return_code
+    res=$(curl -s -k -o /dev/null -w "%{http_code}" -X DELETE -H "Authorization: token $GITHUB_TOKEN" -H "Accept: application/vnd.github.v3.raw+json" "https://api.github.com/repos/$repo_path/releases/assets/$release_asset_id")
+    return_code=$?
+    if [ "$res" -eq 204 ] && [ "$return_code" -eq 0 ] ; then echo 1; else echo 0; fi
 }
 
 
diff --git a/tools/push-to-arduino.sh b/tools/push-to-arduino.sh
index c4d1959d3..8b9b552a7 100755
--- a/tools/push-to-arduino.sh
+++ b/tools/push-to-arduino.sh
@@ -47,16 +47,22 @@ if [ $AR_HAS_COMMIT == "0" ] || [ $LIBS_HAS_ASSET == "0" ]; then
 		fi
 	fi
 
+	sleep 5
 	echo "Creating asset '$LIBS_ZIP_FILENAME'..."
-
 	mv -f "dist/esp32-arduino-libs.zip" "dist/$LIBS_ZIP_FILENAME"
+
 	LIBS_ASSET_ID=`github_release_asset_upload "$AR_LIBS_REPO" "$LIBS_RELEASE_ID" "$LIBS_ZIP_FILENAME" "dist/$LIBS_ZIP_FILENAME"`
 	if [ -z "$LIBS_ASSET_ID" ]; then
-		echo "ERROR: Failed to upload asset '$LIBS_ZIP_FILENAME'"
-		exit 1
+		echo "ERROR: Failed to upload asset '$LIBS_ZIP_FILENAME. Retrying..."
+		LIBS_ASSET_ID=`github_release_asset_upload "$AR_LIBS_REPO" "$LIBS_RELEASE_ID" "$LIBS_ZIP_FILENAME" "dist/$LIBS_ZIP_FILENAME"`
+		if [ -z "$LIBS_ASSET_ID" ]; then
+			echo "ERROR: Failed to upload asset '$LIBS_ZIP_FILENAME'"
+			exit 1
+		fi
 	fi
 
 	echo "Finished uploading asset '$LIBS_ZIP_FILENAME'. Asset ID: $LIBS_ASSET_ID"
+	sleep 5
 
 	# Calculate the local file checksum and size
 	local_checksum=$(sha256sum "dist/$LIBS_ZIP_FILENAME" | awk '{print $1}')
@@ -108,8 +114,12 @@ if [ $AR_HAS_COMMIT == "0" ] || [ $LIBS_HAS_ASSET == "0" ]; then
 
 	JSON_ASSET_ID=`github_release_asset_upload "$AR_LIBS_REPO" "$LIBS_RELEASE_ID" "$LIBS_JSON_FILENAME" "$AR_OUT/package_esp32_index.template.json"`
 	if [ -z "$JSON_ASSET_ID" ]; then
-		echo "ERROR: Failed to upload asset '$LIBS_JSON_FILENAME'"
-		exit 1
+		echo "ERROR: Failed to upload asset '$LIBS_JSON_FILENAME'. Retrying..."
+		JSON_ASSET_ID=`github_release_asset_upload "$AR_LIBS_REPO" "$LIBS_RELEASE_ID" "$LIBS_JSON_FILENAME" "$AR_OUT/package_esp32_index.template.json"`
+		if [ -z "$JSON_ASSET_ID" ]; then
+			echo "ERROR: Failed to upload asset '$LIBS_JSON_FILENAME'"
+			exit 1
+		fi
 	fi
 fi
 

From ad3fb2409169c4c06f2ece49236b63e7eec7e16c Mon Sep 17 00:00:00 2001
From: Me No Dev <me-no-dev@users.noreply.github.com>
Date: Tue, 4 Feb 2025 23:59:06 +0200
Subject: [PATCH 02/26] fix(lcd): Enable optimizations for RGB LCD (#273)

---
 configs/defconfig.esp32p4 | 4 ++++
 configs/defconfig.esp32s3 | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/configs/defconfig.esp32p4 b/configs/defconfig.esp32p4
index 8b04e8469..850b5fd2c 100644
--- a/configs/defconfig.esp32p4
+++ b/configs/defconfig.esp32p4
@@ -24,3 +24,7 @@ CONFIG_ESP_REV_MIN_FULL=0
 CONFIG_ESP32P4_REV_MAX_FULL=99
 CONFIG_ESP_REV_MAX_FULL=99
 # end of Chip revision
+
+# RGB Display Optimizations
+CONFIG_LCD_RGB_ISR_IRAM_SAFE=y
+CONFIG_LCD_RGB_RESTART_IN_VSYNC=y
diff --git a/configs/defconfig.esp32s3 b/configs/defconfig.esp32s3
index 2c2cba3cd..ce53e7747 100644
--- a/configs/defconfig.esp32s3
+++ b/configs/defconfig.esp32s3
@@ -17,3 +17,7 @@ CONFIG_ULP_COPROC_ENABLED=y
 CONFIG_ULP_COPROC_TYPE_FSM=y
 # CONFIG_ULP_COPROC_TYPE_RISCV=y
 CONFIG_ULP_COPROC_RESERVE_MEM=512
+
+# RGB Display Optimizations
+CONFIG_LCD_RGB_ISR_IRAM_SAFE=y
+CONFIG_LCD_RGB_RESTART_IN_VSYNC=y

From 37d69cae6dd8bdbfa877528eb2f5076394b7fb6d Mon Sep 17 00:00:00 2001
From: Me No Dev <me-no-dev@users.noreply.github.com>
Date: Wed, 12 Feb 2025 11:19:22 +0200
Subject: [PATCH 03/26] Add support for two TinyUSB CDC devices at once (#275)

---
 components/arduino_tinyusb/Kconfig.projbuild     | 8 ++++++++
 components/arduino_tinyusb/include/tusb_config.h | 6 +++++-
 configs/defconfig.common                         | 3 +++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/components/arduino_tinyusb/Kconfig.projbuild b/components/arduino_tinyusb/Kconfig.projbuild
index 65d9c37be..f0a1b4dc6 100755
--- a/components/arduino_tinyusb/Kconfig.projbuild
+++ b/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"
diff --git a/components/arduino_tinyusb/include/tusb_config.h b/components/arduino_tinyusb/include/tusb_config.h
index 458c78cf1..7802bea8f 100755
--- a/components/arduino_tinyusb/include/tusb_config.h
+++ b/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
diff --git a/configs/defconfig.common b/configs/defconfig.common
index ef4620bf6..bf5d1197f 100644
--- a/configs/defconfig.common
+++ b/configs/defconfig.common
@@ -131,3 +131,6 @@ CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n
 CONFIG_ENABLE_ESP_INSIGHTS_TRACE=n
 # Use compact attribute storage mode
 CONFIG_ESP_MATTER_NVS_USE_COMPACT_ATTR_STORAGE=y
+
+#TinyUSB Config
+CONFIG_TINYUSB_CDC_MAX_PORTS=2

From 8cea2374eec3c0c387f8c896fa69ff8777711c3a Mon Sep 17 00:00:00 2001
From: Lucas Saavedra Vaz <32426024+lucasssvaz@users.noreply.github.com>
Date: Thu, 13 Feb 2025 08:30:17 -0300
Subject: [PATCH 04/26] fix(docker): Bump base image (#276)

* fix(docker): Bump base image

* fix(docker): Fix pip install
---
 tools/docker/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 3262cbb2d..699f0bd8e 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -1,5 +1,5 @@
 # To Do: Check if it is worth to use espressif/idf as base image (image size will be much bigger)
-FROM ubuntu:22.04
+FROM ubuntu:latest
 
 # switch to root, let the entrypoint drop back to host user
 USER root
@@ -70,7 +70,7 @@ RUN echo LIBBUILDER_CHECKOUT_REF=$LIBBUILDER_CHECKOUT_REF LIBBUILDER_CLONE_BRANC
       git checkout $LIBBUILDER_CHECKOUT_REF && \
       git submodule update --init --recursive; \
     fi && \
-    pip3 install --upgrade -r $LIBBUILDER_PATH/tools/config_editor/requirements.txt
+    pip3 install --break-system-packages --upgrade -r $LIBBUILDER_PATH/tools/config_editor/requirements.txt
 
 COPY entrypoint.sh $LIBBUILDER_PATH/entrypoint.sh
 

From 77f5effeaea8aad19cc1fd044b866cca8f163754 Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Wed, 8 Jan 2025 13:27:51 +0200
Subject: [PATCH 05/26] Configure build for ESP-IDF v5.4

---
 tools/config.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/config.sh b/tools/config.sh
index 3349e4553..1b2941e97 100755
--- a/tools/config.sh
+++ b/tools/config.sh
@@ -6,11 +6,11 @@ if [ -z $IDF_PATH ]; then
 fi
 
 if [ -z $IDF_BRANCH ]; then
-    IDF_BRANCH="release/v5.3"
+    IDF_BRANCH="release/v5.4"
 fi
 
 if [ -z $AR_PR_TARGET_BRANCH ]; then
-    AR_PR_TARGET_BRANCH="master"
+    AR_PR_TARGET_BRANCH="release/v3.2.x"
 fi
 
 if [ -z $IDF_TARGET ]; then

From 731afdf3bfa2a161aec934747b1d4f606a38255c Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Wed, 8 Jan 2025 13:28:16 +0200
Subject: [PATCH 06/26] Remove support for REV0 ESP32-P4

---
 configs/defconfig.esp32p4 | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/configs/defconfig.esp32p4 b/configs/defconfig.esp32p4
index 850b5fd2c..9cc5e8392 100644
--- a/configs/defconfig.esp32p4
+++ b/configs/defconfig.esp32p4
@@ -14,17 +14,6 @@ CONFIG_ESP_SDIO_PIN_D1=15
 CONFIG_ESP_SDIO_PIN_D2=16
 CONFIG_ESP_SDIO_PIN_D3=17
 
-#
-# Chip revision
-#
-CONFIG_ESP32P4_REV_MIN_0=y
-# CONFIG_ESP32P4_REV_MIN_1 is not set
-CONFIG_ESP32P4_REV_MIN_FULL=0
-CONFIG_ESP_REV_MIN_FULL=0
-CONFIG_ESP32P4_REV_MAX_FULL=99
-CONFIG_ESP_REV_MAX_FULL=99
-# end of Chip revision
-
 # RGB Display Optimizations
 CONFIG_LCD_RGB_ISR_IRAM_SAFE=y
 CONFIG_LCD_RGB_RESTART_IN_VSYNC=y

From 784cd9d2626483b40047ad172e06bf897af2b642 Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Wed, 15 Jan 2025 15:50:23 +0200
Subject: [PATCH 07/26] Add temporarily the option to use toolchains with
 `_signed` postfix

This is to fix an issue with ARM Mac toolchain for IDF v5.4
---
 tools/gen_tools_json.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/tools/gen_tools_json.py b/tools/gen_tools_json.py
index 392eed508..a795285b9 100644
--- a/tools/gen_tools_json.py
+++ b/tools/gen_tools_json.py
@@ -27,8 +27,8 @@ def replace_if_xz(system):
     if not system['url'].endswith(".tar.xz"):
         return system
 
-    new_url = system['url'].replace(".tar.xz", ".tar.gz")
-    new_name = system['archiveFileName'].replace(".tar.xz", ".tar.gz")
+    new_url = system['url'].replace(".tar.xz", "_signed.tar.gz")
+    new_name = system['archiveFileName'].replace(".tar.xz", "_signed.tar.gz")
     new_checksum = ""
     new_size = 0
 
@@ -40,8 +40,16 @@ def replace_if_xz(system):
         (owner, proj, version, filename) = urlx[0]
         release_manifest_url = "https://github.com/%s/%s/releases/download/%s/%s-%s-checksum.sha256" % (owner, proj, version, proj, version)
     else:
-        print("No manifest match")
-        return system
+        new_url = system['url'].replace(".tar.xz", ".tar.gz")
+        new_name = system['archiveFileName'].replace(".tar.xz", ".tar.gz")
+        # parse the download url to extract all info needed for the checksum file url
+        urlx = re.findall("^https://github.com/([a-zA-Z0-9_-]+)/([a-zA-Z0-9_-]+)/releases/download/([a-zA-Z0-9_\-.]+)/([a-zA-Z0-9_\-.]+)$", new_url)
+        if urlx and len(urlx) > 0:
+            (owner, proj, version, filename) = urlx[0]
+            release_manifest_url = "https://github.com/%s/%s/releases/download/%s/%s-%s-checksum.sha256" % (owner, proj, version, proj, version)
+        else:
+            print("No manifest match")
+            return system
 
     # check if we have already downloaded and parsed that manifest
     manifest_index = 0

From cc827d83668c660ba3fa9a2329e756e5e47bb9b2 Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Thu, 16 Jan 2025 17:44:36 +0200
Subject: [PATCH 08/26] Fix tools json generation

---
 tools/gen_tools_json.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/tools/gen_tools_json.py b/tools/gen_tools_json.py
index a795285b9..f03b73d78 100644
--- a/tools/gen_tools_json.py
+++ b/tools/gen_tools_json.py
@@ -27,8 +27,10 @@ def replace_if_xz(system):
     if not system['url'].endswith(".tar.xz"):
         return system
 
-    new_url = system['url'].replace(".tar.xz", "_signed.tar.gz")
-    new_name = system['archiveFileName'].replace(".tar.xz", "_signed.tar.gz")
+    new_url = system['url'].replace(".tar.xz", ".tar.gz")
+    new_name = system['archiveFileName'].replace(".tar.xz", ".tar.gz")
+    new_signed_url = system['url'].replace(".tar.xz", "_signed.tar.gz")
+    new_signed_name = system['archiveFileName'].replace(".tar.xz", "_signed.tar.gz")
     new_checksum = ""
     new_size = 0
 
@@ -40,16 +42,8 @@ def replace_if_xz(system):
         (owner, proj, version, filename) = urlx[0]
         release_manifest_url = "https://github.com/%s/%s/releases/download/%s/%s-%s-checksum.sha256" % (owner, proj, version, proj, version)
     else:
-        new_url = system['url'].replace(".tar.xz", ".tar.gz")
-        new_name = system['archiveFileName'].replace(".tar.xz", ".tar.gz")
-        # parse the download url to extract all info needed for the checksum file url
-        urlx = re.findall("^https://github.com/([a-zA-Z0-9_-]+)/([a-zA-Z0-9_-]+)/releases/download/([a-zA-Z0-9_\-.]+)/([a-zA-Z0-9_\-.]+)$", new_url)
-        if urlx and len(urlx) > 0:
-            (owner, proj, version, filename) = urlx[0]
-            release_manifest_url = "https://github.com/%s/%s/releases/download/%s/%s-%s-checksum.sha256" % (owner, proj, version, proj, version)
-        else:
-            print("No manifest match")
-            return system
+        print("No manifest match")
+        return system
 
     # check if we have already downloaded and parsed that manifest
     manifest_index = 0
@@ -84,6 +78,12 @@ def replace_if_xz(system):
         release_manifests.append(manifest)
 
     # find the new file in the list and get it's size and checksum
+    for file in release_manifests[manifest_index]['files']:
+        if file['name'] == new_signed_name:
+            print("Found a signed version of the file")
+            new_url = new_signed_url
+            new_name = new_signed_name
+            break
     for file in release_manifests[manifest_index]['files']:
         if file['name'] == new_name:
             system['url'] = new_url

From 43e5553eeff8e28c296b24c41cd0823d1e4c18cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Proch=C3=A1zka?=
 <90197375+P-R-O-C-H-Y@users.noreply.github.com>
Date: Tue, 4 Feb 2025 22:59:32 +0100
Subject: [PATCH 09/26] fix(zigbee): Exclude correct libs for 1.6.2 version
 (#269)

---
 tools/copy-libs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/copy-libs.sh b/tools/copy-libs.sh
index 21efe1a78..17014e70d 100755
--- a/tools/copy-libs.sh
+++ b/tools/copy-libs.sh
@@ -95,7 +95,7 @@ fi
 
 if [ -d "managed_components/espressif__esp-zboss-lib/lib/$IDF_TARGET/" ]; then
 	cp -r "managed_components/espressif__esp-zboss-lib/lib/$IDF_TARGET"/* "$AR_SDK/lib/"
-	EXCLUDE_LIBS+="zboss_stack.ed;zboss_port.debug;"
+	EXCLUDE_LIBS+="zboss_stack.ed;zboss_port.native.debug;"
 fi
 
 #collect includes, defines and c-flags

From ffdf58bb89214802251d334cb1f9cdafadd93f6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Proch=C3=A1zka?=
 <90197375+P-R-O-C-H-Y@users.noreply.github.com>
Date: Wed, 5 Feb 2025 11:14:11 +0100
Subject: [PATCH 10/26] fix(zigbee): Update exclude libs in script (#274)

---
 tools/copy-libs.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/copy-libs.sh b/tools/copy-libs.sh
index 17014e70d..53e41eee5 100755
--- a/tools/copy-libs.sh
+++ b/tools/copy-libs.sh
@@ -90,12 +90,12 @@ fi
 # copy zigbee + zboss lib
 if [ -d "managed_components/espressif__esp-zigbee-lib/lib/$IDF_TARGET/" ]; then
 	cp -r "managed_components/espressif__esp-zigbee-lib/lib/$IDF_TARGET"/* "$AR_SDK/lib/"
-	EXCLUDE_LIBS+="esp_zb_api_ed;"
+	EXCLUDE_LIBS+="esp_zb_api.ed;"
 fi
 
 if [ -d "managed_components/espressif__esp-zboss-lib/lib/$IDF_TARGET/" ]; then
 	cp -r "managed_components/espressif__esp-zboss-lib/lib/$IDF_TARGET"/* "$AR_SDK/lib/"
-	EXCLUDE_LIBS+="zboss_stack.ed;zboss_port.native.debug;"
+	EXCLUDE_LIBS+="zboss_stack.ed;zboss_port.native;zboss_port.native.debug;"
 fi
 
 #collect includes, defines and c-flags

From 3225f04b8efad7d11286cd27dfef60ac361bfcba Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Tue, 18 Feb 2025 11:48:43 +0200
Subject: [PATCH 11/26] Update target branches

---
 .github/workflows/cron.yml | 8 ++++----
 tools/config.sh            | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml
index 31c578ef7..8a8f721db 100644
--- a/.github/workflows/cron.yml
+++ b/.github/workflows/cron.yml
@@ -35,11 +35,11 @@ jobs:
           # - 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: "master"
-            targets: "esp32,esp32s2,esp32s3,esp32c3,esp32c6,esp32h2,esp32p4"
+          # - idf_branch: "release/v5.3"
+          #   lib_builder_branch: "master"
+          #   targets: "esp32,esp32s2,esp32s3,esp32c3,esp32c6,esp32h2,esp32p4"
           - idf_branch: "release/v5.4"
-            lib_builder_branch: "release/v5.4"
+            lib_builder_branch: "master"
             targets: "esp32,esp32s2,esp32s3,esp32c3,esp32c6,esp32h2,esp32p4"
           - idf_branch: "master"
             lib_builder_branch: "release/v5.5"
diff --git a/tools/config.sh b/tools/config.sh
index 1b2941e97..79d4feef5 100755
--- a/tools/config.sh
+++ b/tools/config.sh
@@ -10,7 +10,7 @@ if [ -z $IDF_BRANCH ]; then
 fi
 
 if [ -z $AR_PR_TARGET_BRANCH ]; then
-    AR_PR_TARGET_BRANCH="release/v3.2.x"
+    AR_PR_TARGET_BRANCH="master"
 fi
 
 if [ -z $IDF_TARGET ]; then

From 5d86a90635cc9c695913503315284fd47b4c192a Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Tue, 18 Feb 2025 21:57:38 +0100
Subject: [PATCH 12/26] Delete removed Zigbee RCP mode / rename of libs

---
 configs/pioarduino_start.txt | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/configs/pioarduino_start.txt b/configs/pioarduino_start.txt
index c5174173d..ec10a10dc 100644
--- a/configs/pioarduino_start.txt
+++ b/configs/pioarduino_start.txt
@@ -45,28 +45,17 @@ flatten_cppdefines = env.Flatten(env['CPPDEFINES'])
 if "ZIGBEE_MODE_ZCZR" in flatten_cppdefines:
     env.Append(
         LIBS=[
-            "-lesp_zb_api_zczr",
-            "-lesp_zb_cli_command",
+            "-lesp_zb_api.zczr",
             "-lzboss_stack.zczr",
-            "-lzboss_port"
+            "-lzboss_port.native"
         ]
     )
 if "ZIGBEE_MODE_ED" in flatten_cppdefines:
     env.Append(
         LIBS=[
-            "-lesp_zb_api_ed",
-            "-lesp_zb_cli_command",
+            "-lesp_zb_api.ed",
             "-lzboss_stack.ed",
-            "-lzboss_port"
-        ]
-    )
-if "ZIGBEE_MODE_RCP" in flatten_cppdefines:
-    env.Append(
-        LIBS=[
-            "-lesp_zb_api_rcp",
-            "-lesp_zb_cli_command",
-            "-lzboss_stack.rcp",
-            "-lzboss_port"
+            "-lzboss_port.native"
         ]
     )
 

From 252044546d2eb42a64401c71df580e4841ebcb7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Proch=C3=A1zka?=
 <90197375+P-R-O-C-H-Y@users.noreply.github.com>
Date: Thu, 20 Feb 2025 16:31:53 +0100
Subject: [PATCH 13/26] feat(zigbee): Enable Zigbee by default on all chips

---
 configs/defconfig.common  | 3 +++
 configs/defconfig.esp32c6 | 1 -
 configs/defconfig.esp32h2 | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/configs/defconfig.common b/configs/defconfig.common
index bf5d1197f..2fc18a697 100644
--- a/configs/defconfig.common
+++ b/configs/defconfig.common
@@ -134,3 +134,6 @@ CONFIG_ESP_MATTER_NVS_USE_COMPACT_ATTR_STORAGE=y
 
 #TinyUSB Config
 CONFIG_TINYUSB_CDC_MAX_PORTS=2
+
+# Zigbee Config
+CONFIG_ZB_ENABLED=y
diff --git a/configs/defconfig.esp32c6 b/configs/defconfig.esp32c6
index 8a45b0eed..d0e2b7bbd 100644
--- a/configs/defconfig.esp32c6
+++ b/configs/defconfig.esp32c6
@@ -45,7 +45,6 @@ CONFIG_ENABLE_MATTER_OVER_THREAD=n
 #
 # Zigbee
 #
-CONFIG_ZB_ENABLED=y
 CONFIG_ZB_ZED=y
 CONFIG_ZB_RADIO_NATIVE=y
 # end of Zigbee
diff --git a/configs/defconfig.esp32h2 b/configs/defconfig.esp32h2
index 9bc304886..024120d34 100644
--- a/configs/defconfig.esp32h2
+++ b/configs/defconfig.esp32h2
@@ -38,7 +38,6 @@ CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53"
 #
 # Zigbee
 #
-CONFIG_ZB_ENABLED=y
 CONFIG_ZB_ZED=y
 CONFIG_ZB_RADIO_NATIVE=y
 # end of Zigbee

From 4ed776080713d42e786f7179b13b8557fc67707c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Proch=C3=A1zka?=
 <90197375+P-R-O-C-H-Y@users.noreply.github.com>
Date: Thu, 20 Feb 2025 19:09:07 +0100
Subject: [PATCH 14/26] fix(libs): Add also zcrz and remote zb libs to exclude

---
 tools/copy-libs.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/copy-libs.sh b/tools/copy-libs.sh
index 53e41eee5..5c71c72ab 100755
--- a/tools/copy-libs.sh
+++ b/tools/copy-libs.sh
@@ -90,12 +90,12 @@ fi
 # copy zigbee + zboss lib
 if [ -d "managed_components/espressif__esp-zigbee-lib/lib/$IDF_TARGET/" ]; then
 	cp -r "managed_components/espressif__esp-zigbee-lib/lib/$IDF_TARGET"/* "$AR_SDK/lib/"
-	EXCLUDE_LIBS+="esp_zb_api.ed;"
+	EXCLUDE_LIBS+="esp_zb_api.ed;esp_zb_api.zczr;"
 fi
 
 if [ -d "managed_components/espressif__esp-zboss-lib/lib/$IDF_TARGET/" ]; then
 	cp -r "managed_components/espressif__esp-zboss-lib/lib/$IDF_TARGET"/* "$AR_SDK/lib/"
-	EXCLUDE_LIBS+="zboss_stack.ed;zboss_port.native;zboss_port.native.debug;"
+	EXCLUDE_LIBS+="zboss_stack.ed;zboss_stack.zczr;zboss_port.native;zboss_port.native.debug;zboss_port.remote;zboss_port.remote.debug;"
 fi
 
 #collect includes, defines and c-flags

From 5db5d9aea007f55e4983ad74de17204649829725 Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Tue, 25 Feb 2025 10:30:06 +0200
Subject: [PATCH 15/26] Update PR Title and commit messages to Arduino

---
 tools/check-deploy-needed.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/check-deploy-needed.sh b/tools/check-deploy-needed.sh
index e33cc169c..28a95ee7e 100755
--- a/tools/check-deploy-needed.sh
+++ b/tools/check-deploy-needed.sh
@@ -33,8 +33,8 @@ fi
 
 # format new branch name and pr title
 AR_NEW_BRANCH_NAME="idf-$IDF_BRANCH"
-AR_NEW_COMMIT_MESSAGE="IDF $IDF_BRANCH $IDF_COMMIT"
-AR_NEW_PR_TITLE="IDF $IDF_BRANCH"
+AR_NEW_COMMIT_MESSAGE="ci(libs): ESP-IDF $IDF_BRANCH $IDF_COMMIT"
+AR_NEW_PR_TITLE="ci(libs): ESP-IDF $IDF_BRANCH"
 
 LIBS_RELEASE_TAG="idf-"${IDF_BRANCH//\//_}""
 LIBS_VERSION_PREFIX="$LIBS_RELEASE_TAG-$IDF_COMMIT-v"

From 16a6e09d397baa2fb58a34dd6abf45d9307100c4 Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Wed, 26 Feb 2025 16:14:00 +0200
Subject: [PATCH 16/26] Revert "Update PR Title and commit messages to Arduino"

This reverts commit 5db5d9aea007f55e4983ad74de17204649829725.
---
 tools/check-deploy-needed.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/check-deploy-needed.sh b/tools/check-deploy-needed.sh
index 28a95ee7e..e33cc169c 100755
--- a/tools/check-deploy-needed.sh
+++ b/tools/check-deploy-needed.sh
@@ -33,8 +33,8 @@ fi
 
 # format new branch name and pr title
 AR_NEW_BRANCH_NAME="idf-$IDF_BRANCH"
-AR_NEW_COMMIT_MESSAGE="ci(libs): ESP-IDF $IDF_BRANCH $IDF_COMMIT"
-AR_NEW_PR_TITLE="ci(libs): ESP-IDF $IDF_BRANCH"
+AR_NEW_COMMIT_MESSAGE="IDF $IDF_BRANCH $IDF_COMMIT"
+AR_NEW_PR_TITLE="IDF $IDF_BRANCH"
 
 LIBS_RELEASE_TAG="idf-"${IDF_BRANCH//\//_}""
 LIBS_VERSION_PREFIX="$LIBS_RELEASE_TAG-$IDF_COMMIT-v"

From 206744855a44ab7332147431ddc4433c93f9c5df Mon Sep 17 00:00:00 2001
From: Sugar Glider <rodrigo.garcia@espressif.com>
Date: Thu, 6 Mar 2025 13:11:22 -0300
Subject: [PATCH 17/26] feat(matter): updates matter version to 1.4

---
 main/idf_component.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/idf_component.yml b/main/idf_component.yml
index c6bb97f46..8c574bb08 100644
--- a/main/idf_component.yml
+++ b/main/idf_component.yml
@@ -17,7 +17,7 @@ dependencies:
     rules:
       - if: "target in [esp32s3]"
   espressif/esp_matter:
-    version: "^1.3.0"
+    version: "^1.4.0"
     require: public
     rules:
       - if: "target not in [esp32c2, esp32h2, esp32p4]"

From a401c5baa24b14515d6dcc7d0c78d0c216dc5ceb Mon Sep 17 00:00:00 2001
From: Me No Dev <me-no-dev@users.noreply.github.com>
Date: Fri, 7 Mar 2025 11:21:26 +0200
Subject: [PATCH 18/26] Enable I2S_ISR_IRAM_SAFE to fix bug in ESP-IDF

---
 configs/defconfig.common | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configs/defconfig.common b/configs/defconfig.common
index 2fc18a697..621256ba7 100644
--- a/configs/defconfig.common
+++ b/configs/defconfig.common
@@ -121,6 +121,7 @@ CONFIG_ESP_COREDUMP_STACK_SIZE=0
 CONFIG_MBEDTLS_DYNAMIC_BUFFER=y
 CONFIG_MBEDTLS_DYNAMIC_FREE_PEER_CERT=y
 CONFIG_MBEDTLS_DYNAMIC_FREE_CONFIG_DATA=y
+CONFIG_I2S_ISR_IRAM_SAFE=y
 #
 # Matter Settings
 #

From fffa99e734a4505fd36d4caf94fbf5cb5f192c5c Mon Sep 17 00:00:00 2001
From: TANAKA Masayuki <tanakamasayuki@gmail.com>
Date: Fri, 7 Mar 2025 18:26:53 +0900
Subject: [PATCH 19/26] fix(TinyUSB): USB HUB Subport Added, FIFO sizes(Bias
 Periodic OUT)

It is used by USB HUB. And, Supports USB packets of 128 bytes or more.
---
 configs/defconfig.common | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/configs/defconfig.common b/configs/defconfig.common
index 2fc18a697..ad01918a7 100644
--- a/configs/defconfig.common
+++ b/configs/defconfig.common
@@ -134,6 +134,9 @@ CONFIG_ESP_MATTER_NVS_USE_COMPACT_ATTR_STORAGE=y
 
 #TinyUSB Config
 CONFIG_TINYUSB_CDC_MAX_PORTS=2
+CONFIG_USB_HOST_HUBS_SUPPORTED=y
+CONFIG_USB_HOST_HUB_MULTI_LEVEL=y
+CONFIG_USB_HOST_HW_BUFFER_BIAS_PERIODIC_OUT=y
 
 # Zigbee Config
 CONFIG_ZB_ENABLED=y

From 3150a1dfabec2b9fa4b5e8be71af90b4d4c05306 Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Fri, 7 Mar 2025 16:58:43 +0200
Subject: [PATCH 20/26] Disable custom IP6 LwIP hook

---
 configs/defconfig.common | 1 -
 1 file changed, 1 deletion(-)

diff --git a/configs/defconfig.common b/configs/defconfig.common
index c0c91d0c4..48baf5081 100644
--- a/configs/defconfig.common
+++ b/configs/defconfig.common
@@ -78,7 +78,6 @@ CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT=y
 CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y
 CONFIG_LWIP_HOOK_IP6_SELECT_SRC_ADDR_DEFAULT=y
 CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_DEFAULT=y
-CONFIG_LWIP_HOOK_IP6_INPUT_CUSTOM=y
 CONFIG_LWIP_MULTICAST_PING=y
 CONFIG_LWIP_BROADCAST_PING=y
 CONFIG_LWIP_IPV6_NUM_ADDRESSES=8

From ce6f1932b49db1aed494871df72fac97592d08b4 Mon Sep 17 00:00:00 2001
From: Sugar Glider <rodrigo.garcia@espressif.com>
Date: Sat, 8 Mar 2025 19:18:26 -0300
Subject: [PATCH 21/26] fixes Matter 1.4 Resolve Include Macro

---
 tools/copy-libs.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/copy-libs.sh b/tools/copy-libs.sh
index 5c71c72ab..7c302ab66 100755
--- a/tools/copy-libs.sh
+++ b/tools/copy-libs.sh
@@ -525,9 +525,10 @@ for flag_file in "c_flags" "cpp_flags" "S_flags"; do
  	sed 's/\\\"-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=<lib\/address_resolve\/AddressResolve_DefaultImpl.h>\\\"/-DCHIP_HAVE_CONFIG_H/' $FLAGS_DIR/$flag_file > $FLAGS_DIR/$flag_file.temp
 	mv $FLAGS_DIR/$flag_file.temp $FLAGS_DIR/$flag_file
 done
-CHIP_RESOLVE_DIR="$AR_SDK/include/espressif__esp_matter/connectedhomeip/connectedhomeip/src/lib/address_resolve"
-sed 's/CHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER/<lib\/address_resolve\/AddressResolve_DefaultImpl.h>/' $CHIP_RESOLVE_DIR/AddressResolve.h > $CHIP_RESOLVE_DIR/AddressResolve_temp.h
-mv $CHIP_RESOLVE_DIR/AddressResolve_temp.h $CHIP_RESOLVE_DIR/AddressResolve.h
+# this is not necessary for Matter 1.4, but it is for Matter 1.3
+#CHIP_RESOLVE_DIR="$AR_SDK/include/espressif__esp_matter/connectedhomeip/connectedhomeip/src/lib/address_resolve"
+#sed 's/CHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER/<lib\/address_resolve\/AddressResolve_DefaultImpl.h>/' $CHIP_RESOLVE_DIR/AddressResolve.h > $CHIP_RESOLVE_DIR/AddressResolve_temp.h
+#mv $CHIP_RESOLVE_DIR/AddressResolve_temp.h $CHIP_RESOLVE_DIR/AddressResolve.h
 # End of Matter Library adjustments
 
 # sdkconfig

From 91af3d16ec1ecef6e589bd9ca1b48b4fbe137a46 Mon Sep 17 00:00:00 2001
From: Me No Dev <me-no-dev@users.noreply.github.com>
Date: Wed, 19 Mar 2025 17:37:46 +0200
Subject: [PATCH 22/26] Enable TLS 1.3

---
 configs/defconfig.common | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configs/defconfig.common b/configs/defconfig.common
index 48baf5081..096556a9f 100644
--- a/configs/defconfig.common
+++ b/configs/defconfig.common
@@ -90,6 +90,7 @@ CONFIG_MBEDTLS_CAMELLIA_C=y
 CONFIG_MBEDTLS_GCM_SUPPORT_NON_AES_CIPHER=y
 # CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN is not set
 CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
+CONFIG_MBEDTLS_SSL_PROTO_TLS1_3=y
 CONFIG_OPENSSL_ASSERT_DO_NOTHING=y
 CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=2048
 CONFIG_SPI_FLASH_YIELD_DURING_ERASE=y

From 5c05937d6ea565806dcba24258812cb8dadbe4af Mon Sep 17 00:00:00 2001
From: Lucas Saavedra Vaz <32426024+lucasssvaz@users.noreply.github.com>
Date: Wed, 19 Mar 2025 18:51:21 -0300
Subject: [PATCH 23/26] ci(workflows): Lock actions to commits and improve
 readability

---
 .github/workflows/cron_build.yml          | 19 +++++++++++--------
 .github/workflows/docker.yml              | 12 ++++++------
 .github/workflows/push.yml                | 13 +++++++------
 .github/workflows/repository_dispatch.yml | 11 ++++++++---
 4 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/cron_build.yml b/.github/workflows/cron_build.yml
index 8d13759b7..fd9634928 100644
--- 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
index d6166a365..c89352150 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -66,23 +66,23 @@ jobs:
           echo "URL: $URL"
 
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - 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' }}
@@ -94,7 +94,7 @@ jobs:
 
       - 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
index 95610c403..756ab0991 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -28,7 +28,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 +39,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 +56,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 +70,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
index a18412a3d..62837976b 100644
--- 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

From c4a6b8f289dee1ea92618dfbd91d981ea2f4d1aa Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Thu, 20 Mar 2025 02:00:16 +0200
Subject: [PATCH 24/26] Revert "Enable TLS 1.3"

This reverts commit 91af3d16ec1ecef6e589bd9ca1b48b4fbe137a46.
---
 configs/defconfig.common | 1 -
 1 file changed, 1 deletion(-)

diff --git a/configs/defconfig.common b/configs/defconfig.common
index 096556a9f..48baf5081 100644
--- a/configs/defconfig.common
+++ b/configs/defconfig.common
@@ -90,7 +90,6 @@ CONFIG_MBEDTLS_CAMELLIA_C=y
 CONFIG_MBEDTLS_GCM_SUPPORT_NON_AES_CIPHER=y
 # CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN is not set
 CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
-CONFIG_MBEDTLS_SSL_PROTO_TLS1_3=y
 CONFIG_OPENSSL_ASSERT_DO_NOTHING=y
 CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=2048
 CONFIG_SPI_FLASH_YIELD_DURING_ERASE=y

From 2e3852231dfddc35cae7c9017713d8c95a1188b9 Mon Sep 17 00:00:00 2001
From: Sugar Glider <rodrigo.garcia@espressif.com>
Date: Thu, 20 Mar 2025 23:25:22 -0300
Subject: [PATCH 25/26] Update CMakeLists.txt to use gnu++2a instead of 17

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1268b8e68..b79d85c0a 100644
--- 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)

From 33f0b46c4c79eacc5939fa3598c3563cc07828a0 Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Tue, 15 Apr 2025 16:41:57 +0300
Subject: [PATCH 26/26] Update TinyUSB DWC2 DCD

---
 .../arduino_tinyusb/patches/dcd_dwc2.patch    |   8 +-
 components/arduino_tinyusb/src/dcd_dwc2.c     | 106 +++++++++---------
 2 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/components/arduino_tinyusb/patches/dcd_dwc2.patch b/components/arduino_tinyusb/patches/dcd_dwc2.patch
index 11c1c05c0..14e6975f0 100644
--- 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];
diff --git a/components/arduino_tinyusb/src/dcd_dwc2.c b/components/arduino_tinyusb/src/dcd_dwc2.c
index d6796641a..ea931ab90 100644
--- a/components/arduino_tinyusb/src/dcd_dwc2.c
+++ b/components/arduino_tinyusb/src/dcd_dwc2.c
@@ -41,12 +41,6 @@
 #include "device/dcd.h"
 #include "dwc2_common.h"
 
-#if TU_CHECK_MCU(OPT_MCU_GD32VF103)
-  #define DWC2_EP_COUNT(_dwc2)   DWC2_EP_MAX
-#else
-  #define DWC2_EP_COUNT(_dwc2)  ((_dwc2)->ghwcfg2_bm.num_dev_ep + 1)
-#endif
-
 //--------------------------------------------------------------------+
 // MACRO TYPEDEF CONSTANT ENUM
 //--------------------------------------------------------------------+
@@ -79,6 +73,16 @@ CFG_TUD_MEM_SECTION static struct {
   TUD_EPBUF_DEF(setup_packet, 8);
 } _dcd_usbbuf;
 
+TU_ATTR_ALWAYS_INLINE static inline uint8_t dwc2_ep_count(const dwc2_regs_t* dwc2) {
+  #if TU_CHECK_MCU(OPT_MCU_GD32VF103)
+  return DWC2_EP_MAX;
+  #else
+  const dwc2_ghwcfg2_t ghwcfg2 = {.value = dwc2->ghwcfg2};
+  return ghwcfg2.num_dev_ep + 1;
+  #endif
+}
+
+
 //--------------------------------------------------------------------
 // DMA
 //--------------------------------------------------------------------
@@ -102,7 +106,8 @@ bool dcd_dcache_clean_invalidate(const void* addr, uint32_t data_size) {
 TU_ATTR_ALWAYS_INLINE static inline bool dma_device_enabled(const dwc2_regs_t* dwc2) {
   (void) dwc2;
   // Internal DMA only
-  return CFG_TUD_DWC2_DMA_ENABLE && dwc2->ghwcfg2_bm.arch == GHWCFG2_ARCH_INTERNAL_DMA;
+  const dwc2_ghwcfg2_t ghwcfg2 = {.value = dwc2->ghwcfg2};
+  return CFG_TUD_DWC2_DMA_ENABLE && ghwcfg2.arch == GHWCFG2_ARCH_INTERNAL_DMA;
 }
 
 static void dma_setup_prepare(uint8_t rhport) {
@@ -261,20 +266,15 @@ static void edpt_activate(uint8_t rhport, const tusb_desc_endpoint_t* p_endpoint
   xfer->interval = p_endpoint_desc->bInterval;
 
   // Endpoint control
-  union {
-    uint32_t value;
-    dwc2_depctl_t bm;
-  } depctl;
-  depctl.value = 0;
-
-  depctl.bm.mps = xfer->max_size;
-  depctl.bm.active = 1;
-  depctl.bm.type = p_endpoint_desc->bmAttributes.xfer;
+  dwc2_depctl_t depctl = {.value = 0};
+  depctl.mps = xfer->max_size;
+  depctl.active = 1;
+  depctl.type = p_endpoint_desc->bmAttributes.xfer;
   if (p_endpoint_desc->bmAttributes.xfer != TUSB_XFER_ISOCHRONOUS) {
-    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.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
@@ -285,7 +285,7 @@ static void edpt_activate(uint8_t rhport, const tusb_desc_endpoint_t* p_endpoint
       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];
@@ -365,31 +365,22 @@ static void edpt_schedule_packets(uint8_t rhport, const uint8_t epnum, const uin
   }
 
   // transfer size: A full OUT transfer (multiple packets, possibly) triggers XFRC.
-  union {
-    uint32_t value;
-    dwc2_ep_tsize_t bm;
-  } deptsiz;
-  deptsiz.value = 0;
-  deptsiz.bm.xfer_size =  total_bytes;
-  deptsiz.bm.packet_count = num_packets;
-
+  dwc2_ep_tsize_t deptsiz = {.value = 0};
+  deptsiz.xfer_size = total_bytes;
+  deptsiz.packet_count = num_packets;
   dep->tsiz = deptsiz.value;
 
   // control
-  union {
-    dwc2_depctl_t bm;
-    uint32_t value;
-  } depctl;
-  depctl.value = dep->ctl;
-
-  depctl.bm.clear_nak = 1;
-  depctl.bm.enable = 1;
-  if (depctl.bm.type == DEPCTL_EPTYPE_ISOCHRONOUS && xfer->interval == 1) {
-    const uint32_t odd_now = (dwc2->dsts_bm.frame_number & 1u);
+  dwc2_depctl_t depctl = {.value = dep->ctl};
+  depctl.clear_nak = 1;
+  depctl.enable = 1;
+  if (depctl.type == DEPCTL_EPTYPE_ISOCHRONOUS && xfer->interval == 1) {
+    const dwc2_dsts_t dsts = {.value = dwc2->dsts};
+    const uint32_t odd_now = dsts.frame_number & 1u;
     if (odd_now) {
-      depctl.bm.set_data0_iso_even = 1;
+      depctl.set_data0_iso_even = 1;
     } else {
-      depctl.bm.set_data1_iso_odd = 1;
+      depctl.set_data1_iso_odd = 1;
     }
   }
 
@@ -432,7 +423,8 @@ bool dcd_init(uint8_t rhport, const tusb_rhport_init_t* rh_init) {
 
     // XCVRDLY: transceiver delay between xcvr_sel and txvalid during device chirp is required
     // when using with some PHYs such as USB334x (USB3341, USB3343, USB3346, USB3347)
-    if (dwc2->ghwcfg2_bm.hs_phy_type == GHWCFG2_HSPHY_ULPI) {
+    const dwc2_ghwcfg2_t ghwcfg2 = {.value = dwc2->ghwcfg2};
+    if (ghwcfg2.hs_phy_type == GHWCFG2_HSPHY_ULPI) {
       dcfg |= DCFG_XCVRDLY;
     }
   } else {
@@ -667,7 +659,7 @@ void dcd_edpt_clear_stall(uint8_t rhport, uint8_t ep_addr) {
 // 7.4.1 Initialization on USB Reset
 static void handle_bus_reset(uint8_t rhport) {
   dwc2_regs_t *dwc2 = DWC2_REG(rhport);
-  const uint8_t ep_count =  DWC2_EP_COUNT(dwc2);
+  const uint8_t ep_count =  dwc2_ep_count(dwc2);
 
   tu_memclr(xfer_status, sizeof(xfer_status));
 
@@ -697,7 +689,9 @@ static void handle_bus_reset(uint8_t rhport) {
   dfifo_device_init(rhport);
 
   // 5. Reset device address
-  dwc2->dcfg_bm.address = 0;
+  dwc2_dcfg_t dcfg = {.value = dwc2->dcfg};
+  dcfg.address = 0;
+  dwc2->dcfg = dcfg.value;
 
   // Fixed both control EP0 size to 64 bytes
   dwc2->epin[0].ctl &= ~(0x03 << DIEPCTL_MPSIZ_Pos);
@@ -717,8 +711,9 @@ static void handle_bus_reset(uint8_t rhport) {
 
 static void handle_enum_done(uint8_t rhport) {
   dwc2_regs_t *dwc2 = DWC2_REG(rhport);
+  const dwc2_dsts_t dsts = {.value = dwc2->dsts};
   tusb_speed_t speed;
-  switch (dwc2->dsts_bm.enum_speed) {
+  switch (dsts.enum_speed) {
     case DCFG_SPEED_HIGH:
       speed = TUSB_SPEED_HIGH;
     break;
@@ -763,12 +758,12 @@ static void handle_rxflvl_irq(uint8_t rhport) {
   const volatile uint32_t* rx_fifo = dwc2->fifo[0];
 
   // Pop control word off FIFO
-  const dwc2_grxstsp_t grxstsp_bm = dwc2->grxstsp_bm;
-  const uint8_t epnum = grxstsp_bm.ep_ch_num;
+  const dwc2_grxstsp_t grxstsp = {.value = dwc2->grxstsp};
+  const uint8_t epnum = grxstsp.ep_ch_num;
 
   dwc2_dep_t* epout = &dwc2->epout[epnum];
 
-  switch (grxstsp_bm.packet_status) {
+  switch (grxstsp.packet_status) {
     case GRXSTS_PKTSTS_GLOBAL_OUT_NAK:
       // Global OUT NAK: do nothing
       break;
@@ -790,7 +785,7 @@ static void handle_rxflvl_irq(uint8_t rhport) {
 
     case GRXSTS_PKTSTS_RX_DATA: {
       // Out packet received
-      const uint16_t byte_count = grxstsp_bm.byte_count;
+      const uint16_t byte_count = grxstsp.byte_count;
       xfer_ctl_t* xfer = XFER_CTL_BASE(epnum, TUSB_DIR_OUT);
 
       if (byte_count) {
@@ -804,7 +799,8 @@ static void handle_rxflvl_irq(uint8_t rhport) {
 
         // short packet, minus remaining bytes (xfer_size)
         if (byte_count < xfer->max_size) {
-          xfer->total_len -= epout->tsiz_bm.xfer_size;
+          const dwc2_ep_tsize_t tsiz = {.value = epout->tsiz};
+          xfer->total_len -= tsiz.xfer_size;
           if (epnum == 0) {
             xfer->total_len -= _dcd_data.ep0_pending[TUSB_DIR_OUT];
             _dcd_data.ep0_pending[TUSB_DIR_OUT] = 0;
@@ -866,11 +862,13 @@ static void handle_epin_slave(uint8_t rhport, uint8_t epnum, dwc2_diepint_t diep
   // - 64 bytes or
   // - Half/Empty of TX FIFO size (configured by GAHBCFG.TXFELVL)
   if (diepint_bm.txfifo_empty && (dwc2->diepempmsk & (1 << epnum))) {
-    const uint16_t remain_packets = epin->tsiz_bm.packet_count;
+    dwc2_ep_tsize_t tsiz = {.value = epin->tsiz};
+    const uint16_t remain_packets = tsiz.packet_count;
 
     // Process every single packet (only whole packets can be written to fifo)
     for (uint16_t i = 0; i < remain_packets; i++) {
-      const uint16_t remain_bytes = (uint16_t) epin->tsiz_bm.xfer_size;
+      tsiz.value = epin->tsiz;
+      const uint16_t remain_bytes = (uint16_t) tsiz.xfer_size;
       const uint16_t xact_bytes = tu_min16(remain_bytes, xfer->max_size);
 
       // Check if dtxfsts has enough space available
@@ -889,7 +887,8 @@ static void handle_epin_slave(uint8_t rhport, uint8_t epnum, dwc2_diepint_t diep
     }
 
     // Turn off TXFE if all bytes are written.
-    if (epin->tsiz_bm.xfer_size == 0) {
+    tsiz.value = epin->tsiz;
+    if (tsiz.xfer_size == 0) {
       dwc2->diepempmsk &= ~(1 << epnum);
     }
   }
@@ -920,7 +919,8 @@ static void handle_epout_dma(uint8_t rhport, uint8_t epnum, dwc2_doepint_t doepi
         xfer_ctl_t* xfer = XFER_CTL_BASE(epnum, TUSB_DIR_OUT);
 
         // determine actual received bytes
-        const uint16_t remain = epout->tsiz_bm.xfer_size;
+        const dwc2_ep_tsize_t tsiz = {.value = epout->tsiz};
+        const uint16_t remain = tsiz.xfer_size;
         xfer->total_len -= remain;
 
         // this is ZLP, so prepare EP0 for next setup
@@ -956,7 +956,7 @@ static void handle_epin_dma(uint8_t rhport, uint8_t epnum, dwc2_diepint_t diepin
 static void handle_ep_irq(uint8_t rhport, uint8_t dir) {
   dwc2_regs_t* dwc2 = DWC2_REG(rhport);
   const bool is_dma = dma_device_enabled(dwc2);
-  const uint8_t ep_count = DWC2_EP_COUNT(dwc2);
+  const uint8_t ep_count = dwc2_ep_count(dwc2);
   const uint8_t daint_offset = (dir == TUSB_DIR_IN) ? DAINT_IEPINT_Pos : DAINT_OEPINT_Pos;
   dwc2_dep_t* ep_base = &dwc2->ep[dir == TUSB_DIR_IN ? 0 : 1][0];