Skip to content

Commit 83159c2

Browse files
gmarcosbpidarped
gmarcosb
authored and
pidarped
committed
Generated using ./scripts/tools/zap_regen_all.py
1 parent 560c1e1 commit 83159c2

32 files changed

+167
-169
lines changed

‎src/controller/data_model/controller-clusters.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -9413,12 +9413,12 @@ provisional cluster Chime = 1366 {
94139413
revision 1;
94149414

94159415
struct ChimeSoundStruct {
9416-
int8u chimeId = 0;
9416+
int8u chimeID = 0;
94179417
char_string<48> name = 1;
94189418
}
94199419

94209420
readonly attribute ChimeSoundStruct installedChimeSounds[] = 0;
9421-
attribute int8u activeChimeSoundId = 1;
9421+
attribute int8u activeChimeID = 1;
94229422
attribute boolean enabled = 2;
94239423
readonly attribute command_id generatedCommandList[] = 65528;
94249424
readonly attribute command_id acceptedCommandList[] = 65529;

‎src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java

+11-11
Original file line numberDiff line numberDiff line change
@@ -59495,7 +59495,7 @@ public static class ChimeCluster extends BaseChipCluster {
5949559495
public static final long CLUSTER_ID = 1366L;
5949659496

5949759497
private static final long INSTALLED_CHIME_SOUNDS_ATTRIBUTE_ID = 0L;
59498-
private static final long ACTIVE_CHIME_SOUND_ID_ATTRIBUTE_ID = 1L;
59498+
private static final long ACTIVE_CHIME_ID_ATTRIBUTE_ID = 1L;
5949959499
private static final long ENABLED_ATTRIBUTE_ID = 2L;
5950059500
private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
5950159501
private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
@@ -59576,39 +59576,39 @@ public void onSuccess(byte[] tlv) {
5957659576
}, INSTALLED_CHIME_SOUNDS_ATTRIBUTE_ID, minInterval, maxInterval);
5957759577
}
5957859578

59579-
public void readActiveChimeSoundIdAttribute(
59579+
public void readActiveChimeIDAttribute(
5958059580
IntegerAttributeCallback callback) {
59581-
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_CHIME_SOUND_ID_ATTRIBUTE_ID);
59581+
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_CHIME_ID_ATTRIBUTE_ID);
5958259582

5958359583
readAttribute(new ReportCallbackImpl(callback, path) {
5958459584
@Override
5958559585
public void onSuccess(byte[] tlv) {
5958659586
Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
5958759587
callback.onSuccess(value);
5958859588
}
59589-
}, ACTIVE_CHIME_SOUND_ID_ATTRIBUTE_ID, true);
59589+
}, ACTIVE_CHIME_ID_ATTRIBUTE_ID, true);
5959059590
}
5959159591

59592-
public void writeActiveChimeSoundIdAttribute(DefaultClusterCallback callback, Integer value) {
59593-
writeActiveChimeSoundIdAttribute(callback, value, 0);
59592+
public void writeActiveChimeIDAttribute(DefaultClusterCallback callback, Integer value) {
59593+
writeActiveChimeIDAttribute(callback, value, 0);
5959459594
}
5959559595

59596-
public void writeActiveChimeSoundIdAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
59596+
public void writeActiveChimeIDAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
5959759597
BaseTLVType tlvValue = new UIntType(value);
59598-
writeAttribute(new WriteAttributesCallbackImpl(callback), ACTIVE_CHIME_SOUND_ID_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
59598+
writeAttribute(new WriteAttributesCallbackImpl(callback), ACTIVE_CHIME_ID_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
5959959599
}
5960059600

59601-
public void subscribeActiveChimeSoundIdAttribute(
59601+
public void subscribeActiveChimeIDAttribute(
5960259602
IntegerAttributeCallback callback, int minInterval, int maxInterval) {
59603-
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_CHIME_SOUND_ID_ATTRIBUTE_ID);
59603+
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_CHIME_ID_ATTRIBUTE_ID);
5960459604

5960559605
subscribeAttribute(new ReportCallbackImpl(callback, path) {
5960659606
@Override
5960759607
public void onSuccess(byte[] tlv) {
5960859608
Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
5960959609
callback.onSuccess(value);
5961059610
}
59611-
}, ACTIVE_CHIME_SOUND_ID_ATTRIBUTE_ID, minInterval, maxInterval);
59611+
}, ACTIVE_CHIME_ID_ATTRIBUTE_ID, minInterval, maxInterval);
5961259612
}
5961359613

