espressif/esp-matter
1
0
Fork 0
mirror of https://github.com/espressif/esp-matter.git synced 2026-04-27 19:13:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

esp_matter managed component: v1.4.0~1

Browse Source
This commit is contained in:
chendejin
2025-07-07 19:57:11 +08:00
parent bea837ee55
commit 06940e3cfe
4 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+5 -3
View File
@@ -1,15 +1,17 @@
# Changelog for esp_matter component registry # 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 #### 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. - `NDEBUG` flag will be added if `CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE` is set.
#### Features #### Features
- esp-matter commit: 725558007ca8d77de8faad2175b04016e90da57c - Use v1.4.0~N based on Matter v1.4.0, remove component v1.4.1
- connectedhomeip commit: 19aeeb3ba072250b47c21cd242e657d5949a97d3 - esp-matter commit: bea837ee556c82571537791c774d2e2aa219fa33
- connectedhomeip commit: 87cf8e5030284e3357cfdff5e0b83eb9d5ff73c9
## [1.4.0](https://components.espressif.com/components/espressif/esp_matter/versions/1.4.0) ## [1.4.0](https://components.espressif.com/components/espressif/esp_matter/versions/1.4.0)
CMakeLists.txt
+14 -6
View File
@@ -461,6 +461,7 @@ target_link_options(${COMPONENT_LIB} PRIVATE -Wl,-O2 -Wl,--gc-sections -Os -Werr
# compile options from esp-matter/components/ # 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=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} 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 # TODO: remove this when building connectedhomeip/src/controller/CHIPDeviceController.cpp with no format error
if (CONFIG_ENABLE_CHIP_CONTROLLER_BUILD) 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) include(${CMAKE_CURRENT_LIST_DIR}/connectedhomeip/connectedhomeip/config/esp32/components/chip/ota-image.cmake)
# Build Matter OTA image # Build Matter OTA image
if (CONFIG_CHIP_OTA_IMAGE_BUILD) if (CONFIG_CHIP_OTA_IMAGE_BUILD)
chip_ota_image(chip-ota-image if (CONFIG_OPENTHREAD_BORDER_ROUTER AND CONFIG_AUTO_UPDATE_RCP)
INPUT_FILES ${BUILD_DIR}/${CMAKE_PROJECT_NAME}.bin chip_ota_image(chip-ota-image
OUTPUT_FILE ${BUILD_DIR}/${CMAKE_PROJECT_NAME}-ota.bin INPUT_FILES ${BUILD_DIR}/ota_with_rcp_image
) OUTPUT_FILE ${BUILD_DIR}/ota_with_rcp_image-ota.bin
# Adding dependecy as app target so that this runs after images are ready )
add_dependencies(chip-ota-image app) 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() endif()
cmake_policy(SET CMP0007 ${policy_status}) cmake_policy(SET CMP0007 ${policy_status})
generate-include-files.cmake
+5 -1
View File
@@ -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_DYNAMIC_MRP_CONFIG 0
#define CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF 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() endif()
@@ -763,7 +768,6 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/CHIPVersion.h
#define BLE_PROJECT_CONFIG_INCLUDE 1 #define BLE_PROJECT_CONFIG_INCLUDE 1
#define INET_PROJECT_CONFIG_INCLUDE 1 #define INET_PROJECT_CONFIG_INCLUDE 1
#define LWIP_DEBUG 1 #define LWIP_DEBUG 1
#define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
#define CHIP_DEVICE_CONFIG_ENABLE_NFC 1 #define CHIP_DEVICE_CONFIG_ENABLE_NFC 1
#define CONFIG_CHIP_NFC_COMMISSIONING 1 #define CONFIG_CHIP_NFC_COMMISSIONING 1
#define CHIP_DEVICE_PROJECT_CONFIG_INCLUDE 1 #define CHIP_DEVICE_PROJECT_CONFIG_INCLUDE 1
idf_component.yml
+2 -2
View File
@@ -1,5 +1,5 @@
## IDF Component Manager Manifest File ## IDF Component Manager Manifest File
version: 1.4.1 version: 1.4.0~1
description: Espressif's Matter SDK Component description: Espressif's Matter SDK Component
url: https://github.com/espressif/esp-matter url: https://github.com/espressif/esp-matter
files: files:
@@ -104,7 +104,7 @@ dependencies:
espressif/json_generator: "~1.1.0" espressif/json_generator: "~1.1.0"
espressif/esp_rcp_update: espressif/esp_rcp_update:
version: "1.2.0" version: "1.3.0"
rules: rules:
- if: "idf_version >=5.0" - if: "idf_version >=5.0"