Skip to content

Commit eda7e67

Browse files
chshuchshu
committed
Merge branch 'remove_scenes_from_1_3' into 'release/v1.3'
[v1.3]components/esp-matter: remove scene management cluster See merge request app-frameworks/esp-matter!975
2 parents acc31fa + 8bd7fc5 commit eda7e67

File tree

2 files changed

+0
-17
lines changed

2 files changed

+0
-17
lines changed

‎components/esp_matter/esp_matter_endpoint.cpp

-9
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,6 @@ esp_err_t add(endpoint_t *endpoint, config_t *config)
262262
cluster_t *identify_cluster = identify::create(endpoint, &(config->identify), CLUSTER_FLAG_SERVER);
263263
identify::command::create_trigger_effect(identify_cluster);
264264
groups::create(endpoint, &(config->groups), CLUSTER_FLAG_SERVER);
265-
scenes_management::create(endpoint, &(config->scenes_management), CLUSTER_FLAG_SERVER);
266265
on_off::create(endpoint, &(config->on_off), CLUSTER_FLAG_SERVER, on_off::feature::lighting::get_id());
267266

268267
return ESP_OK;
@@ -304,7 +303,6 @@ esp_err_t add(endpoint_t *endpoint, config_t *config)
304303
cluster_t *identify_cluster = identify::create(endpoint, &(config->identify), CLUSTER_FLAG_SERVER);
305304
identify::command::create_trigger_effect(identify_cluster);
306305
groups::create(endpoint, &(config->groups), CLUSTER_FLAG_SERVER);
307-
scenes_management::create(endpoint, &(config->scenes_management), CLUSTER_FLAG_SERVER);
308306
on_off::create(endpoint, &(config->on_off), CLUSTER_FLAG_SERVER, on_off::feature::lighting::get_id());
309307
level_control::create(endpoint, &(config->level_control), CLUSTER_FLAG_SERVER,
310308
level_control::feature::on_off::get_id() | level_control::feature::lighting::get_id());
@@ -347,7 +345,6 @@ esp_err_t add(endpoint_t *endpoint, config_t *config)
347345
cluster_t *identify_cluster = identify::create(endpoint, &(config->identify), CLUSTER_FLAG_SERVER);
348346
identify::command::create_trigger_effect(identify_cluster);
349347
groups::create(endpoint, &(config->groups), CLUSTER_FLAG_SERVER);
350-
scenes_management::create(endpoint, &(config->scenes_management), CLUSTER_FLAG_SERVER);
351348
on_off::create(endpoint, &(config->on_off), CLUSTER_FLAG_SERVER, on_off::feature::lighting::get_id());
352349
level_control::create(endpoint, &(config->level_control), CLUSTER_FLAG_SERVER,
353350
level_control::feature::on_off::get_id() | level_control::feature::lighting::get_id());
@@ -393,9 +390,6 @@ esp_err_t add(endpoint_t *endpoint, config_t *config)
393390
cluster_t *identify_cluster = identify::create(endpoint, &(config->identify), CLUSTER_FLAG_SERVER);
394391
identify::command::create_trigger_effect(identify_cluster);
395392
groups::create(endpoint, &(config->groups), CLUSTER_FLAG_SERVER);
396-
cluster_t *scenes_cluster = scenes_management::create(endpoint, &(config->scenes_management), CLUSTER_FLAG_SERVER);
397-
scenes_management::command::create_copy_scene(scenes_cluster);
398-
scenes_management::command::create_copy_scene_response(scenes_cluster);
399393

