Merge branch 'update-device-types' into 'main'

Updated device types according to specs

See merge request app-frameworks/esp-matter!169
This commit is contained in:
Hrishikesh Dhayagude
2022-08-09 11:55:59 +08:00
3 changed files with 2 additions and 11 deletions
@@ -125,7 +125,6 @@ cluster_t *create(endpoint_t *endpoint, uint8_t flags)
global::attribute::create_cluster_revision(cluster, 0);
global::attribute::create_feature_map(cluster, 0);
attribute::create_acl(cluster, NULL, 0, 0);
attribute::create_extension(cluster, NULL, 0, 0);
attribute::create_subjects_per_access_control_entry(cluster, 0);
attribute::create_access_control_entries_per_fabric(cluster, 0);
attribute::create_targets_per_access_control_entry(cluster, 0);
@@ -213,8 +213,6 @@ endpoint_t *create(node_t *node, config_t *config, uint8_t flags, void *priv_dat
descriptor::create(endpoint, CLUSTER_FLAG_SERVER);
identify::create(endpoint, &(config->identify), CLUSTER_FLAG_SERVER | CLUSTER_FLAG_CLIENT);
binding::create(endpoint, &(config->binding), CLUSTER_FLAG_SERVER);
groups::create(endpoint, NULL, CLUSTER_FLAG_CLIENT);
scenes::create(endpoint, NULL, CLUSTER_FLAG_CLIENT);
on_off::create(endpoint, NULL, CLUSTER_FLAG_CLIENT, ESP_MATTER_NONE_FEATURE_ID);
return endpoint;
@@ -239,8 +237,6 @@ endpoint_t *create(node_t *node, config_t *config, uint8_t flags, void *priv_dat
descriptor::create(endpoint, CLUSTER_FLAG_SERVER);
identify::create(endpoint, &(config->identify), CLUSTER_FLAG_SERVER | CLUSTER_FLAG_CLIENT);
binding::create(endpoint, &(config->binding), CLUSTER_FLAG_SERVER);
groups::create(endpoint, NULL, CLUSTER_FLAG_CLIENT);
scenes::create(endpoint, NULL, CLUSTER_FLAG_CLIENT);
on_off::create(endpoint, NULL, CLUSTER_FLAG_CLIENT, ESP_MATTER_NONE_FEATURE_ID);
level_control::create(endpoint, NULL, CLUSTER_FLAG_CLIENT, ESP_MATTER_NONE_FEATURE_ID);
@@ -266,8 +262,6 @@ endpoint_t *create(node_t *node, config_t *config, uint8_t flags, void *priv_dat
descriptor::create(endpoint, CLUSTER_FLAG_SERVER);
identify::create(endpoint, &(config->identify), CLUSTER_FLAG_SERVER | CLUSTER_FLAG_CLIENT);
binding::create(endpoint, &(config->binding), CLUSTER_FLAG_SERVER);
groups::create(endpoint, NULL, CLUSTER_FLAG_CLIENT);
scenes::create(endpoint, NULL, CLUSTER_FLAG_CLIENT);
on_off::create(endpoint, NULL, CLUSTER_FLAG_CLIENT, ESP_MATTER_NONE_FEATURE_ID);
level_control::create(endpoint, NULL, CLUSTER_FLAG_CLIENT, ESP_MATTER_NONE_FEATURE_ID);
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
groups::create(endpoint, &(config->groups), CLUSTER_FLAG_SERVER);
scenes::create(endpoint, &(config->scenes), 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());
return endpoint;
}
@@ -372,8 +364,8 @@ endpoint_t *create(node_t *node, config_t *config, uint8_t flags, void *priv_dat
descriptor::create(endpoint, CLUSTER_FLAG_SERVER);
identify::create(endpoint, &(config->identify), CLUSTER_FLAG_SERVER);
groups::create(endpoint, &(config->groups), CLUSTER_FLAG_SERVER);
scenes::create(endpoint, &(config->scenes), CLUSTER_FLAG_SERVER);
cluster::thermostat::create(endpoint, &(config->thermostat), CLUSTER_FLAG_SERVER);
time_synchronization::create(endpoint, &(config->time_synchronization), CLUSTER_FLAG_SERVER | CLUSTER_FLAG_CLIENT);
return endpoint;
}
+1 -1
View File
@@ -136,7 +136,6 @@ typedef struct config {
cluster::groups::config_t groups;
cluster::scenes::config_t scenes;
cluster::on_off::config_t on_off;
cluster::level_control::config_t level_control;
} config_t;
uint32_t get_device_type_id();
@@ -173,6 +172,7 @@ typedef struct config {
cluster::groups::config_t groups;
cluster::scenes::config_t scenes;
cluster::thermostat::config_t thermostat;
cluster::time_synchronization::config_t time_synchronization;
} config_t;
uint32_t get_device_type_id();