Merge branch 'update/idf_and_submodule' into 'main'

Update esp-matter with a latest submodule and esp-idf version 5.4.1.

See merge request app-frameworks/esp-matter!1085

Author: dhrishi

.gitlab-ci.yml

@@ -23,10 +23,10 @@ variables:
     MATTER_CACHE_DIR: /cache/matter_build
     # This variable represents the latest idf version supported for the target branch.
     # Note: Do change this variable in case of idf version change MR.
-    IDF_CHECKOUT_REF: "v5.2.3"
+    IDF_CHECKOUT_REF: "v5.4.1"
     # This variable represents the short hash of the connectedhomeip submodule.
     # Note: Do change this short hash on submodule update MRs.
-    CHIP_SHORT_HASH: "9b8fffe0bb"
+    CHIP_SHORT_HASH: "326cabf99c"
     DOCKER_IMAGE_NAME: "espressif/chip-idf"
 
 .add_gitlab_ssh_key: &add_gitlab_ssh_key |
@@ -227,7 +227,7 @@ build_image:
       # Change the idf version here in case of idf version change MR.
       - IDF_VERSION:
           - "v4.4.3"
-          - "v5.2.3"
+          - "v5.4.1"
 
 .build_examples_template:
   stage: build
@@ -265,7 +265,7 @@ build_image:
     - *add_gitlab_ssh_key
     - *get_build_caches
     - *setup_idf
-    - pip install 'idf-component-manager~=1.4.0'
+    - pip install 'idf-component-manager~=2.1.2'
     - cd ${ESP_MATTER_PATH}
     - mkdir -p ${REPOS_PATH}
     - *update_build_caches
@@ -570,10 +570,11 @@ build_managed_component_light:
         - idf.py set-target esp32c3
         - idf.py build
 
+# This job is allowed to fail due to a circular dependency with esp-rainmaker.
 build_esp_rainmaker_apps:
     stage: build
     image: ${DOCKER_IMAGE_NAME}:chip_${CHIP_SHORT_HASH}_idf_${IDF_CHECKOUT_REF}
-    allow_failure: false
+    allow_failure: true
 
     tags:
       - build

README.md

@@ -28,8 +28,8 @@ section in the ESP-Matter Programming Guide.
 
 ## Supported ESP-IDF and connectedhomeip versions
 
