From 8bd7fc5d2277b464bf5025270ef7bca68117e972 Mon Sep 17 00:00:00 2001 From: liyashuai Date: Tue, 10 Dec 2024 11:11:51 +0800 Subject: [PATCH] [v1.3]components/esp-matter: remove scene management cluster --- components/esp_matter/esp_matter_endpoint.cpp | 9 --------- components/esp_matter/esp_matter_endpoint.h | 8 -------- 2 files changed, 17 deletions(-) diff --git a/components/esp_matter/esp_matter_endpoint.cpp b/components/esp_matter/esp_matter_endpoint.cpp index f7d3cb6cf..a0fa43cb6 100644 --- a/components/esp_matter/esp_matter_endpoint.cpp +++ b/components/esp_matter/esp_matter_endpoint.cpp @@ -262,7 +262,6 @@ esp_err_t add(endpoint_t *endpoint, config_t *config) cluster_t *identify_cluster = identify::create(endpoint, &(config->identify), CLUSTER_FLAG_SERVER); identify::command::create_trigger_effect(identify_cluster); groups::create(endpoint, &(config->groups), CLUSTER_FLAG_SERVER); - scenes_management::create(endpoint, &(config->scenes_management), CLUSTER_FLAG_SERVER); on_off::create(endpoint, &(config->on_off), CLUSTER_FLAG_SERVER, on_off::feature::lighting::get_id()); return ESP_OK; @@ -304,7 +303,6 @@ esp_err_t add(endpoint_t *endpoint, config_t *config) cluster_t *identify_cluster = identify::create(endpoint, &(config->identify), CLUSTER_FLAG_SERVER); identify::command::create_trigger_effect(identify_cluster); groups::create(endpoint, &(config->groups), CLUSTER_FLAG_SERVER); - scenes_management::create(endpoint, &(config->scenes_management), CLUSTER_FLAG_SERVER); on_off::create(endpoint, &(config->on_off), CLUSTER_FLAG_SERVER, on_off::feature::lighting::get_id()); level_control::create(endpoint, &(config->level_control), CLUSTER_FLAG_SERVER, 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) cluster_t *identify_cluster = identify::create(endpoint, &(config->identify), CLUSTER_FLAG_SERVER); identify::command::create_trigger_effect(identify_cluster); groups::create(endpoint, &(config->groups), CLUSTER_FLAG_SERVER); - scenes_management::create(endpoint, &(config->scenes_management), CLUSTER_FLAG_SERVER); on_off::create(endpoint, &(config->on_off), CLUSTER_FLAG_SERVER, on_off::feature::lighting::get_id()); level_control::create(endpoint, &(config->level_control), CLUSTER_FLAG_SERVER, 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) cluster_t *identify_cluster = identify::create(endpoint, &(config->identify), CLUSTER_FLAG_SERVER); identify::command::create_trigger_effect(identify_cluster); groups::create(endpoint, &(config->groups), CLUSTER_FLAG_SERVER); - cluster_t *scenes_cluster = scenes_management::create(endpoint, &(config->scenes_management), CLUSTER_FLAG_SERVER); - scenes_management::command::create_copy_scene(scenes_cluster); - scenes_management::command::create_copy_scene_response(scenes_cluster); on_off::create(endpoint, &(config->on_off), CLUSTER_FLAG_SERVER, on_off::feature::lighting::get_id()); level_control::create(endpoint, &(config->level_control), CLUSTER_FLAG_SERVER, @@ -600,7 +594,6 @@ esp_err_t add(endpoint_t *endpoint, config_t *config) cluster_t *identify_cluster = identify::create(endpoint, &(config->identify), CLUSTER_FLAG_SERVER); identify::command::create_trigger_effect(identify_cluster); groups::create(endpoint, &(config->groups), CLUSTER_FLAG_SERVER); - scenes_management::create(endpoint, &(config->scenes_management), CLUSTER_FLAG_SERVER); on_off::create(endpoint, &(config->on_off), CLUSTER_FLAG_SERVER, on_off::feature::lighting::get_id()); return ESP_OK; @@ -641,7 +634,6 @@ esp_err_t add(endpoint_t *endpoint, config_t *config) cluster_t *identify_cluster = identify::create(endpoint, &(config->identify), CLUSTER_FLAG_SERVER); identify::command::create_trigger_effect(identify_cluster); groups::create(endpoint, &(config->groups), CLUSTER_FLAG_SERVER); - scenes_management::create(endpoint, &(config->scenes_management), CLUSTER_FLAG_SERVER); on_off::create(endpoint, &(config->on_off), CLUSTER_FLAG_SERVER, on_off::feature::lighting::get_id()); level_control::create(endpoint, &(config->level_control), CLUSTER_FLAG_SERVER, 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) descriptor::create(endpoint, &(config->descriptor), CLUSTER_FLAG_SERVER); identify::create(endpoint, &(config->identify), CLUSTER_FLAG_SERVER); groups::create(endpoint, &(config->groups), CLUSTER_FLAG_SERVER); - scenes_management::create(endpoint, &(config->scenes_management), CLUSTER_FLAG_SERVER); window_covering::create(endpoint, &(config->window_covering), CLUSTER_FLAG_SERVER, ESP_MATTER_NONE_FEATURE_ID); return ESP_OK; diff --git a/components/esp_matter/esp_matter_endpoint.h b/components/esp_matter/esp_matter_endpoint.h index 450a0961e..94512aeb5 100644 --- a/components/esp_matter/esp_matter_endpoint.h +++ b/components/esp_matter/esp_matter_endpoint.h @@ -201,7 +201,6 @@ typedef struct config { cluster::descriptor::config_t descriptor; cluster::identify::config_t identify; cluster::groups::config_t groups; - cluster::scenes_management::config_t scenes_management; cluster::on_off::config_t on_off; } config_t; @@ -216,7 +215,6 @@ typedef struct config { cluster::descriptor::config_t descriptor; cluster::identify::config_t identify; cluster::groups::config_t groups; - cluster::scenes_management::config_t scenes_management; cluster::on_off::config_t on_off; cluster::level_control::config_t level_control; } config_t; @@ -232,7 +230,6 @@ typedef struct config { cluster::descriptor::config_t descriptor; cluster::identify::config_t identify; cluster::groups::config_t groups; - cluster::scenes_management::config_t scenes_management; cluster::on_off::config_t on_off; cluster::level_control::config_t level_control; cluster::color_control::config_t color_control; @@ -249,7 +246,6 @@ typedef struct config { cluster::descriptor::config_t descriptor; cluster::identify::config_t identify; cluster::groups::config_t groups; - cluster::scenes_management::config_t scenes_management; cluster::on_off::config_t on_off; cluster::level_control::config_t level_control; cluster::color_control::config_t color_control; @@ -318,7 +314,6 @@ typedef struct config { cluster::descriptor::config_t descriptor; cluster::identify::config_t identify; cluster::groups::config_t groups; - cluster::scenes_management::config_t scenes_management; cluster::on_off::config_t on_off; } config_t; @@ -333,7 +328,6 @@ typedef struct config { cluster::descriptor::config_t descriptor; cluster::identify::config_t identify; cluster::groups::config_t groups; - cluster::scenes_management::config_t scenes_management; cluster::on_off::config_t on_off; cluster::level_control::config_t level_control; } config_t; @@ -362,7 +356,6 @@ namespace thermostat { typedef struct config { cluster::descriptor::config_t descriptor; cluster::identify::config_t identify; - cluster::scenes_management::config_t scenes_management; cluster::groups::config_t groups; cluster::thermostat::config_t thermostat; } config_t; @@ -487,7 +480,6 @@ typedef struct config { cluster::descriptor::config_t descriptor; cluster::identify::config_t identify; cluster::groups::config_t groups; - cluster::scenes_management::config_t scenes_management; cluster::window_covering::config_t window_covering; config(uint8_t end_product_type = 0) : window_covering(end_product_type) {} } config_t;