espressif/esp-matter
1
0
Fork 0
mirror of https://github.com/espressif/esp-matter.git synced 2026-04-27 19:13:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

components/esp-matter: Add Commissioner Control and Ecosystem Information clusters

Browse Source
This commit is contained in:
Rohit Jadhav
2024-11-19 11:54:33 +05:30
parent a3dbd43d8c
commit 86eaaedbf6
12 changed files with 211 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_matter/esp_matter_attribute.cpp
+28
View File
@@ -4846,5 +4846,33 @@ attribute_t *create_current_low_power_mode_sensitivity(cluster_t *cluster, uint8
} /* attribute */
} /* energy_preference */
namespace commissioner_control {
namespace attribute {
attribute_t *create_supported_device_categories(cluster_t *cluster, uint32_t value)
{
return esp_matter::attribute::create(cluster, CommissionerControl::Attributes::SupportedDeviceCategories::Id,
ATTRIBUTE_FLAG_NONE, esp_matter_bitmap32(value));
}
} /* attribute */
} /* commissioner_control */
namespace ecosystem_information {
namespace attribute {
attribute_t *create_device_directory(cluster_t *cluster, uint8_t *value, uint16_t length, uint16_t count)
{
return esp_matter::attribute::create(cluster, EcosystemInformation::Attributes::DeviceDirectory::Id, ATTRIBUTE_FLAG_NONVOLATILE,
esp_matter_array(value, length, count));
}
attribute_t *create_location_directory(cluster_t *cluster, uint8_t *value, uint16_t length, uint16_t count)
{
return esp_matter::attribute::create(cluster, EcosystemInformation::Attributes::LocationDirectory::Id, ATTRIBUTE_FLAG_NONVOLATILE,
esp_matter_array(value, length, count));
}
} /* attribute */
} /* ecosystem_information */
} /* cluster */
} /* esp_matter */
components/esp_matter/esp_matter_attribute.h
+13
View File
@@ -1181,5 +1181,18 @@ attribute_t *create_current_low_power_mode_sensitivity(cluster_t *cluster, uint8
} /* attribute */
} /* energy_preference */
namespace commissioner_control {
namespace attribute {
attribute_t *create_supported_device_categories(cluster_t *cluster, uint32_t value);
} /* attribute */
} /* commissioner_control */
namespace ecosystem_information {
namespace attribute {
attribute_t *create_device_directory(cluster_t *cluster, uint8_t *value, uint16_t length, uint16_t count);
attribute_t *create_location_directory(cluster_t *cluster, uint8_t *value, uint16_t length, uint16_t count);
} /* attribute */
} /* ecosystem_information */
} /* cluster */
} /* esp_matter */
components/esp_matter/esp_matter_cluster.cpp
+66
View File
@@ -3694,6 +3694,72 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags, uint32_
}
} /* energy_preference */
namespace commissioner_control {
const function_generic_t *function_list = NULL;
const int function_flags = CLUSTER_FLAG_NONE;
cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags, uint32_t features)
{
cluster_t *cluster = cluster::create(endpoint, CommissionerControl::Id, flags);
if (!cluster) {
ESP_LOGE(TAG, "Could not create cluster");
return NULL;
}
if (flags & CLUSTER_FLAG_SERVER) {
if (config -> delegate != nullptr) {
static const auto delegate_init_cb = CommissionerControlDelegateInitCB;
set_delegate_and_init_callback(cluster, delegate_init_cb, config->delegate);
}
static const auto plugin_server_init_cb = CALL_ONCE(MatterCommissionerControlPluginServerInitCallback);
set_plugin_server_init_callback(cluster, plugin_server_init_cb);
add_function_list(cluster, function_list, function_flags);
/* Attributes managed internally */
global::attribute::create_feature_map(cluster, 0);
/** Attributes not managed internally **/
global::attribute::create_cluster_revision(cluster, cluster_revision);
attribute::create_supported_device_categories(cluster, config->supported_device_categories);
}
if (flags & CLUSTER_FLAG_CLIENT) {
create_default_binding_cluster(endpoint);
}
event::create_commissioning_request_result(cluster);
return cluster;
}
} /* commissioner_control */
namespace ecosystem_information {
const function_generic_t *function_list = NULL;
const int function_flags = CLUSTER_FLAG_NONE;
cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags, uint32_t features)
{
cluster_t *cluster = cluster::create(endpoint, EcosystemInformation::Id, flags);
if (!cluster) {
ESP_LOGE(TAG, "Could not create cluster");
return NULL;
}
if (flags & CLUSTER_FLAG_SERVER) {
static const auto plugin_server_init_cb = CALL_ONCE(MatterEcosystemInformationPluginServerInitCallback);
set_plugin_server_init_callback(cluster, plugin_server_init_cb);
add_function_list(cluster, function_list, function_flags);
/* Attributes managed internally */
global::attribute::create_feature_map(cluster, 0);
attribute::create_device_directory(cluster, nullptr, 0, 0);
attribute::create_location_directory(cluster, nullptr, 0, 0);
/** Attributes not managed internally **/
global::attribute::create_cluster_revision(cluster, cluster_revision);
}
return cluster;
}
} /* ecosystem_information */
// namespace binary_input_basic {
// // ToDo
// } /* binary_input_basic */
components/esp_matter/esp_matter_cluster.h
+15
View File
@@ -941,5 +941,20 @@ typedef struct config {
cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags, uint32_t features);
} /* energy_preference */
namespace commissioner_control {
typedef struct config {
uint32_t supported_device_categories;
void *delegate;
config() : supported_device_categories(0), delegate(nullptr) {}
} config_t;
cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags);
} /* commissioner_control */
namespace ecosystem_information {
using config_t = common::config_t;
cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags);
} /* ecosystem_information */
} /* cluster */
} /* esp_matter */
components/esp_matter/esp_matter_command.cpp
+33
View File
@@ -3285,6 +3285,38 @@ command_t *create_cancel_boost(cluster_t *cluster)
} /* command */
} /* water_heater_management */
namespace commissioner_control {
namespace command {
constexpr const command_entry_t accepted_command_list[] = {
{CommissionerControl::Commands::RequestCommissioningApproval::Id, COMMAND_FLAG_ACCEPTED, NULL},
{CommissionerControl::Commands::CommissionNode::Id, COMMAND_FLAG_ACCEPTED, NULL},
};
constexpr const command_entry_t generated_command_list[] = {
{CommissionerControl::Commands::ReverseOpenCommissioningWindow::Id, COMMAND_FLAG_GENERATED, NULL},
};
command_t *create_request_commissioning_approval(cluster_t *cluster)
{
return esp_matter::command::create(cluster, CommissionerControl::Commands::RequestCommissioningApproval::Id,
COMMAND_FLAG_ACCEPTED, NULL);
}
command_t *create_commission_node(cluster_t *cluster)
{
return esp_matter::command::create(cluster, CommissionerControl::Commands::CommissionNode::Id,
COMMAND_FLAG_ACCEPTED, NULL);
}
command_t *create_reverse_open_commissioning_window(cluster_t *cluster)
{
return esp_matter::command::create(cluster, CommissionerControl::Commands::ReverseOpenCommissioningWindow::Id,
COMMAND_FLAG_ACCEPTED, NULL);
}
} /* command */
} /* commissioner_control */
} /* cluster */
} /* esp_matter */
@@ -3332,6 +3364,7 @@ constexpr const cluster_command_t cluster_command_table[] = {
{WiFiNetworkManagement::Id, GET_COMMAND_COUNT_LIST(cluster::wifi_network_management)},
{ThreadNetworkDirectory::Id, GET_COMMAND_COUNT_LIST(cluster::thread_network_directory)},
{WaterHeaterManagement::Id, GET_COMMAND_COUNT_LIST(cluster::water_heater_management)},
{CommissionerControl::Id, GET_COMMAND_COUNT_LIST(cluster::commissioner_control)},
};
#if defined(CONFIG_ESP_MATTER_ENABLE_MATTER_SERVER) && defined(CONFIG_ESP_MATTER_ENABLE_DATA_MODEL)
components/esp_matter/esp_matter_command.h
+8
View File
@@ -473,5 +473,13 @@ command_t *create_cancel_boost(cluster_t *cluster);
} /* command */
} /* water_heater_management */
namespace commissioner_control {
namespace command {
command_t *create_request_commissioning_approval(cluster_t *cluster);
command_t *create_commission_node(cluster_t *cluster);
command_t *create_reverse_open_commissioning_window(cluster_t *cluster);
} /* command */
} /* commissioner_control */
} /* cluster */
} /* esp_matter */
components/esp_matter/esp_matter_delegate_callbacks.cpp
+11
View File
@@ -40,6 +40,7 @@
#include <app/clusters/thread-border-router-management-server/thread-border-router-management-server.h>
#include <app/clusters/water-heater-management-server/water-heater-management-server.h>
#include <app/clusters/energy-preference-server/energy-preference-server.h>
#include <app/clusters/commissioner-control-server/commissioner-control-server.h>
using namespace chip::app::Clusters;
namespace esp_matter {
@@ -410,6 +411,16 @@ void EnergyPreferenceDelegateInitCB(void *delegate, uint16_t endpoint_id)
EnergyPreference::SetDelegate(energy_preference_delegate);
}
void CommissionerControlDelegateInitCB(void *delegate, uint16_t endpoint_id)
{
if(delegate == nullptr)
{
return;
}
CommissionerControl::Delegate *commissioner_control_delegate = static_cast<CommissionerControl::Delegate*>(delegate);
CommissionerControl::CommissionerControlServer::Instance().Init(*commissioner_control_delegate);
}
} // namespace delegate_cb
} // namespace cluster
components/esp_matter/esp_matter_delegate_callbacks.h
+1
View File
@@ -50,6 +50,7 @@ void ThreadBorderRouterManagementDelegateInitCB(void *delegate, uint16_t endpoin
void ServiceAreaDelegateInitCB(void *delegate, uint16_t endpoint_id);
void WaterHeaterManagementDelegateInitCB(void *delegate, uint16_t endpoint_id);
void EnergyPreferenceDelegateInitCB(void *delegate, uint16_t endpoint_id);
void CommissionerControlDelegateInitCB(void *delegate, uint16_t endpoint_id);
} // namespace delegate_cb
} // namespace cluster
components/esp_matter/esp_matter_event.cpp
+10
View File
@@ -759,5 +759,15 @@ event_t *create_boost_ended(cluster_t *cluster)
} // namespace event
} // namespace water_heater_management
namespace commissioner_control {
namespace event {
event_t *create_commissioning_request_result(cluster_t *cluster)
{
return esp_matter::event::create(cluster, CommissionerControl::Events::CommissioningRequestResult::Id);
}
} // namespace event
} // namespace commissioner_control
} // namespace cluster
} // namespace esp_matter
components/esp_matter/esp_matter_event.h
+6
View File
@@ -230,5 +230,11 @@ event_t *create_boost_ended(cluster_t *cluster);
} // namespace event
} // namespace water_heater_management
namespace commissioner_control {
namespace event {
event_t *create_commissioning_request_result(cluster_t *cluster);
} // namespace event
} // namespace commissioner_control
} // namespace cluster
} // namespace esp_matter
components/esp_matter/private/esp_matter_cluster_revisions.h
+8
View File
@@ -395,6 +395,14 @@ namespace energy_preference {
constexpr uint16_t cluster_revision = 1;
} // namespace energy_preference
namespace commissioner_control {
constexpr uint16_t cluster_revision = 1;
} // namespace commissioner_control
namespace ecosystem_information {
constexpr uint16_t cluster_revision = 1;
} // namespace ecosystem_information
} // namespace cluster
} // namespace esp_matter
docs/en/app_guide.rst
+12 -1
View File
@@ -47,6 +47,7 @@ List of clusters with delegate:
- Mode Select Cluster.
- Water Heater Management Cluster.
- Energy Preference Cluster.
- Commissioner Control Cluster.
9.1.1 Mode Base Cluster
-----------------------
@@ -227,7 +228,7 @@ ModeWaterHeater, ModeRefrigerator, ModeLaundryWasher and ModeMicrowaveOven.
`Water Heater Management`_, `Water Heater Management Delegate`_
9.1.21 Energy Preference Cluster
9.1.22 Energy Preference Cluster
--------------------------------
.. csv-table::
@@ -235,6 +236,14 @@ ModeWaterHeater, ModeRefrigerator, ModeLaundryWasher and ModeMicrowaveOven.
`Energy Preference`_, `Energy Preference Delegate`_
9.1.23 Commissioner Control Cluster
-----------------------------------
.. csv-table::
:header: "Delegate Class", "Reference Implementation"
`Commissioner Control`_, `Commissioner Control Delegate`_
.. note::
Make sure that after implementing delegate class, you set the delegate class pointer at the time of creating cluster.
@@ -293,3 +302,5 @@ ModeWaterHeater, ModeRefrigerator, ModeLaundryWasher and ModeMicrowaveOven.
.. _`Water Heater Management Delegate`: https://github.com/espressif/connectedhomeip/blob/ea679d2dc674f576f4d391d1d71af1489010e580/examples/energy-management-app/energy-management-common/water-heater/include/WhmDelegate.h
.. _`Energy Preference`: https://github.com/espressif/connectedhomeip/blob/ea679d2dc674f576f4d391d1d71af1489010e580/src/app/clusters/energy-preference-server/energy-preference-server.h
.. _`Energy Preference Delegate`: https://github.com/espressif/connectedhomeip/blob/ea679d2dc674f576f4d391d1d71af1489010e580/examples/all-clusters-app/all-clusters-common/src/energy-preference-delegate.cpp
.. _`Commissioner Control`: https://github.com/espressif/connectedhomeip/blob/ea679d2dc674f576f4d391d1d71af1489010e580/src/app/clusters/commissioner-control-server/commissioner-control-server.h
.. _`Commissioner Control Delegate`: https://github.com/espressif/connectedhomeip/blob/ea679d2dc674f576f4d391d1d71af1489010e580/examples/fabric-bridge-app/linux/include/CommissionerControl.h