managed component: update esp_matter managed component based on esp-matter release/v1.3

CHANGELOG.md

@@ -0,0 +1,7 @@
+# Changelog for esp_matter component registry
+
+## [1.3.0](https://components.espressif.com/components/espressif/esp_matter/versions/1.3.0)
+
+#### Features
+
+- 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

@@ -67,6 +67,7 @@ set(SRC_DIRS_LIST "${MATTER_SDK_PATH}/src/access"
 set(INCLUDE_DIRS_LIST "${MATTER_SDK_PATH}/src"
                       "${MATTER_SDK_PATH}/src/include"
                       "${MATTER_SDK_PATH}/src/lib"
+                      "${MATTER_SDK_PATH}/src/lib/dnssd"
                       "${MATTER_SDK_PATH}/src/platform/OpenThread"
                       "${MATTER_SDK_PATH}/third_party/nlfaultinjection/include"
                       "${MATTER_SDK_PATH}/third_party/nlassert/repo/include"
@@ -90,6 +91,7 @@ set(EXCLUDE_SRCS_LIST "${MATTER_SDK_PATH}/src/controller/ExamplePersistentStorag
                       "${MATTER_SDK_PATH}/src/crypto/CHIPCryptoPALOpenSSL.cpp"
                       "${MATTER_SDK_PATH}/src/crypto/CHIPCryptoPALPSA.cpp"
                       "${MATTER_SDK_PATH}/src/crypto/PSAOperationalKeystore.cpp"
+                      "${MATTER_SDK_PATH}/src/crypto/PSASpake2p.cpp"
                       "${MATTER_SDK_PATH}/src/crypto/PSASessionKeystore.cpp"
                       "${MATTER_SDK_PATH}/src/inet/TCPEndPointImplOpenThread.cpp"
                       "${MATTER_SDK_PATH}/src/inet/TCPEndPointImplSockets.cpp"
@@ -144,20 +146,23 @@ endif()
 set(PRIV_INCLUDE_DIRS_LIST "${ESP_COMPONENTS_PATH}/esp_matter/private")
 
 if (CONFIG_ESP_MATTER_CONTROLLER_ENABLE)
-    list(APPEND SRC_DIRS_LIST "${ESP_COMPONENTS_PATH}/esp_matter_controller"
+    list(APPEND SRC_DIRS_LIST "${ESP_COMPONENTS_PATH}/esp_matter_controller/core"
+                              "${ESP_COMPONENTS_PATH}/esp_matter_controller/commands"
                               "${ESP_COMPONENTS_PATH}/esp_matter_controller/logger/zap-generated")
-    list(APPEND INCLUDE_DIRS_LIST "${ESP_COMPONENTS_PATH}/esp_matter_controller"
+    list(APPEND INCLUDE_DIRS_LIST "${ESP_COMPONENTS_PATH}/esp_matter_controller/core"
+                                  "${ESP_COMPONENTS_PATH}/esp_matter_controller/commands"
                                   "${ESP_COMPONENTS_PATH}/esp_matter_controller/logger")
 
-    if (CONFIG_ESP_MATTER_CONTROLLER_CUSTOM_CLUSTER_ENABLE)
-        list(APPEND SRC_DIRS_LIST "${ESP_COMPONENTS_PATH}/esp_matter_controller/controller_custom_cluster")
-        list(APPEND INCLUDE_DIRS_LIST "${ESP_COMPONENTS_PATH}/esp_matter_controller/controller_custom_cluster")
+     if (CONFIG_ESP_MATTER_ENABLE_MATTER_SERVER)
+         list(APPEND EXCLUDE_SRCS_LIST "${ESP_COMPONENTS_PATH}/esp_matter_controller/core/esp_matter_controller_client.cpp"
+                                       "${ESP_COMPONENTS_PATH}/esp_matter_controller/core/esp_matter_controller_credentials_issuer.cpp"
+                                       "${ESP_COMPONENTS_PATH}/esp_matter_controller/core/esp_matter_controller_group_settings.cpp")
     endif()
-    if (NOT CONFIG_ESP_MATTER_COMMISSIONER_ENABLE)
-        list(APPEND EXCLUDE_SRCS_LIST "${ESP_COMPONENTS_PATH}/esp_matter_controller/esp_matter_commissioner.cpp"
-                                      "${ESP_COMPONENTS_PATH}/esp_matter_controller/esp_matter_controller_pairing_command.cpp"
-                                      "${ESP_COMPONENTS_PATH}/esp_matter_controller/esp_matter_attestation_trust_store.cpp"
-                                      "${ESP_COMPONENTS_PATH}/esp_matter_controller/esp_matter_controller_group_settings.cpp")
+    if (CONFIG_ESP_MATTER_COMMISSIONER_ENABLE)
+        list(APPEND SRC_DIRS_LIST "${ESP_COMPONENTS_PATH}/esp_matter_controller/attestation_store")
+        list(APPEND INCLUDE_DIRS_LIST "${ESP_COMPONENTS_PATH}/esp_matter_controller/attestation_store")
+    else()
+        list(APPEND EXCLUDE_SRCS_LIST "${ESP_COMPONENTS_PATH}/esp_matter_controller/commands/esp_matter_controller_pairing_command.cpp")
     endif()
 endif()
 
@@ -269,7 +274,16 @@ endif()
 
 if (CONFIG_ENABLE_ESP_INSIGHTS_TRACE)
     list(APPEND SRC_DIRS_LIST "${MATTER_SDK_PATH}/src/tracing/esp32_trace")
-    list(APPEND INCLUDE_DIRS_LIST "${MATTER_SDK_PATH}/src/tracing/esp32_trace/include")
+    list(APPEND INCLUDE_DIRS_LIST "${MATTER_SDK_PATH}/src/tracing/esp32_trace/include"
+                                  "${MATTER_SDK_PATH}/src/tracing/esp32_trace")
+    if (NOT CONFIG_ENABLE_ESP_INSIGHTS_SYSTEM_STATS)
+        list(APPEND EXCLUDE_SRCS_LIST "${MATTER_SDK_PATH}/src/tracing/esp32_trace/insights_sys_stats.cpp")
+    endif()
+endif()
+
+if (NOT CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS)
+    list(APPEND EXCLUDE_SRCS_LIST "${MATTER_SDK_PATH}/src/app/SimpleSubscriptionResumptionStorage.cpp"
+                                  "${MATTER_SDK_PATH}/src/app/SubscriptionResumptionSessionEstablisher.cpp")
 endif()
 
 if (CONFIG_CHIP_ENABLE_EXTERNAL_PLATFORM)
@@ -296,7 +310,7 @@ else()
     endif()
 
     if ((CONFIG_USE_MINIMAL_MDNS) OR ((NOT CONFIG_ENABLE_WIFI_STATION) AND (NOT CONFIG_ENABLE_WIFI_AP)))
-        list(APPEND EXCLUDE_SRCS_LIST "${MATTER_SDK_PATH}/src/platform/ESP32/WiFiDnssdImpl.cpp")
+        list(APPEND EXCLUDE_SRCS_LIST "${MATTER_SDK_PATH}/src/platform/ESP32/ESP32DnssdImpl.cpp")
     endif()
 
     if((NOT CONFIG_ENABLE_WIFI_STATION) AND (NOT CONFIG_ENABLE_WIFI_AP))
@@ -407,7 +421,10 @@ endif()
 if (CONFIG_USE_MINIMAL_MDNS)
     target_compile_options(${COMPONENT_LIB} PUBLIC "-DCHIP_MINMDNS_DEFAULT_POLICY=1"
                                                    "-DCHIP_MINMDNS_USE_EPHEMERAL_UNICAST_PORT=0"
-                                                   "-DCHIP_MINMDNS_HIGH_VERBOSITY=0")
+                                                   "-DCHIP_MINMDNS_HIGH_VERBOSITY=0"
+                                                   "-DCHIP_DNSSD_DEFAULT_MINIMAL=1")
+else()
+    target_compile_options(${COMPONENT_LIB} PUBLIC "-DCHIP_DNSSD_DEFAULT_PLATFORM=1")
 endif()
 
 if (NOT CMAKE_BUILD_EARLY_EXPANSION)

Kconfig

@@ -2,4 +2,5 @@ rsource "connectedhomeip/connectedhomeip/config/esp32/components/chip/Kconfig"
 rsource "components/esp_matter/Kconfig"
 rsource "components/esp_matter_bridge/Kconfig"
 rsource "components/esp_matter_console/Kconfig"
-rsource "components/esp_matter_controller/Kconfig"
+rsource "components/esp_matter_controller/Kconfig"
+rsource "components/esp_matter_thread_br/Kconfig"

generate-include-files.cmake

@@ -25,12 +25,12 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/app/AppBuildConfig.h
 #define CHIP_CONFIG_ENABLE_SESSION_RESUMPTION 1
 #define CHIP_CONFIG_ACCESS_CONTROL_POLICY_LOGGING_VERBOSITY 0
 
-#ifdef CONFIG_CHIP_ENABLE_EXTERNAL_PLATFORM
-#define CHIP_CONFIG_PERSIST_SUBSCRIPTIONS 0
-#define CHIP_CONFIG_SUBSCRIPTION_TIMEOUT_RESUMPTION 0
-#else
+#ifdef CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS
 #define CHIP_CONFIG_PERSIST_SUBSCRIPTIONS 1
 #define CHIP_CONFIG_SUBSCRIPTION_TIMEOUT_RESUMPTION 1
+#else
+#define CHIP_CONFIG_PERSIST_SUBSCRIPTIONS 0
+#define CHIP_CONFIG_SUBSCRIPTION_TIMEOUT_RESUMPTION 0
 #endif
 
 #ifdef CONFIG_ENABLE_MATTER_EVENT_LIST
@@ -44,23 +44,57 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/app/AppBuildConfig.h
 #else
 #define CHIP_CONFIG_ENABLE_READ_CLIENT 1
 #endif
+
+#define CHIP_CONFIG_STATIC_GLOBAL_INTERACTION_MODEL_ENGINE 1
+#define TIME_SYNC_ENABLE_TSC_FEATURE 1
+#define NON_SPEC_COMPLIANT_OTA_ACTION_DELAY_FLOOR -1
 ")
 
 # Generating app/icd/server/ICDServerBuildConfig.h
 file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/app/icd/server/ICDServerBuildConfig.h
 "#pragma once\n
+#include <sdkconfig.h>\n
 #ifdef CONFIG_ENABLE_ICD_SERVER
 #define CHIP_CONFIG_ENABLE_ICD_SERVER 1
 #else
 #define CHIP_CONFIG_ENABLE_ICD_SERVER 0
 #endif
 
+#ifdef CONFIG_ENABLE_ICD_LIT
+#define CHIP_CONFIG_ENABLE_ICD_LIT 1
+#else
 #define CHIP_CONFIG_ENABLE_ICD_LIT 0
+#endif
+
+#ifdef CONFIG_ENABLE_ICD_CIP
+#define CHIP_CONFIG_ENABLE_ICD_CIP 1
+#else
 #define CHIP_CONFIG_ENABLE_ICD_CIP 0
+#endif
+
+#ifdef CONFIG_ENABLE_ICD_USER_ACTIVE_MODE_TRIGGER
+#define CHIP_CONFIG_ENABLE_ICD_UAT 1
+#else
 #define CHIP_CONFIG_ENABLE_ICD_UAT 0
+#endif
+
+#ifdef CONFIG_ICD_REPORT_ON_ACTIVE_MODE
+#define ICD_REPORT_ON_ENTER_ACTIVE_MODE 1
+#else
 #define ICD_REPORT_ON_ENTER_ACTIVE_MODE 0
+#endif
+
+#ifdef CONFIG_ICD_MAX_NOTIFICATION_SUBSCRIBERS
+#define ICD_MAX_NOTIFICATION_SUBSCRIBERS CONFIG_ICD_MAX_NOTIFICATION_SUBSCRIBERS
+#else
 #define ICD_MAX_NOTIFICATION_SUBSCRIBERS 1
+#endif
+
+#ifdef CONFIG_ICD_ENFORCE_SIT_SLOW_POLL_LIMIT
+#define ICD_ENFORCE_SIT_SLOW_POLL_LIMIT 1
+#else
 #define ICD_ENFORCE_SIT_SLOW_POLL_LIMIT 0
+#endif
 ")
 
 # Generating asn1/ASN1OID.h
@@ -346,6 +380,9 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/core/CHIPBuildConfig.h
 #define CHIP_CONFIG_MINMDNS_MAX_PARALLEL_RESOLVES 2
 #define CHIP_CONFIG_CANCELABLE_HAS_INFO_STRING_FIELD 0
 #define CHIP_CONFIG_BIG_ENDIAN_TARGET 0
+#define CHIP_CONFIG_TLV_VALIDATE_CHAR_STRING_ON_WRITE 1
+#define CHIP_CONFIG_TLV_VALIDATE_CHAR_STRING_ON_READ 0
+#define CHIP_CONFIG_COMMAND_SENDER_BUILTIN_SUPPORT_FOR_BATCHED_COMMANDS 0
 ")
 
 # Generating crypto/CryptoBuildConfig.h
@@ -354,6 +391,7 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/crypto/CryptoBuildConfig.h
 #include <sdkconfig.h>\n
 #define CHIP_CRYPTO_MBEDTLS 1
 #define CHIP_CRYPTO_PSA 0
+#define CHIP_CRYPTO_PSA_SPAKE2P 0
 #define CHIP_CRYPTO_OPENSSL 0
 #define CHIP_CRYPTO_BORINGSSL 0
 #define CHIP_CRYPTO_PLATFORM 0
@@ -424,6 +462,8 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/platform/CHIPDeviceBuildConfig.h
 #define CHIP_DEVICE_CONFIG_THREAD_FTD 0
 #endif
 
+#define CHIP_DEVICE_CONFIG_THREAD_BORDER_ROUTER 0
+#define CHIP_DEVICE_CONFIG_USES_OTBR_POSIX_DBUS_STACK 0
 #define CHIP_STACK_LOCK_TRACKING_ENABLED 1
 #define CHIP_STACK_LOCK_TRACKING_ERROR_FATAL 1
 
@@ -463,6 +503,7 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/platform/CHIPDeviceBuildConfig.h
 #endif
 
 #define CHIP_DEVICE_CONFIG_MAX_DISCOVERED_IP_ADDRESSES 5
+#define CHIP_DEVICE_CONFIG_ENABLE_DYNAMIC_MRP_CONFIG 0
 ")
 
 # Generating setup_payload/CHIPAdditionalDataPayloadBuildConfig.h

idf_component.yml

@@ -1,5 +1,5 @@
 ## IDF Component Manager Manifest File
-version: 0.0.2
+version: 1.3.0
 description: Espressif's Matter SDK Component
 url: https://github.com/espressif/esp-matter
 files:
@@ -12,6 +12,7 @@ files:
         - "./generate-include-files.cmake"
         - "./ota-image.cmake"
         - "./README.md"
+        - "./CHANGELOG.md"
         - "./components/**/*"
         - "./connectedhomeip/connectedhomeip/config/esp32/components/chip/Kconfig"
         - "./connectedhomeip/connectedhomeip/config/esp32/components/chip/ota-image.cmake"
@@ -20,6 +21,7 @@ files:
         - "./connectedhomeip/connectedhomeip/src/app/*.*"
         - "./connectedhomeip/connectedhomeip/src/app/app-platform/**/*"
         - "./connectedhomeip/connectedhomeip/src/app/clusters/**/*"
+        - "./connectedhomeip/connectedhomeip/src/app/common/**/*"
         - "./connectedhomeip/connectedhomeip/src/app/data-model/**/*"
         - "./connectedhomeip/connectedhomeip/src/app/dynamic_server/**/*"
         - "./connectedhomeip/connectedhomeip/src/app/icd/**/*"