5961459614
public void readEnabledAttribute(

‎src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -12725,22 +12725,22 @@ public String toString() {
1272512725
}
1272612726
}
1272712727
public static class ChimeClusterChimeSoundStruct {
12728-
public Integer chimeId;
12728+
public Integer chimeID;
1272912729
public String name;
1273012730
private static final long CHIME_ID_ID = 0L;
1273112731
private static final long NAME_ID = 1L;
1273212732

1273312733
public ChimeClusterChimeSoundStruct(
12734-
Integer chimeId,
12734+
Integer chimeID,
1273512735
String name
1273612736
) {
12737-
this.chimeId = chimeId;
12737+
this.chimeID = chimeID;
1273812738
this.name = name;
1273912739
}
1274012740

1274112741
public StructType encodeTlv() {
1274212742
ArrayList<StructElement> values = new ArrayList<>();
12743-
values.add(new StructElement(CHIME_ID_ID, new UIntType(chimeId)));
12743+
values.add(new StructElement(CHIME_ID_ID, new UIntType(chimeID)));
1274412744
values.add(new StructElement(NAME_ID, new StringType(name)));
1274512745

1274612746
return new StructType(values);
@@ -12750,13 +12750,13 @@ public static ChimeClusterChimeSoundStruct decodeTlv(BaseTLVType tlvValue) {
1275012750
if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
1275112751
return null;
1275212752
}
12753-
Integer chimeId = null;
12753+
Integer chimeID = null;
1275412754
String name = null;
1275512755
for (StructElement element: ((StructType)tlvValue).value()) {
1275612756
if (element.contextTagNum() == CHIME_ID_ID) {
1275712757
if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
1275812758
UIntType castingValue = element.value(UIntType.class);
12759-
chimeId = castingValue.value(Integer.class);
12759+
chimeID = castingValue.value(Integer.class);
1276012760
}
1276112761
} else if (element.contextTagNum() == NAME_ID) {
1276212762
if (element.value(BaseTLVType.class).type() == TLVType.String) {
@@ -12766,7 +12766,7 @@ public static ChimeClusterChimeSoundStruct decodeTlv(BaseTLVType tlvValue) {
1276612766
}
1276712767
}
1276812768
return new ChimeClusterChimeSoundStruct(
12769-
chimeId,
12769+
chimeID,
1277012770
name
1277112771
);
1277212772
}
@@ -12775,8 +12775,8 @@ public static ChimeClusterChimeSoundStruct decodeTlv(BaseTLVType tlvValue) {
1277512775
public String toString() {
1277612776
StringBuilder output = new StringBuilder();
1277712777
output.append("ChimeClusterChimeSoundStruct {\n");
12778-
output.append("\tchimeId: ");
12779-
output.append(chimeId);
12778+
output.append("\tchimeID: ");
12779+
output.append(chimeID);
1278012780
output.append("\n");
1278112781
output.append("\tname: ");
1278212782
output.append(name);

‎src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16889,7 +16889,7 @@ public long getID() {
1688916889

1689016890
public enum Attribute {
1689116891
InstalledChimeSounds(0L),
16892-
ActiveChimeSoundId(1L),
16892+
ActiveChimeID(1L),
1689316893
Enabled(2L),
1689416894
GeneratedCommandList(65528L),
1689516895
AcceptedCommandList(65529L),

‎src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -18248,17 +18248,17 @@ private static Map<String, InteractionInfo> readChimeInteractionInfo() {
1824818248
readChimeInstalledChimeSoundsCommandParams
1824918249
);
1825018250
result.put("readInstalledChimeSoundsAttribute", readChimeInstalledChimeSoundsAttributeInteractionInfo);
18251-
Map<String, CommandParameterInfo> readChimeActiveChimeSoundIdCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
18252-
InteractionInfo readChimeActiveChimeSoundIdAttributeInteractionInfo = new InteractionInfo(
18251+
Map<String, CommandParameterInfo> readChimeActiveChimeIDCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
18252+
InteractionInfo readChimeActiveChimeIDAttributeInteractionInfo = new InteractionInfo(
1825318253
(cluster, callback, commandArguments) -> {
18254-
((ChipClusters.ChimeCluster) cluster).readActiveChimeSoundIdAttribute(
18254+
((ChipClusters.ChimeCluster) cluster).readActiveChimeIDAttribute(
1825518255
(ChipClusters.IntegerAttributeCallback) callback
1825618256
);
1825718257
},
1825818258
() -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
18259-
readChimeActiveChimeSoundIdCommandParams
18259+
readChimeActiveChimeIDCommandParams
1826018260
);
18261-
result.put("readActiveChimeSoundIdAttribute", readChimeActiveChimeSoundIdAttributeInteractionInfo);
18261+
result.put("readActiveChimeIDAttribute", readChimeActiveChimeIDAttributeInteractionInfo);
1826218262
Map<String, CommandParameterInfo> readChimeEnabledCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
1826318263
InteractionInfo readChimeEnabledAttributeInteractionInfo = new InteractionInfo(
1826418264
(cluster, callback, commandArguments) -> {

‎src/controller/java/generated/java/chip/devicecontroller/ClusterWriteMapping.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -3473,28 +3473,28 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
34733473
Map<String, InteractionInfo> writeContentAppObserverInteractionInfo = new LinkedHashMap<>();
34743474
writeAttributeMap.put("contentAppObserver", writeContentAppObserverInteractionInfo);
34753475
Map<String, InteractionInfo> writeChimeInteractionInfo = new LinkedHashMap<>();
3476-
Map<String, CommandParameterInfo> writeChimeActiveChimeSoundIdCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
3477-
CommandParameterInfo chimeactiveChimeSoundIdCommandParameterInfo =
3476+
Map<String, CommandParameterInfo> writeChimeActiveChimeIDCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
3477+
CommandParameterInfo chimeactiveChimeIDCommandParameterInfo =
34783478
new CommandParameterInfo(
34793479
"value",
34803480
Integer.class,
34813481
Integer.class
34823482
);
3483-
writeChimeActiveChimeSoundIdCommandParams.put(
3483+
writeChimeActiveChimeIDCommandParams.put(
34843484
"value",
3485-
chimeactiveChimeSoundIdCommandParameterInfo
3485+
chimeactiveChimeIDCommandParameterInfo
34863486
);
3487-
InteractionInfo writeChimeActiveChimeSoundIdAttributeInteractionInfo = new InteractionInfo(
3487+
InteractionInfo writeChimeActiveChimeIDAttributeInteractionInfo = new InteractionInfo(
34883488
(cluster, callback, commandArguments) -> {
3489-
((ChipClusters.ChimeCluster) cluster).writeActiveChimeSoundIdAttribute(
3489+
((ChipClusters.ChimeCluster) cluster).writeActiveChimeIDAttribute(
34903490
(DefaultClusterCallback) callback,
34913491
(Integer) commandArguments.get("value")
34923492
);
34933493
},
34943494
() -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
3495-
writeChimeActiveChimeSoundIdCommandParams
3495+
writeChimeActiveChimeIDCommandParams
34963496
);
3497-
writeChimeInteractionInfo.put("writeActiveChimeSoundIdAttribute", writeChimeActiveChimeSoundIdAttributeInteractionInfo);
3497+
writeChimeInteractionInfo.put("writeActiveChimeIDAttribute", writeChimeActiveChimeIDAttributeInteractionInfo);
34983498
Map<String, CommandParameterInfo> writeChimeEnabledCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
34993499
CommandParameterInfo chimeenabledCommandParameterInfo =
35003500
new CommandParameterInfo(

‎src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ChimeClusterChimeSoundStruct.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@ import matter.tlv.Tag
2222
import matter.tlv.TlvReader
2323
import matter.tlv.TlvWriter
2424

25-
class ChimeClusterChimeSoundStruct(val chimeId: UInt, val name: String) {
25+
class ChimeClusterChimeSoundStruct(val chimeID: UInt, val name: String) {
2626
override fun toString(): String = buildString {
2727
append("ChimeClusterChimeSoundStruct {\n")
28-
append("\tchimeId : $chimeId\n")
28+
append("\tchimeID : $chimeID\n")
2929
append("\tname : $name\n")
3030
append("}\n")
3131
}
3232

3333
fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
3434
tlvWriter.apply {
3535
startStructure(tlvTag)
36-
put(ContextSpecificTag(TAG_CHIME_ID), chimeId)
36+
put(ContextSpecificTag(TAG_CHIME_ID), chimeID)
3737
put(ContextSpecificTag(TAG_NAME), name)
3838
endStructure()
3939
}
@@ -45,12 +45,12 @@ class ChimeClusterChimeSoundStruct(val chimeId: UInt, val name: String) {
4545

4646
fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ChimeClusterChimeSoundStruct {
4747
tlvReader.enterStructure(tlvTag)
48-
val chimeId = tlvReader.getUInt(ContextSpecificTag(TAG_CHIME_ID))
48+
val chimeID = tlvReader.getUInt(ContextSpecificTag(TAG_CHIME_ID))
4949
val name = tlvReader.getString(ContextSpecificTag(TAG_NAME))
5050

5151
tlvReader.exitContainer()
5252

53-
return ChimeClusterChimeSoundStruct(chimeId, name)
53+
return ChimeClusterChimeSoundStruct(chimeID, name)
5454
}
5555
}
5656
}

‎src/controller/java/generated/java/matter/controller/cluster/clusters/ChimeCluster.kt

+5-7
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ class ChimeCluster(private val controller: MatterController, private val endpoin
210210
}
211211
}
212212

213-
suspend fun readActiveChimeSoundIdAttribute(): UByte {
213+
suspend fun readActiveChimeIDAttribute(): UByte {
214214
val ATTRIBUTE_ID: UInt = 1u
215215

216216
val attributePath =
@@ -232,7 +232,7 @@ class ChimeCluster(private val controller: MatterController, private val endpoin
232232
it.path.attributeId == ATTRIBUTE_ID
233233
}
234234

235-
requireNotNull(attributeData) { "Activechimesoundid attribute not found in response" }
235+
requireNotNull(attributeData) { "Activechimeid attribute not found in response" }
236236

237237
// Decode the TLV data into the appropriate type
238238
val tlvReader = TlvReader(attributeData.data)
@@ -241,7 +241,7 @@ class ChimeCluster(private val controller: MatterController, private val endpoin
241241
return decodedValue
242242
}
243243

244-
suspend fun writeActiveChimeSoundIdAttribute(value: UByte, timedWriteTimeout: Duration? = null) {
244+
suspend fun writeActiveChimeIDAttribute(value: UByte, timedWriteTimeout: Duration? = null) {
245245
val ATTRIBUTE_ID: UInt = 1u
246246

247247
val tlvWriter = TlvWriter()
@@ -281,7 +281,7 @@ class ChimeCluster(private val controller: MatterController, private val endpoin
281281
}
282282
}
283283

284-
suspend fun subscribeActiveChimeSoundIdAttribute(
284+
suspend fun subscribeActiveChimeIDAttribute(
285285
minInterval: Int,
286286
maxInterval: Int,
287287
): Flow<UByteSubscriptionState> {
@@ -316,9 +316,7 @@ class ChimeCluster(private val controller: MatterController, private val endpoin
316316
.filterIsInstance<ReadData.Attribute>()
317317
.firstOrNull { it.path.attributeId == ATTRIBUTE_ID }
318318

319-
requireNotNull(attributeData) {
320-
"Activechimesoundid attribute not found in Node State update"
321-
}
319+
requireNotNull(attributeData) { "Activechimeid attribute not found in Node State update" }
322320

323321
// Decode the TLV data into the appropriate type
324322
val tlvReader = TlvReader(attributeData.data)

‎src/controller/java/generated/java/matter/controller/cluster/structs/ChimeClusterChimeSoundStruct.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@ import matter.tlv.Tag
2222
import matter.tlv.TlvReader
2323
import matter.tlv.TlvWriter
2424

25-
class ChimeClusterChimeSoundStruct(val chimeId: UByte, val name: String) {
25+
class ChimeClusterChimeSoundStruct(val chimeID: UByte, val name: String) {
2626
override fun toString(): String = buildString {
2727
append("ChimeClusterChimeSoundStruct {\n")
28-
append("\tchimeId : $chimeId\n")
28+
append("\tchimeID : $chimeID\n")
2929
append("\tname : $name\n")
3030
append("}\n")
3131
}
3232

3333
fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
3434
tlvWriter.apply {
3535
startStructure(tlvTag)
36-
put(ContextSpecificTag(TAG_CHIME_ID), chimeId)
36+
put(ContextSpecificTag(TAG_CHIME_ID), chimeID)
3737
put(ContextSpecificTag(TAG_NAME), name)
3838
endStructure()
3939
}
@@ -45,12 +45,12 @@ class ChimeClusterChimeSoundStruct(val chimeId: UByte, val name: String) {
4545

4646
fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ChimeClusterChimeSoundStruct {
4747
tlvReader.enterStructure(tlvTag)
48-
val chimeId = tlvReader.getUByte(ContextSpecificTag(TAG_CHIME_ID))
48+
val chimeID = tlvReader.getUByte(ContextSpecificTag(TAG_CHIME_ID))
4949
val name = tlvReader.getString(ContextSpecificTag(TAG_NAME))
5050

5151
tlvReader.exitContainer()
5252

53-
return ChimeClusterChimeSoundStruct(chimeId, name)
53+
return ChimeClusterChimeSoundStruct(chimeID, name)
5454
}
5555
}
5656
}

‎src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp

+10-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/controller/python/chip/clusters/CHIPClusters.py

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)