Merge branch 'espressif:release/v5.5' into release/v5.5

Jason2866 · web-flow · commit cc815cfaaaa6 · 2025-07-01T22:50:18.000+02:00
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -26,47 +26,52 @@ 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@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+          echo "DOCKER_TAGS:"
+          echo "$DOCKER_TAGS"
 
       - name: Login to Docker Hub
         if: ${{ github.event_name == 'push' }}
@@ -86,7 +91,8 @@ jobs:
         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 }}
diff --git a/configs/defconfig.common b/configs/defconfig.common
@@ -125,12 +125,13 @@ CONFIG_I2S_ISR_IRAM_SAFE=y
 # Matter Settings
 #
 # Disable Matter BLE
-CONFIG_ENABLE_CHIPOBLE=n
 CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n
 # ESP Insights
 CONFIG_ENABLE_ESP_INSIGHTS_TRACE=n
 # Use compact attribute storage mode
 CONFIG_ESP_MATTER_NVS_USE_COMPACT_ATTR_STORAGE=y
+# Do not use minimal mDNS within Matter Core
+CONFIG_USE_MINIMAL_MDNS=n
 
 #TinyUSB Config
 CONFIG_TINYUSB_CDC_MAX_PORTS=2
diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32
@@ -20,3 +20,6 @@ CONFIG_TWAI_ERRATA_FIX_RX_FRAME_INVALID=y
 CONFIG_TWAI_ERRATA_FIX_RX_FIFO_CORRUPT=y
 CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
 CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=4096
+
+# Matter settings:
+CONFIG_ENABLE_CHIPOBLE=n
diff --git a/configs/defconfig.esp32c3 b/configs/defconfig.esp32c3
@@ -12,3 +12,6 @@ CONFIG_ESP_WIFI_SCAN_CACHE=y
 CONFIG_ESP_WIFI_MBO_SUPPORT=y
 CONFIG_ESP_WIFI_11R_SUPPORT=y
 CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=4096
+
+# Matter settings:
+CONFIG_ENABLE_CHIPOBLE=y
diff --git a/configs/defconfig.esp32c5 b/configs/defconfig.esp32c5
@@ -50,8 +50,13 @@ CONFIG_OPENTHREAD_NETWORK_MASTERKEY="00112233445566778899aabbccddeeff"
 CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53"
 # end of OpenThread
 
-# Matter shall use only WiFi
-CONFIG_ENABLE_MATTER_OVER_THREAD=n
+# ESP32-C5 fails when ESP Matter 1.4.1 is used. Try this latter with some other IDF 5.5 commit
+# Matter settings: WiFi and OpenThread + CHIPoBLE
+# CONFIG_ENABLE_CHIPOBLE=y
+# CONFIG_ENABLE_MATTER_OVER_THREAD=y
+# Set endpoint id for Thread and Wi-Fi, depending on the secondary network interface endpoint id.
+# CONFIG_THREAD_NETWORK_ENDPOINT_ID=2
+# CONFIG_WIFI_NETWORK_ENDPOINT_ID=0
 
 #
 # Zigbee
diff --git a/configs/defconfig.esp32c6 b/configs/defconfig.esp32c6
@@ -44,8 +44,12 @@ CONFIG_OPENTHREAD_NETWORK_MASTERKEY="00112233445566778899aabbccddeeff"
 CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53"
 # end of OpenThread
 
-# Matter shall use only WiFi
-CONFIG_ENABLE_MATTER_OVER_THREAD=n
+# Matter settings: WiFi and OpenThread + CHIPoBLE
+CONFIG_ENABLE_CHIPOBLE=y
+CONFIG_ENABLE_MATTER_OVER_THREAD=y
+# Set endpoint id for Thread and Wi-Fi, depending on the secondary network interface endpoint id.
+CONFIG_THREAD_NETWORK_ENDPOINT_ID=2
+CONFIG_WIFI_NETWORK_ENDPOINT_ID=0
 
 #
 # Zigbee
diff --git a/configs/defconfig.esp32h2 b/configs/defconfig.esp32h2
@@ -40,6 +40,13 @@ CONFIG_OPENTHREAD_NETWORK_MASTERKEY="00112233445566778899aabbccddeeff"
 CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53"
 # end of OpenThread
 
+# Matter settings: OpenThread + CHIPoBLE
+CONFIG_ENABLE_CHIPOBLE=y
+CONFIG_ENABLE_MATTER_OVER_THREAD=y
+# Disable Matter over WiFi
+CONFIG_ENABLE_WIFI_AP=n
+CONFIG_ENABLE_WIFI_STATION=n
+
 #
 # Zigbee
 #
diff --git a/configs/defconfig.esp32s2 b/configs/defconfig.esp32s2
@@ -15,3 +15,6 @@ CONFIG_ULP_COPROC_ENABLED=y
 CONFIG_ULP_COPROC_TYPE_FSM=y
 # CONFIG_ULP_COPROC_TYPE_RISCV=y
 CONFIG_ULP_COPROC_RESERVE_MEM=512
+
+# Matter settings:
+CONFIG_ENABLE_CHIPOBLE=n
diff --git a/configs/defconfig.esp32s3 b/configs/defconfig.esp32s3
@@ -26,3 +26,6 @@ CONFIG_ULP_COPROC_RESERVE_MEM=512
 # RGB Display Optimizations
 # CONFIG_LCD_RGB_ISR_IRAM_SAFE is not set
 CONFIG_LCD_RGB_RESTART_IN_VSYNC=y
+
+# Matter settings:
+CONFIG_ENABLE_CHIPOBLE=y
diff --git a/main/idf_component.yml b/main/idf_component.yml
@@ -20,4 +20,4 @@ dependencies:
     version: "1.4.1"
     require: public
     rules:
-      - if: "target not in [esp32c2, esp32h2, esp32p4]"
+      - if: "target not in [esp32c2, esp32c5, esp32p4]"

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,13 @@ CONFIG_OPENTHREAD_NETWORK_MASTERKEY="00112233445566778899aabbccddeeff"`
`40`	`40`	`CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53"`
`41`	`41`	`# end of OpenThread`
`42`	`42`
	`43`	`+# Matter settings: OpenThread + CHIPoBLE`
	`44`	`+CONFIG_ENABLE_CHIPOBLE=y`
	`45`	`+CONFIG_ENABLE_MATTER_OVER_THREAD=y`
	`46`	`+# Disable Matter over WiFi`
	`47`	`+CONFIG_ENABLE_WIFI_AP=n`
	`48`	`+CONFIG_ENABLE_WIFI_STATION=n`
	`49`	`+`
`43`	`50`	`#`
`44`	`51`	`# Zigbee`
`45`	`52`	`#`