diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter index ebf78d1228fe3a..b736c96d6fbf64 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter @@ -2666,7 +2666,7 @@ server cluster SmokeCoAlarm = 92 { readonly attribute AlarmStateEnum interconnectSmokeAlarm = 8; readonly attribute AlarmStateEnum interconnectCOAlarm = 9; readonly attribute ContaminationStateEnum contaminationState = 10; - attribute SensitivityEnum sensitivityLevel = 11; + attribute SensitivityEnum smokeSensitivityLevel = 11; readonly attribute epoch_s expiryDate = 12; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -6303,7 +6303,7 @@ endpoint 1 { ram attribute interconnectSmokeAlarm default = 0; ram attribute interconnectCOAlarm default = 0; ram attribute contaminationState default = 0; - ram attribute sensitivityLevel default = 1; + ram attribute smokeSensitivityLevel default = 1; ram attribute expiryDate default = 0; ram attribute featureMap default = 3; ram attribute clusterRevision default = 1; diff --git a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter index 26db9451812a0f..e31b69a6e76c86 100644 --- a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter +++ b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter @@ -1705,7 +1705,7 @@ server cluster SmokeCoAlarm = 92 { readonly attribute AlarmStateEnum interconnectSmokeAlarm = 8; readonly attribute AlarmStateEnum interconnectCOAlarm = 9; readonly attribute ContaminationStateEnum contaminationState = 10; - attribute SensitivityEnum sensitivityLevel = 11; + attribute SensitivityEnum smokeSensitivityLevel = 11; readonly attribute epoch_s expiryDate = 12; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -2231,7 +2231,7 @@ endpoint 1 { ram attribute interconnectSmokeAlarm default = 0; ram attribute interconnectCOAlarm default = 0; ram attribute contaminationState default = 0; - ram attribute sensitivityLevel default = 1; + ram attribute smokeSensitivityLevel default = 1; ram attribute expiryDate default = 0; ram attribute featureMap default = 3; ram attribute clusterRevision default = 1; diff --git a/src/app/clusters/smoke-co-alarm-server/smoke-co-alarm-server.cpp b/src/app/clusters/smoke-co-alarm-server/smoke-co-alarm-server.cpp index aa1d6fe59e0b28..c5f109fac63a31 100644 --- a/src/app/clusters/smoke-co-alarm-server/smoke-co-alarm-server.cpp +++ b/src/app/clusters/smoke-co-alarm-server/smoke-co-alarm-server.cpp @@ -351,15 +351,16 @@ bool SmokeCoAlarmServer::SetContaminationState(EndpointId endpointId, Contaminat return success; } -bool SmokeCoAlarmServer::SetSensitivityLevel(EndpointId endpointId, SensitivityEnum newSensitivityLevel) +bool SmokeCoAlarmServer::SetSmokeSensitivityLevel(EndpointId endpointId, SensitivityEnum newSmokeSensitivityLevel) { - SensitivityEnum sensitivityLevel; - bool success = GetAttribute(endpointId, Attributes::SensitivityLevel::Id, Attributes::SensitivityLevel::Get, sensitivityLevel); + SensitivityEnum smokeSensitivityLevel; + bool success = GetAttribute(endpointId, Attributes::SmokeSensitivityLevel::Id, Attributes::SmokeSensitivityLevel::Get, + smokeSensitivityLevel); - if (success && (sensitivityLevel != newSensitivityLevel)) + if (success && (smokeSensitivityLevel != newSmokeSensitivityLevel)) { - success = - SetAttribute(endpointId, Attributes::SensitivityLevel::Id, Attributes::SensitivityLevel::Set, newSensitivityLevel); + success = SetAttribute(endpointId, Attributes::SmokeSensitivityLevel::Id, Attributes::SmokeSensitivityLevel::Set, + newSmokeSensitivityLevel); } return success; @@ -421,9 +422,10 @@ bool SmokeCoAlarmServer::GetContaminationState(EndpointId endpointId, Contaminat return GetAttribute(endpointId, Attributes::ContaminationState::Id, Attributes::ContaminationState::Get, contaminationState); } -bool SmokeCoAlarmServer::GetSensitivityLevel(EndpointId endpointId, SensitivityEnum & sensitivityLevel) +bool SmokeCoAlarmServer::GetSmokeSensitivityLevel(EndpointId endpointId, SensitivityEnum & smokeSensitivityLevel) { - return GetAttribute(endpointId, Attributes::SensitivityLevel::Id, Attributes::SensitivityLevel::Get, sensitivityLevel); + return GetAttribute(endpointId, Attributes::SmokeSensitivityLevel::Id, Attributes::SmokeSensitivityLevel::Get, + smokeSensitivityLevel); } bool SmokeCoAlarmServer::GetExpiryDate(EndpointId endpointId, uint32_t & expiryDate) diff --git a/src/app/clusters/smoke-co-alarm-server/smoke-co-alarm-server.h b/src/app/clusters/smoke-co-alarm-server/smoke-co-alarm-server.h index 2c43c9ed636961..529df2ed766807 100644 --- a/src/app/clusters/smoke-co-alarm-server/smoke-co-alarm-server.h +++ b/src/app/clusters/smoke-co-alarm-server/smoke-co-alarm-server.h @@ -71,7 +71,7 @@ class SmokeCoAlarmServer bool SetInterconnectSmokeAlarm(chip::EndpointId endpointId, AlarmStateEnum newInterconnectSmokeAlarm); bool SetInterconnectCOAlarm(chip::EndpointId endpointId, AlarmStateEnum newInterconnectCOAlarm); bool SetContaminationState(chip::EndpointId endpointId, ContaminationStateEnum newContaminationState); - bool SetSensitivityLevel(chip::EndpointId endpointId, SensitivityEnum newSensitivityLevel); + bool SetSmokeSensitivityLevel(chip::EndpointId endpointId, SensitivityEnum newSmokeSensitivityLevel); bool GetExpressedState(chip::EndpointId endpointId, ExpressedStateEnum & expressedState); bool GetSmokeState(chip::EndpointId endpointId, AlarmStateEnum & smokeState); @@ -84,7 +84,7 @@ class SmokeCoAlarmServer bool GetInterconnectSmokeAlarm(chip::EndpointId endpointId, AlarmStateEnum & interconnectSmokeAlarm); bool GetInterconnectCOAlarm(chip::EndpointId endpointId, AlarmStateEnum & interconnectCOAlarm); bool GetContaminationState(chip::EndpointId endpointId, ContaminationStateEnum & contaminationState); - bool GetSensitivityLevel(chip::EndpointId endpointId, SensitivityEnum & sensitivityLevel); + bool GetSmokeSensitivityLevel(chip::EndpointId endpointId, SensitivityEnum & smokeSensitivityLevel); bool GetExpiryDate(chip::EndpointId endpointId, uint32_t & expiryDate); chip::BitFlags GetFeatures(chip::EndpointId endpointId); diff --git a/src/app/zap-templates/zcl/data-model/chip/smoke-co-alarm-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/smoke-co-alarm-cluster.xml index 83eb6ffeda9d80..2a7c4b9818ca30 100644 --- a/src/app/zap-templates/zcl/data-model/chip/smoke-co-alarm-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/smoke-co-alarm-cluster.xml @@ -48,7 +48,7 @@ limitations under the License. InterconnectSmokeAlarm InterconnectCOAlarm ContaminationState - SensitivityLevel + SmokeSensitivityLevel ExpiryDate diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index a565b48f760df6..3edbae9b71ef74 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -3258,7 +3258,7 @@ client cluster SmokeCoAlarm = 92 { readonly attribute optional AlarmStateEnum interconnectSmokeAlarm = 8; readonly attribute optional AlarmStateEnum interconnectCOAlarm = 9; readonly attribute optional ContaminationStateEnum contaminationState = 10; - attribute optional SensitivityEnum sensitivityLevel = 11; + attribute optional SensitivityEnum smokeSensitivityLevel = 11; readonly attribute optional epoch_s expiryDate = 12; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java index b59d10121571c3..9e75229ea9d4c2 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java @@ -7352,7 +7352,7 @@ public enum Attribute { InterconnectSmokeAlarm(8L), InterconnectCOAlarm(9L), ContaminationState(10L), - SensitivityLevel(11L), + SmokeSensitivityLevel(11L), ExpiryDate(12L), GeneratedCommandList(65528L), AcceptedCommandList(65529L), diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java index 9c25e598f3c4c9..6da03e3e855517 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java @@ -7182,17 +7182,17 @@ private static Map readSmokeCoAlarmInteractionInfo() { readSmokeCoAlarmContaminationStateCommandParams ); result.put("readContaminationStateAttribute", readSmokeCoAlarmContaminationStateAttributeInteractionInfo); - Map readSmokeCoAlarmSensitivityLevelCommandParams = new LinkedHashMap(); - InteractionInfo readSmokeCoAlarmSensitivityLevelAttributeInteractionInfo = new InteractionInfo( + Map readSmokeCoAlarmSmokeSensitivityLevelCommandParams = new LinkedHashMap(); + InteractionInfo readSmokeCoAlarmSmokeSensitivityLevelAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.SmokeCoAlarmCluster) cluster).readSensitivityLevelAttribute( + ((ChipClusters.SmokeCoAlarmCluster) cluster).readSmokeSensitivityLevelAttribute( (ChipClusters.IntegerAttributeCallback) callback ); }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), - readSmokeCoAlarmSensitivityLevelCommandParams + readSmokeCoAlarmSmokeSensitivityLevelCommandParams ); - result.put("readSensitivityLevelAttribute", readSmokeCoAlarmSensitivityLevelAttributeInteractionInfo); + result.put("readSmokeSensitivityLevelAttribute", readSmokeCoAlarmSmokeSensitivityLevelAttributeInteractionInfo); Map readSmokeCoAlarmExpiryDateCommandParams = new LinkedHashMap(); InteractionInfo readSmokeCoAlarmExpiryDateAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterWriteMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterWriteMapping.java index 338013532297d6..a2fa8b83be4fba 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ClusterWriteMapping.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterWriteMapping.java @@ -1053,28 +1053,28 @@ public Map> getWriteAttributeMap() { Map writeAirQualityInteractionInfo = new LinkedHashMap<>(); writeAttributeMap.put("airQuality", writeAirQualityInteractionInfo); Map writeSmokeCoAlarmInteractionInfo = new LinkedHashMap<>(); - Map writeSmokeCoAlarmSensitivityLevelCommandParams = new LinkedHashMap(); - CommandParameterInfo smokeCoAlarmsensitivityLevelCommandParameterInfo = + Map writeSmokeCoAlarmSmokeSensitivityLevelCommandParams = new LinkedHashMap(); + CommandParameterInfo smokeCoAlarmsmokeSensitivityLevelCommandParameterInfo = new CommandParameterInfo( "value", Integer.class, Integer.class ); - writeSmokeCoAlarmSensitivityLevelCommandParams.put( + writeSmokeCoAlarmSmokeSensitivityLevelCommandParams.put( "value", - smokeCoAlarmsensitivityLevelCommandParameterInfo + smokeCoAlarmsmokeSensitivityLevelCommandParameterInfo ); - InteractionInfo writeSmokeCoAlarmSensitivityLevelAttributeInteractionInfo = new InteractionInfo( + InteractionInfo writeSmokeCoAlarmSmokeSensitivityLevelAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.SmokeCoAlarmCluster) cluster).writeSensitivityLevelAttribute( + ((ChipClusters.SmokeCoAlarmCluster) cluster).writeSmokeSensitivityLevelAttribute( (DefaultClusterCallback) callback, (Integer) commandArguments.get("value") ); }, () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(), - writeSmokeCoAlarmSensitivityLevelCommandParams + writeSmokeCoAlarmSmokeSensitivityLevelCommandParams ); - writeSmokeCoAlarmInteractionInfo.put("writeSensitivityLevelAttribute", writeSmokeCoAlarmSensitivityLevelAttributeInteractionInfo); + writeSmokeCoAlarmInteractionInfo.put("writeSmokeSensitivityLevelAttribute", writeSmokeCoAlarmSmokeSensitivityLevelAttributeInteractionInfo); writeAttributeMap.put("smokeCoAlarm", writeSmokeCoAlarmInteractionInfo); Map writeDishwasherAlarmInteractionInfo = new LinkedHashMap<>(); writeAttributeMap.put("dishwasherAlarm", writeDishwasherAlarmInteractionInfo); diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp index ac21a7212f3ecb..55912752bb4344 100644 --- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp @@ -14632,8 +14632,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR static_cast(cppValue), value); return value; } - case Attributes::SensitivityLevel::Id: { - using TypeInfo = Attributes::SensitivityLevel::TypeInfo; + case Attributes::SmokeSensitivityLevel::Id: { + using TypeInfo = Attributes::SmokeSensitivityLevel::TypeInfo; TypeInfo::DecodableType cppValue; *aError = app::DataModel::Decode(aReader, cppValue); if (*aError != CHIP_NO_ERROR) diff --git a/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp b/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp index d96b03b437aeb2..a3936fe6b03dbb 100644 --- a/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp +++ b/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp @@ -3056,12 +3056,12 @@ JNI_METHOD(void, DishwasherModeCluster, writeOnModeAttribute) onFailure.release(); } -JNI_METHOD(void, SmokeCoAlarmCluster, writeSensitivityLevelAttribute) +JNI_METHOD(void, SmokeCoAlarmCluster, writeSmokeSensitivityLevelAttribute) (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs) { chip::DeviceLayer::StackLock lock; ListFreer listFreer; - using TypeInfo = chip::app::Clusters::SmokeCoAlarm::Attributes::SensitivityLevel::TypeInfo; + using TypeInfo = chip::app::Clusters::SmokeCoAlarm::Attributes::SmokeSensitivityLevel::TypeInfo; TypeInfo::Type cppValue; std::vector> cleanupByteArrays; diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java index 97185a802f168f..fcca0b6dd8f9b9 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java @@ -16254,23 +16254,23 @@ public void subscribeContaminationStateAttribute( subscribeContaminationStateAttribute(chipClusterPtr, callback, minInterval, maxInterval); } - public void readSensitivityLevelAttribute( + public void readSmokeSensitivityLevelAttribute( IntegerAttributeCallback callback ) { - readSensitivityLevelAttribute(chipClusterPtr, callback); + readSmokeSensitivityLevelAttribute(chipClusterPtr, callback); } - public void writeSensitivityLevelAttribute(DefaultClusterCallback callback, Integer value) { - writeSensitivityLevelAttribute(chipClusterPtr, callback, value, null); + public void writeSmokeSensitivityLevelAttribute(DefaultClusterCallback callback, Integer value) { + writeSmokeSensitivityLevelAttribute(chipClusterPtr, callback, value, null); } - public void writeSensitivityLevelAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) { - writeSensitivityLevelAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs); + public void writeSmokeSensitivityLevelAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) { + writeSmokeSensitivityLevelAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs); } - public void subscribeSensitivityLevelAttribute( + public void subscribeSmokeSensitivityLevelAttribute( IntegerAttributeCallback callback , int minInterval, int maxInterval) { - subscribeSensitivityLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval); + subscribeSmokeSensitivityLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval); } public void readExpiryDateAttribute( @@ -16434,12 +16434,12 @@ private native void subscribeContaminationStateAttribute(long chipClusterPtr, IntegerAttributeCallback callback , int minInterval, int maxInterval); - private native void readSensitivityLevelAttribute(long chipClusterPtr, + private native void readSmokeSensitivityLevelAttribute(long chipClusterPtr, IntegerAttributeCallback callback ); - private native void writeSensitivityLevelAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs); - private native void subscribeSensitivityLevelAttribute(long chipClusterPtr, + private native void writeSmokeSensitivityLevelAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs); + private native void subscribeSmokeSensitivityLevelAttribute(long chipClusterPtr, IntegerAttributeCallback callback , int minInterval, int maxInterval); diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py index bb22b411b5ee66..cf2e064fd7ae75 100644 --- a/src/controller/python/chip/clusters/CHIPClusters.py +++ b/src/controller/python/chip/clusters/CHIPClusters.py @@ -5091,7 +5091,7 @@ class ChipClusters: "reportable": True, }, 0x0000000B: { - "attributeName": "SensitivityLevel", + "attributeName": "SmokeSensitivityLevel", "attributeId": 0x0000000B, "type": "int", "reportable": True, diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 2518ca44d774cb..5ece28924a6f42 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -17371,7 +17371,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="interconnectSmokeAlarm", Tag=0x00000008, Type=typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum]), ClusterObjectFieldDescriptor(Label="interconnectCOAlarm", Tag=0x00000009, Type=typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum]), ClusterObjectFieldDescriptor(Label="contaminationState", Tag=0x0000000A, Type=typing.Optional[SmokeCoAlarm.Enums.ContaminationStateEnum]), - ClusterObjectFieldDescriptor(Label="sensitivityLevel", Tag=0x0000000B, Type=typing.Optional[SmokeCoAlarm.Enums.SensitivityEnum]), + ClusterObjectFieldDescriptor(Label="smokeSensitivityLevel", Tag=0x0000000B, Type=typing.Optional[SmokeCoAlarm.Enums.SensitivityEnum]), ClusterObjectFieldDescriptor(Label="expiryDate", Tag=0x0000000C, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]), @@ -17392,7 +17392,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: interconnectSmokeAlarm: 'typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum]' = None interconnectCOAlarm: 'typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum]' = None contaminationState: 'typing.Optional[SmokeCoAlarm.Enums.ContaminationStateEnum]' = None - sensitivityLevel: 'typing.Optional[SmokeCoAlarm.Enums.SensitivityEnum]' = None + smokeSensitivityLevel: 'typing.Optional[SmokeCoAlarm.Enums.SensitivityEnum]' = None expiryDate: 'typing.Optional[uint]' = None generatedCommandList: 'typing.List[uint]' = None acceptedCommandList: 'typing.List[uint]' = None @@ -17664,7 +17664,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[SmokeCoAlarm.Enums.ContaminationStateEnum]' = None @dataclass - class SensitivityLevel(ClusterAttributeDescriptor): + class SmokeSensitivityLevel(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x005C diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp index 1ebe74f6fc6b16..6ad597651faaab 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp @@ -9002,7 +9002,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm:: } // namespace ContaminationState -namespace SensitivityLevel { +namespace SmokeSensitivityLevel { EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::SensitivityEnum * value) { @@ -9031,7 +9031,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm:: return emberAfWriteAttribute(endpoint, Clusters::SmokeCoAlarm::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE); } -} // namespace SensitivityLevel +} // namespace SmokeSensitivityLevel namespace ExpiryDate { diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h index 1e62913f31e77d..6578a7473af17c 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h @@ -1698,10 +1698,10 @@ EmberAfStatus Get(chip::EndpointId endpoint, EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::ContaminationStateEnum value); } // namespace ContaminationState -namespace SensitivityLevel { +namespace SmokeSensitivityLevel { EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::SensitivityEnum * value); // SensitivityEnum EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::SmokeCoAlarm::SensitivityEnum value); -} // namespace SensitivityLevel +} // namespace SmokeSensitivityLevel namespace ExpiryDate { EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // epoch_s diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp index 4255e959a9672a..d7ade9c76585ec 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp @@ -12622,8 +12622,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre case Attributes::ContaminationState::TypeInfo::GetAttributeId(): ReturnErrorOnFailure(DataModel::Decode(reader, contaminationState)); break; - case Attributes::SensitivityLevel::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, sensitivityLevel)); + case Attributes::SmokeSensitivityLevel::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, smokeSensitivityLevel)); break; case Attributes::ExpiryDate::TypeInfo::GetAttributeId(): ReturnErrorOnFailure(DataModel::Decode(reader, expiryDate)); diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h index 70871295b2c8ce..8505e29ef6bc51 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h @@ -16018,7 +16018,7 @@ struct TypeInfo static constexpr bool MustUseTimedWrite() { return false; } }; } // namespace ContaminationState -namespace SensitivityLevel { +namespace SmokeSensitivityLevel { struct TypeInfo { using Type = chip::app::Clusters::SmokeCoAlarm::SensitivityEnum; @@ -16026,10 +16026,10 @@ struct TypeInfo using DecodableArgType = chip::app::Clusters::SmokeCoAlarm::SensitivityEnum; static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::SensitivityLevel::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::SmokeSensitivityLevel::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace SensitivityLevel +} // namespace SmokeSensitivityLevel namespace ExpiryDate { struct TypeInfo { @@ -16106,7 +16106,7 @@ struct TypeInfo static_cast(0); Attributes::ContaminationState::TypeInfo::DecodableType contaminationState = static_cast(0); - Attributes::SensitivityLevel::TypeInfo::DecodableType sensitivityLevel = + Attributes::SmokeSensitivityLevel::TypeInfo::DecodableType smokeSensitivityLevel = static_cast(0); Attributes::ExpiryDate::TypeInfo::DecodableType expiryDate = static_cast(0); Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList; diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h index a863191ad668c0..c4fcf0898f6413 100644 --- a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h +++ b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h @@ -2920,9 +2920,9 @@ namespace ContaminationState { static constexpr AttributeId Id = 0x0000000A; } // namespace ContaminationState -namespace SensitivityLevel { +namespace SmokeSensitivityLevel { static constexpr AttributeId Id = 0x0000000B; -} // namespace SensitivityLevel +} // namespace SmokeSensitivityLevel namespace ExpiryDate { static constexpr AttributeId Id = 0x0000000C; diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index 9b7ee566019cc9..d3d37905f09c4e 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -4461,7 +4461,7 @@ class DishwasherModeChangeToMode : public ClusterCommand | * InterconnectSmokeAlarm | 0x0008 | | * InterconnectCOAlarm | 0x0009 | | * ContaminationState | 0x000A | -| * SensitivityLevel | 0x000B | +| * SmokeSensitivityLevel | 0x000B | | * ExpiryDate | 0x000C | | * GeneratedCommandList | 0xFFF8 | | * AcceptedCommandList | 0xFFF9 | @@ -14836,7 +14836,7 @@ void registerClusterSmokeCoAlarm(Commands & commands, CredentialIssuerCommands * make_unique(Id, "interconnect-smoke-alarm", Attributes::InterconnectSmokeAlarm::Id, credsIssuerConfig), // make_unique(Id, "interconnect-coalarm", Attributes::InterconnectCOAlarm::Id, credsIssuerConfig), // make_unique(Id, "contamination-state", Attributes::ContaminationState::Id, credsIssuerConfig), // - make_unique(Id, "sensitivity-level", Attributes::SensitivityLevel::Id, credsIssuerConfig), // + make_unique(Id, "smoke-sensitivity-level", Attributes::SmokeSensitivityLevel::Id, credsIssuerConfig), // make_unique(Id, "expiry-date", Attributes::ExpiryDate::Id, credsIssuerConfig), // make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // @@ -14873,7 +14873,7 @@ void registerClusterSmokeCoAlarm(Commands & commands, CredentialIssuerCommands * Id, "contamination-state", 0, UINT8_MAX, Attributes::ContaminationState::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>( - Id, "sensitivity-level", 0, UINT8_MAX, Attributes::SensitivityLevel::Id, WriteCommandType::kWrite, + Id, "smoke-sensitivity-level", 0, UINT8_MAX, Attributes::SmokeSensitivityLevel::Id, WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "expiry-date", 0, UINT32_MAX, Attributes::ExpiryDate::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // @@ -14900,17 +14900,17 @@ void registerClusterSmokeCoAlarm(Commands & commands, CredentialIssuerCommands * make_unique(Id, "hardware-fault-alert", Attributes::HardwareFaultAlert::Id, credsIssuerConfig), // make_unique(Id, "end-of-service-alert", Attributes::EndOfServiceAlert::Id, credsIssuerConfig), // make_unique(Id, "interconnect-smoke-alarm", Attributes::InterconnectSmokeAlarm::Id, - credsIssuerConfig), // - make_unique(Id, "interconnect-coalarm", Attributes::InterconnectCOAlarm::Id, credsIssuerConfig), // - make_unique(Id, "contamination-state", Attributes::ContaminationState::Id, credsIssuerConfig), // - make_unique(Id, "sensitivity-level", Attributes::SensitivityLevel::Id, credsIssuerConfig), // - make_unique(Id, "expiry-date", Attributes::ExpiryDate::Id, credsIssuerConfig), // - make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // - make_unique(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig), // - make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // - make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // - make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + credsIssuerConfig), // + make_unique(Id, "interconnect-coalarm", Attributes::InterconnectCOAlarm::Id, credsIssuerConfig), // + make_unique(Id, "contamination-state", Attributes::ContaminationState::Id, credsIssuerConfig), // + make_unique(Id, "smoke-sensitivity-level", Attributes::SmokeSensitivityLevel::Id, credsIssuerConfig), // + make_unique(Id, "expiry-date", Attributes::ExpiryDate::Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // // // Events // diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp index 3dbc344679c856..79bd5fe44b7584 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -8582,10 +8582,10 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("ContaminationState", 1, value); } - case SmokeCoAlarm::Attributes::SensitivityLevel::Id: { + case SmokeCoAlarm::Attributes::SmokeSensitivityLevel::Id: { chip::app::Clusters::SmokeCoAlarm::SensitivityEnum value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("SensitivityLevel", 1, value); + return DataModelLogger::LogValue("SmokeSensitivityLevel", 1, value); } case SmokeCoAlarm::Attributes::ExpiryDate::Id: { uint32_t value;