From 9fc9be398ebc7458778d87c2532b3209cd6bf89a Mon Sep 17 00:00:00 2001 From: mahesh Date: Fri, 21 Nov 2025 12:50:55 +0530 Subject: [PATCH] components/esp_matter: remove api name inconsistencies, update release notes --- RELEASE_NOTES.md | 102 ++++++++++++++++++ .../data_model/esp_matter_attribute.cpp | 70 ++++++------ .../data_model/esp_matter_attribute.h | 68 ++++++------ .../data_model/esp_matter_cluster.cpp | 38 +++---- .../data_model/esp_matter_cluster.h | 28 ++--- .../data_model/esp_matter_feature.cpp | 16 +-- .../data_model/esp_matter_feature.h | 14 +-- 7 files changed, 219 insertions(+), 117 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index af98ef2d3..7fba49205 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,105 @@ +## 21-Nov-2025 +### API Changes: Attribute Creation Function Names + +The following attribute creation APIs have been renamed to remove inconsistencies and align with Matter specifications: + +#### Descriptor Cluster +``` +create_device_list() → create_device_type_list() +``` + +#### Thread Network Diagnostics Cluster +``` +create_active_network_faults() → create_active_network_faults_list() +``` + +#### Ethernet Network Diagnostics Cluster +``` +create_tx_error_count() → create_tx_err_count() +``` + +#### Groups Cluster +``` +create_group_name_support() → create_name_support() +``` + +#### Thermostat Cluster +``` +create_schedule_type() → create_schedule_types() +``` + +#### Door Lock Cluster +``` +create_door_close_events() → create_door_closed_events() +``` + +#### Temperature Measurement Cluster +Removed `temperature_` prefix from attribute names: +``` +create_temperature_measured_value() → create_measured_value() +create_temperature_min_measured_value() → create_min_measured_value() +create_temperature_max_measured_value() → create_max_measured_value() +``` + +#### Relative Humidity Measurement Cluster +Removed `relative_humidity_` prefix from attribute names: +``` +create_relative_humidity_measured_value() → create_measured_value() +create_relative_humidity_min_measured_value() → create_min_measured_value() +create_relative_humidity_max_measured_value() → create_max_measured_value() +create_relative_humidity_tolerance() → create_tolerance() +``` + +#### Illuminance Measurement Cluster +Removed `illuminance_` prefix from attribute names: +``` +create_illuminance_measured_value() → create_measured_value() +create_illuminance_min_measured_value() → create_min_measured_value() +create_illuminance_max_measured_value() → create_max_measured_value() +create_illuminance_tolerance() → create_tolerance() +create_illuminance_light_sensor_type() → create_light_sensor_type() +``` + +#### Pressure Measurement Cluster +Removed `pressure_` prefix from attribute names: +``` +create_pressure_measured_value() → create_measured_value() +create_pressure_min_measured_value() → create_min_measured_value() +create_pressure_max_measured_value() → create_max_measured_value() +create_pressure_tolerance() → create_tolerance() +create_pressure_scaled_value() → create_scaled_value() +create_pressure_min_scaled_value() → create_min_scaled_value() +create_pressure_max_scaled_value() → create_max_scaled_value() +create_pressure_scaled_tolerance() → create_scaled_tolerance() +create_pressure_scale() → create_scale() +``` + +#### Flow Measurement Cluster +Removed `flow_` prefix from attribute names: +``` +create_flow_measured_value() → create_measured_value() +create_flow_min_measured_value() → create_min_measured_value() +create_flow_max_measured_value() → create_max_measured_value() +create_flow_tolerance() → create_tolerance() +``` + +#### Pump Configuration and Control Cluster +``` +create_pump_power() → create_power() +``` + +#### Mode Select Cluster +``` +create_mode_select_description() → create_description() +``` + +### Namespace Changes + +#### Thread Network Diagnostics Cluster +``` +feature::packets_counts → feature::packet_counts +``` + ## 31-Oct-2025 ### API Changes: `feature::add()` Function The following APIs have been updated — the config parameter has been removed, as the corresponding attributes are optional. diff --git a/components/esp_matter/data_model/esp_matter_attribute.cpp b/components/esp_matter/data_model/esp_matter_attribute.cpp index 7a00ce543..019ec3c55 100644 --- a/components/esp_matter/data_model/esp_matter_attribute.cpp +++ b/components/esp_matter/data_model/esp_matter_attribute.cpp @@ -46,7 +46,7 @@ attribute_t *create_feature_map(cluster_t *cluster, uint32_t value) namespace descriptor { namespace attribute { -attribute_t *create_device_list(cluster_t *cluster, uint8_t *value, uint16_t length, uint16_t count) +attribute_t *create_device_type_list(cluster_t *cluster, uint8_t *value, uint16_t length, uint16_t count) { return esp_matter::attribute::create(cluster, Descriptor::Attributes::DeviceTypeList::Id, ATTRIBUTE_FLAG_MANAGED_INTERNALLY, esp_matter_array(value, length, count)); @@ -940,7 +940,7 @@ attribute_t *create_operational_dataset_components(cluster_t *cluster, uint8_t * ATTRIBUTE_FLAG_MANAGED_INTERNALLY | ATTRIBUTE_FLAG_NULLABLE, esp_matter_array(value, length, count)); } -attribute_t *create_active_network_faults(cluster_t *cluster, uint8_t *value, uint16_t length, uint16_t count) +attribute_t *create_active_network_faults_list(cluster_t *cluster, uint8_t *value, uint16_t length, uint16_t count) { return esp_matter::attribute::create(cluster, ThreadNetworkDiagnostics::Attributes::ActiveNetworkFaultsList::Id, ATTRIBUTE_FLAG_MANAGED_INTERNALLY | ATTRIBUTE_FLAG_NULLABLE, esp_matter_array(value, length, count)); @@ -1274,7 +1274,7 @@ attribute_t *create_packet_tx_count(cluster_t *cluster, uint64_t value) ATTRIBUTE_FLAG_MANAGED_INTERNALLY, esp_matter_uint64(value)); } -attribute_t *create_tx_error_count(cluster_t *cluster, uint64_t value) +attribute_t *create_tx_err_count(cluster_t *cluster, uint64_t value) { return esp_matter::attribute::create(cluster, EthernetNetworkDiagnostics::Attributes::TxErrCount::Id, ATTRIBUTE_FLAG_MANAGED_INTERNALLY, esp_matter_uint64(value)); @@ -1469,7 +1469,7 @@ attribute_t *create_identify_type(cluster_t *cluster, uint8_t value) namespace groups { namespace attribute { -attribute_t *create_group_name_support(cluster_t *cluster, uint8_t value) +attribute_t *create_name_support(cluster_t *cluster, uint8_t value) { return esp_matter::attribute::create(cluster, Groups::Attributes::NameSupport::Id, ATTRIBUTE_FLAG_NONE, esp_matter_bitmap8(value)); @@ -2259,7 +2259,7 @@ attribute_t *create_preset_types(cluster_t *cluster, uint8_t * value, uint16_t l esp_matter_array(value, length, count)); } -attribute_t *create_schedule_type(cluster_t *cluster, uint8_t * value, uint16_t length, uint16_t count) +attribute_t *create_schedule_types(cluster_t *cluster, uint8_t * value, uint16_t length, uint16_t count) { return esp_matter::attribute::create(cluster, Thermostat::Attributes::ScheduleTypes::Id, ATTRIBUTE_FLAG_MANAGED_INTERNALLY, esp_matter_array(value, length, count)); @@ -2686,7 +2686,7 @@ attribute_t *create_door_open_events(cluster_t *cluster, uint32_t value) esp_matter_uint32(value)); } -attribute_t *create_door_close_events(cluster_t *cluster, uint32_t value) +attribute_t *create_door_closed_events(cluster_t *cluster, uint32_t value) { return esp_matter::attribute::create(cluster, DoorLock::Attributes::DoorClosedEvents::Id, ATTRIBUTE_FLAG_WRITABLE, esp_matter_uint32(value)); @@ -3130,19 +3130,19 @@ attribute_t *create_multi_press_max(cluster_t *cluster, uint8_t value) namespace temperature_measurement { namespace attribute { -attribute_t *create_temperature_measured_value(cluster_t *cluster, nullable value) +attribute_t *create_measured_value(cluster_t *cluster, nullable value) { return esp_matter::attribute::create(cluster, TemperatureMeasurement::Attributes::MeasuredValue::Id, ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_int16(value)); } -attribute_t *create_temperature_min_measured_value(cluster_t *cluster, nullable value) +attribute_t *create_min_measured_value(cluster_t *cluster, nullable value) { return esp_matter::attribute::create(cluster, TemperatureMeasurement::Attributes::MinMeasuredValue::Id, ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_int16(value)); } -attribute_t *create_temperature_max_measured_value(cluster_t *cluster, nullable value) +attribute_t *create_max_measured_value(cluster_t *cluster, nullable value) { return esp_matter::attribute::create(cluster, TemperatureMeasurement::Attributes::MaxMeasuredValue::Id, ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_int16(value)); @@ -3154,25 +3154,25 @@ attribute_t *create_temperature_max_measured_value(cluster_t *cluster, nullable< namespace relative_humidity_measurement { namespace attribute { -attribute_t *create_relative_humidity_measured_value(cluster_t *cluster, nullable value) +attribute_t *create_measured_value(cluster_t *cluster, nullable value) { return esp_matter::attribute::create(cluster, RelativeHumidityMeasurement::Attributes::MeasuredValue::Id, ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint16(value)); } -attribute_t *create_relative_humidity_min_measured_value(cluster_t *cluster, nullable value) +attribute_t *create_min_measured_value(cluster_t *cluster, nullable value) { return esp_matter::attribute::create(cluster, RelativeHumidityMeasurement::Attributes::MinMeasuredValue::Id, ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint16(value)); } -attribute_t *create_relative_humidity_max_measured_value(cluster_t *cluster, nullable value) +attribute_t *create_max_measured_value(cluster_t *cluster, nullable value) { return esp_matter::attribute::create(cluster, RelativeHumidityMeasurement::Attributes::MaxMeasuredValue::Id, ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint16(value)); } -attribute_t *create_relative_humidity_tolerance(cluster_t *cluster, nullable value) +attribute_t *create_tolerance(cluster_t *cluster, nullable value) { return esp_matter::attribute::create(cluster, RelativeHumidityMeasurement::Attributes::Tolerance::Id, ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint16(value)); @@ -3404,7 +3404,7 @@ attribute_t *create_supported_calendar_types(cluster_t *cluster, uint8_t *value, namespace illuminance_measurement { namespace attribute { -attribute_t *create_illuminance_measured_value(cluster_t *cluster, nullable value, nullable min, nullable max) +attribute_t *create_measured_value(cluster_t *cluster, nullable value, nullable min, nullable max) { attribute_t *attribute = esp_matter::attribute::create(cluster, IlluminanceMeasurement::Attributes::MeasuredValue::Id, ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint16(value)); VerifyOrReturnValue(attribute, NULL, ESP_LOGE(TAG, "Could not create attribute. cluster_id: 0x%08" PRIX32 "'s attribute_id: 0x%08" PRIX32 , cluster::get_id(cluster), IlluminanceMeasurement::Attributes::MeasuredValue::Id)); @@ -3412,7 +3412,7 @@ attribute_t *create_illuminance_measured_value(cluster_t *cluster, nullable value, nullable min, nullable max) +attribute_t *create_min_measured_value(cluster_t *cluster, nullable value, nullable min, nullable max) { attribute_t *attribute = esp_matter::attribute::create(cluster, IlluminanceMeasurement::Attributes::MinMeasuredValue::Id, ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint16(value)); VerifyOrReturnValue(attribute, NULL, ESP_LOGE(TAG, "Could not create attribute. cluster_id: 0x%08" PRIX32 "'s attribute_id: 0x%08" PRIX32 , cluster::get_id(cluster), IlluminanceMeasurement::Attributes::MinMeasuredValue::Id)); @@ -3420,7 +3420,7 @@ attribute_t *create_illuminance_min_measured_value(cluster_t *cluster, nullable< return attribute; } -attribute_t *create_illuminance_max_measured_value(cluster_t *cluster, nullable value, nullable min, nullable max) +attribute_t *create_max_measured_value(cluster_t *cluster, nullable value, nullable min, nullable max) { attribute_t *attribute = esp_matter::attribute::create(cluster, IlluminanceMeasurement::Attributes::MaxMeasuredValue::Id, ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint16(value)); VerifyOrReturnValue(attribute, NULL, ESP_LOGE(TAG, "Could not create attribute. cluster_id: 0x%08" PRIX32 "'s attribute_id: 0x%08" PRIX32 , cluster::get_id(cluster), IlluminanceMeasurement::Attributes::MaxMeasuredValue::Id)); @@ -3428,7 +3428,7 @@ attribute_t *create_illuminance_max_measured_value(cluster_t *cluster, nullable< return attribute; } -attribute_t *create_illuminance_tolerance(cluster_t *cluster, uint16_t value, uint16_t min, uint16_t max) +attribute_t *create_tolerance(cluster_t *cluster, uint16_t value, uint16_t min, uint16_t max) { attribute_t *attribute = esp_matter::attribute::create(cluster, IlluminanceMeasurement::Attributes::Tolerance::Id, ATTRIBUTE_FLAG_NONE, esp_matter_uint16(value)); VerifyOrReturnValue(attribute, NULL, ESP_LOGE(TAG, "Could not create attribute. cluster_id: 0x%08" PRIX32 "'s attribute_id: 0x%08" PRIX32 , cluster::get_id(cluster), IlluminanceMeasurement::Attributes::Tolerance::Id)); @@ -3436,7 +3436,7 @@ attribute_t *create_illuminance_tolerance(cluster_t *cluster, uint16_t value, ui return attribute; } -attribute_t *create_illuminance_light_sensor_type(cluster_t *cluster, nullable value, nullable min, nullable max) +attribute_t *create_light_sensor_type(cluster_t *cluster, nullable value, nullable min, nullable max) { attribute_t *attribute = esp_matter::attribute::create(cluster, IlluminanceMeasurement::Attributes::LightSensorType::Id, ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_enum8(value)); VerifyOrReturnValue(attribute, NULL, ESP_LOGE(TAG, "Could not create attribute. cluster_id: 0x%08" PRIX32 "'s attribute_id: 0x%08" PRIX32 , cluster::get_id(cluster), IlluminanceMeasurement::Attributes::LightSensorType::Id)); @@ -3450,22 +3450,22 @@ attribute_t *create_illuminance_light_sensor_type(cluster_t *cluster, nullable value) +attribute_t *create_measured_value(cluster_t *cluster, nullable value) { return esp_matter::attribute::create(cluster, PressureMeasurement::Attributes::MeasuredValue::Id, ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_int16(value)); } -attribute_t *create_pressure_min_measured_value(cluster_t *cluster, nullable value) +attribute_t *create_min_measured_value(cluster_t *cluster, nullable value) { return esp_matter::attribute::create(cluster, PressureMeasurement::Attributes::MinMeasuredValue::Id, ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_int16(value)); } -attribute_t *create_pressure_max_measured_value(cluster_t *cluster, nullable value) +attribute_t *create_max_measured_value(cluster_t *cluster, nullable value) { return esp_matter::attribute::create(cluster, PressureMeasurement::Attributes::MaxMeasuredValue::Id, ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_int16(value)); } -attribute_t *create_pressure_tolerance(cluster_t *cluster, uint16_t value, uint16_t min, uint16_t max) +attribute_t *create_tolerance(cluster_t *cluster, uint16_t value, uint16_t min, uint16_t max) { attribute_t *attribute = esp_matter::attribute::create(cluster, PressureMeasurement::Attributes::Tolerance::Id, ATTRIBUTE_FLAG_NONE, esp_matter_uint16(value)); VerifyOrReturnValue(attribute, NULL, ESP_LOGE(TAG, "Could not create attribute. cluster_id: 0x%08" PRIX32 "'s attribute_id: 0x%08" PRIX32 , cluster::get_id(cluster), PressureMeasurement::Attributes::Tolerance::Id)); @@ -3473,22 +3473,22 @@ attribute_t *create_pressure_tolerance(cluster_t *cluster, uint16_t value, uint1 return attribute; } -attribute_t *create_pressure_scaled_value(cluster_t *cluster, nullable value) +attribute_t *create_scaled_value(cluster_t *cluster, nullable value) { return esp_matter::attribute::create(cluster, PressureMeasurement::Attributes::ScaledValue::Id, ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_int16(value)); } -attribute_t *create_pressure_min_scaled_value(cluster_t *cluster, nullable value) +attribute_t *create_min_scaled_value(cluster_t *cluster, nullable value) { return esp_matter::attribute::create(cluster, PressureMeasurement::Attributes::MinScaledValue::Id, ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_int16(value)); } -attribute_t *create_pressure_max_scaled_value(cluster_t *cluster, nullable value) +attribute_t *create_max_scaled_value(cluster_t *cluster, nullable value) { return esp_matter::attribute::create(cluster, PressureMeasurement::Attributes::MaxScaledValue::Id, ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_int16(value)); } -attribute_t *create_pressure_scaled_tolerance(cluster_t *cluster, uint16_t value, uint16_t min, uint16_t max) +attribute_t *create_scaled_tolerance(cluster_t *cluster, uint16_t value, uint16_t min, uint16_t max) { attribute_t *attribute = esp_matter::attribute::create(cluster, PressureMeasurement::Attributes::ScaledTolerance::Id, ATTRIBUTE_FLAG_NONE, esp_matter_uint16(value)); VerifyOrReturnValue(attribute, NULL, ESP_LOGE(TAG, "Could not create attribute. cluster_id: 0x%08" PRIX32 "'s attribute_id: 0x%08" PRIX32 , cluster::get_id(cluster), PressureMeasurement::Attributes::ScaledTolerance::Id)); @@ -3496,7 +3496,7 @@ attribute_t *create_pressure_scaled_tolerance(cluster_t *cluster, uint16_t value return attribute; } -attribute_t *create_pressure_scale(cluster_t *cluster, int8_t value) +attribute_t *create_scale(cluster_t *cluster, int8_t value) { return esp_matter::attribute::create(cluster, PressureMeasurement::Attributes::Scale::Id, ATTRIBUTE_FLAG_NONE, esp_matter_int8(value)); } @@ -3507,22 +3507,22 @@ attribute_t *create_pressure_scale(cluster_t *cluster, int8_t value) namespace flow_measurement { namespace attribute { -attribute_t *create_flow_measured_value(cluster_t *cluster, nullable value) +attribute_t *create_measured_value(cluster_t *cluster, nullable value) { return esp_matter::attribute::create(cluster, FlowMeasurement::Attributes::MeasuredValue::Id, ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint16(value)); } -attribute_t *create_flow_min_measured_value(cluster_t *cluster, nullable value) +attribute_t *create_min_measured_value(cluster_t *cluster, nullable value) { return esp_matter::attribute::create(cluster, FlowMeasurement::Attributes::MinMeasuredValue::Id, ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint16(value)); } -attribute_t *create_flow_max_measured_value(cluster_t *cluster, nullable value) +attribute_t *create_max_measured_value(cluster_t *cluster, nullable value) { return esp_matter::attribute::create(cluster, FlowMeasurement::Attributes::MaxMeasuredValue::Id, ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint16(value)); } -attribute_t *create_flow_tolerance(cluster_t *cluster, uint16_t value, uint16_t min, uint16_t max) +attribute_t *create_tolerance(cluster_t *cluster, uint16_t value, uint16_t min, uint16_t max) { attribute_t *attribute = esp_matter::attribute::create(cluster, FlowMeasurement::Attributes::Tolerance::Id, ATTRIBUTE_FLAG_NONE, esp_matter_uint16(value)); VerifyOrReturnValue(attribute, NULL, ESP_LOGE(TAG, "Could not create attribute. cluster_id: 0x%08" PRIX32 "'s attribute_id: 0x%08" PRIX32 , cluster::get_id(cluster), FlowMeasurement::Attributes::Tolerance::Id)); @@ -3630,7 +3630,7 @@ attribute_t *create_lifetime_running_hours(cluster_t *cluster, nullable value) +attribute_t *create_power(cluster_t *cluster, nullable value) { return esp_matter::attribute::create(cluster, PumpConfigurationAndControl::Attributes::Power::Id, ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint32(value)); } @@ -3655,12 +3655,12 @@ attribute_t *create_control_mode(cluster_t *cluster, uint8_t value) namespace mode_select { namespace attribute { -attribute_t *create_mode_select_description(cluster_t *cluster, const char * value, uint16_t length) +attribute_t *create_description(cluster_t *cluster, const char * value, uint16_t length) { - VerifyOrReturnValue(length <= k_max_mode_select_description_length, NULL, ESP_LOGE(TAG, "Could not create attribute, string length out of bound")); + VerifyOrReturnValue(length <= k_max_description_length, NULL, ESP_LOGE(TAG, "Could not create attribute, string length out of bound")); return esp_matter::attribute::create(cluster, ModeSelect::Attributes::Description::Id, ATTRIBUTE_FLAG_NONE, esp_matter_char_str((char *)value, length), - k_max_mode_select_description_length); + k_max_description_length); } attribute_t *create_standard_namespace(cluster_t *cluster, const nullable value) diff --git a/components/esp_matter/data_model/esp_matter_attribute.h b/components/esp_matter/data_model/esp_matter_attribute.h index 93bc44718..2bca95261 100644 --- a/components/esp_matter/data_model/esp_matter_attribute.h +++ b/components/esp_matter/data_model/esp_matter_attribute.h @@ -34,7 +34,7 @@ attribute_t *create_feature_map(cluster_t *cluster, uint32_t value); namespace descriptor { namespace attribute { -attribute_t *create_device_list(cluster_t *cluster, uint8_t *value, uint16_t length, uint16_t count); +attribute_t *create_device_type_list(cluster_t *cluster, uint8_t *value, uint16_t length, uint16_t count); attribute_t *create_server_list(cluster_t *cluster, uint8_t *value, uint16_t length, uint16_t count); attribute_t *create_client_list(cluster_t *cluster, uint8_t *value, uint16_t length, uint16_t count); attribute_t *create_parts_list(cluster_t *cluster, uint8_t *value, uint16_t length, uint16_t count); @@ -257,7 +257,7 @@ attribute_t *create_leader_router_id(cluster_t *cluster, nullable value attribute_t *create_security_policy(cluster_t *cluster, uint8_t *value, uint16_t length, uint16_t count); attribute_t *create_channel_page0_mask(cluster_t *cluster, uint8_t *value, uint16_t length); attribute_t *create_operational_dataset_components(cluster_t *cluster, uint8_t *value, uint16_t length, uint16_t count); -attribute_t *create_active_network_faults(cluster_t *cluster, uint8_t *value, uint16_t length, uint16_t count); +attribute_t *create_active_network_faults_list(cluster_t *cluster, uint8_t *value, uint16_t length, uint16_t count); attribute_t *create_ext_address(cluster_t *cluster, nullable value); attribute_t *create_rloc16(cluster_t *cluster, nullable value); attribute_t *create_overrun_count(cluster_t *cluster, uint64_t value); @@ -315,7 +315,7 @@ attribute_t *create_phy_rate(cluster_t *cluster, nullable value); attribute_t *create_full_duplex(cluster_t *cluster, nullable value); attribute_t *create_packet_rx_count(cluster_t *cluster, uint64_t value); attribute_t *create_packet_tx_count(cluster_t *cluster, uint64_t value); -attribute_t *create_tx_error_count(cluster_t *cluster, uint64_t value); +attribute_t *create_tx_err_count(cluster_t *cluster, uint64_t value); attribute_t *create_collision_count(cluster_t *cluster, uint64_t value); attribute_t *create_overrun_count(cluster_t *cluster, uint64_t value); attribute_t *create_carrier_detect(cluster_t *cluster, nullable value); @@ -384,7 +384,7 @@ attribute_t *create_identify_type(cluster_t *cluster, uint8_t value); namespace groups { namespace attribute { -attribute_t *create_group_name_support(cluster_t *cluster, uint8_t value); +attribute_t *create_name_support(cluster_t *cluster, uint8_t value); } /* attribute */ } /* groups */ @@ -528,7 +528,7 @@ attribute_t *create_ac_louver_position(cluster_t *cluster, uint8_t value); attribute_t *create_ac_coil_temperature(cluster_t *cluster, nullable value); attribute_t *create_ac_capacity_format(cluster_t *cluster, uint8_t value); attribute_t *create_preset_types(cluster_t *cluster, uint8_t * value, uint16_t length, uint16_t count); -attribute_t *create_schedule_type(cluster_t *cluster, uint8_t * value, uint16_t length, uint16_t count); +attribute_t *create_schedule_types(cluster_t *cluster, uint8_t * value, uint16_t length, uint16_t count); attribute_t *create_number_of_presets(cluster_t *cluster, uint8_t value); attribute_t *create_number_of_schedules(cluster_t *cluster, uint8_t value); attribute_t *create_number_of_schedule_transitions(cluster_t *cluster, uint8_t value); @@ -655,7 +655,7 @@ attribute_t *create_lock_type(cluster_t *cluster, uint8_t value); attribute_t *create_actuator_enabled(cluster_t *cluster, bool value); attribute_t *create_door_state(cluster_t *cluster, nullable value); attribute_t *create_door_open_events(cluster_t *cluster, uint32_t value); -attribute_t *create_door_close_events(cluster_t *cluster, uint32_t value); +attribute_t *create_door_closed_events(cluster_t *cluster, uint32_t value); attribute_t *create_open_period(cluster_t *cluster, uint16_t value); attribute_t *create_number_of_total_users_supported(cluster_t *cluster, const uint16_t value); attribute_t *create_number_of_pin_users_supported(cluster_t *cluster, const uint16_t value); @@ -769,18 +769,18 @@ attribute_t *create_multi_press_max(cluster_t *cluster, uint8_t value); namespace temperature_measurement { namespace attribute { -attribute_t *create_temperature_measured_value(cluster_t *cluster, nullable value); -attribute_t *create_temperature_min_measured_value(cluster_t *cluster, nullable value); -attribute_t *create_temperature_max_measured_value(cluster_t *cluster, nullable value); +attribute_t *create_measured_value(cluster_t *cluster, nullable value); +attribute_t *create_min_measured_value(cluster_t *cluster, nullable value); +attribute_t *create_max_measured_value(cluster_t *cluster, nullable value); } /* attribute */ } /* temperature_measurement */ namespace relative_humidity_measurement { namespace attribute { -attribute_t *create_relative_humidity_measured_value(cluster_t *cluster, nullable value); -attribute_t *create_relative_humidity_min_measured_value(cluster_t *cluster, nullable value); -attribute_t *create_relative_humidity_max_measured_value(cluster_t *cluster, nullable value); -attribute_t *create_relative_humidity_tolerance(cluster_t *cluster, nullable value); +attribute_t *create_measured_value(cluster_t *cluster, nullable value); +attribute_t *create_min_measured_value(cluster_t *cluster, nullable value); +attribute_t *create_max_measured_value(cluster_t *cluster, nullable value); +attribute_t *create_tolerance(cluster_t *cluster, nullable value); } /* attribute */ } /* relative_humidity_measurement */ @@ -851,36 +851,36 @@ attribute_t *create_supported_calendar_types(cluster_t *cluster, uint8_t *value, // Note: Attribute name for the below cluster deviates from Matter spec namespace illuminance_measurement { namespace attribute { -attribute_t *create_illuminance_measured_value(cluster_t *cluster, nullable value, nullable min, nullable max); -attribute_t *create_illuminance_min_measured_value(cluster_t *cluster, nullable value, nullable min, nullable max); -attribute_t *create_illuminance_max_measured_value(cluster_t *cluster, nullable value, nullable min, nullable max); -attribute_t *create_illuminance_tolerance(cluster_t *cluster, uint16_t value, uint16_t min, uint16_t max); -attribute_t *create_illuminance_light_sensor_type(cluster_t *cluster, nullable value, nullable min, nullable max); +attribute_t *create_measured_value(cluster_t *cluster, nullable value, nullable min, nullable max); +attribute_t *create_min_measured_value(cluster_t *cluster, nullable value, nullable min, nullable max); +attribute_t *create_max_measured_value(cluster_t *cluster, nullable value, nullable min, nullable max); +attribute_t *create_tolerance(cluster_t *cluster, uint16_t value, uint16_t min, uint16_t max); +attribute_t *create_light_sensor_type(cluster_t *cluster, nullable value, nullable min, nullable max); } /* attribute */ } /* illuminance_measurement */ // Note: Attribute name for the below cluster deviates from Matter spec namespace pressure_measurement { namespace attribute { -attribute_t *create_pressure_measured_value(cluster_t *cluster, nullable value); -attribute_t *create_pressure_min_measured_value(cluster_t *cluster, nullable value); -attribute_t *create_pressure_max_measured_value(cluster_t *cluster, nullable value); -attribute_t *create_pressure_tolerance(cluster_t *cluster, uint16_t value, uint16_t min, uint16_t max); -attribute_t *create_pressure_scaled_value(cluster_t *cluster, nullable value); -attribute_t *create_pressure_min_scaled_value(cluster_t *cluster, nullable value); -attribute_t *create_pressure_max_scaled_value(cluster_t *cluster, nullable value); -attribute_t *create_pressure_scaled_tolerance(cluster_t *cluster, uint16_t value, uint16_t min, uint16_t max); -attribute_t *create_pressure_scale(cluster_t *cluster, int8_t value); +attribute_t *create_measured_value(cluster_t *cluster, nullable value); +attribute_t *create_min_measured_value(cluster_t *cluster, nullable value); +attribute_t *create_max_measured_value(cluster_t *cluster, nullable value); +attribute_t *create_tolerance(cluster_t *cluster, uint16_t value, uint16_t min, uint16_t max); +attribute_t *create_scaled_value(cluster_t *cluster, nullable value); +attribute_t *create_min_scaled_value(cluster_t *cluster, nullable value); +attribute_t *create_max_scaled_value(cluster_t *cluster, nullable value); +attribute_t *create_scaled_tolerance(cluster_t *cluster, uint16_t value, uint16_t min, uint16_t max); +attribute_t *create_scale(cluster_t *cluster, int8_t value); } /* attribute */ } /* pressure_measurement */ // Note: Attribute name for the below cluster deviates from Matter spec namespace flow_measurement { namespace attribute { -attribute_t *create_flow_measured_value(cluster_t *cluster, nullable value); -attribute_t *create_flow_min_measured_value(cluster_t *cluster, nullable value); -attribute_t *create_flow_max_measured_value(cluster_t *cluster, nullable value); -attribute_t *create_flow_tolerance(cluster_t *cluster, uint16_t value, uint16_t min, uint16_t max); +attribute_t *create_measured_value(cluster_t *cluster, nullable value); +attribute_t *create_min_measured_value(cluster_t *cluster, nullable value); +attribute_t *create_max_measured_value(cluster_t *cluster, nullable value); +attribute_t *create_tolerance(cluster_t *cluster, uint16_t value, uint16_t min, uint16_t max); } /* attribute */ } /* flow_measurement */ @@ -905,7 +905,7 @@ attribute_t *create_effective_control_mode(cluster_t *cluster, uint8_t value); attribute_t *create_capacity(cluster_t *cluster, nullable value); attribute_t *create_speed(cluster_t *cluster, nullable value); attribute_t *create_lifetime_running_hours(cluster_t *cluster, nullable value); -attribute_t *create_pump_power(cluster_t *cluster, nullable value); +attribute_t *create_power(cluster_t *cluster, nullable value); attribute_t *create_lifetime_energy_consumed(cluster_t *cluster, nullable value); attribute_t *create_operation_mode(cluster_t *cluster, uint8_t value); attribute_t *create_control_mode(cluster_t *cluster, uint8_t value); @@ -913,10 +913,10 @@ attribute_t *create_control_mode(cluster_t *cluster, uint8_t value); } /* pump_configuration_and_control */ namespace mode_select { -constexpr uint8_t k_max_mode_select_description_length = 64; +constexpr uint8_t k_max_description_length = 64; namespace attribute { -attribute_t *create_mode_select_description(cluster_t *cluster, const char * value, uint16_t length); +attribute_t *create_description(cluster_t *cluster, const char * value, uint16_t length); attribute_t *create_standard_namespace(cluster_t *cluster, const nullable value); attribute_t *create_supported_modes(cluster_t *cluster, const uint8_t * value, uint16_t length, uint16_t count); attribute_t *create_current_mode(cluster_t *cluster, uint8_t value); diff --git a/components/esp_matter/data_model/esp_matter_cluster.cpp b/components/esp_matter/data_model/esp_matter_cluster.cpp index 11fe1c9b5..0219d4860 100644 --- a/components/esp_matter/data_model/esp_matter_cluster.cpp +++ b/components/esp_matter/data_model/esp_matter_cluster.cpp @@ -199,7 +199,7 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags) add_function_list(cluster, function_list, function_flags); /* Attributes managed internally */ - attribute::create_device_list(cluster, NULL, 0, 0); + attribute::create_device_type_list(cluster, NULL, 0, 0); attribute::create_server_list(cluster, NULL, 0, 0); attribute::create_client_list(cluster, NULL, 0, 0); attribute::create_parts_list(cluster, NULL, 0, 0); @@ -767,7 +767,7 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags) attribute::create_security_policy(cluster, NULL, 0, 0); attribute::create_channel_page0_mask(cluster, NULL, 0); attribute::create_operational_dataset_components(cluster, NULL, 0, 0); - attribute::create_active_network_faults(cluster, NULL, 0, 0); + attribute::create_active_network_faults_list(cluster, NULL, 0, 0); /* Attributes not managed internally */ global::attribute::create_cluster_revision(cluster, cluster_revision); @@ -1086,7 +1086,7 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags) /* Attributes not managed internally */ global::attribute::create_cluster_revision(cluster, cluster_revision); if (config) { - attribute::create_group_name_support(cluster, chip::to_underlying(Groups::NameSupportBitmap::kGroupNames)); + attribute::create_name_support(cluster, chip::to_underlying(Groups::NameSupportBitmap::kGroupNames)); } else { ESP_LOGE(TAG, "Config is NULL. Cannot add some attributes."); } @@ -2167,9 +2167,9 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags) /* Attributes not managed internally */ global::attribute::create_cluster_revision(cluster, cluster_revision); if (config) { - attribute::create_temperature_measured_value(cluster, config->measured_value); - attribute::create_temperature_min_measured_value(cluster, config->min_measured_value); - attribute::create_temperature_max_measured_value(cluster, config->max_measured_value); + attribute::create_measured_value(cluster, config->measured_value); + attribute::create_min_measured_value(cluster, config->min_measured_value); + attribute::create_max_measured_value(cluster, config->max_measured_value); } else { ESP_LOGE(TAG, "Config is NULL. Cannot add some attributes."); } @@ -2203,9 +2203,9 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags) /* Attributes not managed internally */ global::attribute::create_cluster_revision(cluster, cluster_revision); if (config) { - attribute::create_relative_humidity_measured_value(cluster, config->measured_value); - attribute::create_relative_humidity_min_measured_value(cluster, config->min_measured_value); - attribute::create_relative_humidity_max_measured_value(cluster, config->max_measured_value); + attribute::create_measured_value(cluster, config->measured_value); + attribute::create_min_measured_value(cluster, config->min_measured_value); + attribute::create_max_measured_value(cluster, config->max_measured_value); } else { ESP_LOGE(TAG, "Config is NULL. Cannot add some attributes."); } @@ -2444,10 +2444,10 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags) /** Attributes not managed internally **/ global::attribute::create_cluster_revision(cluster, cluster_revision); if (config) { - attribute::create_illuminance_measured_value(cluster, config->illuminance_measured_value, 0x0000, 0xFFFF); - attribute::create_illuminance_min_measured_value(cluster, config->illuminance_min_measured_value, 0x0001, + attribute::create_measured_value(cluster, config->measured_value, 0x0000, 0xFFFF); + attribute::create_min_measured_value(cluster, config->min_measured_value, 0x0001, 0xFFFD); - attribute::create_illuminance_max_measured_value(cluster, config->illuminance_max_measured_value, 0x0002, + attribute::create_max_measured_value(cluster, config->max_measured_value, 0x0002, 0xFFFE); } else { ESP_LOGE(TAG, "Config is NULL. Cannot add some attributes."); @@ -2481,9 +2481,9 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags) /** Attributes not managed internally **/ global::attribute::create_cluster_revision(cluster, cluster_revision); if (config) { - attribute::create_pressure_measured_value(cluster, config->pressure_measured_value); - attribute::create_pressure_min_measured_value(cluster, config->pressure_min_measured_value); - attribute::create_pressure_max_measured_value(cluster, config->pressure_max_measured_value); + attribute::create_measured_value(cluster, config->measured_value); + attribute::create_min_measured_value(cluster, config->min_measured_value); + attribute::create_max_measured_value(cluster, config->max_measured_value); } else { ESP_LOGE(TAG, "Config is NULL. Cannot add some attributes."); } @@ -2516,9 +2516,9 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags) /** Attributes not managed internally **/ global::attribute::create_cluster_revision(cluster, cluster_revision); if (config) { - attribute::create_flow_measured_value(cluster, config->flow_measured_value); - attribute::create_flow_min_measured_value(cluster, config->flow_min_measured_value); - attribute::create_flow_max_measured_value(cluster, config->flow_max_measured_value); + attribute::create_measured_value(cluster, config->measured_value); + attribute::create_min_measured_value(cluster, config->min_measured_value); + attribute::create_max_measured_value(cluster, config->max_measured_value); } else { ESP_LOGE(TAG, "Config is NULL. Cannot add some attributes."); } @@ -2630,7 +2630,7 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags) /** Attributes not managed internally **/ global::attribute::create_cluster_revision(cluster, cluster_revision); if (config) { - attribute::create_mode_select_description(cluster, config->mode_select_description, strlen(config->mode_select_description)); + attribute::create_description(cluster, config->description, strlen(config->description)); attribute::create_standard_namespace(cluster, config->standard_namespace); attribute::create_current_mode(cluster, config->current_mode); } else { diff --git a/components/esp_matter/data_model/esp_matter_cluster.h b/components/esp_matter/data_model/esp_matter_cluster.h index b49634907..70e597284 100644 --- a/components/esp_matter/data_model/esp_matter_cluster.h +++ b/components/esp_matter/data_model/esp_matter_cluster.h @@ -636,10 +636,10 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags); namespace illuminance_measurement { typedef struct config { - nullable illuminance_measured_value; - nullable illuminance_min_measured_value; - nullable illuminance_max_measured_value; - config() : illuminance_measured_value(0), illuminance_min_measured_value(), illuminance_max_measured_value() {} + nullable measured_value; + nullable min_measured_value; + nullable max_measured_value; + config() : measured_value(0), min_measured_value(), max_measured_value() {} } config_t; cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags); @@ -647,10 +647,10 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags); namespace pressure_measurement { typedef struct config { - nullable pressure_measured_value; - nullable pressure_min_measured_value; - nullable pressure_max_measured_value; - config() : pressure_measured_value(), pressure_min_measured_value(), pressure_max_measured_value() {} + nullable measured_value; + nullable min_measured_value; + nullable max_measured_value; + config() : measured_value(), min_measured_value(), max_measured_value() {} } config_t; cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags); @@ -658,10 +658,10 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags); namespace flow_measurement { typedef struct config { - nullable flow_measured_value; - nullable flow_min_measured_value; - nullable flow_max_measured_value; - config() : flow_measured_value(), flow_min_measured_value(), flow_max_measured_value() {} + nullable measured_value; + nullable min_measured_value; + nullable max_measured_value; + config() : measured_value(), min_measured_value(), max_measured_value() {} } config_t; cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags); @@ -700,11 +700,11 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags); namespace mode_select { typedef struct config { - char mode_select_description[k_max_mode_select_description_length + 1]; + char description[k_max_description_length + 1]; const nullable standard_namespace; uint8_t current_mode; void *delegate; - config() : mode_select_description{0}, standard_namespace(), current_mode(0), delegate(nullptr) {} + config() : description{0}, standard_namespace(), current_mode(0), delegate(nullptr) {} } config_t; cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags); diff --git a/components/esp_matter/data_model/esp_matter_feature.cpp b/components/esp_matter/data_model/esp_matter_feature.cpp index a5d22aa86..58178272a 100644 --- a/components/esp_matter/data_model/esp_matter_feature.cpp +++ b/components/esp_matter/data_model/esp_matter_feature.cpp @@ -971,7 +971,7 @@ esp_err_t add(cluster_t *cluster) namespace thread_network_diagnostics { namespace feature { -namespace packets_counts { +namespace packet_counts { uint32_t get_id() { @@ -985,7 +985,7 @@ esp_err_t add(cluster_t *cluster) return ESP_OK; } -} /* packets_counts */ +} /* packet_counts */ namespace error_counts { @@ -1081,7 +1081,7 @@ esp_err_t add(cluster_t *cluster) update_feature_map(cluster, get_id()); /* Attributes managed internally */ - attribute::create_tx_error_count(cluster, 0); + attribute::create_tx_err_count(cluster, 0); attribute::create_collision_count(cluster, 0); attribute::create_overrun_count(cluster, 0); @@ -1606,7 +1606,7 @@ esp_err_t add(cluster_t *cluster, config_t *config) } update_feature_map(cluster, get_id()); - attribute::create_schedule_type(cluster, NULL, 0, 0); + attribute::create_schedule_types(cluster, NULL, 0, 0); attribute::create_number_of_schedules(cluster, config->number_of_schedules); attribute::create_number_of_schedule_transitions(cluster, config->number_of_schedule_transitions); attribute::create_number_of_schedule_transition_per_day(cluster, config->number_of_schedule_transition_per_day); @@ -1881,10 +1881,10 @@ esp_err_t add(cluster_t *cluster, config_t *config) VerifyOrReturnError(cluster, ESP_ERR_INVALID_ARG, ESP_LOGE(TAG, "Cluster cannot be NULL")); update_feature_map(cluster, get_id()); - attribute::create_pressure_scaled_value(cluster, config->pressure_scaled_value); - attribute::create_pressure_min_scaled_value(cluster, config->pressure_min_scaled_value); - attribute::create_pressure_max_scaled_value(cluster, config->pressure_max_scaled_value); - attribute::create_pressure_scale(cluster, config->pressure_scale); + attribute::create_scaled_value(cluster, config->scaled_value); + attribute::create_min_scaled_value(cluster, config->min_scaled_value); + attribute::create_max_scaled_value(cluster, config->max_scaled_value); + attribute::create_scale(cluster, config->scale); return ESP_OK; } diff --git a/components/esp_matter/data_model/esp_matter_feature.h b/components/esp_matter/data_model/esp_matter_feature.h index 3e57cf559..ea58153b5 100644 --- a/components/esp_matter/data_model/esp_matter_feature.h +++ b/components/esp_matter/data_model/esp_matter_feature.h @@ -446,12 +446,12 @@ esp_err_t add(cluster_t *cluster); namespace thread_network_diagnostics { namespace feature { -namespace packets_counts { +namespace packet_counts { uint32_t get_id(); esp_err_t add(cluster_t *cluster); -} /* packets_counts */ +} /* packet_counts */ namespace error_counts { @@ -1608,11 +1608,11 @@ namespace feature { namespace extended { typedef struct config { - nullable pressure_scaled_value; - nullable pressure_min_scaled_value; - nullable pressure_max_scaled_value; - uint8_t pressure_scale; - config() : pressure_scaled_value(), pressure_min_scaled_value(), pressure_max_scaled_value(), pressure_scale(0) {} + nullable scaled_value; + nullable min_scaled_value; + nullable max_scaled_value; + uint8_t scale; + config() : scaled_value(), min_scaled_value(), max_scaled_value(), scale(0) {} } config_t; uint32_t get_id();