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 'fix/attribute-types' into 'main'

Browse Source 
Fix Attribute Type Inconsistencies in Data Model

See merge request app-frameworks/esp-matter!1312
This commit is contained in:
Hrishikesh Dhayagude
2025-11-26 19:25:11 +08:00
parent 1b3af2da27 2dd49d31ba
commit 83db5f6dec
3 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_matter/data_model/esp_matter_attribute.cpp
+30 -30
View File
@@ -462,7 +462,7 @@ attribute_t *create_interface_enabled(cluster_t *cluster, bool value)
attribute_t *create_last_networking_status(cluster_t *cluster, nullable<uint8_t> value)
{
return esp_matter::attribute::create(cluster, NetworkCommissioning::Attributes::LastNetworkingStatus::Id,
ATTRIBUTE_FLAG_MANAGED_INTERNALLY | ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint8(value));
ATTRIBUTE_FLAG_MANAGED_INTERNALLY | ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_enum8(value));
}
attribute_t *create_last_network_id(cluster_t *cluster, uint8_t *value, uint16_t length)
@@ -486,7 +486,7 @@ attribute_t *create_supported_wifi_bands(cluster_t *cluster, uint8_t *value, uin
attribute_t *create_supported_thread_features(cluster_t *cluster, uint16_t value)
{
return esp_matter::attribute::create(cluster, NetworkCommissioning::Attributes::SupportedThreadFeatures::Id,
ATTRIBUTE_FLAG_MANAGED_INTERNALLY, esp_matter_uint16(value));
ATTRIBUTE_FLAG_MANAGED_INTERNALLY, esp_matter_bitmap16(value));
}
attribute_t *create_thread_version(cluster_t *cluster, uint16_t value)
@@ -595,7 +595,7 @@ namespace attribute {
attribute_t *create_window_status(cluster_t *cluster, uint8_t value)
{
return esp_matter::attribute::create(cluster, AdministratorCommissioning::Attributes::WindowStatus::Id,
ATTRIBUTE_FLAG_MANAGED_INTERNALLY, esp_matter_uint8(value));
ATTRIBUTE_FLAG_MANAGED_INTERNALLY, esp_matter_enum8(value));
}
attribute_t *create_admin_fabric_index(cluster_t *cluster, uint16_t value)
@@ -774,7 +774,7 @@ attribute_t *create_security_type(cluster_t *cluster, nullable<uint8_t> value)
attribute_t *create_wifi_version(cluster_t *cluster, nullable<uint8_t> value)
{
return esp_matter::attribute::create(cluster, WiFiNetworkDiagnostics::Attributes::WiFiVersion::Id,
ATTRIBUTE_FLAG_MANAGED_INTERNALLY | ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint8(value));
ATTRIBUTE_FLAG_MANAGED_INTERNALLY | ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_enum8(value));
}
attribute_t *create_channel_number(cluster_t *cluster, nullable<uint16_t> value)
@@ -852,7 +852,7 @@ attribute_t *create_channel(cluster_t *cluster, nullable<uint16_t> value)
attribute_t *create_routing_role(cluster_t *cluster, nullable<uint8_t> value)
{
return esp_matter::attribute::create(cluster, ThreadNetworkDiagnostics::Attributes::RoutingRole::Id,
ATTRIBUTE_FLAG_MANAGED_INTERNALLY | ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint8(value));
ATTRIBUTE_FLAG_MANAGED_INTERNALLY | ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_enum8(value));
}
attribute_t *create_network_name(cluster_t *cluster, char *value, uint16_t length)
@@ -897,22 +897,22 @@ attribute_t *create_partition_id(cluster_t *cluster, nullable<uint32_t> value)
ATTRIBUTE_FLAG_MANAGED_INTERNALLY | ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint32(value));
}
attribute_t *create_weighting(cluster_t *cluster, nullable<uint8_t> value)
attribute_t *create_weighting(cluster_t *cluster, nullable<uint16_t> value)
{
return esp_matter::attribute::create(cluster, ThreadNetworkDiagnostics::Attributes::Weighting::Id,
ATTRIBUTE_FLAG_MANAGED_INTERNALLY | ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint8(value));
ATTRIBUTE_FLAG_MANAGED_INTERNALLY | ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint16(value));
}
attribute_t *create_data_version(cluster_t *cluster, nullable<uint8_t> value)
attribute_t *create_data_version(cluster_t *cluster, nullable<uint16_t> value)
{
return esp_matter::attribute::create(cluster, ThreadNetworkDiagnostics::Attributes::DataVersion::Id,
ATTRIBUTE_FLAG_MANAGED_INTERNALLY | ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint8(value));
ATTRIBUTE_FLAG_MANAGED_INTERNALLY | ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint16(value));
}
attribute_t *create_stable_data_version(cluster_t *cluster, nullable<uint8_t> value)
attribute_t *create_stable_data_version(cluster_t *cluster, nullable<uint16_t> value)
{
return esp_matter::attribute::create(cluster, ThreadNetworkDiagnostics::Attributes::StableDataVersion::Id,
ATTRIBUTE_FLAG_MANAGED_INTERNALLY | ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint8(value));
ATTRIBUTE_FLAG_MANAGED_INTERNALLY | ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint16(value));
}
attribute_t *create_leader_router_id(cluster_t *cluster, nullable<uint8_t> value)
@@ -1460,7 +1460,7 @@ attribute_t *create_identify_time(cluster_t *cluster, uint16_t value)
attribute_t *create_identify_type(cluster_t *cluster, uint8_t value)
{
return esp_matter::attribute::create(cluster, Identify::Attributes::IdentifyType::Id, ATTRIBUTE_FLAG_NONE,
esp_matter_uint8(value));
esp_matter_enum8(value));
}
} /* attribute */
@@ -1746,7 +1746,7 @@ attribute_t *create_color_loop_active(cluster_t *cluster, uint8_t value)
attribute_t *create_color_loop_direction(cluster_t *cluster, uint8_t value)
{
return esp_matter::attribute::create(cluster, ColorControl::Attributes::ColorLoopDirection::Id,
ATTRIBUTE_FLAG_NONVOLATILE, esp_matter_uint8(value));
ATTRIBUTE_FLAG_NONVOLATILE, esp_matter_enum8(value));
}
attribute_t *create_color_loop_time(cluster_t *cluster, uint16_t value)
@@ -1971,7 +1971,7 @@ attribute_t *create_outdoor_temperature(cluster_t *cluster, nullable<int16_t> va
attribute_t *create_occupancy(cluster_t *cluster, uint8_t value)
{
return esp_matter::attribute::create(cluster, Thermostat::Attributes::Occupancy::Id, ATTRIBUTE_FLAG_NONE,
esp_matter_enum8(value));
esp_matter_bitmap8(value));
}
attribute_t *create_abs_min_heat_setpoint_limit(cluster_t *cluster, int16_t value)
@@ -2146,7 +2146,7 @@ attribute_t *create_thermostat_running_state(cluster_t *cluster, uint16_t value)
attribute_t *create_setpoint_change_source(cluster_t *cluster, uint8_t value)
{
return esp_matter::attribute::create(cluster, Thermostat::Attributes::SetpointChangeSource::Id,
ATTRIBUTE_FLAG_NONE, esp_matter_uint8(value));
ATTRIBUTE_FLAG_NONE, esp_matter_enum8(value));
}
attribute_t *create_setpoint_change_amount(cluster_t *cluster, nullable<int16_t> value)
@@ -2155,10 +2155,10 @@ attribute_t *create_setpoint_change_amount(cluster_t *cluster, nullable<int16_t>
ATTRIBUTE_FLAG_NONE, esp_matter_nullable_int16(value));
}
attribute_t *create_setpoint_change_source_timestamp(cluster_t *cluster, uint16_t value)
attribute_t *create_setpoint_change_source_timestamp(cluster_t *cluster, uint32_t value)
{
return esp_matter::attribute::create(cluster, Thermostat::Attributes::SetpointChangeSourceTimestamp::Id,
ATTRIBUTE_FLAG_NONE, esp_matter_uint16(value));
ATTRIBUTE_FLAG_NONE, esp_matter_uint32(value));
}
attribute_t *create_occupied_setback(cluster_t *cluster, nullable<uint8_t> value)
@@ -2208,7 +2208,7 @@ attribute_t *create_emergency_heat_delta(cluster_t *cluster, uint8_t value)
attribute_t *create_ac_type(cluster_t *cluster, uint8_t value)
{
return esp_matter::attribute::create(cluster, Thermostat::Attributes::ACType::Id,
ATTRIBUTE_FLAG_NONVOLATILE | ATTRIBUTE_FLAG_WRITABLE, esp_matter_uint8(value));
ATTRIBUTE_FLAG_NONVOLATILE | ATTRIBUTE_FLAG_WRITABLE, esp_matter_enum8(value));
}
attribute_t *create_ac_capacity(cluster_t *cluster, uint16_t value)
@@ -2220,13 +2220,13 @@ attribute_t *create_ac_capacity(cluster_t *cluster, uint16_t value)
attribute_t *create_ac_refrigerant_type(cluster_t *cluster, uint8_t value)
{
return esp_matter::attribute::create(cluster, Thermostat::Attributes::ACRefrigerantType::Id,
ATTRIBUTE_FLAG_NONVOLATILE | ATTRIBUTE_FLAG_WRITABLE, esp_matter_uint8(value));
ATTRIBUTE_FLAG_NONVOLATILE | ATTRIBUTE_FLAG_WRITABLE, esp_matter_enum8(value));
}
attribute_t *create_ac_compressor_type(cluster_t *cluster, uint8_t value)
{
return esp_matter::attribute::create(cluster, Thermostat::Attributes::ACCompressorType::Id,
ATTRIBUTE_FLAG_NONVOLATILE | ATTRIBUTE_FLAG_WRITABLE, esp_matter_uint8(value));
ATTRIBUTE_FLAG_NONVOLATILE | ATTRIBUTE_FLAG_WRITABLE, esp_matter_enum8(value));
}
attribute_t *create_ac_error_code(cluster_t *cluster, uint32_t value)
@@ -2238,7 +2238,7 @@ attribute_t *create_ac_error_code(cluster_t *cluster, uint32_t value)
attribute_t *create_ac_louver_position(cluster_t *cluster, uint8_t value)
{
return esp_matter::attribute::create(cluster, Thermostat::Attributes::ACLouverPosition::Id,
ATTRIBUTE_FLAG_NONVOLATILE | ATTRIBUTE_FLAG_WRITABLE, esp_matter_uint8(value));
ATTRIBUTE_FLAG_NONVOLATILE | ATTRIBUTE_FLAG_WRITABLE, esp_matter_enum8(value));
}
attribute_t *create_ac_coil_temperature(cluster_t *cluster, nullable<int16_t> value)
@@ -2250,7 +2250,7 @@ attribute_t *create_ac_coil_temperature(cluster_t *cluster, nullable<int16_t> va
attribute_t *create_ac_capacity_format(cluster_t *cluster, uint8_t value)
{
return esp_matter::attribute::create(cluster, Thermostat::Attributes::ACCapacityformat::Id,
ATTRIBUTE_FLAG_NONVOLATILE | ATTRIBUTE_FLAG_WRITABLE, esp_matter_uint8(value));
ATTRIBUTE_FLAG_NONVOLATILE | ATTRIBUTE_FLAG_WRITABLE, esp_matter_enum8(value));
}
attribute_t *create_preset_types(cluster_t *cluster, uint8_t * value, uint16_t length, uint16_t count)
@@ -2512,10 +2512,10 @@ attribute_t *create_operational_state(cluster_t *cluster, uint8_t value)
esp_matter_enum8(value));
}
attribute_t *create_operational_error(cluster_t *cluster, uint8_t value)
attribute_t *create_operational_error(cluster_t *cluster, uint8_t *value, uint16_t length, uint16_t count)
{
return esp_matter::attribute::create(cluster, OperationalState::Attributes::OperationalError::Id, ATTRIBUTE_FLAG_MANAGED_INTERNALLY,
esp_matter_enum8(value));
esp_matter_array(value, length, count));
}
} /* attribute */
@@ -2563,7 +2563,7 @@ attribute_t *create_supported_dryness_levels(cluster_t *cluster, uint8_t *value,
attribute_t *create_selected_dryness_level(cluster_t *cluster, nullable<uint8_t> value)
{
return esp_matter::attribute::create(cluster, LaundryDryerControls::Attributes::SelectedDrynessLevel::Id,
ATTRIBUTE_FLAG_NULLABLE | ATTRIBUTE_FLAG_WRITABLE, esp_matter_nullable_uint8(value));
ATTRIBUTE_FLAG_NULLABLE | ATTRIBUTE_FLAG_WRITABLE, esp_matter_nullable_enum8(value));
}
@@ -2659,7 +2659,7 @@ namespace attribute {
attribute_t *create_lock_state(cluster_t *cluster, nullable<uint8_t> value)
{
return esp_matter::attribute::create(cluster, DoorLock::Attributes::LockState::Id, ATTRIBUTE_FLAG_NULLABLE,
esp_matter_nullable_uint8(value));
esp_matter_nullable_enum8(value));
}
attribute_t *create_lock_type(cluster_t *cluster, uint8_t value)
@@ -3953,17 +3953,17 @@ namespace refrigerator_alarm {
namespace attribute {
attribute_t *create_mask(cluster_t *cluster, uint32_t value)
{
return esp_matter::attribute::create(cluster, RefrigeratorAlarm::Attributes::Mask::Id, ATTRIBUTE_FLAG_NONE, esp_matter_uint32(value));
return esp_matter::attribute::create(cluster, RefrigeratorAlarm::Attributes::Mask::Id, ATTRIBUTE_FLAG_NONE, esp_matter_bitmap32(value));
}
attribute_t *create_state(cluster_t *cluster, uint32_t value)
{
return esp_matter::attribute::create(cluster, RefrigeratorAlarm::Attributes::State::Id, ATTRIBUTE_FLAG_NONE, esp_matter_uint32(value));
return esp_matter::attribute::create(cluster, RefrigeratorAlarm::Attributes::State::Id, ATTRIBUTE_FLAG_NONE, esp_matter_bitmap32(value));
}
attribute_t *create_supported(cluster_t *cluster, uint32_t value)
{
return esp_matter::attribute::create(cluster, RefrigeratorAlarm::Attributes::Supported::Id, ATTRIBUTE_FLAG_NONE, esp_matter_uint32(value));
return esp_matter::attribute::create(cluster, RefrigeratorAlarm::Attributes::Supported::Id, ATTRIBUTE_FLAG_NONE, esp_matter_bitmap32(value));
}
} /* attribute */
@@ -4794,7 +4794,7 @@ attribute_t *create_dst_offset_list_max_size(cluster_t *cluster, uint8_t value)
attribute_t *create_supports_dns_resolve(cluster_t *cluster, bool value)
{
return esp_matter::attribute::create(cluster, TimeSynchronization::Attributes::SupportsDNSResolve::Id,
ATTRIBUTE_FLAG_NONE, esp_matter_uint64(value));
ATTRIBUTE_FLAG_NONE, esp_matter_bool(value));
}
} /* attribute */
components/esp_matter/data_model/esp_matter_attribute.h
+5 -5
View File
@@ -250,9 +250,9 @@ attribute_t *create_mesh_local_prefix(cluster_t *cluster, uint8_t *value, uint16
attribute_t *create_neighbor_table(cluster_t *cluster, uint8_t *value, uint16_t length, uint16_t count);
attribute_t *create_route_table(cluster_t *cluster, uint8_t *value, uint16_t length, uint16_t count);
attribute_t *create_partition_id(cluster_t *cluster, nullable<uint32_t> value);
attribute_t *create_weighting(cluster_t *cluster, nullable<uint8_t> value);
attribute_t *create_data_version(cluster_t *cluster, nullable<uint8_t> value);
attribute_t *create_stable_data_version(cluster_t *cluster, nullable<uint8_t> value);
attribute_t *create_weighting(cluster_t *cluster, nullable<uint16_t> value);
attribute_t *create_data_version(cluster_t *cluster, nullable<uint16_t> value);
attribute_t *create_stable_data_version(cluster_t *cluster, nullable<uint16_t> value);
attribute_t *create_leader_router_id(cluster_t *cluster, nullable<uint8_t> 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);
@@ -511,7 +511,7 @@ attribute_t *create_thermostat_programming_operation_mode(cluster_t *cluster, ui
attribute_t *create_thermostat_running_state(cluster_t *cluster, uint16_t value);
attribute_t *create_setpoint_change_source(cluster_t *cluster, uint8_t value);
attribute_t *create_setpoint_change_amount(cluster_t *cluster, nullable<int16_t> value);
attribute_t *create_setpoint_change_source_timestamp(cluster_t *cluster, uint16_t value);
attribute_t *create_setpoint_change_source_timestamp(cluster_t *cluster, uint32_t value);
attribute_t *create_occupied_setback(cluster_t *cluster, nullable<uint8_t> value);
attribute_t *create_occupied_setback_min(cluster_t *cluster, nullable<uint8_t> value);
attribute_t *create_occupied_setback_max(cluster_t *cluster, nullable<uint8_t> value);
@@ -638,7 +638,7 @@ attribute_t *create_current_phase(cluster_t *cluster, nullable<uint8_t> value);
attribute_t *create_countdown_time(cluster_t *cluster, nullable<uint32_t> value);
attribute_t *create_operational_state_list(cluster_t *cluster, uint8_t *value, uint16_t length, uint16_t count);
attribute_t *create_operational_state(cluster_t *cluster, uint8_t value);
attribute_t *create_operational_error(cluster_t *cluster, uint8_t value);
attribute_t *create_operational_error(cluster_t *cluster, uint8_t *value, uint16_t length, uint16_t count);
} /* attribute */
} /* operational_state */
components/esp_matter/data_model/esp_matter_cluster.cpp
+5 -5
View File
@@ -770,9 +770,9 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags)
attribute::create_neighbor_table(cluster, NULL, 0, 0);
attribute::create_route_table(cluster, NULL, 0, 0);
attribute::create_partition_id(cluster, nullable<uint32_t>(0));
attribute::create_weighting(cluster, nullable<uint8_t>(0));
attribute::create_data_version(cluster, nullable<uint8_t>(0));
attribute::create_stable_data_version(cluster, nullable<uint8_t>(0));
attribute::create_weighting(cluster, nullable<uint16_t>(0));
attribute::create_data_version(cluster, nullable<uint16_t>(0));
attribute::create_stable_data_version(cluster, nullable<uint16_t>(0));
attribute::create_leader_router_id(cluster, nullable<uint8_t>(0));
attribute::create_security_policy(cluster, NULL, 0, 0);
attribute::create_channel_page0_mask(cluster, NULL, 0);
@@ -1712,7 +1712,7 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags)
attribute::create_current_phase(cluster, 0);
attribute::create_operational_state_list(cluster, NULL, 0, 0);
attribute::create_operational_state(cluster, 0);
attribute::create_operational_error(cluster, 0);
attribute::create_operational_error(cluster, NULL, 0, 0);
/* Attributes not managed internally */
global::attribute::create_cluster_revision(cluster, cluster_revision);
@@ -3027,7 +3027,7 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags)
operational_state::attribute::create_current_phase(cluster, 0);
operational_state::attribute::create_operational_state_list(cluster, NULL, 0, 0);
operational_state::attribute::create_operational_state(cluster, 0);
operational_state::attribute::create_operational_error(cluster, 0);
operational_state::attribute::create_operational_error(cluster, NULL, 0, 0);
/* Attributes not managed internally */
global::attribute::create_cluster_revision(cluster, cluster_revision);