Skip to content

Commit 7cd0785

Browse files
ksperling-appleksperling-apple
committed
zap_regen_all
1 parent bd4b228 commit 7cd0785

38 files changed

+210
-588
lines changed

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

+5-8
Original file line numberDiff line numberDiff line change
@@ -8118,16 +8118,13 @@ cluster ThreadNetworkDirectory = 1107 {
81188118
revision 1;
81198119

81208120
struct ThreadNetworkStruct {
8121-
int64u extendedPanID = 0;
8121+
octet_string<8> extendedPanID = 0;
81228122
char_string<16> networkName = 1;
81238123
int16u channel = 2;
8124+
int64u activeTimestamp = 3;
81248125
}
81258126

8126-
info event access(read: operate) NetworkChanged = 0 {
8127-
int64u extendedPanID = 0;
8128-
}
8129-
8130-
attribute access(read: manage, write: manage) nullable int64u preferredExtendedPanID = 0;
8127+
attribute access(read: manage, write: manage) nullable octet_string<8> preferredExtendedPanID = 0;
81318128
readonly attribute access(read: operate) ThreadNetworkStruct threadNetworks[] = 1;
81328129
readonly attribute int8u threadNetworkTableSize = 2;
81338130
readonly attribute command_id generatedCommandList[] = 65528;
@@ -8142,11 +8139,11 @@ cluster ThreadNetworkDirectory = 1107 {
81428139
}
81438140

81448141
request struct RemoveNetworkRequest {
8145-
int64u extendedPanID = 0;
8142+
octet_string<8> extendedPanID = 0;
81468143
}
81478144

81488145
request struct GetOperationalDatasetRequest {
8149-
int64u extendedPanID = 0;
8146+
octet_string<8> extendedPanID = 0;
81508147
}
81518148

81528149
response struct OperationalDatasetResponse = 3 {

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

+10-10
Original file line numberDiff line numberDiff line change
@@ -54495,12 +54495,12 @@ public void onResponse(StructType invokeStructValue) {
5449554495
}
5449654496

5449754497

54498-
public void removeNetwork(DefaultClusterCallback callback, Long extendedPanID, int timedInvokeTimeoutMs) {
54498+
public void removeNetwork(DefaultClusterCallback callback, byte[] extendedPanID, int timedInvokeTimeoutMs) {
5449954499
final long commandId = 1L;
5450054500

5450154501
ArrayList<StructElement> elements = new ArrayList<>();
5450254502
final long extendedPanIDFieldID = 0L;
54503-
BaseTLVType extendedPanIDtlvValue = new UIntType(extendedPanID);
54503+
BaseTLVType extendedPanIDtlvValue = new ByteArrayType(extendedPanID);
5450454504
elements.add(new StructElement(extendedPanIDFieldID, extendedPanIDtlvValue));
5450554505

5450654506
StructType commandArgs = new StructType(elements);
@@ -54512,12 +54512,12 @@ public void onResponse(StructType invokeStructValue) {
5451254512
}
5451354513

5451454514

54515-
public void getOperationalDataset(OperationalDatasetResponseCallback callback, Long extendedPanID, int timedInvokeTimeoutMs) {
54515+
public void getOperationalDataset(OperationalDatasetResponseCallback callback, byte[] extendedPanID, int timedInvokeTimeoutMs) {
5451654516
final long commandId = 2L;
5451754517

5451854518
ArrayList<StructElement> elements = new ArrayList<>();
5451954519
final long extendedPanIDFieldID = 0L;
54520-
BaseTLVType extendedPanIDtlvValue = new UIntType(extendedPanID);
54520+
BaseTLVType extendedPanIDtlvValue = new ByteArrayType(extendedPanID);
5452154521
elements.add(new StructElement(extendedPanIDFieldID, extendedPanIDtlvValue));
5452254522

5452354523
StructType commandArgs = new StructType(elements);
@@ -54543,7 +54543,7 @@ public interface OperationalDatasetResponseCallback extends BaseClusterCallback
5454354543
}
5454454544

5454554545
public interface PreferredExtendedPanIDAttributeCallback extends BaseAttributeCallback {
54546-
void onSuccess(@Nullable Long value);
54546+
void onSuccess(@Nullable byte[] value);
5454754547
}
5454854548

5454954549
public interface ThreadNetworksAttributeCallback extends BaseAttributeCallback {
@@ -54573,18 +54573,18 @@ public void readPreferredExtendedPanIDAttribute(
5457354573
readAttribute(new ReportCallbackImpl(callback, path) {
5457454574
@Override
5457554575
public void onSuccess(byte[] tlv) {
54576-
@Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
54576+
@Nullable byte[] value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
5457754577
callback.onSuccess(value);
5457854578
}
5457954579
}, PREFERRED_EXTENDED_PAN_I_D_ATTRIBUTE_ID, true);
5458054580
}
5458154581

54582-
public void writePreferredExtendedPanIDAttribute(DefaultClusterCallback callback, Long value) {
54582+
public void writePreferredExtendedPanIDAttribute(DefaultClusterCallback callback, byte[] value) {
5458354583
writePreferredExtendedPanIDAttribute(callback, value, 0);
5458454584
}
5458554585

54586-
public void writePreferredExtendedPanIDAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
54587-
BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
54586+
public void writePreferredExtendedPanIDAttribute(DefaultClusterCallback callback, byte[] value, int timedWriteTimeoutMs) {
54587+
BaseTLVType tlvValue = value != null ? new ByteArrayType(value) : new NullType();
5458854588
writeAttribute(new WriteAttributesCallbackImpl(callback), PREFERRED_EXTENDED_PAN_I_D_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
5458954589
}
5459054590

@@ -54595,7 +54595,7 @@ public void subscribePreferredExtendedPanIDAttribute(
5459554595
subscribeAttribute(new ReportCallbackImpl(callback, path) {
5459654596
@Override
5459754597
public void onSuccess(byte[] tlv) {
54598-
@Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
54598+
@Nullable byte[] value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
5459954599
callback.onSuccess(value);
5460054600
}
5460154601
}, PREFERRED_EXTENDED_PAN_I_D_ATTRIBUTE_ID, minInterval, maxInterval);

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

-46
Original file line numberDiff line numberDiff line change
@@ -5614,52 +5614,6 @@ public String toString() {
56145614
return output.toString();
56155615
}
56165616
}
5617-
public static class ThreadNetworkDirectoryClusterNetworkChangedEvent {
5618-
public Long extendedPanID;
5619-
private static final long EXTENDED_PAN_I_D_ID = 0L;
5620-
5621-
public ThreadNetworkDirectoryClusterNetworkChangedEvent(
5622-
Long extendedPanID
5623-
) {
5624-
this.extendedPanID = extendedPanID;
5625-
}
5626-
5627-
public StructType encodeTlv() {
5628-
ArrayList<StructElement> values = new ArrayList<>();
5629-
values.add(new StructElement(EXTENDED_PAN_I_D_ID, new UIntType(extendedPanID)));
5630-
5631-
return new StructType(values);
5632-
}
5633-
5634-
public static ThreadNetworkDirectoryClusterNetworkChangedEvent decodeTlv(BaseTLVType tlvValue) {
5635-
if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
5636-
return null;
5637-
}
5638-
Long extendedPanID = null;
5639-
for (StructElement element: ((StructType)tlvValue).value()) {
5640-
if (element.contextTagNum() == EXTENDED_PAN_I_D_ID) {
5641-
if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
5642-
UIntType castingValue = element.value(UIntType.class);
5643-
extendedPanID = castingValue.value(Long.class);
5644-
}
5645-
}
5646-
}
5647-
return new ThreadNetworkDirectoryClusterNetworkChangedEvent(
5648-
extendedPanID
5649-
);
5650-
}
5651-
5652-
@Override
5653-
public String toString() {
5654-
StringBuilder output = new StringBuilder();
5655-
output.append("ThreadNetworkDirectoryClusterNetworkChangedEvent {\n");
5656-
output.append("\textendedPanID: ");
5657-
output.append(extendedPanID);
5658-
output.append("\n");
5659-
output.append("}\n");
5660-
return output.toString();
5661-
}
5662-
}
56635617
public static class TargetNavigatorClusterTargetUpdatedEvent {
56645618
public ArrayList<ChipStructs.TargetNavigatorClusterTargetInfoStruct> targetList;
56655619
public Integer currentTarget;

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

+25-10
Original file line numberDiff line numberDiff line change
@@ -9930,28 +9930,33 @@ public String toString() {
99309930
}
99319931
}
99329932
public static class ThreadNetworkDirectoryClusterThreadNetworkStruct {
9933-
public Long extendedPanID;
9933+
public byte[] extendedPanID;
99349934
public String networkName;
99359935
public Integer channel;
9936+
public Long activeTimestamp;
99369937
private static final long EXTENDED_PAN_I_D_ID = 0L;
99379938
private static final long NETWORK_NAME_ID = 1L;
99389939
private static final long CHANNEL_ID = 2L;
9940+
private static final long ACTIVE_TIMESTAMP_ID = 3L;
99399941

99409942
public ThreadNetworkDirectoryClusterThreadNetworkStruct(
9941-
Long extendedPanID,
9943+
byte[] extendedPanID,
99429944
String networkName,
9943-
Integer channel
9945+
Integer channel,
9946+
Long activeTimestamp
99449947
) {
99459948
this.extendedPanID = extendedPanID;
99469949
this.networkName = networkName;
99479950
this.channel = channel;
9951+
this.activeTimestamp = activeTimestamp;
99489952
}
99499953

99509954
public StructType encodeTlv() {
99519955
ArrayList<StructElement> values = new ArrayList<>();
9952-
values.add(new StructElement(EXTENDED_PAN_I_D_ID, new UIntType(extendedPanID)));
9956+
values.add(new StructElement(EXTENDED_PAN_I_D_ID, new ByteArrayType(extendedPanID)));
99539957
values.add(new StructElement(NETWORK_NAME_ID, new StringType(networkName)));
99549958
values.add(new StructElement(CHANNEL_ID, new UIntType(channel)));
9959+
values.add(new StructElement(ACTIVE_TIMESTAMP_ID, new UIntType(activeTimestamp)));
99559960

99569961
return new StructType(values);
99579962
}
@@ -9960,14 +9965,15 @@ public static ThreadNetworkDirectoryClusterThreadNetworkStruct decodeTlv(BaseTLV
99609965
if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
99619966
return null;
99629967
}
9963-
Long extendedPanID = null;
9968+
byte[] extendedPanID = null;
99649969
String networkName = null;
99659970
Integer channel = null;
9971+
Long activeTimestamp = null;
99669972
for (StructElement element: ((StructType)tlvValue).value()) {
99679973
if (element.contextTagNum() == EXTENDED_PAN_I_D_ID) {
9968-
if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
9969-
UIntType castingValue = element.value(UIntType.class);
9970-
extendedPanID = castingValue.value(Long.class);
9974+
if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
9975+
ByteArrayType castingValue = element.value(ByteArrayType.class);
9976+
extendedPanID = castingValue.value(byte[].class);
99719977
}
99729978
} else if (element.contextTagNum() == NETWORK_NAME_ID) {
99739979
if (element.value(BaseTLVType.class).type() == TLVType.String) {
@@ -9979,12 +9985,18 @@ public static ThreadNetworkDirectoryClusterThreadNetworkStruct decodeTlv(BaseTLV
99799985
UIntType castingValue = element.value(UIntType.class);
99809986
channel = castingValue.value(Integer.class);
99819987
}
9988+
} else if (element.contextTagNum() == ACTIVE_TIMESTAMP_ID) {
9989+
if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
9990+
UIntType castingValue = element.value(UIntType.class);
9991+
activeTimestamp = castingValue.value(Long.class);
9992+
}
99829993
}
99839994
}
99849995
return new ThreadNetworkDirectoryClusterThreadNetworkStruct(
99859996
extendedPanID,
99869997
networkName,
9987-
channel
9998+
channel,
9999+
activeTimestamp
998810000
);
998910001
}
999010002

@@ -9993,14 +10005,17 @@ public String toString() {
999310005
StringBuilder output = new StringBuilder();
999410006
output.append("ThreadNetworkDirectoryClusterThreadNetworkStruct {\n");
999510007
output.append("\textendedPanID: ");
9996-
output.append(extendedPanID);
10008+
output.append(Arrays.toString(extendedPanID));
999710009
output.append("\n");
999810010
output.append("\tnetworkName: ");
999910011
output.append(networkName);
1000010012
output.append("\n");
1000110013
output.append("\tchannel: ");
1000210014
output.append(channel);
1000310015
output.append("\n");
10016+
output.append("\tactiveTimestamp: ");
10017+
output.append(activeTimestamp);
10018+
output.append("\n");
1000410019
output.append("}\n");
1000510020
return output.toString();
1000610021
}

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -14863,8 +14863,7 @@ public static Attribute value(long id) throws NoSuchFieldError {
1486314863
}
1486414864
}
1486514865

14866-
public enum Event {
14867-
NetworkChanged(0L),;
14866+
public enum Event {;
1486814867
private final long id;
1486914868
Event(long id) {
1487014869
this.id = id;

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -17946,9 +17946,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
1794617946
}
1794717947

1794817948
@Override
17949-
public void onSuccess(@Nullable Long value) {
17949+
public void onSuccess(@Nullable byte[] value) {
1795017950
Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
17951-
CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Long");
17951+
CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "byte[]");
1795217952
responseValues.put(commandResponseInfo, value);
1795317953
callback.onSuccess(responseValues);
1795417954
}
@@ -27492,13 +27492,13 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
2749227492

2749327493
Map<String, CommandParameterInfo> threadNetworkDirectoryremoveNetworkCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
2749427494

27495-
CommandParameterInfo threadNetworkDirectoryremoveNetworkextendedPanIDCommandParameterInfo = new CommandParameterInfo("extendedPanID", Long.class, Long.class);
27495+
CommandParameterInfo threadNetworkDirectoryremoveNetworkextendedPanIDCommandParameterInfo = new CommandParameterInfo("extendedPanID", byte[].class, byte[].class);
2749627496
threadNetworkDirectoryremoveNetworkCommandParams.put("extendedPanID",threadNetworkDirectoryremoveNetworkextendedPanIDCommandParameterInfo);
2749727497
InteractionInfo threadNetworkDirectoryremoveNetworkInteractionInfo = new InteractionInfo(
2749827498
(cluster, callback, commandArguments) -> {
2749927499
((ChipClusters.ThreadNetworkDirectoryCluster) cluster)
2750027500
.removeNetwork((DefaultClusterCallback) callback
27501-
, (Long)
27501+
, (byte[])
2750227502
commandArguments.get("extendedPanID"), 10000
2750327503
);
2750427504
},
@@ -27509,13 +27509,13 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
2750927509

2751027510
Map<String, CommandParameterInfo> threadNetworkDirectorygetOperationalDatasetCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
2751127511

27512-
CommandParameterInfo threadNetworkDirectorygetOperationalDatasetextendedPanIDCommandParameterInfo = new CommandParameterInfo("extendedPanID", Long.class, Long.class);
27512+
CommandParameterInfo threadNetworkDirectorygetOperationalDatasetextendedPanIDCommandParameterInfo = new CommandParameterInfo("extendedPanID", byte[].class, byte[].class);
2751327513
threadNetworkDirectorygetOperationalDatasetCommandParams.put("extendedPanID",threadNetworkDirectorygetOperationalDatasetextendedPanIDCommandParameterInfo);
2751427514
InteractionInfo threadNetworkDirectorygetOperationalDatasetInteractionInfo = new InteractionInfo(
2751527515
(cluster, callback, commandArguments) -> {
2751627516
((ChipClusters.ThreadNetworkDirectoryCluster) cluster)
2751727517
.getOperationalDataset((ChipClusters.ThreadNetworkDirectoryCluster.OperationalDatasetResponseCallback) callback
27518-
, (Long)
27518+
, (byte[])
2751927519
commandArguments.get("extendedPanID")
2752027520

2752127521
, 10000);

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -3671,8 +3671,8 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
36713671
CommandParameterInfo threadNetworkDirectorypreferredExtendedPanIDCommandParameterInfo =
36723672
new CommandParameterInfo(
36733673
"value",
3674-
Long.class,
3675-
Long.class
3674+
byte[].class,
3675+
byte[].class
36763676
);
36773677
writeThreadNetworkDirectoryPreferredExtendedPanIDCommandParams.put(
36783678
"value",
@@ -3682,7 +3682,7 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
36823682
(cluster, callback, commandArguments) -> {
36833683
((ChipClusters.ThreadNetworkDirectoryCluster) cluster).writePreferredExtendedPanIDAttribute(
36843684
(DefaultClusterCallback) callback,
3685-
(Long) commandArguments.get("value")
3685+
(byte[]) commandArguments.get("value")
36863686
);
36873687
},
36883688
() -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),

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

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

25-
class ThreadNetworkDirectoryClusterNetworkChangedEvent(val extendedPanID: ULong) {
25+
class ThreadNetworkDirectoryClusterNetworkChangedEvent(val extendedPanID: ByteArray) {
2626
override fun toString(): String = buildString {
2727
append("ThreadNetworkDirectoryClusterNetworkChangedEvent {\n")
2828
append("\textendedPanID : $extendedPanID\n")
@@ -45,7 +45,7 @@ class ThreadNetworkDirectoryClusterNetworkChangedEvent(val extendedPanID: ULong)
4545
tlvReader: TlvReader,
4646
): ThreadNetworkDirectoryClusterNetworkChangedEvent {
4747
tlvReader.enterStructure(tlvTag)
48-
val extendedPanID = tlvReader.getULong(ContextSpecificTag(TAG_EXTENDED_PAN_I_D))
48+
val extendedPanID = tlvReader.getByteArray(ContextSpecificTag(TAG_EXTENDED_PAN_I_D))
4949

5050
tlvReader.exitContainer()
5151

‎src/controller/java/generated/java/chip/devicecontroller/cluster/files.gni

-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,6 @@ eventstructs_sources = [
220220
"${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/TargetNavigatorClusterTargetUpdatedEvent.kt",
221221
"${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/ThreadNetworkDiagnosticsClusterConnectionStatusEvent.kt",
222222
"${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/ThreadNetworkDiagnosticsClusterNetworkFaultChangeEvent.kt",
223-
"${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/ThreadNetworkDirectoryClusterNetworkChangedEvent.kt",
224223
"${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/TimeSynchronizationClusterDSTStatusEvent.kt",
225224
"${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/TimeSynchronizationClusterTimeZoneStatusEvent.kt",
226225
"${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/UnitTestingClusterTestDifferentVendorMeiEventEvent.kt",

0 commit comments

Comments
 (0)