From 06940e3cfe8b6dfadf8b3d3a0a82f882d12d79e2 Mon Sep 17 00:00:00 2001
From: chendejin <chendejin@espressif.com>
Date: Mon, 7 Jul 2025 19:57:11 +0800
Subject: [PATCH] esp_matter managed component: v1.4.0~1

---
 CHANGELOG.md                 |  8 +++++---
 CMakeLists.txt               | 20 ++++++++++++++------
 generate-include-files.cmake |  6 +++++-
 idf_component.yml            |  4 ++--
 4 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d07b5a17..19eb99d43 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,17 @@
 # Changelog for esp_matter component registry
 
-## [1.4.1](https://components.espressif.com/components/espressif/esp_matter/versions/1.4.1)
+## [1.4.0~1](https://components.espressif.com/components/espressif/esp_matter/versions/1.4.0~1)
 
 #### Bug Fixes
 
+- fix compiling error for `to_underlying` when using c++23
 - `NDEBUG` flag will be added if `CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE` is set.
 
 #### Features
 
-- esp-matter commit: 725558007ca8d77de8faad2175b04016e90da57c
-- connectedhomeip commit: 19aeeb3ba072250b47c21cd242e657d5949a97d3
+- Use v1.4.0~N based on Matter v1.4.0, remove component v1.4.1
+- esp-matter commit: bea837ee556c82571537791c774d2e2aa219fa33
+- connectedhomeip commit: 87cf8e5030284e3357cfdff5e0b83eb9d5ff73c9
 
 ## [1.4.0](https://components.espressif.com/components/espressif/esp_matter/versions/1.4.0)
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 66531fda4..6077ce76e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -461,6 +461,7 @@ target_link_options(${COMPONENT_LIB} PRIVATE -Wl,-O2 -Wl,--gc-sections -Os -Werr
 # compile options from esp-matter/components/
 target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-error=uninitialized;-Wno-error=maybe-uninitialized;-Wno-missing-field-initializers")
 target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-error=array-bounds;-Wno-write-strings")
+target_compile_options(${COMPONENT_LIB} PUBLIC "-DCHIP_HAVE_CONFIG_H")
 
 # TODO: remove this when building connectedhomeip/src/controller/CHIPDeviceController.cpp with no format error
 if (CONFIG_ENABLE_CHIP_CONTROLLER_BUILD)
@@ -539,11 +540,18 @@ cmake_policy(SET CMP0007 NEW)
 include(${CMAKE_CURRENT_LIST_DIR}/connectedhomeip/connectedhomeip/config/esp32/components/chip/ota-image.cmake)
 # Build Matter OTA image
 if (CONFIG_CHIP_OTA_IMAGE_BUILD)
-    chip_ota_image(chip-ota-image
-        INPUT_FILES ${BUILD_DIR}/${CMAKE_PROJECT_NAME}.bin
-        OUTPUT_FILE ${BUILD_DIR}/${CMAKE_PROJECT_NAME}-ota.bin
-    )
-    # Adding dependecy as app target so that this runs after images are ready
-    add_dependencies(chip-ota-image app)
+    if (CONFIG_OPENTHREAD_BORDER_ROUTER AND CONFIG_AUTO_UPDATE_RCP)
+        chip_ota_image(chip-ota-image
+            INPUT_FILES ${BUILD_DIR}/ota_with_rcp_image
+            OUTPUT_FILE ${BUILD_DIR}/ota_with_rcp_image-ota.bin
+        )
+        add_dependencies(chip-ota-image gen_ota_image)
+    else()
+        chip_ota_image(chip-ota-image
+            INPUT_FILES ${BUILD_DIR}/${CMAKE_PROJECT_NAME}.bin
+            OUTPUT_FILE ${BUILD_DIR}/${CMAKE_PROJECT_NAME}-ota.bin
+        )
+        add_dependencies(chip-ota-image app)
+    endif()
 endif()
 cmake_policy(SET CMP0007 ${policy_status})
diff --git a/generate-include-files.cmake b/generate-include-files.cmake
index 605f06595..2cc46b594 100644
--- a/generate-include-files.cmake
+++ b/generate-include-files.cmake
@@ -526,6 +526,11 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/platform/CHIPDeviceBuildConfig.h
 
 #define CHIP_DEVICE_CONFIG_ENABLE_DYNAMIC_MRP_CONFIG 0
 #define CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF 0
+#ifdef CONFIG_ENABLE_CHIPOBLE
+#define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
+#else
+#define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 0
+#endif
 ")
 endif()
 
@@ -763,7 +768,6 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/CHIPVersion.h
 #define BLE_PROJECT_CONFIG_INCLUDE 1
 #define INET_PROJECT_CONFIG_INCLUDE 1
 #define LWIP_DEBUG 1
-#define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
 #define CHIP_DEVICE_CONFIG_ENABLE_NFC 1
 #define CONFIG_CHIP_NFC_COMMISSIONING 1
 #define CHIP_DEVICE_PROJECT_CONFIG_INCLUDE 1
diff --git a/idf_component.yml b/idf_component.yml
index f93eb2669..09684f2a1 100644
--- a/idf_component.yml
+++ b/idf_component.yml
@@ -1,5 +1,5 @@
 ## IDF Component Manager Manifest File
-version: 1.4.1
+version: 1.4.0~1
 description: Espressif's Matter SDK Component
 url: https://github.com/espressif/esp-matter
 files:
@@ -104,7 +104,7 @@ dependencies:
     espressif/json_generator: "~1.1.0"
 
     espressif/esp_rcp_update:
-        version: "1.2.0"
+        version: "1.3.0"
         rules:
             - if: "idf_version >=5.0"