Generated using ./scripts/tools/zap_regen_all.py
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
index b265d1d..c619320 100644
--- a/src/controller/data_model/controller-clusters.matter
+++ b/src/controller/data_model/controller-clusters.matter
@@ -9413,12 +9413,12 @@
revision 1;
struct ChimeSoundStruct {
- int8u chimeId = 0;
+ int8u chimeID = 0;
char_string<48> name = 1;
}
readonly attribute ChimeSoundStruct installedChimeSounds[] = 0;
- attribute int8u activeChimeSoundId = 1;
+ attribute int8u activeChimeID = 1;
attribute boolean enabled = 2;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
diff --git a/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java
index c8e56ac..dbc26ae 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java
+++ b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java
@@ -59495,7 +59495,7 @@
public static final long CLUSTER_ID = 1366L;
private static final long INSTALLED_CHIME_SOUNDS_ATTRIBUTE_ID = 0L;
- private static final long ACTIVE_CHIME_SOUND_ID_ATTRIBUTE_ID = 1L;
+ private static final long ACTIVE_CHIME_ID_ATTRIBUTE_ID = 1L;
private static final long ENABLED_ATTRIBUTE_ID = 2L;
private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
@@ -59576,9 +59576,9 @@
}, INSTALLED_CHIME_SOUNDS_ATTRIBUTE_ID, minInterval, maxInterval);
}
- public void readActiveChimeSoundIdAttribute(
+ public void readActiveChimeIDAttribute(
IntegerAttributeCallback callback) {
- ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_CHIME_SOUND_ID_ATTRIBUTE_ID);
+ ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_CHIME_ID_ATTRIBUTE_ID);
readAttribute(new ReportCallbackImpl(callback, path) {
@Override
@@ -59586,21 +59586,21 @@
Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
callback.onSuccess(value);
}
- }, ACTIVE_CHIME_SOUND_ID_ATTRIBUTE_ID, true);
+ }, ACTIVE_CHIME_ID_ATTRIBUTE_ID, true);
}
- public void writeActiveChimeSoundIdAttribute(DefaultClusterCallback callback, Integer value) {
- writeActiveChimeSoundIdAttribute(callback, value, 0);
+ public void writeActiveChimeIDAttribute(DefaultClusterCallback callback, Integer value) {
+ writeActiveChimeIDAttribute(callback, value, 0);
}
- public void writeActiveChimeSoundIdAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+ public void writeActiveChimeIDAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
BaseTLVType tlvValue = new UIntType(value);
- writeAttribute(new WriteAttributesCallbackImpl(callback), ACTIVE_CHIME_SOUND_ID_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+ writeAttribute(new WriteAttributesCallbackImpl(callback), ACTIVE_CHIME_ID_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
}
- public void subscribeActiveChimeSoundIdAttribute(
+ public void subscribeActiveChimeIDAttribute(
IntegerAttributeCallback callback, int minInterval, int maxInterval) {
- ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_CHIME_SOUND_ID_ATTRIBUTE_ID);
+ ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_CHIME_ID_ATTRIBUTE_ID);
subscribeAttribute(new ReportCallbackImpl(callback, path) {
@Override
@@ -59608,7 +59608,7 @@
Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
callback.onSuccess(value);
}
- }, ACTIVE_CHIME_SOUND_ID_ATTRIBUTE_ID, minInterval, maxInterval);
+ }, ACTIVE_CHIME_ID_ATTRIBUTE_ID, minInterval, maxInterval);
}
public void readEnabledAttribute(
diff --git a/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java b/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java
index ad16b07..dc9a94c 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java
+++ b/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java
@@ -12725,22 +12725,22 @@
}
}
public static class ChimeClusterChimeSoundStruct {
- public Integer chimeId;
+ public Integer chimeID;
public String name;
private static final long CHIME_ID_ID = 0L;
private static final long NAME_ID = 1L;
public ChimeClusterChimeSoundStruct(
- Integer chimeId,
+ Integer chimeID,
String name
) {
- this.chimeId = chimeId;
+ this.chimeID = chimeID;
this.name = name;
}
public StructType encodeTlv() {
ArrayList<StructElement> values = new ArrayList<>();
- values.add(new StructElement(CHIME_ID_ID, new UIntType(chimeId)));
+ values.add(new StructElement(CHIME_ID_ID, new UIntType(chimeID)));
values.add(new StructElement(NAME_ID, new StringType(name)));
return new StructType(values);
@@ -12750,13 +12750,13 @@
if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
return null;
}
- Integer chimeId = null;
+ Integer chimeID = null;
String name = null;
for (StructElement element: ((StructType)tlvValue).value()) {
if (element.contextTagNum() == CHIME_ID_ID) {
if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
UIntType castingValue = element.value(UIntType.class);
- chimeId = castingValue.value(Integer.class);
+ chimeID = castingValue.value(Integer.class);
}
} else if (element.contextTagNum() == NAME_ID) {
if (element.value(BaseTLVType.class).type() == TLVType.String) {
@@ -12766,7 +12766,7 @@
}
}
return new ChimeClusterChimeSoundStruct(
- chimeId,
+ chimeID,
name
);
}
@@ -12775,8 +12775,8 @@
public String toString() {
StringBuilder output = new StringBuilder();
output.append("ChimeClusterChimeSoundStruct {\n");
- output.append("\tchimeId: ");
- output.append(chimeId);
+ output.append("\tchimeID: ");
+ output.append(chimeID);
output.append("\n");
output.append("\tname: ");
output.append(name);
diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java
index fb20707..56ed2c4 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java
+++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java
@@ -16889,7 +16889,7 @@
public enum Attribute {
InstalledChimeSounds(0L),
- ActiveChimeSoundId(1L),
+ ActiveChimeID(1L),
Enabled(2L),
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 76df131..b4ef81d 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java
+++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java
@@ -18248,17 +18248,17 @@
readChimeInstalledChimeSoundsCommandParams
);
result.put("readInstalledChimeSoundsAttribute", readChimeInstalledChimeSoundsAttributeInteractionInfo);
- Map<String, CommandParameterInfo> readChimeActiveChimeSoundIdCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
- InteractionInfo readChimeActiveChimeSoundIdAttributeInteractionInfo = new InteractionInfo(
+ Map<String, CommandParameterInfo> readChimeActiveChimeIDCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+ InteractionInfo readChimeActiveChimeIDAttributeInteractionInfo = new InteractionInfo(
(cluster, callback, commandArguments) -> {
- ((ChipClusters.ChimeCluster) cluster).readActiveChimeSoundIdAttribute(
+ ((ChipClusters.ChimeCluster) cluster).readActiveChimeIDAttribute(
(ChipClusters.IntegerAttributeCallback) callback
);
},
() -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
- readChimeActiveChimeSoundIdCommandParams
+ readChimeActiveChimeIDCommandParams
);
- result.put("readActiveChimeSoundIdAttribute", readChimeActiveChimeSoundIdAttributeInteractionInfo);
+ result.put("readActiveChimeIDAttribute", readChimeActiveChimeIDAttributeInteractionInfo);
Map<String, CommandParameterInfo> readChimeEnabledCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
InteractionInfo readChimeEnabledAttributeInteractionInfo = 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 1e8e727..fce8cee 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/ClusterWriteMapping.java
+++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterWriteMapping.java
@@ -3473,28 +3473,28 @@
Map<String, InteractionInfo> writeContentAppObserverInteractionInfo = new LinkedHashMap<>();
writeAttributeMap.put("contentAppObserver", writeContentAppObserverInteractionInfo);
Map<String, InteractionInfo> writeChimeInteractionInfo = new LinkedHashMap<>();
- Map<String, CommandParameterInfo> writeChimeActiveChimeSoundIdCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
- CommandParameterInfo chimeactiveChimeSoundIdCommandParameterInfo =
+ Map<String, CommandParameterInfo> writeChimeActiveChimeIDCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+ CommandParameterInfo chimeactiveChimeIDCommandParameterInfo =
new CommandParameterInfo(
"value",
Integer.class,
Integer.class
);
- writeChimeActiveChimeSoundIdCommandParams.put(
+ writeChimeActiveChimeIDCommandParams.put(
"value",
- chimeactiveChimeSoundIdCommandParameterInfo
+ chimeactiveChimeIDCommandParameterInfo
);
- InteractionInfo writeChimeActiveChimeSoundIdAttributeInteractionInfo = new InteractionInfo(
+ InteractionInfo writeChimeActiveChimeIDAttributeInteractionInfo = new InteractionInfo(
(cluster, callback, commandArguments) -> {
- ((ChipClusters.ChimeCluster) cluster).writeActiveChimeSoundIdAttribute(
+ ((ChipClusters.ChimeCluster) cluster).writeActiveChimeIDAttribute(
(DefaultClusterCallback) callback,
(Integer) commandArguments.get("value")
);
},
() -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
- writeChimeActiveChimeSoundIdCommandParams
+ writeChimeActiveChimeIDCommandParams
);
- writeChimeInteractionInfo.put("writeActiveChimeSoundIdAttribute", writeChimeActiveChimeSoundIdAttributeInteractionInfo);
+ writeChimeInteractionInfo.put("writeActiveChimeIDAttribute", writeChimeActiveChimeIDAttributeInteractionInfo);
Map<String, CommandParameterInfo> writeChimeEnabledCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
CommandParameterInfo chimeenabledCommandParameterInfo =
new CommandParameterInfo(
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ChimeClusterChimeSoundStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ChimeClusterChimeSoundStruct.kt
index 586f6fc..de86021 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ChimeClusterChimeSoundStruct.kt
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ChimeClusterChimeSoundStruct.kt
@@ -22,10 +22,10 @@
import matter.tlv.TlvReader
import matter.tlv.TlvWriter
-class ChimeClusterChimeSoundStruct(val chimeId: UInt, val name: String) {
+class ChimeClusterChimeSoundStruct(val chimeID: UInt, val name: String) {
override fun toString(): String = buildString {
append("ChimeClusterChimeSoundStruct {\n")
- append("\tchimeId : $chimeId\n")
+ append("\tchimeID : $chimeID\n")
append("\tname : $name\n")
append("}\n")
}
@@ -33,7 +33,7 @@
fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
tlvWriter.apply {
startStructure(tlvTag)
- put(ContextSpecificTag(TAG_CHIME_ID), chimeId)
+ put(ContextSpecificTag(TAG_CHIME_ID), chimeID)
put(ContextSpecificTag(TAG_NAME), name)
endStructure()
}
@@ -45,12 +45,12 @@
fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ChimeClusterChimeSoundStruct {
tlvReader.enterStructure(tlvTag)
- val chimeId = tlvReader.getUInt(ContextSpecificTag(TAG_CHIME_ID))
+ val chimeID = tlvReader.getUInt(ContextSpecificTag(TAG_CHIME_ID))
val name = tlvReader.getString(ContextSpecificTag(TAG_NAME))
tlvReader.exitContainer()
- return ChimeClusterChimeSoundStruct(chimeId, name)
+ return ChimeClusterChimeSoundStruct(chimeID, name)
}
}
}
diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/ChimeCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/ChimeCluster.kt
index 2d6242b..cd23c6d 100644
--- a/src/controller/java/generated/java/matter/controller/cluster/clusters/ChimeCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/ChimeCluster.kt
@@ -210,7 +210,7 @@
}
}
- suspend fun readActiveChimeSoundIdAttribute(): UByte {
+ suspend fun readActiveChimeIDAttribute(): UByte {
val ATTRIBUTE_ID: UInt = 1u
val attributePath =
@@ -232,7 +232,7 @@
it.path.attributeId == ATTRIBUTE_ID
}
- requireNotNull(attributeData) { "Activechimesoundid attribute not found in response" }
+ requireNotNull(attributeData) { "Activechimeid attribute not found in response" }
// Decode the TLV data into the appropriate type
val tlvReader = TlvReader(attributeData.data)
@@ -241,7 +241,7 @@
return decodedValue
}
- suspend fun writeActiveChimeSoundIdAttribute(value: UByte, timedWriteTimeout: Duration? = null) {
+ suspend fun writeActiveChimeIDAttribute(value: UByte, timedWriteTimeout: Duration? = null) {
val ATTRIBUTE_ID: UInt = 1u
val tlvWriter = TlvWriter()
@@ -281,7 +281,7 @@
}
}
- suspend fun subscribeActiveChimeSoundIdAttribute(
+ suspend fun subscribeActiveChimeIDAttribute(
minInterval: Int,
maxInterval: Int,
): Flow<UByteSubscriptionState> {
@@ -316,9 +316,7 @@
.filterIsInstance<ReadData.Attribute>()
.firstOrNull { it.path.attributeId == ATTRIBUTE_ID }
- requireNotNull(attributeData) {
- "Activechimesoundid attribute not found in Node State update"
- }
+ requireNotNull(attributeData) { "Activechimeid attribute not found in Node State update" }
// Decode the TLV data into the appropriate type
val tlvReader = TlvReader(attributeData.data)
diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/ChimeClusterChimeSoundStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ChimeClusterChimeSoundStruct.kt
index adc8cbb..49c892f 100644
--- a/src/controller/java/generated/java/matter/controller/cluster/structs/ChimeClusterChimeSoundStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ChimeClusterChimeSoundStruct.kt
@@ -22,10 +22,10 @@
import matter.tlv.TlvReader
import matter.tlv.TlvWriter
-class ChimeClusterChimeSoundStruct(val chimeId: UByte, val name: String) {
+class ChimeClusterChimeSoundStruct(val chimeID: UByte, val name: String) {
override fun toString(): String = buildString {
append("ChimeClusterChimeSoundStruct {\n")
- append("\tchimeId : $chimeId\n")
+ append("\tchimeID : $chimeID\n")
append("\tname : $name\n")
append("}\n")
}
@@ -33,7 +33,7 @@
fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
tlvWriter.apply {
startStructure(tlvTag)
- put(ContextSpecificTag(TAG_CHIME_ID), chimeId)
+ put(ContextSpecificTag(TAG_CHIME_ID), chimeID)
put(ContextSpecificTag(TAG_NAME), name)
endStructure()
}
@@ -45,12 +45,12 @@
fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ChimeClusterChimeSoundStruct {
tlvReader.enterStructure(tlvTag)
- val chimeId = tlvReader.getUByte(ContextSpecificTag(TAG_CHIME_ID))
+ val chimeID = tlvReader.getUByte(ContextSpecificTag(TAG_CHIME_ID))
val name = tlvReader.getString(ContextSpecificTag(TAG_NAME))
tlvReader.exitContainer()
- return ChimeClusterChimeSoundStruct(chimeId, name)
+ return ChimeClusterChimeSoundStruct(chimeID, name)
}
}
}
diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
index c272e84..0cf7ce8 100644
--- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
+++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
@@ -42240,13 +42240,13 @@
{
auto & entry_0 = iter_value_0.GetValue();
jobject newElement_0;
- jobject newElement_0_chimeId;
- std::string newElement_0_chimeIdClassName = "java/lang/Integer";
- std::string newElement_0_chimeIdCtorSignature = "(I)V";
- jint jninewElement_0_chimeId = static_cast<jint>(entry_0.chimeId);
- chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_0_chimeIdClassName.c_str(),
- newElement_0_chimeIdCtorSignature.c_str(),
- jninewElement_0_chimeId, newElement_0_chimeId);
+ jobject newElement_0_chimeID;
+ std::string newElement_0_chimeIDClassName = "java/lang/Integer";
+ std::string newElement_0_chimeIDCtorSignature = "(I)V";
+ jint jninewElement_0_chimeID = static_cast<jint>(entry_0.chimeID);
+ chip::JniReferences::GetInstance().CreateBoxedObject<jint>(newElement_0_chimeIDClassName.c_str(),
+ newElement_0_chimeIDCtorSignature.c_str(),
+ jninewElement_0_chimeID, newElement_0_chimeID);
jobject newElement_0_name;
LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0.name, newElement_0_name));
@@ -42269,14 +42269,14 @@
return nullptr;
}
- newElement_0 = env->NewObject(chimeSoundStructStructClass_1, chimeSoundStructStructCtor_1, newElement_0_chimeId,
+ newElement_0 = env->NewObject(chimeSoundStructStructClass_1, chimeSoundStructStructCtor_1, newElement_0_chimeID,
newElement_0_name);
chip::JniReferences::GetInstance().AddToList(value, newElement_0);
}
return value;
}
- case Attributes::ActiveChimeSoundId::Id: {
- using TypeInfo = Attributes::ActiveChimeSoundId::TypeInfo;
+ case Attributes::ActiveChimeID::Id: {
+ using TypeInfo = Attributes::ActiveChimeID::TypeInfo;
TypeInfo::DecodableType cppValue;
*aError = app::DataModel::Decode(aReader, cppValue);
if (*aError != CHIP_NO_ERROR)
diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py
index 1b5f2e6..1105faa 100644
--- a/src/controller/python/chip/clusters/CHIPClusters.py
+++ b/src/controller/python/chip/clusters/CHIPClusters.py
@@ -13048,7 +13048,7 @@
"reportable": True,
},
0x00000001: {
- "attributeName": "ActiveChimeSoundId",
+ "attributeName": "ActiveChimeID",
"attributeId": 0x00000001,
"type": "int",
"reportable": True,
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
index c70def4..b6e375c 100644
--- a/src/controller/python/chip/clusters/Objects.py
+++ b/src/controller/python/chip/clusters/Objects.py
@@ -46515,7 +46515,7 @@
return ClusterObjectDescriptor(
Fields=[
ClusterObjectFieldDescriptor(Label="installedChimeSounds", Tag=0x00000000, Type=typing.List[Chime.Structs.ChimeSoundStruct]),
- ClusterObjectFieldDescriptor(Label="activeChimeSoundId", Tag=0x00000001, Type=uint),
+ ClusterObjectFieldDescriptor(Label="activeChimeID", Tag=0x00000001, Type=uint),
ClusterObjectFieldDescriptor(Label="enabled", Tag=0x00000002, Type=bool),
ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
@@ -46526,7 +46526,7 @@
])
installedChimeSounds: 'typing.List[Chime.Structs.ChimeSoundStruct]' = None
- activeChimeSoundId: 'uint' = None
+ activeChimeID: 'uint' = None
enabled: 'bool' = None
generatedCommandList: 'typing.List[uint]' = None
acceptedCommandList: 'typing.List[uint]' = None
@@ -46542,11 +46542,11 @@
def descriptor(cls) -> ClusterObjectDescriptor:
return ClusterObjectDescriptor(
Fields=[
- ClusterObjectFieldDescriptor(Label="chimeId", Tag=0, Type=uint),
+ ClusterObjectFieldDescriptor(Label="chimeID", Tag=0, Type=uint),
ClusterObjectFieldDescriptor(Label="name", Tag=1, Type=str),
])
- chimeId: 'uint' = 0
+ chimeID: 'uint' = 0
name: 'str' = ""
class Commands:
@@ -46581,7 +46581,7 @@
value: 'typing.List[Chime.Structs.ChimeSoundStruct]' = field(default_factory=lambda: [])
@dataclass
- class ActiveChimeSoundId(ClusterAttributeDescriptor):
+ class ActiveChimeID(ClusterAttributeDescriptor):
@ChipUtility.classproperty
def cluster_id(cls) -> int:
return 0x00000556
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm
index f94445c..986f977 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm
@@ -5919,7 +5919,7 @@
case Attributes::InstalledChimeSounds::Id: {
return YES;
}
- case Attributes::ActiveChimeSoundId::Id: {
+ case Attributes::ActiveChimeID::Id: {
return YES;
}
case Attributes::Enabled::Id: {
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
index 3b8fff3..630c612 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
@@ -16918,7 +16918,7 @@
auto & entry_0 = iter_0.GetValue();
MTRChimeClusterChimeSoundStruct * newElement_0;
newElement_0 = [MTRChimeClusterChimeSoundStruct new];
- newElement_0.chimeId = [NSNumber numberWithUnsignedChar:entry_0.chimeId];
+ newElement_0.chimeID = [NSNumber numberWithUnsignedChar:entry_0.chimeID];
newElement_0.name = AsString(entry_0.name);
if (newElement_0.name == nil) {
CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
@@ -16936,8 +16936,8 @@
}
return value;
}
- case Attributes::ActiveChimeSoundId::Id: {
- using TypeInfo = Attributes::ActiveChimeSoundId::TypeInfo;
+ case Attributes::ActiveChimeID::Id: {
+ using TypeInfo = Attributes::ActiveChimeID::TypeInfo;
TypeInfo::DecodableType cppValue;
*aError = DataModel::Decode(aReader, cppValue);
if (*aError != CHIP_NO_ERROR) {
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
index 76196a2..85307d9 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
@@ -14779,13 +14779,13 @@
reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
+ (void)readAttributeInstalledChimeSoundsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)readAttributeActiveChimeSoundIdWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeActiveChimeSoundIdWithValue:(NSNumber * _Nonnull)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeActiveChimeSoundIdWithValue:(NSNumber * _Nonnull)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeActiveChimeSoundIdWithParams:(MTRSubscribeParams *)params
- subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
- reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeActiveChimeSoundIdWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)readAttributeActiveChimeIDWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeActiveChimeIDWithValue:(NSNumber * _Nonnull)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeActiveChimeIDWithValue:(NSNumber * _Nonnull)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeActiveChimeIDWithParams:(MTRSubscribeParams *)params
+ subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+ reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeActiveChimeIDWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
- (void)readAttributeEnabledWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
- (void)writeAttributeEnabledWithValue:(NSNumber * _Nonnull)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
index f129e16..f6899e0 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
@@ -102152,9 +102152,9 @@
completion:completion];
}
-- (void)readAttributeActiveChimeSoundIdWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+- (void)readAttributeActiveChimeIDWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
{
- using TypeInfo = Chime::Attributes::ActiveChimeSoundId::TypeInfo;
+ using TypeInfo = Chime::Attributes::ActiveChimeID::TypeInfo;
[self.device _readKnownAttributeWithEndpointID:self.endpointID
clusterID:@(TypeInfo::GetClusterId())
attributeID:@(TypeInfo::GetAttributeId())
@@ -102163,11 +102163,11 @@
completion:completion];
}
-- (void)writeAttributeActiveChimeSoundIdWithValue:(NSNumber * _Nonnull)value completion:(MTRStatusCompletion)completion
+- (void)writeAttributeActiveChimeIDWithValue:(NSNumber * _Nonnull)value completion:(MTRStatusCompletion)completion
{
- [self writeAttributeActiveChimeSoundIdWithValue:(NSNumber * _Nonnull) value params:nil completion:completion];
+ [self writeAttributeActiveChimeIDWithValue:(NSNumber * _Nonnull) value params:nil completion:completion];
}
-- (void)writeAttributeActiveChimeSoundIdWithValue:(NSNumber * _Nonnull)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
+- (void)writeAttributeActiveChimeIDWithValue:(NSNumber * _Nonnull)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion
{
// Make a copy of params before we go async.
params = [params copy];
@@ -102182,7 +102182,7 @@
}
ListFreer listFreer;
- using TypeInfo = Chime::Attributes::ActiveChimeSoundId::TypeInfo;
+ using TypeInfo = Chime::Attributes::ActiveChimeID::TypeInfo;
TypeInfo::Type cppValue;
cppValue = value.unsignedCharValue;
@@ -102191,11 +102191,11 @@
std::move(*bridge).DispatchAction(self.device);
}
-- (void)subscribeAttributeActiveChimeSoundIdWithParams:(MTRSubscribeParams * _Nonnull)params
- subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
- reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeActiveChimeIDWithParams:(MTRSubscribeParams * _Nonnull)params
+ subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+ reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
{
- using TypeInfo = Chime::Attributes::ActiveChimeSoundId::TypeInfo;
+ using TypeInfo = Chime::Attributes::ActiveChimeID::TypeInfo;
[self.device _subscribeToKnownAttributeWithEndpointID:self.endpointID
clusterID:@(TypeInfo::GetClusterId())
attributeID:@(TypeInfo::GetAttributeId())
@@ -102205,9 +102205,9 @@
subscriptionEstablished:subscriptionEstablished];
}
-+ (void)readAttributeActiveChimeSoundIdWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
++ (void)readAttributeActiveChimeIDWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
{
- using TypeInfo = Chime::Attributes::ActiveChimeSoundId::TypeInfo;
+ using TypeInfo = Chime::Attributes::ActiveChimeID::TypeInfo;
[clusterStateCacheContainer
_readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
clusterID:TypeInfo::GetClusterId()
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
index 72233c4..2b1d5e5 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
@@ -4741,7 +4741,7 @@
// Cluster Chime attributes
MTRAttributeIDTypeClusterChimeAttributeInstalledChimeSoundsID MTR_PROVISIONALLY_AVAILABLE = 0x00000000,
- MTRAttributeIDTypeClusterChimeAttributeActiveChimeSoundIdID MTR_PROVISIONALLY_AVAILABLE = 0x00000001,
+ MTRAttributeIDTypeClusterChimeAttributeActiveChimeIDID MTR_PROVISIONALLY_AVAILABLE = 0x00000001,
MTRAttributeIDTypeClusterChimeAttributeEnabledID MTR_PROVISIONALLY_AVAILABLE = 0x00000002,
MTRAttributeIDTypeClusterChimeAttributeGeneratedCommandListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeGeneratedCommandListID,
MTRAttributeIDTypeClusterChimeAttributeAcceptedCommandListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAcceptedCommandListID,
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm
index 00c2db4..e0a8484 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm
@@ -8148,8 +8148,8 @@
result = @"InstalledChimeSounds";
break;
- case MTRAttributeIDTypeClusterChimeAttributeActiveChimeSoundIdID:
- result = @"ActiveChimeSoundId";
+ case MTRAttributeIDTypeClusterChimeAttributeActiveChimeIDID:
+ result = @"ActiveChimeID";
break;
case MTRAttributeIDTypeClusterChimeAttributeEnabledID:
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h
index f46e1d1..964282c 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h
@@ -6837,9 +6837,9 @@
- (NSDictionary<NSString *, id> * _Nullable)readAttributeInstalledChimeSoundsWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeActiveChimeSoundIdWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeActiveChimeSoundIdWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
-- (void)writeAttributeActiveChimeSoundIdWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeActiveChimeIDWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeActiveChimeIDWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
+- (void)writeAttributeActiveChimeIDWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
- (NSDictionary<NSString *, id> * _Nullable)readAttributeEnabledWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
- (void)writeAttributeEnabledWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE;
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
index c745143..0e90529 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
@@ -19587,20 +19587,20 @@
return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeChimeID) attributeID:@(MTRAttributeIDTypeClusterChimeAttributeInstalledChimeSoundsID) params:params];
}
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeActiveChimeSoundIdWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeActiveChimeIDWithParams:(MTRReadParams * _Nullable)params
{
- return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeChimeID) attributeID:@(MTRAttributeIDTypeClusterChimeAttributeActiveChimeSoundIdID) params:params];
+ return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeChimeID) attributeID:@(MTRAttributeIDTypeClusterChimeAttributeActiveChimeIDID) params:params];
}
-- (void)writeAttributeActiveChimeSoundIdWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
+- (void)writeAttributeActiveChimeIDWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
{
- [self writeAttributeActiveChimeSoundIdWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil];
+ [self writeAttributeActiveChimeIDWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil];
}
-- (void)writeAttributeActiveChimeSoundIdWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params
+- (void)writeAttributeActiveChimeIDWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params
{
NSNumber * timedWriteTimeout = params.timedWriteTimeout;
- [self.device writeAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeChimeID) attributeID:@(MTRAttributeIDTypeClusterChimeAttributeActiveChimeSoundIdID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
+ [self.device writeAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeChimeID) attributeID:@(MTRAttributeIDTypeClusterChimeAttributeActiveChimeIDID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
}
- (NSDictionary<NSString *, id> * _Nullable)readAttributeEnabledWithParams:(MTRReadParams * _Nullable)params
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
index 2aecf40..42ee02b 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
@@ -2119,7 +2119,7 @@
MTR_PROVISIONALLY_AVAILABLE
@interface MTRChimeClusterChimeSoundStruct : NSObject <NSCopying>
-@property (nonatomic, copy) NSNumber * _Nonnull chimeId MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull chimeID MTR_PROVISIONALLY_AVAILABLE;
@property (nonatomic, copy) NSString * _Nonnull name MTR_PROVISIONALLY_AVAILABLE;
@end
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
index 67b0774..a632603 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
@@ -8773,7 +8773,7 @@
{
if (self = [super init]) {
- _chimeId = @(0);
+ _chimeID = @(0);
_name = @"";
}
@@ -8784,7 +8784,7 @@
{
auto other = [[MTRChimeClusterChimeSoundStruct alloc] init];
- other.chimeId = self.chimeId;
+ other.chimeID = self.chimeID;
other.name = self.name;
return other;
@@ -8792,7 +8792,7 @@
- (NSString *)description
{
- NSString * descriptionString = [NSString stringWithFormat:@"<%@: chimeId:%@; name:%@; >", NSStringFromClass([self class]), _chimeId, _name];
+ NSString * descriptionString = [NSString stringWithFormat:@"<%@: chimeID:%@; name:%@; >", NSStringFromClass([self class]), _chimeID, _name];
return descriptionString;
}
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 2ccdf50..fa1f965 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
@@ -36670,7 +36670,7 @@
namespace Chime {
namespace Attributes {
-namespace ActiveChimeSoundId {
+namespace ActiveChimeID {
Protocols::InteractionModel::Status Get(EndpointId endpoint, uint8_t * value)
{
@@ -36714,7 +36714,7 @@
return emberAfWriteAttribute(endpoint, Clusters::Chime::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
}
-} // namespace ActiveChimeSoundId
+} // namespace ActiveChimeID
namespace Enabled {
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 7d60e62..90d7d65 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
@@ -5566,11 +5566,11 @@
namespace Chime {
namespace Attributes {
-namespace ActiveChimeSoundId {
+namespace ActiveChimeID {
Protocols::InteractionModel::Status Get(EndpointId endpoint, uint8_t * value); // int8u
Protocols::InteractionModel::Status Set(EndpointId endpoint, uint8_t value);
Protocols::InteractionModel::Status Set(EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty);
-} // namespace ActiveChimeSoundId
+} // namespace ActiveChimeID
namespace Enabled {
Protocols::InteractionModel::Status Get(EndpointId endpoint, bool * value); // boolean
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 9c7cad3..9612ff6 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
@@ -28483,7 +28483,7 @@
CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
{
DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
- encoder.Encode(to_underlying(Fields::kChimeId), chimeId);
+ encoder.Encode(to_underlying(Fields::kChimeID), chimeID);
encoder.Encode(to_underlying(Fields::kName), name);
return encoder.Finalize();
}
@@ -28502,9 +28502,9 @@
CHIP_ERROR err = CHIP_NO_ERROR;
const uint8_t __context_tag = std::get<uint8_t>(__element);
- if (__context_tag == to_underlying(Fields::kChimeId))
+ if (__context_tag == to_underlying(Fields::kChimeID))
{
- err = DataModel::Decode(reader, chimeId);
+ err = DataModel::Decode(reader, chimeID);
}
else if (__context_tag == to_underlying(Fields::kName))
{
@@ -28551,8 +28551,8 @@
{
case Attributes::InstalledChimeSounds::TypeInfo::GetAttributeId():
return DataModel::Decode(reader, installedChimeSounds);
- case Attributes::ActiveChimeSoundId::TypeInfo::GetAttributeId():
- return DataModel::Decode(reader, activeChimeSoundId);
+ case Attributes::ActiveChimeID::TypeInfo::GetAttributeId():
+ return DataModel::Decode(reader, activeChimeID);
case Attributes::Enabled::TypeInfo::GetAttributeId():
return DataModel::Decode(reader, enabled);
case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
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 59d48f7..0cdb5fd 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
@@ -41201,14 +41201,14 @@
namespace ChimeSoundStruct {
enum class Fields : uint8_t
{
- kChimeId = 0,
+ kChimeID = 0,
kName = 1,
};
struct Type
{
public:
- uint8_t chimeId = static_cast<uint8_t>(0);
+ uint8_t chimeID = static_cast<uint8_t>(0);
chip::CharSpan name;
CHIP_ERROR Decode(TLV::TLVReader & reader);
@@ -41279,7 +41279,7 @@
static constexpr bool MustUseTimedWrite() { return false; }
};
} // namespace InstalledChimeSounds
-namespace ActiveChimeSoundId {
+namespace ActiveChimeID {
struct TypeInfo
{
using Type = uint8_t;
@@ -41287,10 +41287,10 @@
using DecodableArgType = uint8_t;
static constexpr ClusterId GetClusterId() { return Clusters::Chime::Id; }
- static constexpr AttributeId GetAttributeId() { return Attributes::ActiveChimeSoundId::Id; }
+ static constexpr AttributeId GetAttributeId() { return Attributes::ActiveChimeID::Id; }
static constexpr bool MustUseTimedWrite() { return false; }
};
-} // namespace ActiveChimeSoundId
+} // namespace ActiveChimeID
namespace Enabled {
struct TypeInfo
{
@@ -41349,8 +41349,8 @@
CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
Attributes::InstalledChimeSounds::TypeInfo::DecodableType installedChimeSounds;
- Attributes::ActiveChimeSoundId::TypeInfo::DecodableType activeChimeSoundId = static_cast<uint8_t>(0);
- Attributes::Enabled::TypeInfo::DecodableType enabled = static_cast<bool>(0);
+ Attributes::ActiveChimeID::TypeInfo::DecodableType activeChimeID = static_cast<uint8_t>(0);
+ Attributes::Enabled::TypeInfo::DecodableType enabled = static_cast<bool>(0);
Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
Attributes::EventList::TypeInfo::DecodableType eventList;
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 a7703bd..059dcab 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
@@ -7320,9 +7320,9 @@
static constexpr AttributeId Id = 0x00000000;
} // namespace InstalledChimeSounds
-namespace ActiveChimeSoundId {
+namespace ActiveChimeID {
static constexpr AttributeId Id = 0x00000001;
-} // namespace ActiveChimeSoundId
+} // namespace ActiveChimeID
namespace Enabled {
static constexpr AttributeId Id = 0x00000002;
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
index eb8fe22..90f5916 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
@@ -13654,7 +13654,7 @@
|------------------------------------------------------------------------------|
| Attributes: | |
| * InstalledChimeSounds | 0x0000 |
-| * ActiveChimeSoundId | 0x0001 |
+| * ActiveChimeID | 0x0001 |
| * Enabled | 0x0002 |
| * GeneratedCommandList | 0xFFF8 |
| * AcceptedCommandList | 0xFFF9 |
@@ -26240,7 +26240,7 @@
//
make_unique<ReadAttribute>(Id, credsIssuerConfig), //
make_unique<ReadAttribute>(Id, "installed-chime-sounds", Attributes::InstalledChimeSounds::Id, credsIssuerConfig), //
- make_unique<ReadAttribute>(Id, "active-chime-sound-id", Attributes::ActiveChimeSoundId::Id, credsIssuerConfig), //
+ make_unique<ReadAttribute>(Id, "active-chime-id", Attributes::ActiveChimeID::Id, credsIssuerConfig), //
make_unique<ReadAttribute>(Id, "enabled", Attributes::Enabled::Id, credsIssuerConfig), //
make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), //
@@ -26253,7 +26253,7 @@
WriteAttributeAsComplex<chip::app::DataModel::List<const chip::app::Clusters::Chime::Structs::ChimeSoundStruct::Type>>>(
Id, "installed-chime-sounds", Attributes::InstalledChimeSounds::Id, WriteCommandType::kForceWrite,
credsIssuerConfig), //
- make_unique<WriteAttribute<uint8_t>>(Id, "active-chime-sound-id", 0, UINT8_MAX, Attributes::ActiveChimeSoundId::Id,
+ make_unique<WriteAttribute<uint8_t>>(Id, "active-chime-id", 0, UINT8_MAX, Attributes::ActiveChimeID::Id,
WriteCommandType::kWrite, credsIssuerConfig), //
make_unique<WriteAttribute<bool>>(Id, "enabled", 0, 1, Attributes::Enabled::Id, WriteCommandType::kWrite,
credsIssuerConfig), //
@@ -26272,7 +26272,7 @@
WriteCommandType::kForceWrite, credsIssuerConfig), //
make_unique<SubscribeAttribute>(Id, credsIssuerConfig), //
make_unique<SubscribeAttribute>(Id, "installed-chime-sounds", Attributes::InstalledChimeSounds::Id, credsIssuerConfig), //
- make_unique<SubscribeAttribute>(Id, "active-chime-sound-id", Attributes::ActiveChimeSoundId::Id, credsIssuerConfig), //
+ make_unique<SubscribeAttribute>(Id, "active-chime-id", Attributes::ActiveChimeID::Id, credsIssuerConfig), //
make_unique<SubscribeAttribute>(Id, "enabled", Attributes::Enabled::Id, credsIssuerConfig), //
make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), //
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp
index 0c7234d..159b3bd 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp
@@ -5680,13 +5680,13 @@
Json::Value valueCopy(value);
ReturnErrorOnFailure(
- ComplexArgumentParser::EnsureMemberExist("ChimeSoundStruct.chimeId", "chimeId", value.isMember("chimeId")));
+ ComplexArgumentParser::EnsureMemberExist("ChimeSoundStruct.chimeID", "chimeID", value.isMember("chimeID")));
ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("ChimeSoundStruct.name", "name", value.isMember("name")));
char labelWithMember[kMaxLabelLength];
- snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "chimeId");
- ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.chimeId, value["chimeId"]));
- valueCopy.removeMember("chimeId");
+ snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "chimeID");
+ ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.chimeID, value["chimeID"]));
+ valueCopy.removeMember("chimeID");
snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "name");
ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.name, value["name"]));
@@ -5697,7 +5697,7 @@
void ComplexArgumentParser::Finalize(chip::app::Clusters::Chime::Structs::ChimeSoundStruct::Type & request)
{
- ComplexArgumentParser::Finalize(request.chimeId);
+ ComplexArgumentParser::Finalize(request.chimeID);
ComplexArgumentParser::Finalize(request.name);
}
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 4d998a0..842863a 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
@@ -5002,10 +5002,10 @@
{
DataModelLogger::LogString(label, indent, "{");
{
- CHIP_ERROR err = LogValue("ChimeId", indent + 1, value.chimeId);
+ CHIP_ERROR err = LogValue("ChimeID", indent + 1, value.chimeID);
if (err != CHIP_NO_ERROR)
{
- DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'ChimeId'");
+ DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'ChimeID'");
return err;
}
}
@@ -17951,10 +17951,10 @@
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
return DataModelLogger::LogValue("InstalledChimeSounds", 1, value);
}
- case Chime::Attributes::ActiveChimeSoundId::Id: {
+ case Chime::Attributes::ActiveChimeID::Id: {
uint8_t value;
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
- return DataModelLogger::LogValue("ActiveChimeSoundId", 1, value);
+ return DataModelLogger::LogValue("ActiveChimeID", 1, value);
}
case Chime::Attributes::Enabled::Id: {
bool value;
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp
index 7eb6aaa..47b4b54 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp
@@ -4382,8 +4382,8 @@
{
case chip::app::Clusters::Chime::Attributes::InstalledChimeSounds::Id:
return "InstalledChimeSounds";
- case chip::app::Clusters::Chime::Attributes::ActiveChimeSoundId::Id:
- return "ActiveChimeSoundId";
+ case chip::app::Clusters::Chime::Attributes::ActiveChimeID::Id:
+ return "ActiveChimeID";
case chip::app::Clusters::Chime::Attributes::Enabled::Id:
return "Enabled";
case chip::app::Clusters::Chime::Attributes::GeneratedCommandList::Id:
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
index f88caca..d162236 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
@@ -160040,7 +160040,7 @@
|------------------------------------------------------------------------------|
| Attributes: | |
| * InstalledChimeSounds | 0x0000 |
-| * ActiveChimeSoundId | 0x0001 |
+| * ActiveChimeID | 0x0001 |
| * Enabled | 0x0002 |
| * GeneratedCommandList | 0xFFF8 |
| * AcceptedCommandList | 0xFFF9 |
@@ -160187,34 +160187,34 @@
#if MTR_ENABLE_PROVISIONAL
/*
- * Attribute ActiveChimeSoundId
+ * Attribute ActiveChimeID
*/
-class ReadChimeActiveChimeSoundId : public ReadAttribute {
+class ReadChimeActiveChimeID : public ReadAttribute {
public:
- ReadChimeActiveChimeSoundId()
- : ReadAttribute("active-chime-sound-id")
+ ReadChimeActiveChimeID()
+ : ReadAttribute("active-chime-id")
{
}
- ~ReadChimeActiveChimeSoundId()
+ ~ReadChimeActiveChimeID()
{
}
CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
{
constexpr chip::ClusterId clusterId = chip::app::Clusters::Chime::Id;
- constexpr chip::AttributeId attributeId = chip::app::Clusters::Chime::Attributes::ActiveChimeSoundId::Id;
+ constexpr chip::AttributeId attributeId = chip::app::Clusters::Chime::Attributes::ActiveChimeID::Id;
ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
__auto_type * cluster = [[MTRBaseClusterChime alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
- [cluster readAttributeActiveChimeSoundIdWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
- NSLog(@"Chime.ActiveChimeSoundId response %@", [value description]);
+ [cluster readAttributeActiveChimeIDWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+ NSLog(@"Chime.ActiveChimeID response %@", [value description]);
if (error == nil) {
RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
} else {
- LogNSError("Chime ActiveChimeSoundId read Error", error);
+ LogNSError("Chime ActiveChimeID read Error", error);
RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
}
SetCommandExitStatus(error);
@@ -160223,24 +160223,24 @@
}
};
-class WriteChimeActiveChimeSoundId : public WriteAttribute {
+class WriteChimeActiveChimeID : public WriteAttribute {
public:
- WriteChimeActiveChimeSoundId()
- : WriteAttribute("active-chime-sound-id")
+ WriteChimeActiveChimeID()
+ : WriteAttribute("active-chime-id")
{
- AddArgument("attr-name", "active-chime-sound-id");
+ AddArgument("attr-name", "active-chime-id");
AddArgument("attr-value", 0, UINT8_MAX, &mValue);
WriteAttribute::AddArguments();
}
- ~WriteChimeActiveChimeSoundId()
+ ~WriteChimeActiveChimeID()
{
}
CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
{
constexpr chip::ClusterId clusterId = chip::app::Clusters::Chime::Id;
- constexpr chip::AttributeId attributeId = chip::app::Clusters::Chime::Attributes::ActiveChimeSoundId::Id;
+ constexpr chip::AttributeId attributeId = chip::app::Clusters::Chime::Attributes::ActiveChimeID::Id;
ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
@@ -160250,9 +160250,9 @@
params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil;
NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
- [cluster writeAttributeActiveChimeSoundIdWithValue:value params:params completion:^(NSError * _Nullable error) {
+ [cluster writeAttributeActiveChimeIDWithValue:value params:params completion:^(NSError * _Nullable error) {
if (error != nil) {
- LogNSError("Chime ActiveChimeSoundId write Error", error);
+ LogNSError("Chime ActiveChimeID write Error", error);
RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
}
SetCommandExitStatus(error);
@@ -160264,21 +160264,21 @@
uint8_t mValue;
};
-class SubscribeAttributeChimeActiveChimeSoundId : public SubscribeAttribute {
+class SubscribeAttributeChimeActiveChimeID : public SubscribeAttribute {
public:
- SubscribeAttributeChimeActiveChimeSoundId()
- : SubscribeAttribute("active-chime-sound-id")
+ SubscribeAttributeChimeActiveChimeID()
+ : SubscribeAttribute("active-chime-id")
{
}
- ~SubscribeAttributeChimeActiveChimeSoundId()
+ ~SubscribeAttributeChimeActiveChimeID()
{
}
CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
{
constexpr chip::ClusterId clusterId = chip::app::Clusters::Chime::Id;
- constexpr chip::CommandId attributeId = chip::app::Clusters::Chime::Attributes::ActiveChimeSoundId::Id;
+ constexpr chip::CommandId attributeId = chip::app::Clusters::Chime::Attributes::ActiveChimeID::Id;
ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
@@ -160293,10 +160293,10 @@
if (mAutoResubscribe.HasValue()) {
params.resubscribeAutomatically = mAutoResubscribe.Value();
}
- [cluster subscribeAttributeActiveChimeSoundIdWithParams:params
+ [cluster subscribeAttributeActiveChimeIDWithParams:params
subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
- NSLog(@"Chime.ActiveChimeSoundId response %@", [value description]);
+ NSLog(@"Chime.ActiveChimeID response %@", [value description]);
if (error == nil) {
RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
} else {
@@ -183955,9 +183955,9 @@
make_unique<SubscribeAttributeChimeInstalledChimeSounds>(), //
#endif // MTR_ENABLE_PROVISIONAL
#if MTR_ENABLE_PROVISIONAL
- make_unique<ReadChimeActiveChimeSoundId>(), //
- make_unique<WriteChimeActiveChimeSoundId>(), //
- make_unique<SubscribeAttributeChimeActiveChimeSoundId>(), //
+ make_unique<ReadChimeActiveChimeID>(), //
+ make_unique<WriteChimeActiveChimeID>(), //
+ make_unique<SubscribeAttributeChimeActiveChimeID>(), //
#endif // MTR_ENABLE_PROVISIONAL
#if MTR_ENABLE_PROVISIONAL
make_unique<ReadChimeEnabled>(), //