-- This SDK currently works with commit [9b8fffe0bb](https://github.com/project-chip/connectedhomeip/tree/9b8fffe0bb) of connectedhomeip.
-- For Matter projects development with this SDK, it is recommended to utilize ESP-IDF [v5.2.3](https://github.com/espressif/esp-idf/tree/v5.2.3).
+- This SDK currently works with commit [326cabf99c](https://github.com/project-chip/connectedhomeip/tree/326cabf99c) of connectedhomeip.
+- For Matter projects development with this SDK, it is recommended to utilize ESP-IDF [v5.4.1](https://github.com/espressif/esp-idf/tree/v5.4.1).
 
 ## Documentation
 

components/esp_matter/esp_matter.h

@@ -30,7 +30,6 @@ application.
 #include <esp_matter_feature.h>
 #include <esp_matter_identify.h>
 
-#include <app/util/att-storage.h>
 #include <app/server/Dnssd.h>
 #include <platform/CHIPDeviceEvent.h>
 #include <platform/CHIPDeviceLayer.h>
@@ -52,35 +51,35 @@ typedef enum cluster_flags {
     /** No specific flags */
     CLUSTER_FLAG_NONE = 0x00,
     /** The cluster has an init function (function_flag) */
-    CLUSTER_FLAG_INIT_FUNCTION = CLUSTER_MASK_INIT_FUNCTION, /* 0x01 */
+    CLUSTER_FLAG_INIT_FUNCTION = MATTER_CLUSTER_FLAG_INIT_FUNCTION, /* 0x01 */
     /** The cluster has an attribute changed function (function_flag) */
-    CLUSTER_FLAG_ATTRIBUTE_CHANGED_FUNCTION = CLUSTER_MASK_ATTRIBUTE_CHANGED_FUNCTION, /* 0x02 */
+    CLUSTER_FLAG_ATTRIBUTE_CHANGED_FUNCTION = MATTER_CLUSTER_FLAG_ATTRIBUTE_CHANGED_FUNCTION, /* 0x02 */
     /** The cluster has a shutdown function (function_flag) */
-    CLUSTER_FLAG_SHUTDOWN_FUNCTION = CLUSTER_MASK_SHUTDOWN_FUNCTION, /* 0x10 */
+    CLUSTER_FLAG_SHUTDOWN_FUNCTION = MATTER_CLUSTER_FLAG_SHUTDOWN_FUNCTION, /* 0x10 */
     /** The cluster has a pre attribute changed function (function_flag) */
-    CLUSTER_FLAG_PRE_ATTRIBUTE_CHANGED_FUNCTION = CLUSTER_MASK_PRE_ATTRIBUTE_CHANGED_FUNCTION, /* 0x20 */
+    CLUSTER_FLAG_PRE_ATTRIBUTE_CHANGED_FUNCTION = MATTER_CLUSTER_FLAG_PRE_ATTRIBUTE_CHANGED_FUNCTION, /* 0x20 */
     /** The cluster is a server cluster */
-    CLUSTER_FLAG_SERVER = CLUSTER_MASK_SERVER, /* 0x40 */
+    CLUSTER_FLAG_SERVER = MATTER_CLUSTER_FLAG_SERVER, /* 0x40 */
     /** The cluster is a client cluster */
-    CLUSTER_FLAG_CLIENT = CLUSTER_MASK_CLIENT, /* 0x80 */
+    CLUSTER_FLAG_CLIENT = MATTER_CLUSTER_FLAG_CLIENT, /* 0x80 */
 } cluster_flags_t;
 
 /** Attribute flags */
 typedef enum attribute_flags {
     /** No specific flags */
     ATTRIBUTE_FLAG_NONE = 0x00,
     /** The attribute is writable and can be directly changed by clients */
-    ATTRIBUTE_FLAG_WRITABLE = ATTRIBUTE_MASK_WRITABLE, /* 0x01 */
+    ATTRIBUTE_FLAG_WRITABLE = MATTER_ATTRIBUTE_FLAG_WRITABLE, /* 0x01 */
     /** The attribute is non volatile and its value will be stored in NVS */
-    ATTRIBUTE_FLAG_NONVOLATILE = ATTRIBUTE_MASK_NONVOLATILE, /* 0x02 */
+    ATTRIBUTE_FLAG_NONVOLATILE = MATTER_ATTRIBUTE_FLAG_NONVOLATILE, /* 0x02 */
     /** The attribute has bounds */
-    ATTRIBUTE_FLAG_MIN_MAX = ATTRIBUTE_MASK_MIN_MAX, /* 0x04 */
-    ATTRIBUTE_FLAG_MUST_USE_TIMED_WRITE = ATTRIBUTE_MASK_MUST_USE_TIMED_WRITE, /* 0x08 */
+    ATTRIBUTE_FLAG_MIN_MAX = MATTER_ATTRIBUTE_FLAG_MIN_MAX, /* 0x04 */
+    ATTRIBUTE_FLAG_MUST_USE_TIMED_WRITE = MATTER_ATTRIBUTE_FLAG_MUST_USE_TIMED_WRITE, /* 0x08 */
     /** The attribute uses external storage for its value. If attributes
     have this flag enabled, as all of them are stored in the ESP Matter database. */
-    ATTRIBUTE_FLAG_EXTERNAL_STORAGE = ATTRIBUTE_MASK_EXTERNAL_STORAGE, /* 0x10 */
-    ATTRIBUTE_FLAG_SINGLETON = ATTRIBUTE_MASK_SINGLETON, /* 0x20 */
-    ATTRIBUTE_FLAG_NULLABLE = ATTRIBUTE_MASK_NULLABLE, /* 0x40 */
+    ATTRIBUTE_FLAG_EXTERNAL_STORAGE = MATTER_ATTRIBUTE_FLAG_EXTERNAL_STORAGE, /* 0x10 */
+    ATTRIBUTE_FLAG_SINGLETON = MATTER_ATTRIBUTE_FLAG_SINGLETON, /* 0x20 */
+    ATTRIBUTE_FLAG_NULLABLE = MATTER_ATTRIBUTE_FLAG_NULLABLE, /* 0x40 */
     /** The attribute read and write are overridden. The attribute value will be fetched from and will be updated using
     the override callback. The value of this attribute is not maintained internally. */
     ATTRIBUTE_FLAG_OVERRIDE = ATTRIBUTE_FLAG_NULLABLE << 1, /* 0x80 */

components/esp_matter/esp_matter_attribute.cpp

@@ -1448,12 +1448,6 @@ attribute_t *create_group_name_support(cluster_t *cluster, uint8_t value)
 
 namespace scenes_management {
 namespace attribute {
-attribute_t *create_last_configured_by(cluster_t *cluster, uint64_t value)
-{
-    return esp_matter::attribute::create(cluster, ScenesManagement::Attributes::LastConfiguredBy::Id, ATTRIBUTE_FLAG_NONE,
-                                         esp_matter_uint64(value));
-}
-
 attribute_t *create_scene_table_size(cluster_t *cluster, uint16_t value)
 {
     return esp_matter::attribute::create(cluster, ScenesManagement::Attributes::SceneTableSize::Id, ATTRIBUTE_FLAG_NONE,
@@ -3703,14 +3697,14 @@ attribute_t *create_end_product_type(cluster_t *cluster, const uint8_t value)
 attribute_t *create_current_position_lift_percent_100ths(cluster_t *cluster, nullable<uint16_t> value)
 {
     return esp_matter::attribute::create(cluster, WindowCovering::Attributes::CurrentPositionLiftPercent100ths::Id,
-                                         ATTRIBUTE_FLAG_NULLABLE | ATTRIBUTE_MASK_NONVOLATILE,
+                                         ATTRIBUTE_FLAG_NULLABLE | ATTRIBUTE_FLAG_NONVOLATILE,
                                          esp_matter_nullable_uint16(value));
 }
 
 attribute_t *create_current_position_tilt_percent_100ths(cluster_t *cluster, nullable<uint16_t> value)
 {
     return esp_matter::attribute::create(cluster, WindowCovering::Attributes::CurrentPositionTiltPercent100ths::Id,
-                                         ATTRIBUTE_FLAG_NULLABLE | ATTRIBUTE_MASK_NONVOLATILE,
+                                         ATTRIBUTE_FLAG_NULLABLE | ATTRIBUTE_FLAG_NONVOLATILE,
                                          esp_matter_nullable_uint16(value));
 }
 

components/esp_matter/esp_matter_attribute.h

@@ -385,7 +385,6 @@ attribute_t *create_group_name_support(cluster_t *cluster, uint8_t value);
 
 namespace scenes_management {
 namespace attribute {
-attribute_t *create_last_configured_by(cluster_t *cluster, uint64_t value);
 attribute_t *create_scene_table_size(cluster_t *cluster, uint16_t value);
 attribute_t *create_fabric_scene_info(cluster_t *cluster, const uint8_t * value, uint16_t length, uint16_t count);
 } /* attribute */

components/esp_matter/esp_matter_command.cpp

@@ -135,42 +135,6 @@ static esp_err_t esp_matter_command_callback_key_set_read_all_indices(const Conc
     return ESP_OK;
 }
 
-static esp_err_t esp_matter_command_callback_open_commissioning_window(const ConcreteCommandPath &command_path,
-                                                                       TLVReader &tlv_data, void *opaque_ptr)
-{
-    chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::DecodableType command_data;
-    CHIP_ERROR error = Decode(tlv_data, command_data);
-    if (error == CHIP_NO_ERROR) {
-        emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback((CommandHandler *)opaque_ptr,
-                                                                                command_path, command_data);
-    }
-    return ESP_OK;
-}
-
-static esp_err_t esp_matter_command_callback_open_basic_commissioning_window(const ConcreteCommandPath &command_path,
-                                                                             TLVReader &tlv_data, void *opaque_ptr)
-{
-    chip::app::Clusters::AdministratorCommissioning::Commands::OpenBasicCommissioningWindow::DecodableType command_data;
-    CHIP_ERROR error = Decode(tlv_data, command_data);
-    if (error == CHIP_NO_ERROR) {
-        emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallback((CommandHandler *)opaque_ptr,
-                                                                                     command_path, command_data);
-    }
-    return ESP_OK;
-}
-
-static esp_err_t esp_matter_command_callback_revoke_commissioning(const ConcreteCommandPath &command_path,
-                                                                  TLVReader &tlv_data, void *opaque_ptr)
-{
-    chip::app::Clusters::AdministratorCommissioning::Commands::RevokeCommissioning::DecodableType command_data;
-    CHIP_ERROR error = Decode(tlv_data, command_data);
-    if (error == CHIP_NO_ERROR) {
-        emberAfAdministratorCommissioningClusterRevokeCommissioningCallback((CommandHandler *)opaque_ptr, command_path,
-                                                                            command_data);
-    }
-    return ESP_OK;
-}
-
 static esp_err_t esp_matter_command_callback_attestation_request(const ConcreteCommandPath &command_path,
                                                                  TLVReader &tlv_data, void *opaque_ptr)
 {
@@ -1143,17 +1107,6 @@ static esp_err_t esp_matter_command_callback_thread_reset_counts(const ConcreteC
     return ESP_OK;
 }
 
-static esp_err_t esp_matter_command_callback_wifi_reset_counts(const ConcreteCommandPath &command_path,
-                                                               TLVReader &tlv_data, void *opaque_ptr)
-{
-    chip::app::Clusters::WiFiNetworkDiagnostics::Commands::ResetCounts::DecodableType command_data;
-    CHIP_ERROR error = Decode(tlv_data, command_data);
-    if (error == CHIP_NO_ERROR) {
-        emberAfWiFiNetworkDiagnosticsClusterResetCountsCallback((CommandHandler *)opaque_ptr, command_path, command_data);
-    }
-    return ESP_OK;
-}
-
 static esp_err_t esp_matter_command_callback_ethernet_reset_counts(const ConcreteCommandPath &command_path,
 								   TLVReader &tlv_data, void *opaque_ptr)
 {
@@ -1177,28 +1130,6 @@ static esp_err_t esp_matter_command_callback_retrieve_logs_request(const Concret
     return ESP_OK;
 }
 
-static esp_err_t esp_matter_command_callback_test_event_trigger(const ConcreteCommandPath &command_path,
-                                                                  TLVReader &tlv_data, void *opaque_ptr)
-{
-    chip::app::Clusters::GeneralDiagnostics::Commands::TestEventTrigger::DecodableType command_data;
-    CHIP_ERROR error = Decode(tlv_data, command_data);
-    if (error == CHIP_NO_ERROR) {
-        emberAfGeneralDiagnosticsClusterTestEventTriggerCallback((CommandHandler *)opaque_ptr, command_path, command_data);
-    }
-    return ESP_OK;
-}
-
-static esp_err_t esp_matter_command_callback_time_snap_shot(const ConcreteCommandPath &command_path,
-                                                                  TLVReader &tlv_data, void *opaque_ptr)
-{
-    chip::app::Clusters::GeneralDiagnostics::Commands::TimeSnapshot::DecodableType command_data;
-    CHIP_ERROR error = Decode(tlv_data, command_data);
-    if (error == CHIP_NO_ERROR) {
-        emberAfGeneralDiagnosticsClusterTimeSnapshotCallback((CommandHandler *)opaque_ptr, command_path, command_data);
-    }
-    return ESP_OK;
-}
-
 static esp_err_t esp_matter_command_callback_up_or_open(const ConcreteCommandPath &command_path, TLVReader &tlv_data,
                                                        void *opaque_ptr)
 {
@@ -1688,8 +1619,7 @@ namespace command {
 
 command_t *create_reset_counts(cluster_t *cluster)
 {
-    return esp_matter::command::create(cluster, WiFiNetworkDiagnostics::Commands::ResetCounts::Id, COMMAND_FLAG_ACCEPTED,
-                                       esp_matter_command_callback_wifi_reset_counts);
+    return esp_matter::command::create(cluster, WiFiNetworkDiagnostics::Commands::ResetCounts::Id, COMMAND_FLAG_ACCEPTED, nullptr);
 }
 
 } /* command */
@@ -1729,10 +1659,8 @@ namespace general_diagnostics {
 namespace command {
 
 constexpr const command_entry_t accepted_command_list[] = {
-    {GeneralDiagnostics::Commands::TestEventTrigger::Id, COMMAND_FLAG_ACCEPTED,
-     esp_matter_command_callback_test_event_trigger},
-    {GeneralDiagnostics::Commands::TimeSnapshot::Id, COMMAND_FLAG_ACCEPTED,
-     esp_matter_command_callback_time_snap_shot},
+    {GeneralDiagnostics::Commands::TestEventTrigger::Id, COMMAND_FLAG_ACCEPTED, nullptr},
+    {GeneralDiagnostics::Commands::TimeSnapshot::Id, COMMAND_FLAG_ACCEPTED, nullptr},
 };
 
 constexpr const command_entry_t generated_command_list[] = {
@@ -1741,14 +1669,12 @@ constexpr const command_entry_t generated_command_list[] = {
 
 command_t *create_test_event_trigger(cluster_t *cluster)
 {
-    return esp_matter::command::create(cluster, GeneralDiagnostics::Commands::TestEventTrigger::Id, COMMAND_FLAG_ACCEPTED,
-                                        esp_matter_command_callback_test_event_trigger);
+    return esp_matter::command::create(cluster, GeneralDiagnostics::Commands::TestEventTrigger::Id, COMMAND_FLAG_ACCEPTED, nullptr);
 }
 
 command_t *create_time_snap_shot(cluster_t *cluster)
 {
-    return esp_matter::command::create(cluster, GeneralDiagnostics::Commands::TimeSnapshot::Id, COMMAND_FLAG_ACCEPTED,
-                                        esp_matter_command_callback_time_snap_shot);
+    return esp_matter::command::create(cluster, GeneralDiagnostics::Commands::TimeSnapshot::Id, COMMAND_FLAG_ACCEPTED, nullptr);
 }
 
 command_t *create_time_snap_shot_response(cluster_t *cluster)
@@ -1969,31 +1895,28 @@ namespace administrator_commissioning {
 namespace command {
 
 constexpr const command_entry_t accepted_command_list[] = {
-    {AdministratorCommissioning::Commands::OpenCommissioningWindow::Id, COMMAND_FLAG_ACCEPTED,
-     esp_matter_command_callback_open_commissioning_window},
-    {AdministratorCommissioning::Commands::RevokeCommissioning::Id, COMMAND_FLAG_ACCEPTED,
-     esp_matter_command_callback_revoke_commissioning},
+    {AdministratorCommissioning::Commands::OpenCommissioningWindow::Id, COMMAND_FLAG_ACCEPTED, nullptr},
+    {AdministratorCommissioning::Commands::RevokeCommissioning::Id, COMMAND_FLAG_ACCEPTED, nullptr},
 };
 
 constexpr const command_entry_t generated_command_list[] = {};
 
 command_t *create_open_commissioning_window(cluster_t *cluster)
 {
     return esp_matter::command::create(cluster, AdministratorCommissioning::Commands::OpenCommissioningWindow::Id,
-                                       COMMAND_FLAG_ACCEPTED, esp_matter_command_callback_open_commissioning_window);
+                                       COMMAND_FLAG_ACCEPTED, nullptr);
 }
 
 command_t *create_open_basic_commissioning_window(cluster_t *cluster)
 {
     return esp_matter::command::create(cluster, AdministratorCommissioning::Commands::OpenBasicCommissioningWindow::Id,
-                                       COMMAND_FLAG_ACCEPTED,
-                                       esp_matter_command_callback_open_basic_commissioning_window);
+                                       COMMAND_FLAG_ACCEPTED, nullptr);
 }
 
 command_t *create_revoke_commissioning(cluster_t *cluster)
 {
     return esp_matter::command::create(cluster, AdministratorCommissioning::Commands::RevokeCommissioning::Id,
-                                       COMMAND_FLAG_ACCEPTED, esp_matter_command_callback_revoke_commissioning);
+                                       COMMAND_FLAG_ACCEPTED, nullptr);
 }
 
 } /* command */

components/esp_matter/esp_matter_core.cpp

@@ -458,8 +458,8 @@ esp_err_t enable(endpoint_t *endpoint)
         return ESP_ERR_NO_MEM;
     }
     for (size_t i = 0; i < current_endpoint->device_type_count; ++i) {
-        device_types_ptr[i].deviceId = current_endpoint->device_type_ids[i];
-        device_types_ptr[i].deviceVersion = current_endpoint->device_type_versions[i];
+        device_types_ptr[i].deviceTypeId = current_endpoint->device_type_ids[i];
+        device_types_ptr[i].deviceTypeRevision = current_endpoint->device_type_versions[i];
     }
     chip::Span<EmberAfDeviceType> device_types(device_types_ptr, current_endpoint->device_type_count);
     current_endpoint->device_types_ptr = device_types_ptr;

components/esp_matter/esp_matter_delegate_callbacks.cpp

@@ -350,7 +350,7 @@ void CommissionerControlDelegateInitCB(void *delegate, uint16_t endpoint_id)
     CommissionerControl::Delegate *commissioner_control_delegate = static_cast<CommissionerControl::Delegate*>(delegate);
     CommissionerControl::CommissionerControlServer *commissioner_control_instance = nullptr;
     commissioner_control_instance =
-        new CommissionerControl::CommissionerControlServer(commissioner_control_delegate, endpoint_id, CommissionerControl::Id);
+        new CommissionerControl::CommissionerControlServer(commissioner_control_delegate, endpoint_id);
     commissioner_control_instance->Init();
 }
 

components/esp_matter/utils/cluster_select/Kconfig.in

@@ -9,6 +9,10 @@ config SUPPORT_ACCOUNT_LOGIN_CLUSTER
 	bool "Support ACCOUNT_LOGIN_CLUSTER"
 	default y
 
+config SUPPORT_ACTIONS_CLUSTER
+	bool "Support ACTIONS_CLUSTER"
+	default y
+
 config SUPPORT_ACTIVATED_CARBON_FILTER_MONITORING_CLUSTER
 	bool "Support ACTIVATED_CARBON_FILTER_MONITORING_CLUSTER"
 	default y
@@ -49,6 +53,10 @@ config SUPPORT_BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER
 	bool "Support BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER"
 	default y
 
+config SUPPORT_CAMERA_AV_STREAM_MANAGEMENT_CLUSTER
+	bool "Support CAMERA_AV_STREAM_MANAGEMENT_CLUSTER"
+	default y
+
 config SUPPORT_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 	bool "Support CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER"
 	default y
@@ -65,6 +73,10 @@ config SUPPORT_CHIME_CLUSTER
 	bool "Support CHIME_CLUSTER"
 	default y
 
+config SUPPORT_CLOSURE_CONTROL_CLUSTER
+	bool "Support CLOSURE_CONTROL_CLUSTER"
+	default y
+
 config SUPPORT_COLOR_CONTROL_CLUSTER
 	bool "Support COLOR_CONTROL_CLUSTER"
 	default y
@@ -417,6 +429,14 @@ config SUPPORT_LAUNDRY_DRYER_CONTROLS_CLUSTER
 	bool "Support LAUNDRY_DRYER_CONTROLS_CLUSTER"
 	default y
 
+config SUPPORT_WEB_RTC_TRANSPORT_PROVIDER_CLUSTER
+	bool "Support WEB_RTC_TRANSPORT_PROVIDER_CLUSTER"
+	default y
+
+config SUPPORT_WEB_RTC_TRANSPORT_REQUESTOR_CLUSTER
+	bool "Support WEB_RTC_TRANSPORT_REQUESTOR_CLUSTER"
+	default y
+
 config SUPPORT_WIFI_NETWORK_DIAGNOSTICS_CLUSTER
 	bool "Support WIFI_NETWORK_DIAGNOSTICS_CLUSTER"
 	default y