Skip to content

Commit 3bffdb5

Browse files
committed
Merge branch 'update-device-types' into 'main'
Updated device types according to specs See merge request app-frameworks/esp-matter!169
2 parents d941645 + 7f8c9e2 commit 3bffdb5

File tree

3 files changed

+2
-11
lines changed

3 files changed

+2
-11
lines changed

components/esp_matter/esp_matter_cluster.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ cluster_t *create(endpoint_t *endpoint, uint8_t flags)
125125
global::attribute::create_cluster_revision(cluster, 0);
126126
global::attribute::create_feature_map(cluster, 0);
127127
attribute::create_acl(cluster, NULL, 0, 0);
128-
attribute::create_extension(cluster, NULL, 0, 0);
129128
attribute::create_subjects_per_access_control_entry(cluster, 0);
130129
attribute::create_access_control_entries_per_fabric(cluster, 0);
131130
attribute::create_targets_per_access_control_entry(cluster, 0);

components/esp_matter/esp_matter_endpoint.cpp

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,6 @@ endpoint_t *create(node_t *node, config_t *config, uint8_t flags, void *priv_dat
213213
descriptor::create(endpoint, CLUSTER_FLAG_SERVER);
214214
identify::create(endpoint, &(config->identify), CLUSTER_FLAG_SERVER | CLUSTER_FLAG_CLIENT);
215215
binding::create(endpoint, &(config->binding), CLUSTER_FLAG_SERVER);
216-
groups::create(endpoint, NULL, CLUSTER_FLAG_CLIENT);
217-
scenes::create(endpoint, NULL, CLUSTER_FLAG_CLIENT);
218216
on_off::create(endpoint, NULL, CLUSTER_FLAG_CLIENT, ESP_MATTER_NONE_FEATURE_ID);
219217

220218
return endpoint;
@@ -239,8 +237,6 @@ endpoint_t *create(node_t *node, config_t *config, uint8_t flags, void *priv_dat
239237
descriptor::create(endpoint, CLUSTER_FLAG_SERVER);
240238
identify::create(endpoint, &(config->identify), CLUSTER_FLAG_SERVER | CLUSTER_FLAG_CLIENT);
241239
binding::create(endpoint, &(config->binding), CLUSTER_FLAG_SERVER);
242-
groups::create(endpoint, NULL, CLUSTER_FLAG_CLIENT);
243-
scenes::create(endpoint, NULL, CLUSTER_FLAG_CLIENT);
244240
on_off::create(endpoint, NULL, CLUSTER_FLAG_CLIENT, ESP_MATTER_NONE_FEATURE_ID);
245241
level_control::create(endpoint, NULL, CLUSTER_FLAG_CLIENT, ESP_MATTER_NONE_FEATURE_ID);
246242

@@ -266,8 +262,6 @@ endpoint_t *create(node_t *node, config_t *config, uint8_t flags, void *priv_dat
266262
descriptor::create(endpoint, CLUSTER_FLAG_SERVER);
267263
identify::create(endpoint, &(config->identify), CLUSTER_FLAG_SERVER | CLUSTER_FLAG_CLIENT);
268264
binding::create(endpoint, &(config->binding), CLUSTER_FLAG_SERVER);
269-
groups::create(endpoint, NULL, CLUSTER_FLAG_CLIENT);
270-
scenes::create(endpoint, NULL, CLUSTER_FLAG_CLIENT);
271265
on_off::create(endpoint, NULL, CLUSTER_FLAG_CLIENT, ESP_MATTER_NONE_FEATURE_ID);
272266
level_control::create(endpoint, NULL, CLUSTER_FLAG_CLIENT, ESP_MATTER_NONE_FEATURE_ID);
273267
color_control::create(endpoint, NULL, CLUSTER_FLAG_CLIENT, ESP_MATTER_NONE_FEATURE_ID);
@@ -296,8 +290,6 @@ endpoint_t *create(node_t *node, config_t *config, uint8_t flags, void *priv_dat
296290
groups::create(endpoint, &(config->groups), CLUSTER_FLAG_SERVER);
297291
scenes::create(endpoint, &(config->scenes), CLUSTER_FLAG_SERVER);
298292
on_off::create(endpoint, &(config->on_off), CLUSTER_FLAG_SERVER, on_off::feature::lighting::get_id());
299-
level_control::create(endpoint, &(config->level_control), CLUSTER_FLAG_SERVER,
300-
level_control::feature::on_off::get_id() | level_control::feature::lighting::get_id());
301293

302294
return endpoint;
303295
}
@@ -372,8 +364,8 @@ endpoint_t *create(node_t *node, config_t *config, uint8_t flags, void *priv_dat
372364
descriptor::create(endpoint, CLUSTER_FLAG_SERVER);
373365
identify::create(endpoint, &(config->identify), CLUSTER_FLAG_SERVER);
374366
groups::create(endpoint, &(config->groups), CLUSTER_FLAG_SERVER);
375-
scenes::create(endpoint, &(config->scenes), CLUSTER_FLAG_SERVER);
376367
cluster::thermostat::create(endpoint, &(config->thermostat), CLUSTER_FLAG_SERVER);
368+
time_synchronization::create(endpoint, &(config->time_synchronization), CLUSTER_FLAG_SERVER | CLUSTER_FLAG_CLIENT);
377369

378370
return endpoint;
379371
}

components/esp_matter/esp_matter_endpoint.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ typedef struct config {
136136
cluster::groups::config_t groups;
137137
cluster::scenes::config_t scenes;
138138
cluster::on_off::config_t on_off;
139-
cluster::level_control::config_t level_control;
140139
} config_t;
141140

142141
uint32_t get_device_type_id();
@@ -173,6 +172,7 @@ typedef struct config {
173172
cluster::groups::config_t groups;
174173
cluster::scenes::config_t scenes;
175174
cluster::thermostat::config_t thermostat;
175+
cluster::time_synchronization::config_t time_synchronization;
176176
} config_t;
177177

178178
uint32_t get_device_type_id();

0 commit comments

Comments
 (0)