Skip to content

Commit 90c1b76

Browse files
ksperling-appleksperling-apple
committed
zap_regen_all
1 parent f4264f1 commit 90c1b76

27 files changed

+161
-161
lines changed

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -7679,13 +7679,13 @@ cluster ThreadNetworkDirectory = 1107 {
76797679
revision 1;
76807680

76817681
struct ThreadNetworkStruct {
7682-
int64u extendedPanId = 0;
7682+
int64u extendedPanID = 0;
76837683
char_string<16> networkName = 1;
76847684
int16u channel = 2;
76857685
}
76867686

76877687
info event access(read: operate) NetworkChanged = 0 {
7688-
int64u extendedPanId = 0;
7688+
int64u extendedPanID = 0;
76897689
}
76907690

76917691
attribute access(read: manage, write: manage) nullable int64u preferredExtendedPanID = 0;
@@ -7703,11 +7703,11 @@ cluster ThreadNetworkDirectory = 1107 {
77037703
}
77047704

77057705
request struct RemoveNetworkRequest {
7706-
int64u extendedPanId = 0;
7706+
int64u extendedPanID = 0;
77077707
}
77087708

77097709
request struct GetOperationalDatasetRequest {
7710-
int64u extendedPanId = 0;
7710+
int64u extendedPanID = 0;
77117711
}
77127712

77137713
response struct OperationalDatasetResponse = 3 {

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

+12-12
Original file line numberDiff line numberDiff line change
@@ -53126,17 +53126,17 @@ public void onResponse(StructType invokeStructValue) {
5312653126
}}, commandId, commandArgs, timedInvokeTimeoutMs);
5312753127
}
5312853128