400394
on_off::create(endpoint, &(config->on_off), CLUSTER_FLAG_SERVER, on_off::feature::lighting::get_id());
401395
level_control::create(endpoint, &(config->level_control), CLUSTER_FLAG_SERVER,
@@ -600,7 +594,6 @@ esp_err_t add(endpoint_t *endpoint, config_t *config)
600594
cluster_t *identify_cluster = identify::create(endpoint, &(config->identify), CLUSTER_FLAG_SERVER);
601595
identify::command::create_trigger_effect(identify_cluster);
602596
groups::create(endpoint, &(config->groups), CLUSTER_FLAG_SERVER);
603-
scenes_management::create(endpoint, &(config->scenes_management), CLUSTER_FLAG_SERVER);
604597
on_off::create(endpoint, &(config->on_off), CLUSTER_FLAG_SERVER, on_off::feature::lighting::get_id());
605598

606599
return ESP_OK;
@@ -641,7 +634,6 @@ esp_err_t add(endpoint_t *endpoint, config_t *config)
641634
cluster_t *identify_cluster = identify::create(endpoint, &(config->identify), CLUSTER_FLAG_SERVER);
642635
identify::command::create_trigger_effect(identify_cluster);
643636
groups::create(endpoint, &(config->groups), CLUSTER_FLAG_SERVER);
644-
scenes_management::create(endpoint, &(config->scenes_management), CLUSTER_FLAG_SERVER);
645637
on_off::create(endpoint, &(config->on_off), CLUSTER_FLAG_SERVER, on_off::feature::lighting::get_id());
646638
level_control::create(endpoint, &(config->level_control), CLUSTER_FLAG_SERVER,
647639
level_control::feature::on_off::get_id() | level_control::feature::lighting::get_id());
@@ -1106,7 +1098,6 @@ esp_err_t add(endpoint_t *endpoint, config_t *config)
11061098
descriptor::create(endpoint, &(config->descriptor), CLUSTER_FLAG_SERVER);
11071099
identify::create(endpoint, &(config->identify), CLUSTER_FLAG_SERVER);
11081100
groups::create(endpoint, &(config->groups), CLUSTER_FLAG_SERVER);
1109-
scenes_management::create(endpoint, &(config->scenes_management), CLUSTER_FLAG_SERVER);
11101101
window_covering::create(endpoint, &(config->window_covering), CLUSTER_FLAG_SERVER, ESP_MATTER_NONE_FEATURE_ID);
11111102

11121103
return ESP_OK;

‎components/esp_matter/esp_matter_endpoint.h

-8
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,6 @@ typedef struct config {
201201
cluster::descriptor::config_t descriptor;
202202
cluster::identify::config_t identify;
203203
cluster::groups::config_t groups;
204-
cluster::scenes_management::config_t scenes_management;
205204
cluster::on_off::config_t on_off;
206205
} config_t;
207206

@@ -216,7 +215,6 @@ typedef struct config {
216215
cluster::descriptor::config_t descriptor;
217216
cluster::identify::config_t identify;
218217
cluster::groups::config_t groups;
219-
cluster::scenes_management::config_t scenes_management;
220218
cluster::on_off::config_t on_off;
221219
cluster::level_control::config_t level_control;
222220
} config_t;
@@ -232,7 +230,6 @@ typedef struct config {
232230
cluster::descriptor::config_t descriptor;
233231
cluster::identify::config_t identify;
234232
cluster::groups::config_t groups;
235-
cluster::scenes_management::config_t scenes_management;
236233
cluster::on_off::config_t on_off;
237234
cluster::level_control::config_t level_control;
238235
cluster::color_control::config_t color_control;
@@ -249,7 +246,6 @@ typedef struct config {
249246
cluster::descriptor::config_t descriptor;
250247
cluster::identify::config_t identify;
251248
cluster::groups::config_t groups;
252-
cluster::scenes_management::config_t scenes_management;
253249
cluster::on_off::config_t on_off;
254250
cluster::level_control::config_t level_control;
255251
cluster::color_control::config_t color_control;
@@ -318,7 +314,6 @@ typedef struct config {
318314
cluster::descriptor::config_t descriptor;
319315
cluster::identify::config_t identify;
320316
cluster::groups::config_t groups;
321-
cluster::scenes_management::config_t scenes_management;
322317
cluster::on_off::config_t on_off;
323318
} config_t;
324319

@@ -333,7 +328,6 @@ typedef struct config {
333328
cluster::descriptor::config_t descriptor;
334329
cluster::identify::config_t identify;
335330
cluster::groups::config_t groups;
336-
cluster::scenes_management::config_t scenes_management;
337331
cluster::on_off::config_t on_off;
338332
cluster::level_control::config_t level_control;
339333
} config_t;
@@ -362,7 +356,6 @@ namespace thermostat {
362356
typedef struct config {
363357
cluster::descriptor::config_t descriptor;
364358
cluster::identify::config_t identify;
365-
cluster::scenes_management::config_t scenes_management;
366359
cluster::groups::config_t groups;
367360
cluster::thermostat::config_t thermostat;
368361
} config_t;
@@ -487,7 +480,6 @@ typedef struct config {
487480
cluster::descriptor::config_t descriptor;
488481
cluster::identify::config_t identify;
489482
cluster::groups::config_t groups;
490-
cluster::scenes_management::config_t scenes_management;
491483
cluster::window_covering::config_t window_covering;
492484
config(uint8_t end_product_type = 0) : window_covering(end_product_type) {}
493485
} config_t;

0 commit comments

Comments
 (0)