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

Merge branch 'concentration-measurement-optimization' into 'main'

Browse Source 
components/esp_matter: further optimize the concentration measurement

See merge request app-frameworks/esp-matter!1249
This commit is contained in:
Hrishikesh Dhayagude
2025-09-29 13:48:34 +08:00
parent d0faa92c93 7b173696a8
commit e264ecb0f1
3 changed files with 16 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_matter/data_model/esp_matter_cluster.cpp
+12 -23
View File
@@ -1532,9 +1532,7 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags)
namespace concentration_measurement {
template <typename T>
static cluster_t *create(endpoint_t *endpoint, T *config, uint8_t flags, uint32_t cluster_id, uint32_t cluster_revision,
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 cluster_id)
{
cluster_t *cluster = cluster::create(endpoint, cluster_id, flags);
VerifyOrReturnValue(cluster, NULL, ESP_LOGE(TAG, "Could not create cluster, id: 0x%08" PRIX32, cluster_id));
@@ -1542,7 +1540,7 @@ static cluster_t *create(endpoint_t *endpoint, T *config, uint8_t flags, uint32_
if (flags & CLUSTER_FLAG_SERVER) {
VerifyOrReturnValue(config != NULL, ABORT_CLUSTER_CREATE(cluster));
add_function_list(cluster, function_list, function_flags);
add_function_list(cluster, NULL, CLUSTER_FLAG_NONE);
// For all concentration measurement cluster Attribute Id of measurement medium is 0x09
// Hence, using the hard coded value
@@ -1591,8 +1589,7 @@ namespace carbon_monoxide_concentration_measurement {
cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags)
{
return concentration_measurement::create<config_t>(endpoint, config, flags,
CarbonMonoxideConcentrationMeasurement::Id, cluster_revision);
return concentration_measurement::create(endpoint, config, flags, CarbonMonoxideConcentrationMeasurement::Id);
}
} /* carbon_monoxide_concentration_measurement */
@@ -1601,8 +1598,7 @@ namespace carbon_dioxide_concentration_measurement {
cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags)
{
return concentration_measurement::create<config_t>(endpoint, config, flags,
CarbonDioxideConcentrationMeasurement::Id, cluster_revision);
return concentration_measurement::create(endpoint, config, flags, CarbonDioxideConcentrationMeasurement::Id);
}
} /* carbon_dioxide_concentration_measurement */
@@ -1611,8 +1607,7 @@ namespace nitrogen_dioxide_concentration_measurement {
cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags)
{
return concentration_measurement::create<config_t>(endpoint, config, flags,
NitrogenDioxideConcentrationMeasurement::Id, cluster_revision);
return concentration_measurement::create(endpoint, config, flags, NitrogenDioxideConcentrationMeasurement::Id);
}
} /* nitrogen_dioxide_concentration_measurement */
@@ -1621,8 +1616,7 @@ namespace ozone_concentration_measurement {
cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags)
{
return concentration_measurement::create<config_t>(endpoint, config, flags,
OzoneConcentrationMeasurement::Id, cluster_revision);
return concentration_measurement::create(endpoint, config, flags, OzoneConcentrationMeasurement::Id);
}
} /* ozone_concentration_measurement */
@@ -1631,8 +1625,7 @@ namespace formaldehyde_concentration_measurement {
cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags)
{
return concentration_measurement::create<config_t>(endpoint, config, flags,
FormaldehydeConcentrationMeasurement::Id, cluster_revision);
return concentration_measurement::create(endpoint, config, flags, FormaldehydeConcentrationMeasurement::Id);
}
} /* formaldehyde_concentration_measurement */
@@ -1641,8 +1634,7 @@ namespace pm1_concentration_measurement {
cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags)
{
return concentration_measurement::create<config_t>(endpoint, config, flags,
Pm1ConcentrationMeasurement::Id, cluster_revision);
return concentration_measurement::create(endpoint, config, flags, Pm1ConcentrationMeasurement::Id);
}
} /* pm1_concentration_measurement */
@@ -1651,8 +1643,7 @@ namespace pm25_concentration_measurement {
cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags)
{
return concentration_measurement::create<config_t>(endpoint, config, flags,
Pm25ConcentrationMeasurement::Id, cluster_revision);
return concentration_measurement::create(endpoint, config, flags, Pm25ConcentrationMeasurement::Id);
}
} /* pm25_concentration_measurement */
@@ -1661,8 +1652,7 @@ namespace pm10_concentration_measurement {
cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags)
{
return concentration_measurement::create<config_t>(endpoint, config, flags,
Pm10ConcentrationMeasurement::Id, cluster_revision);
return concentration_measurement::create(endpoint, config, flags, Pm10ConcentrationMeasurement::Id);
}
} /* pm10_concentration_measurement */
@@ -1671,8 +1661,7 @@ namespace radon_concentration_measurement {
cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags)
{
return concentration_measurement::create<config_t>(endpoint, config, flags,
RadonConcentrationMeasurement::Id, cluster_revision);
return concentration_measurement::create(endpoint, config, flags, RadonConcentrationMeasurement::Id);
}
} /* radon_concentration_measurement */
@@ -1681,7 +1670,7 @@ namespace total_volatile_organic_compounds_concentration_measurement {
cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags)
{
return concentration_measurement::create<config_t>(endpoint, config, flags, TotalVolatileOrganicCompoundsConcentrationMeasurement::Id, cluster_revision);
return concentration_measurement::create(endpoint, config, flags, TotalVolatileOrganicCompoundsConcentrationMeasurement::Id);
}
} /* total_volatile_organic_compounds_concentration_measurement */
components/esp_matter/data_model/esp_matter_cluster.h
+2
View File
@@ -390,6 +390,8 @@ typedef struct config {
void *delegate;
config() : measurement_medium(0), feature_flags(0) {}
} config_t;
cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags, uint32_t cluster_id);
} /* concentration_measurement */
namespace carbon_monoxide_concentration_measurement {
components/esp_matter/data_model/private/esp_matter_cluster_revisions.h
+2 -38
View File
@@ -167,45 +167,9 @@ namespace activated_carbon_filter_monitoring {
constexpr uint16_t cluster_revision = 1;
} // namespace activated_carbon_filter_monitoring
namespace carbon_monoxide_concentration_measurement {
namespace concentration_measurement {
constexpr uint16_t cluster_revision = 3;
} // namespace carbon_monoxide_concentration_measurement
namespace carbon_dioxide_concentration_measurement {
constexpr uint16_t cluster_revision = 3;
} // namespace carbon_dioxide_concentration_measurement
namespace nitrogen_dioxide_concentration_measurement {
constexpr uint16_t cluster_revision = 3;
} // namespace nitrogen_dioxide_concentration_measurement
namespace ozone_concentration_measurement {
constexpr uint16_t cluster_revision = 3;
} // namespace ozone_concentration_measurement
namespace formaldehyde_concentration_measurement {
constexpr uint16_t cluster_revision = 3;
} // namespace formaldehyde_concentration_measurement
namespace pm1_concentration_measurement {
constexpr uint16_t cluster_revision = 3;
} // namespace pm1_concentration_measurement
namespace pm25_concentration_measurement {
constexpr uint16_t cluster_revision = 3;
} // namespace pm25_concentration_measurement
namespace pm10_concentration_measurement {
constexpr uint16_t cluster_revision = 3;
} // namespace pm10_concentration_measurement
namespace radon_concentration_measurement {
constexpr uint16_t cluster_revision = 3;
} // namespace radon_concentration_measurement
namespace total_volatile_organic_compounds_concentration_measurement {
constexpr uint16_t cluster_revision = 3;
} // namespace total_volatile_organic_compounds_concentration_measurement
} // namespace concentration_measurement
namespace operational_state {
constexpr uint16_t cluster_revision = 2;