Skip to content

Commit d0454b1

Browse files
chshuchshu
committed
Merge branch 'esp_matter_v1_4_0_component' into 'release/v1.4'
esp_matter managed component: v1.4.0 See merge request app-frameworks/esp-matter!1010
2 parents 30af618 + 6720a31 commit d0454b1

File tree

8 files changed

+418
-96
lines changed

8 files changed

+418
-96
lines changed

‎CHANGELOG.md

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# Changelog for esp_matter component registry
2+
3+
## [1.4.0](https://components.espressif.com/components/espressif/esp_matter/versions/1.4.0)
4+
5+
#### Features
6+
7+
- Component based on Matter 1.4
8+
- esp-matter commit: 30af618a6e962623a0098ad6a33b468f33dc49c7
9+
- connectedhomeip commit: cd07c4f5c3988258e6eba9d34d3dc0767d95e5a3
10+
11+
## [1.3.1](https://components.espressif.com/components/espressif/esp_matter/versions/1.3.1)
12+
13+
#### Features
14+
15+
- Work with IDF component management (version >= 2.0) without hash problem
16+
- External platform path setting: support both absolute path or relative path to top-level CMakeLists
17+
- More default compile options for the source files
18+
- Could enable CONFIG_CHIP_OTA_IMAGE_BUILD to generate ota.bin file with IDF component management (version >= 2.0)
19+
- esp-matter commit: 5a9bc09a640d5cfd4c6b137f7e3b13ce5fa9cca4
20+
- connectedhomeip commit: 735b69f73e386cb675242371afd0b237a8a78982
21+
22+
## [1.3.0](https://components.espressif.com/components/espressif/esp_matter/versions/1.3.0)
23+
24+
#### Features
25+
26+
- Component `esp_matter` based on branch release/v1.3 [commit](https://github.com/espressif/esp-matter/commit/d76d4857d768b32eb215e825448d938018e5691a), commit date Jun 11, 2024.

‎CMakeLists.txt

+157-61
Large diffs are not rendered by default.

‎Kconfig

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ rsource "connectedhomeip/connectedhomeip/config/esp32/components/chip/Kconfig"
22
rsource "components/esp_matter/Kconfig"
33
rsource "components/esp_matter_bridge/Kconfig"
44
rsource "components/esp_matter_console/Kconfig"
5-
rsource "components/esp_matter_controller/Kconfig"
5+
rsource "components/esp_matter_controller/Kconfig"
6+
rsource "components/esp_matter_ota_provider/Kconfig"

‎docs/en/developing.rst

+4-3
Original file line numberDiff line numberDiff line change
@@ -201,16 +201,17 @@ To add the esp_matter component to your project, run:
201201

202202
::
203203

204-
idf.py add-dependency "espressif/esp_matter^0.0.2"
204+
idf.py add-dependency "espressif/esp_matter^1.4.0"
205205

206206
An example with esp_matter component is offered:
207207

208208
- :project_file:`Managed Component Light <examples/managed_component_light/README.md>`
209209

210210
.. note::
211211

212-
To use this component, the version of IDF component management should be 1.4.*.
213-
Use ``compote version`` to show the version. Use ``pip install 'idf-component-manager~=1.4.0'`` to install.
212+
To use this component, the version of IDF component management should be ``1.4.*`` or ``>= 2.0``.
213+
Use ``compote version`` to show the version. Use ``pip install 'idf-component-manager~=1.4.0'``
214+
or ``pip install 'idf-component-manager~=2.0.0'`` to install.
214215

215216
2.2.3 Building Applications
216217
~~~~~~~~~~~~~~~~~~~~~~~~~~~

‎examples/common/blemesh_platform/platform/ESP32_custom/external_platform.cmake

+8-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ if (NOT CONFIG_ENABLE_ETHERNET_TELEMETRY)
5353
"${CMAKE_CURRENT_LIST_DIR}/NetworkCommissioningDriver_Ethernet.cpp")
5454
endif()
5555

56-
if (NOT CONFIG_ENABLE_MATTER_OVER_THREAD)
57-
list(APPEND EXPLANT_EXCLUDE_SRCS_LIST "${CMAKE_CURRENT_LIST_DIR}/OpenthreadLauncher.c"
56+
if ((NOT CONFIG_OPENTHREAD_ENABLED) OR (NOT CONFIG_ENABLE_MATTER_OVER_THREAD))
57+
list(APPEND EXPLANT_EXCLUDE_SRCS_LIST "${CMAKE_CURRENT_LIST_DIR}/OpenthreadLauncher.cpp"
5858
"${CMAKE_CURRENT_LIST_DIR}/ThreadStackManagerImpl.cpp")
5959
endif()
6060

@@ -78,3 +78,9 @@ endif()
7878
if (NOT CONFIG_USE_ESP32_ECDSA_PERIPHERAL)
7979
list(APPEND EXPLANT_EXCLUDE_SRCS_LIST "${CMAKE_CURRENT_LIST_DIR}/ESP32CHIPCryptoPAL.cpp")
8080
endif()
81+
82+
if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/generate-include-files.cmake)
83+
include(${CMAKE_CURRENT_LIST_DIR}/generate-include-files.cmake)
84+
else()
85+
message(FATAL_ERROR "There should be a generate-include-files.cmake file in CONFIG_CHIP_EXTERNAL_PLATFORM_DIR!")
86+
endif()

‎examples/common/blemesh_platform/platform/ESP32_custom/generate-include-files.cmake

