Skip to content

Commit 8fb81f3

Browse files
yunhanw-googleyunhanw-google
committed
regen
1 parent 15320e2 commit 8fb81f3

File tree

592 files changed

+130746
-119256
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

592 files changed

+130746
-119256
lines changed

‎examples/contact-sensor-app/nxp/zap-lit/contact-sensor-app.matter

+3-3
Original file line numberDiff line numberDiff line change
@@ -1377,9 +1377,9 @@ cluster IcdManagement = 70 {
13771377
request struct RegisterClientRequest {
13781378
node_id checkInNodeID = 0;
13791379
int64u monitoredSubject = 1;
1380-
optional ClientTypeEnum clientType = 2;
1381-
octet_string<16> key = 3;
1382-
optional octet_string<16> verificationKey = 4;
1380+
octet_string<16> key = 2;
1381+
optional octet_string<16> verificationKey = 3;
1382+
ClientTypeEnum clientType = 4;
13831383
}
13841384

13851385
response struct RegisterClientResponse = 1 {

‎examples/contact-sensor-app/nxp/zap-sit/contact-sensor-app.matter

+3-3
Original file line numberDiff line numberDiff line change
@@ -1377,9 +1377,9 @@ cluster IcdManagement = 70 {
13771377
request struct RegisterClientRequest {
13781378
node_id checkInNodeID = 0;
13791379
int64u monitoredSubject = 1;
1380-
optional ClientTypeEnum clientType = 2;
1381-
octet_string<16> key = 3;
1382-
optional octet_string<16> verificationKey = 4;
1380+
octet_string<16> key = 2;
1381+
optional octet_string<16> verificationKey = 3;
1382+
ClientTypeEnum clientType = 4;
13831383
}
13841384

13851385
response struct RegisterClientResponse = 1 {

‎examples/light-switch-app/light-switch-common/light-switch-app.matter

+3-3
Original file line numberDiff line numberDiff line change
@@ -2001,9 +2001,9 @@ cluster IcdManagement = 70 {
20012001
request struct RegisterClientRequest {
20022002
node_id checkInNodeID = 0;
20032003
int64u monitoredSubject = 1;
2004-
optional ClientTypeEnum clientType = 2;
2005-
octet_string<16> key = 3;
2006-
optional octet_string<16> verificationKey = 4;
2004+
octet_string<16> key = 2;
2005+
optional octet_string<16> verificationKey = 3;
2006+
ClientTypeEnum clientType = 4;
20072007
}
20082008

20092009
response struct RegisterClientResponse = 1 {

‎examples/light-switch-app/qpg/zap/switch.matter

+3-3
Original file line numberDiff line numberDiff line change
@@ -1798,9 +1798,9 @@ cluster IcdManagement = 70 {
17981798
request struct RegisterClientRequest {
17991799
node_id checkInNodeID = 0;
18001800
int64u monitoredSubject = 1;
1801-
optional ClientTypeEnum clientType = 2;
1802-
octet_string<16> key = 3;
1803-
optional octet_string<16> verificationKey = 4;
1801+
octet_string<16> key = 2;
1802+
optional octet_string<16> verificationKey = 3;
1803+
ClientTypeEnum clientType = 4;
18041804
}
18051805

18061806
response struct RegisterClientResponse = 1 {

‎examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter

+3-3
Original file line numberDiff line numberDiff line change
@@ -1475,9 +1475,9 @@ cluster IcdManagement = 70 {
14751475
request struct RegisterClientRequest {
14761476
node_id checkInNodeID = 0;
14771477
int64u monitoredSubject = 1;
1478-
optional ClientTypeEnum clientType = 2;
1479-
octet_string<16> key = 3;
1480-
optional octet_string<16> verificationKey = 4;
1478+
octet_string<16> key = 2;
1479+
optional octet_string<16> verificationKey = 3;
1480+
ClientTypeEnum clientType = 4;
14811481
}
14821482

14831483
response struct RegisterClientResponse = 1 {

‎examples/lock-app/lock-common/lock-app.matter

+3-3
Original file line numberDiff line numberDiff line change
@@ -1818,9 +1818,9 @@ cluster IcdManagement = 70 {
18181818
request struct RegisterClientRequest {
18191819
node_id checkInNodeID = 0;
18201820
int64u monitoredSubject = 1;
1821-
optional ClientTypeEnum clientType = 2;
1822-
octet_string<16> key = 3;
1823-
optional octet_string<16> verificationKey = 4;
1821+
octet_string<16> key = 2;
1822+
optional octet_string<16> verificationKey = 3;
1823+
ClientTypeEnum clientType = 4;
18241824
}
18251825

18261826
response struct RegisterClientResponse = 1 {

‎examples/lock-app/qpg/zap/lock.matter

+3-3
Original file line numberDiff line numberDiff line change
@@ -1474,9 +1474,9 @@ cluster IcdManagement = 70 {
14741474
request struct RegisterClientRequest {
14751475
node_id checkInNodeID = 0;
14761476
int64u monitoredSubject = 1;
1477-
optional ClientTypeEnum clientType = 2;
1478-
octet_string<16> key = 3;
1479-
optional octet_string<16> verificationKey = 4;
1477+
octet_string<16> key = 2;
1478+
optional octet_string<16> verificationKey = 3;
1479+
ClientTypeEnum clientType = 4;
14801480
}
14811481

14821482
response struct RegisterClientResponse = 1 {

‎examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter

+3-3
Original file line numberDiff line numberDiff line change
@@ -1794,9 +1794,9 @@ cluster IcdManagement = 70 {
17941794
request struct RegisterClientRequest {
17951795
node_id checkInNodeID = 0;
17961796
int64u monitoredSubject = 1;
1797-
optional ClientTypeEnum clientType = 2;
1798-
octet_string<16> key = 3;
1799-
optional octet_string<16> verificationKey = 4;
1797+
octet_string<16> key = 2;
1798+
optional octet_string<16> verificationKey = 3;
1799+
ClientTypeEnum clientType = 4;
18001800
}
18011801

18021802
response struct RegisterClientResponse = 1 {

‎examples/window-app/common/window-app.matter

+3-3
Original file line numberDiff line numberDiff line change
@@ -1892,9 +1892,9 @@ cluster IcdManagement = 70 {
18921892
request struct RegisterClientRequest {
18931893
node_id checkInNodeID = 0;
18941894
int64u monitoredSubject = 1;
1895-
optional ClientTypeEnum clientType = 2;
1896-
octet_string<16> key = 3;
1897-
optional octet_string<16> verificationKey = 4;
1895+
octet_string<16> key = 2;
1896+
optional octet_string<16> verificationKey = 3;
1897+
ClientTypeEnum clientType = 4;
18981898
}
18991899

19001900
response struct RegisterClientResponse = 1 {

‎src/app/icd/server/tests/TestICDManager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ class TestAddressResolver : public AddressResolve::Resolver
134134
CHIP_ERROR LookupNode(const NodeLookupRequest & request, Impl::NodeLookupHandle & handle) override { return CHIP_NO_ERROR; };
135135
CHIP_ERROR TryNextResult(Impl::NodeLookupHandle & handle) override { return CHIP_NO_ERROR; };
136136
CHIP_ERROR CancelLookup(Impl::NodeLookupHandle & handle, FailureCallback cancel_method) override { return CHIP_NO_ERROR; };
137-
void Shutdown() override {};
137+
void Shutdown() override{};
138138
};
139139

140140
System::Clock::Internal::MockClock * pMockClock = nullptr;

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -2734,9 +2734,9 @@ cluster IcdManagement = 70 {
27342734
request struct RegisterClientRequest {
27352735
node_id checkInNodeID = 0;
27362736
int64u monitoredSubject = 1;
2737-
optional ClientTypeEnum clientType = 2;
2738-
octet_string<16> key = 3;
2739-
optional octet_string<16> verificationKey = 4;
2737+
octet_string<16> key = 2;
2738+
optional octet_string<16> verificationKey = 3;
2739+
ClientTypeEnum clientType = 4;
27402740
}
27412741

27422742
response struct RegisterClientResponse = 1 {

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

+9-9
Original file line numberDiff line numberDiff line change
@@ -18618,11 +18618,11 @@ public long initWithDevice(long devicePtr, int endpointId) {
1861818618
return 0L;
1861918619
}
1862018620

18621-
public void registerClient(RegisterClientResponseCallback callback, Long checkInNodeID, Long monitoredSubject, Optional<Integer> clientType, byte[] key, Optional<byte[]> verificationKey) {
18622-
registerClient(callback, checkInNodeID, monitoredSubject, clientType, key, verificationKey, 0);
18621+
public void registerClient(RegisterClientResponseCallback callback, Long checkInNodeID, Long monitoredSubject, byte[] key, Optional<byte[]> verificationKey, Integer clientType) {
18622+
registerClient(callback, checkInNodeID, monitoredSubject, key, verificationKey, clientType, 0);
1862318623
}
1862418624

18625-
public void registerClient(RegisterClientResponseCallback callback, Long checkInNodeID, Long monitoredSubject, Optional<Integer> clientType, byte[] key, Optional<byte[]> verificationKey, int timedInvokeTimeoutMs) {
18625+
public void registerClient(RegisterClientResponseCallback callback, Long checkInNodeID, Long monitoredSubject, byte[] key, Optional<byte[]> verificationKey, Integer clientType, int timedInvokeTimeoutMs) {
1862618626
final long commandId = 0L;
1862718627

1862818628
ArrayList<StructElement> elements = new ArrayList<>();
@@ -18634,18 +18634,18 @@ public void registerClient(RegisterClientResponseCallback callback, Long checkIn
1863418634
BaseTLVType monitoredSubjecttlvValue = new UIntType(monitoredSubject);
1863518635
elements.add(new StructElement(monitoredSubjectFieldID, monitoredSubjecttlvValue));
1863618636

18637-
final long clientTypeFieldID = 2L;
18638-
BaseTLVType clientTypetlvValue = clientType.<BaseTLVType>map((nonOptionalclientType) -> new UIntType(nonOptionalclientType)).orElse(new EmptyType());
18639-
elements.add(new StructElement(clientTypeFieldID, clientTypetlvValue));
18640-
18641-
final long keyFieldID = 3L;
18637+
final long keyFieldID = 2L;
1864218638
BaseTLVType keytlvValue = new ByteArrayType(key);
1864318639
elements.add(new StructElement(keyFieldID, keytlvValue));
1864418640

18645-
final long verificationKeyFieldID = 4L;
18641+
final long verificationKeyFieldID = 3L;
1864618642
BaseTLVType verificationKeytlvValue = verificationKey.<BaseTLVType>map((nonOptionalverificationKey) -> new ByteArrayType(nonOptionalverificationKey)).orElse(new EmptyType());
1864718643
elements.add(new StructElement(verificationKeyFieldID, verificationKeytlvValue));
1864818644

18645+
final long clientTypeFieldID = 4L;
18646+
BaseTLVType clientTypetlvValue = new UIntType(clientType);
18647+
elements.add(new StructElement(clientTypeFieldID, clientTypetlvValue));
18648+
1864918649
StructType commandArgs = new StructType(elements);
1865018650
invoke(new InvokeCallbackImpl(callback) {
1865118651
@Override

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5859,7 +5859,7 @@ public static Command value(long id) throws NoSuchFieldError {
58595859
}
58605860
throw new NoSuchFieldError();
58615861
}
5862-
}public enum RegisterClientCommandField {CheckInNodeID(0),MonitoredSubject(1),ClientType(2),Key(3),VerificationKey(4),;
5862+
}public enum RegisterClientCommandField {CheckInNodeID(0),MonitoredSubject(1),Key(2),VerificationKey(3),ClientType(4),;
58635863
private final int id;
58645864
RegisterClientCommandField(int id) {
58655865
this.id = id;

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -23981,14 +23981,14 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
2398123981
CommandParameterInfo icdManagementregisterClientmonitoredSubjectCommandParameterInfo = new CommandParameterInfo("monitoredSubject", Long.class, Long.class);
2398223982
icdManagementregisterClientCommandParams.put("monitoredSubject",icdManagementregisterClientmonitoredSubjectCommandParameterInfo);
2398323983

23984-
CommandParameterInfo icdManagementregisterClientclientTypeCommandParameterInfo = new CommandParameterInfo("clientType", Optional.class, Integer.class);
23985-
icdManagementregisterClientCommandParams.put("clientType",icdManagementregisterClientclientTypeCommandParameterInfo);
23986-
2398723984
CommandParameterInfo icdManagementregisterClientkeyCommandParameterInfo = new CommandParameterInfo("key", byte[].class, byte[].class);
2398823985
icdManagementregisterClientCommandParams.put("key",icdManagementregisterClientkeyCommandParameterInfo);
2398923986

2399023987
CommandParameterInfo icdManagementregisterClientverificationKeyCommandParameterInfo = new CommandParameterInfo("verificationKey", Optional.class, byte[].class);
2399123988
icdManagementregisterClientCommandParams.put("verificationKey",icdManagementregisterClientverificationKeyCommandParameterInfo);
23989+
23990+
CommandParameterInfo icdManagementregisterClientclientTypeCommandParameterInfo = new CommandParameterInfo("clientType", Integer.class, Integer.class);
23991+
icdManagementregisterClientCommandParams.put("clientType",icdManagementregisterClientclientTypeCommandParameterInfo);
2399223992
InteractionInfo icdManagementregisterClientInteractionInfo = new InteractionInfo(
2399323993
(cluster, callback, commandArguments) -> {
2399423994
((ChipClusters.IcdManagementCluster) cluster)
@@ -23999,15 +23999,15 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
2399923999
, (Long)
2400024000
commandArguments.get("monitoredSubject")
2400124001

24002-
, (Optional<Integer>)
24003-
commandArguments.get("clientType")
24004-
2400524002
, (byte[])
2400624003
commandArguments.get("key")
2400724004

2400824005
, (Optional<byte[]>)
2400924006
commandArguments.get("verificationKey")
2401024007

24008+
, (Integer)
24009+
commandArguments.get("clientType")
24010+
2401124011
);
2401224012
},
2401324013
() -> new DelegatedIcdManagementClusterRegisterClientResponseCallback(),

‎src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AccessControlClusterAccessControlEntryChangedEvent.kt

+44-55
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,22 @@
1717
package chip.devicecontroller.cluster.eventstructs
1818

1919
import chip.devicecontroller.cluster.*
20+
import matter.tlv.AnonymousTag
2021
import matter.tlv.ContextSpecificTag
2122
import matter.tlv.Tag
23+
import matter.tlv.TlvParsingException
2224
import matter.tlv.TlvReader
2325
import matter.tlv.TlvWriter
2426

25-
class AccessControlClusterAccessControlEntryChangedEvent(
26-
val adminNodeID: ULong?,
27-
val adminPasscodeID: UInt?,
28-
val changeType: UInt,
29-
val latestValue:
30-
chip.devicecontroller.cluster.structs.AccessControlClusterAccessControlEntryStruct?,
31-
val fabricIndex: UInt,
32-
) {
33-
override fun toString(): String = buildString {
27+
import java.util.Optional
28+
29+
class AccessControlClusterAccessControlEntryChangedEvent (
30+
val adminNodeID: ULong?,
31+
val adminPasscodeID: UInt?,
32+
val changeType: UInt,
33+
val latestValue: chip.devicecontroller.cluster.structs.AccessControlClusterAccessControlEntryStruct?,
34+
val fabricIndex: UInt) {
35+
override fun toString(): String = buildString {
3436
append("AccessControlClusterAccessControlEntryChangedEvent {\n")
3537
append("\tadminNodeID : $adminNodeID\n")
3638
append("\tadminPasscodeID : $adminPasscodeID\n")
@@ -44,21 +46,21 @@ class AccessControlClusterAccessControlEntryChangedEvent(
4446
tlvWriter.apply {
4547
startStructure(tlvTag)
4648
if (adminNodeID != null) {
47-
put(ContextSpecificTag(TAG_ADMIN_NODE_I_D), adminNodeID)
48-
} else {
49-
putNull(ContextSpecificTag(TAG_ADMIN_NODE_I_D))
50-
}
49+
put(ContextSpecificTag(TAG_ADMIN_NODE_I_D), adminNodeID)
50+
} else {
51+
putNull(ContextSpecificTag(TAG_ADMIN_NODE_I_D))
52+
}
5153
if (adminPasscodeID != null) {
52-
put(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D), adminPasscodeID)
53-
} else {
54-
putNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D))
55-
}
54+
put(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D), adminPasscodeID)
55+
} else {
56+
putNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D))
57+
}
5658
put(ContextSpecificTag(TAG_CHANGE_TYPE), changeType)
5759
if (latestValue != null) {
58-
latestValue.toTlv(ContextSpecificTag(TAG_LATEST_VALUE), this)
59-
} else {
60-
putNull(ContextSpecificTag(TAG_LATEST_VALUE))
61-
}
60+
latestValue.toTlv(ContextSpecificTag(TAG_LATEST_VALUE), this)
61+
} else {
62+
putNull(ContextSpecificTag(TAG_LATEST_VALUE))
63+
}
6264
put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex)
6365
endStructure()
6466
}
@@ -71,45 +73,32 @@ class AccessControlClusterAccessControlEntryChangedEvent(
7173
private const val TAG_LATEST_VALUE = 4
7274
private const val TAG_FABRIC_INDEX = 254
7375

74-
fun fromTlv(
75-
tlvTag: Tag,
76-
tlvReader: TlvReader,
77-
): AccessControlClusterAccessControlEntryChangedEvent {
76+
fun fromTlv(tlvTag: Tag, tlvReader: TlvReader) : AccessControlClusterAccessControlEntryChangedEvent {
7877
tlvReader.enterStructure(tlvTag)
79-
val adminNodeID =
80-
if (!tlvReader.isNull()) {
81-
tlvReader.getULong(ContextSpecificTag(TAG_ADMIN_NODE_I_D))
82-
} else {
83-
tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_NODE_I_D))
84-
null
85-
}
86-
val adminPasscodeID =
87-
if (!tlvReader.isNull()) {
88-
tlvReader.getUInt(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D))
89-
} else {
90-
tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D))
91-
null
92-
}
78+
val adminNodeID = if (!tlvReader.isNull()) {
79+
tlvReader.getULong(ContextSpecificTag(TAG_ADMIN_NODE_I_D))
80+
} else {
81+
tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_NODE_I_D))
82+
null
83+
}
84+
val adminPasscodeID = if (!tlvReader.isNull()) {
85+
tlvReader.getUInt(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D))
86+
} else {
87+
tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D))
88+
null
89+
}
9390
val changeType = tlvReader.getUInt(ContextSpecificTag(TAG_CHANGE_TYPE))
94-
val latestValue =
95-
if (!tlvReader.isNull()) {
96-
chip.devicecontroller.cluster.structs.AccessControlClusterAccessControlEntryStruct
97-
.fromTlv(ContextSpecificTag(TAG_LATEST_VALUE), tlvReader)
98-
} else {
99-
tlvReader.getNull(ContextSpecificTag(TAG_LATEST_VALUE))
100-
null
101-
}
91+
val latestValue = if (!tlvReader.isNull()) {
92+
chip.devicecontroller.cluster.structs.AccessControlClusterAccessControlEntryStruct.fromTlv(ContextSpecificTag(TAG_LATEST_VALUE), tlvReader)
93+
} else {
94+
tlvReader.getNull(ContextSpecificTag(TAG_LATEST_VALUE))
95+
null
96+
}
10297
val fabricIndex = tlvReader.getUInt(ContextSpecificTag(TAG_FABRIC_INDEX))
103-
98+
10499
tlvReader.exitContainer()
105100

106-
return AccessControlClusterAccessControlEntryChangedEvent(
107-
adminNodeID,
108-
adminPasscodeID,
109-
changeType,
110-
latestValue,
111-
fabricIndex,
112-
)
101+
return AccessControlClusterAccessControlEntryChangedEvent(adminNodeID, adminPasscodeID, changeType, latestValue, fabricIndex)
113102
}
114103
}
115104
}

0 commit comments

Comments
 (0)