Skip to content

Commit 3a4ae18

Browse files
committed
Merge branch 'backport/v1.4.2/fix/add_mandatory_attribute' into 'release/v1.4.2'
[v1.4.2]: Add missing pending_dataset_timestamp mandatory attribute See merge request app-frameworks/esp-matter!1299
2 parents 5d95031 + 0d85755 commit 3a4ae18

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

components/esp_matter/data_model/esp_matter_cluster.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3387,8 +3387,9 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags)
33873387
attribute::create_border_agent_id(cluster, nullptr, 0);
33883388
attribute::create_thread_version(cluster, 0);
33893389
attribute::create_interface_enabled(cluster, false);
3390-
nullable<uint64_t> timestamp;
3391-
attribute::create_active_dataset_timestamp(cluster, timestamp);
3390+
nullable<uint64_t> active_dataset_timestamp, pending_dataset_timestamp;
3391+
attribute::create_active_dataset_timestamp(cluster, active_dataset_timestamp);
3392+
attribute::create_pending_dataset_timestamp(cluster, pending_dataset_timestamp);
33923393

33933394
/** Attributes not managed internally **/
33943395
global::attribute::create_cluster_revision(cluster, cluster_revision);

components/esp_matter/data_model/esp_matter_feature.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3171,9 +3171,6 @@ esp_err_t add(cluster_t *cluster)
31713171
{
31723172
VerifyOrReturnError(cluster, ESP_ERR_INVALID_ARG, ESP_LOGE(TAG, "Cluster cannot be NULL"));
31733173
update_feature_map(cluster, get_id());
3174-
/* attribute */
3175-
nullable<uint64_t> timestamp;
3176-
attribute::create_pending_dataset_timestamp(cluster, timestamp);
31773174

31783175
/* command */
31793176
command::create_set_pending_dataset_request(cluster);

0 commit comments

Comments
 (0)