53129-
public void removeNetwork(DefaultClusterCallback callback, Long extendedPanId) {
53130-
removeNetwork(callback, extendedPanId, 0);
53129+
public void removeNetwork(DefaultClusterCallback callback, Long extendedPanID) {
53130+
removeNetwork(callback, extendedPanID, 0);
5313153131
}
5313253132

53133-
public void removeNetwork(DefaultClusterCallback callback, Long extendedPanId, int timedInvokeTimeoutMs) {
53133+
public void removeNetwork(DefaultClusterCallback callback, Long extendedPanID, int timedInvokeTimeoutMs) {
5313453134
final long commandId = 1L;
5313553135

5313653136
ArrayList<StructElement> elements = new ArrayList<>();
53137-
final long extendedPanIdFieldID = 0L;
53138-
BaseTLVType extendedPanIdtlvValue = new UIntType(extendedPanId);
53139-
elements.add(new StructElement(extendedPanIdFieldID, extendedPanIdtlvValue));
53137+
final long extendedPanIDFieldID = 0L;
53138+
BaseTLVType extendedPanIDtlvValue = new UIntType(extendedPanID);
53139+
elements.add(new StructElement(extendedPanIDFieldID, extendedPanIDtlvValue));
5314053140

5314153141
StructType commandArgs = new StructType(elements);
5314253142
invoke(new InvokeCallbackImpl(callback) {
@@ -53146,17 +53146,17 @@ public void onResponse(StructType invokeStructValue) {
5314653146
}}, commandId, commandArgs, timedInvokeTimeoutMs);
5314753147
}
5314853148

53149-
public void getOperationalDataset(OperationalDatasetResponseCallback callback, Long extendedPanId) {
53150-
getOperationalDataset(callback, extendedPanId, 0);
53149+
public void getOperationalDataset(OperationalDatasetResponseCallback callback, Long extendedPanID) {
53150+
getOperationalDataset(callback, extendedPanID, 0);
5315153151
}
5315253152

53153-
public void getOperationalDataset(OperationalDatasetResponseCallback callback, Long extendedPanId, int timedInvokeTimeoutMs) {
53153+
public void getOperationalDataset(OperationalDatasetResponseCallback callback, Long extendedPanID, int timedInvokeTimeoutMs) {
5315453154
final long commandId = 2L;
5315553155

5315653156
ArrayList<StructElement> elements = new ArrayList<>();
53157-
final long extendedPanIdFieldID = 0L;
53158-
BaseTLVType extendedPanIdtlvValue = new UIntType(extendedPanId);
53159-
elements.add(new StructElement(extendedPanIdFieldID, extendedPanIdtlvValue));
53157+
final long extendedPanIDFieldID = 0L;
53158+
BaseTLVType extendedPanIDtlvValue = new UIntType(extendedPanID);
53159+
elements.add(new StructElement(extendedPanIDFieldID, extendedPanIDtlvValue));
5316053160

5316153161
StructType commandArgs = new StructType(elements);
5316253162
invoke(new InvokeCallbackImpl(callback) {

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

+11-11
Original file line numberDiff line numberDiff line change
@@ -5585,18 +5585,18 @@ public String toString() {
55855585
}
55865586
}
55875587
public static class ThreadNetworkDirectoryClusterNetworkChangedEvent {
5588-
public Long extendedPanId;
5589-
private static final long EXTENDED_PAN_ID_ID = 0L;
5588+
public Long extendedPanID;
5589+
private static final long EXTENDED_PAN_I_D_ID = 0L;
55905590

55915591
public ThreadNetworkDirectoryClusterNetworkChangedEvent(
5592-
Long extendedPanId
5592+
Long extendedPanID
55935593
) {
5594-
this.extendedPanId = extendedPanId;
5594+
this.extendedPanID = extendedPanID;
55955595
}
55965596

55975597
public StructType encodeTlv() {
55985598
ArrayList<StructElement> values = new ArrayList<>();
5599-
values.add(new StructElement(EXTENDED_PAN_ID_ID, new UIntType(extendedPanId)));
5599+
values.add(new StructElement(EXTENDED_PAN_I_D_ID, new UIntType(extendedPanID)));
56005600

56015601
return new StructType(values);
56025602
}
@@ -5605,26 +5605,26 @@ public static ThreadNetworkDirectoryClusterNetworkChangedEvent decodeTlv(BaseTLV
56055605
if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
56065606
return null;
56075607
}
5608-
Long extendedPanId = null;
5608+
Long extendedPanID = null;
56095609
for (StructElement element: ((StructType)tlvValue).value()) {
5610-
if (element.contextTagNum() == EXTENDED_PAN_ID_ID) {
5610+
if (element.contextTagNum() == EXTENDED_PAN_I_D_ID) {
56115611
if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
56125612
UIntType castingValue = element.value(UIntType.class);
5613-
extendedPanId = castingValue.value(Long.class);
5613+
extendedPanID = castingValue.value(Long.class);
56145614
}
56155615
}
56165616
}
56175617
return new ThreadNetworkDirectoryClusterNetworkChangedEvent(
5618-
extendedPanId
5618+
extendedPanID
56195619
);
56205620
}
56215621

56225622
@Override
56235623
public String toString() {
56245624
StringBuilder output = new StringBuilder();
56255625
output.append("ThreadNetworkDirectoryClusterNetworkChangedEvent {\n");
5626-
output.append("\textendedPanId: ");
5627-
output.append(extendedPanId);
5626+
output.append("\textendedPanID: ");
5627+
output.append(extendedPanID);
56285628
output.append("\n");
56295629
output.append("}\n");
56305630
return output.toString();

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

+11-11
Original file line numberDiff line numberDiff line change
@@ -9278,26 +9278,26 @@ public String toString() {
92789278
}
92799279
}
92809280
public static class ThreadNetworkDirectoryClusterThreadNetworkStruct {
9281-
public Long extendedPanId;
9281+
public Long extendedPanID;
92829282
public String networkName;
92839283
public Integer channel;
9284-
private static final long EXTENDED_PAN_ID_ID = 0L;
9284+
private static final long EXTENDED_PAN_I_D_ID = 0L;
92859285
private static final long NETWORK_NAME_ID = 1L;
92869286
private static final long CHANNEL_ID = 2L;
92879287

92889288
public ThreadNetworkDirectoryClusterThreadNetworkStruct(
9289-
Long extendedPanId,
9289+
Long extendedPanID,
92909290
String networkName,
92919291
Integer channel
92929292
) {
9293-
this.extendedPanId = extendedPanId;
9293+
this.extendedPanID = extendedPanID;
92949294
this.networkName = networkName;
92959295
this.channel = channel;
92969296
}
92979297

92989298
public StructType encodeTlv() {
92999299
ArrayList<StructElement> values = new ArrayList<>();
9300-
values.add(new StructElement(EXTENDED_PAN_ID_ID, new UIntType(extendedPanId)));
9300+
values.add(new StructElement(EXTENDED_PAN_I_D_ID, new UIntType(extendedPanID)));
93019301
values.add(new StructElement(NETWORK_NAME_ID, new StringType(networkName)));
93029302
values.add(new StructElement(CHANNEL_ID, new UIntType(channel)));
93039303

@@ -9308,14 +9308,14 @@ public static ThreadNetworkDirectoryClusterThreadNetworkStruct decodeTlv(BaseTLV
93089308
if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
93099309
return null;
93109310
}
9311-
Long extendedPanId = null;
9311+
Long extendedPanID = null;
93129312
String networkName = null;
93139313
Integer channel = null;
93149314
for (StructElement element: ((StructType)tlvValue).value()) {
9315-
if (element.contextTagNum() == EXTENDED_PAN_ID_ID) {
9315+
if (element.contextTagNum() == EXTENDED_PAN_I_D_ID) {
93169316
if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
93179317
UIntType castingValue = element.value(UIntType.class);
9318-
extendedPanId = castingValue.value(Long.class);
9318+
extendedPanID = castingValue.value(Long.class);
93199319
}
93209320
} else if (element.contextTagNum() == NETWORK_NAME_ID) {
93219321
if (element.value(BaseTLVType.class).type() == TLVType.String) {
@@ -9330,7 +9330,7 @@ public static ThreadNetworkDirectoryClusterThreadNetworkStruct decodeTlv(BaseTLV
93309330
}
93319331
}
93329332
return new ThreadNetworkDirectoryClusterThreadNetworkStruct(
9333-
extendedPanId,
9333+
extendedPanID,
93349334
networkName,
93359335
channel
93369336
);
@@ -9340,8 +9340,8 @@ public static ThreadNetworkDirectoryClusterThreadNetworkStruct decodeTlv(BaseTLV
93409340
public String toString() {
93419341
StringBuilder output = new StringBuilder();
93429342
output.append("ThreadNetworkDirectoryClusterThreadNetworkStruct {\n");
9343-
output.append("\textendedPanId: ");
9344-
output.append(extendedPanId);
9343+
output.append("\textendedPanID: ");
9344+
output.append(extendedPanID);
93459345
output.append("\n");
93469346
output.append("\tnetworkName: ");
93479347
output.append(networkName);

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -14515,7 +14515,7 @@ public static AddNetworkCommandField value(int id) throws NoSuchFieldError {
1451514515
}
1451614516
throw new NoSuchFieldError();
1451714517
}
14518-
}public enum RemoveNetworkCommandField {ExtendedPanId(0),;
14518+
}public enum RemoveNetworkCommandField {ExtendedPanID(0),;
1451914519
private final int id;
1452014520
RemoveNetworkCommandField(int id) {
1452114521
this.id = id;
@@ -14532,7 +14532,7 @@ public static RemoveNetworkCommandField value(int id) throws NoSuchFieldError {
1453214532
}
1453314533
throw new NoSuchFieldError();
1453414534
}
14535-
}public enum GetOperationalDatasetCommandField {ExtendedPanId(0),;
14535+
}public enum GetOperationalDatasetCommandField {ExtendedPanID(0),;
1453614536
private final int id;
1453714537
GetOperationalDatasetCommandField(int id) {
1453814538
this.id = id;

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -26681,14 +26681,14 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
2668126681

2668226682
Map<String, CommandParameterInfo> threadNetworkDirectoryremoveNetworkCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
2668326683

26684-
CommandParameterInfo threadNetworkDirectoryremoveNetworkextendedPanIdCommandParameterInfo = new CommandParameterInfo("extendedPanId", Long.class, Long.class);
26685-
threadNetworkDirectoryremoveNetworkCommandParams.put("extendedPanId",threadNetworkDirectoryremoveNetworkextendedPanIdCommandParameterInfo);
26684+
CommandParameterInfo threadNetworkDirectoryremoveNetworkextendedPanIDCommandParameterInfo = new CommandParameterInfo("extendedPanID", Long.class, Long.class);
26685+
threadNetworkDirectoryremoveNetworkCommandParams.put("extendedPanID",threadNetworkDirectoryremoveNetworkextendedPanIDCommandParameterInfo);
2668626686
InteractionInfo threadNetworkDirectoryremoveNetworkInteractionInfo = new InteractionInfo(
2668726687
(cluster, callback, commandArguments) -> {
2668826688
((ChipClusters.ThreadNetworkDirectoryCluster) cluster)
2668926689
.removeNetwork((DefaultClusterCallback) callback
2669026690
, (Long)
26691-
commandArguments.get("extendedPanId")
26691+
commandArguments.get("extendedPanID")
2669226692
);
2669326693
},
2669426694
() -> new DelegatedDefaultClusterCallback(),
@@ -26698,14 +26698,14 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
2669826698

2669926699
Map<String, CommandParameterInfo> threadNetworkDirectorygetOperationalDatasetCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
2670026700

26701-
CommandParameterInfo threadNetworkDirectorygetOperationalDatasetextendedPanIdCommandParameterInfo = new CommandParameterInfo("extendedPanId", Long.class, Long.class);
26702-
threadNetworkDirectorygetOperationalDatasetCommandParams.put("extendedPanId",threadNetworkDirectorygetOperationalDatasetextendedPanIdCommandParameterInfo);
26701+
CommandParameterInfo threadNetworkDirectorygetOperationalDatasetextendedPanIDCommandParameterInfo = new CommandParameterInfo("extendedPanID", Long.class, Long.class);
26702+
threadNetworkDirectorygetOperationalDatasetCommandParams.put("extendedPanID",threadNetworkDirectorygetOperationalDatasetextendedPanIDCommandParameterInfo);
2670326703
InteractionInfo threadNetworkDirectorygetOperationalDatasetInteractionInfo = new InteractionInfo(
2670426704
(cluster, callback, commandArguments) -> {
2670526705
((ChipClusters.ThreadNetworkDirectoryCluster) cluster)
2670626706
.getOperationalDataset((ChipClusters.ThreadNetworkDirectoryCluster.OperationalDatasetResponseCallback) callback
2670726707
, (Long)
26708-
commandArguments.get("extendedPanId")
26708+
commandArguments.get("extendedPanID")
2670926709

2671026710
);
2671126711
},

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -22,34 +22,34 @@ 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: ULong) {
2626
override fun toString(): String = buildString {
2727
append("ThreadNetworkDirectoryClusterNetworkChangedEvent {\n")
28-
append("\textendedPanId : $extendedPanId\n")
28+
append("\textendedPanID : $extendedPanID\n")
2929
append("}\n")
3030
}
3131

3232
fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
3333
tlvWriter.apply {
3434
startStructure(tlvTag)
35-
put(ContextSpecificTag(TAG_EXTENDED_PAN_ID), extendedPanId)
35+
put(ContextSpecificTag(TAG_EXTENDED_PAN_I_D), extendedPanID)
3636
endStructure()
3737
}
3838
}
3939

4040
companion object {
41-
private const val TAG_EXTENDED_PAN_ID = 0
41+
private const val TAG_EXTENDED_PAN_I_D = 0
4242

4343
fun fromTlv(
4444
tlvTag: Tag,
4545
tlvReader: TlvReader
4646
): ThreadNetworkDirectoryClusterNetworkChangedEvent {
4747
tlvReader.enterStructure(tlvTag)
48-
val extendedPanId = tlvReader.getULong(ContextSpecificTag(TAG_EXTENDED_PAN_ID))
48+
val extendedPanID = tlvReader.getULong(ContextSpecificTag(TAG_EXTENDED_PAN_I_D))
4949

5050
tlvReader.exitContainer()
5151

52-
return ThreadNetworkDirectoryClusterNetworkChangedEvent(extendedPanId)
52+
return ThreadNetworkDirectoryClusterNetworkChangedEvent(extendedPanID)
5353
}
5454
}
5555
}

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ import matter.tlv.TlvReader
2323
import matter.tlv.TlvWriter
2424

2525
class ThreadNetworkDirectoryClusterThreadNetworkStruct(
26-
val extendedPanId: ULong,
26+
val extendedPanID: ULong,
2727
val networkName: String,
2828
val channel: UInt
2929
) {
3030
override fun toString(): String = buildString {
3131
append("ThreadNetworkDirectoryClusterThreadNetworkStruct {\n")
32-
append("\textendedPanId : $extendedPanId\n")
32+
append("\textendedPanID : $extendedPanID\n")
3333
append("\tnetworkName : $networkName\n")
3434
append("\tchannel : $channel\n")
3535
append("}\n")
@@ -38,15 +38,15 @@ class ThreadNetworkDirectoryClusterThreadNetworkStruct(
3838
fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
3939
tlvWriter.apply {
4040
startStructure(tlvTag)
41-
put(ContextSpecificTag(TAG_EXTENDED_PAN_ID), extendedPanId)
41+
put(ContextSpecificTag(TAG_EXTENDED_PAN_I_D), extendedPanID)
4242
put(ContextSpecificTag(TAG_NETWORK_NAME), networkName)
4343
put(ContextSpecificTag(TAG_CHANNEL), channel)
4444
endStructure()
4545
}
4646
}
4747

4848
companion object {
49-
private const val TAG_EXTENDED_PAN_ID = 0
49+
private const val TAG_EXTENDED_PAN_I_D = 0
5050
private const val TAG_NETWORK_NAME = 1
5151
private const val TAG_CHANNEL = 2
5252

@@ -55,13 +55,13 @@ class ThreadNetworkDirectoryClusterThreadNetworkStruct(
5555
tlvReader: TlvReader
5656
): ThreadNetworkDirectoryClusterThreadNetworkStruct {
5757
tlvReader.enterStructure(tlvTag)
58-
val extendedPanId = tlvReader.getULong(ContextSpecificTag(TAG_EXTENDED_PAN_ID))
58+
val extendedPanID = tlvReader.getULong(ContextSpecificTag(TAG_EXTENDED_PAN_I_D))
5959
val networkName = tlvReader.getString(ContextSpecificTag(TAG_NETWORK_NAME))
6060
val channel = tlvReader.getUInt(ContextSpecificTag(TAG_CHANNEL))
6161

6262
tlvReader.exitContainer()
6363

64-
return ThreadNetworkDirectoryClusterThreadNetworkStruct(extendedPanId, networkName, channel)
64+
return ThreadNetworkDirectoryClusterThreadNetworkStruct(extendedPanID, networkName, channel)
6565
}
6666
}
6767
}

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -131,14 +131,14 @@ class ThreadNetworkDirectoryCluster(
131131
logger.log(Level.FINE, "Invoke command succeeded: ${response}")
132132
}
133133

134-
suspend fun removeNetwork(extendedPanId: ULong, timedInvokeTimeout: Duration? = null) {
134+
suspend fun removeNetwork(extendedPanID: ULong, timedInvokeTimeout: Duration? = null) {
135135
val commandId: UInt = 1u
136136

137137
val tlvWriter = TlvWriter()
138138
tlvWriter.startStructure(AnonymousTag)
139139

140-
val TAG_EXTENDED_PAN_ID_REQ: Int = 0
141-
tlvWriter.put(ContextSpecificTag(TAG_EXTENDED_PAN_ID_REQ), extendedPanId)
140+
val TAG_EXTENDED_PAN_I_D_REQ: Int = 0
141+
tlvWriter.put(ContextSpecificTag(TAG_EXTENDED_PAN_I_D_REQ), extendedPanID)
142142
tlvWriter.endStructure()
143143

144144
val request: InvokeRequest =
@@ -153,16 +153,16 @@ class ThreadNetworkDirectoryCluster(
153153
}
154154

155155
suspend fun getOperationalDataset(
156-
extendedPanId: ULong,
156+
extendedPanID: ULong,
157157
timedInvokeTimeout: Duration? = null
158158
): OperationalDatasetResponse {
159159
val commandId: UInt = 2u
160160

161161
val tlvWriter = TlvWriter()
162162
tlvWriter.startStructure(AnonymousTag)
163163

164-
val TAG_EXTENDED_PAN_ID_REQ: Int = 0
165-
tlvWriter.put(ContextSpecificTag(TAG_EXTENDED_PAN_ID_REQ), extendedPanId)
164+
val TAG_EXTENDED_PAN_I_D_REQ: Int = 0
165+
tlvWriter.put(ContextSpecificTag(TAG_EXTENDED_PAN_I_D_REQ), extendedPanID)
166166
tlvWriter.endStructure()
167167

168168
val request: InvokeRequest =

0 commit comments

Comments
 (0)