+86
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
if (CONFIG_CHIP_ENABLE_EXTERNAL_PLATFORM)
2+
# Generating platform/CHIPDeviceBuildConfig.h
3+
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/platform/CHIPDeviceBuildConfig.h
4+
"#pragma once\n
5+
#include <sdkconfig.h>\n
6+
7+
#if defined(CONFIG_ENABLE_WIFI_STATION) || defined(CONFIG_ENABLE_WIFI_AP)
8+
#define CHIP_DEVICE_CONFIG_ENABLE_WPA 1
9+
#else
10+
#define CHIP_DEVICE_CONFIG_ENABLE_WPA 0
11+
#endif
12+
13+
#ifdef CONFIG_ENABLE_MATTER_OVER_THREAD
14+
#define CHIP_ENABLE_OPENTHREAD 1
15+
#else
16+
#define CHIP_ENABLE_OPENTHREAD 0
17+
#endif
18+
19+
#ifdef CONFIG_OPENTHREAD_FTD
20+
#define CHIP_DEVICE_CONFIG_THREAD_FTD 1
21+
#else
22+
#define CHIP_DEVICE_CONFIG_THREAD_FTD 0
23+
#endif
24+
25+
#ifdef CONFIG_OPENTHREAD_BORDER_ROUTER
26+
#define CHIP_DEVICE_CONFIG_THREAD_BORDER_ROUTER 1
27+
#else
28+
#define CHIP_DEVICE_CONFIG_THREAD_BORDER_ROUTER 0
29+
#endif
30+
31+
#define CHIP_DEVICE_CONFIG_USES_OTBR_POSIX_DBUS_STACK 0
32+
#define CHIP_STACK_LOCK_TRACKING_ENABLED 1
33+
#define CHIP_STACK_LOCK_TRACKING_ERROR_FATAL 1
34+
35+
#ifdef CONFIG_ENABLE_ROTATING_DEVICE_ID
36+
#define CHIP_ENABLE_ADDITIONAL_DATA_ADVERTISING 1
37+
#else
38+
#define CHIP_ENABLE_ADDITIONAL_DATA_ADVERTISING 0
39+
#endif
40+
41+
#define CHIP_DEVICE_CONFIG_RUN_AS_ROOT 1
42+
#define CHIP_DISABLE_PLATFORM_KVS 0
43+
44+
#ifdef CONFIG_ENABLE_OTA_REQUESTOR
45+
#define CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR 1
46+
#else
47+
#define CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR 0
48+
#endif
49+
50+
#ifdef CONFIG_ENABLE_ESP32_FACTORY_DATA_PROVIDER
51+
#define CHIP_USE_TRANSITIONAL_COMMISSIONABLE_DATA_PROVIDER 0
52+
#else
53+
#define CHIP_USE_TRANSITIONAL_COMMISSIONABLE_DATA_PROVIDER 1
54+
#endif
55+
56+
#define CHIP_USE_TRANSITIONAL_DEVICE_INSTANCE_INFO_PROVIDER 1
57+
#define CHIP_DEVICE_LAYER_TARGET_ESP32 1
58+
59+
60+
#define CHIP_DEVICE_CONFIG_MAX_DISCOVERED_IP_ADDRESSES 5
61+
#define CHIP_DEVICE_CONFIG_ENABLE_DYNAMIC_MRP_CONFIG 0
62+
63+
#define CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF 0
64+
65+
#if defined(CONFIG_THREAD_NETWORK_COMMISSIONING_DRIVER) && defined(CONFIG_THREAD_NETWORK_ENDPOINT_ID)
66+
#define CHIP_DEVICE_CONFIG_THREAD_NETWORK_ENDPOINT_ID CONFIG_THREAD_NETWORK_ENDPOINT_ID
67+
#else
68+
#define CHIP_DEVICE_CONFIG_THREAD_NETWORK_ENDPOINT_ID 0
69+
#endif
70+
71+
// For definitions for external platform
72+
#define CHIP_DEVICE_LAYER_TARGET ESP32_custom
73+
#define BLE_PLATFORM_CONFIG_INCLUDE <platform/ESP32_custom/BlePlatformConfig.h>
74+
#define CHIP_DEVICE_PLATFORM_CONFIG_INCLUDE <platform/ESP32_custom/CHIPDevicePlatformConfig.h>
75+
#define CHIP_PLATFORM_CONFIG_INCLUDE <platform/ESP32_custom/CHIPPlatformConfig.h>
76+
#define INET_CONFIG_INCLUDE <platform/ESP32_custom/InetPlatformConfig.h>
77+
#define SYSTEM_PLATFORM_CONFIG_INCLUDE <platform/ESP32_custom/SystemPlatformConfig.h>
78+
#define EXTERNAL_CONFIGURATIONMANAGERIMPL_HEADER <platform/ESP32_custom/ConfigurationManagerImpl.h>
79+
#define EXTERNAL_CHIPDEVICEPLATFORMEVENT_HEADER <platform/ESP32_custom/CHIPDevicePlatformEvent.h>
80+
#define EXTERNAL_CONNECTIVITYMANAGERIMPL_HEADER <platform/ESP32_custom/ConnectivityManagerImpl.h>
81+
#define EXTERNAL_BLEMANAGERIMPL_HEADER <platform/ESP32_custom/BLEManagerImpl.h>
82+
#define EXTERNAL_KEYVALUESTOREMANAGERIMPL_HEADER <platform/ESP32_custom/KeyValueStoreManagerImpl.h>
83+
#define EXTERNAL_PLATFORMMANAGERIMPL_HEADER <platform/ESP32_custom/PlatformManagerImpl.h>
84+
#define EXTERNAL_THREADSTACKMANAGERIMPL_HEADER <platform/ESP32_custom/ThreadStackManagerImpl.h>
85+
")
86+
endif()

0 commit comments

Comments
 (0)