Skip to content

Commit f841410

Browse files
ksperling-appleksperling-apple
committed
zap_regen_all
1 parent 8a9a015 commit f841410

Some content is hidden

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

42 files changed

+4021
-3
lines changed

‎docs/zap_clusters.md

+1
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ Generally regenerate using one of:
127127
| 1295 | 0x50F | ContentControl |
128128
| 1296 | 0x510 | ContentAppObserver |
129129
| 2820 | 0xB04 | ElectricalMeasurement |
130+
| 3072 | 0xC00 | WiFiNetworkManagement |
130131
| 4294048773 | 0xFFF1FC05 | UnitTesting |
131132
| 4294048774 | 0xFFF1FC06 | FaultInjection |
132133
| 4294048800 | 0xFFF1FC20 | SampleMei |

‎examples/network-manager-app/network-manager-common/network-manager-app.matter

+35-2
Original file line numberDiff line numberDiff line change
@@ -1175,6 +1175,26 @@ cluster GroupKeyManagement = 63 {
11751175
fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4;
11761176
}
11771177

1178+
/** Functionality to retrieve operational information about a managed Wi-Fi network. */
1179+
cluster WiFiNetworkManagement = 3072 {
1180+
revision 1;
1181+
1182+
readonly attribute nullable octet_string<32> ssid = 1;
1183+
readonly attribute command_id generatedCommandList[] = 65528;
1184+
readonly attribute command_id acceptedCommandList[] = 65529;
1185+
readonly attribute event_id eventList[] = 65530;
1186+
readonly attribute attrib_id attributeList[] = 65531;
1187+
readonly attribute bitmap32 featureMap = 65532;
1188+
readonly attribute int16u clusterRevision = 65533;
1189+
1190+
response struct NetworkPassphraseResponse = 1 {
1191+
octet_string<64> passphrase = 0;
1192+
}
1193+
1194+
/** Request the current WPA-Personal passphrase or PSK associated with the managed Wi-Fi network. */
1195+
command access(invoke: administer) NetworkPassphraseRequest(): NetworkPassphraseResponse = 0;
1196+
}
1197+
11781198
endpoint 0 {
11791199
device type ma_rootdevice = 22, version 1;
11801200

@@ -1280,7 +1300,7 @@ endpoint 0 {
12801300
callback attribute acceptedCommandList;
12811301
callback attribute attributeList;
12821302
callback attribute featureMap default = 0;
1283-
ram attribute clusterRevision default = 1;
1303+
callback attribute clusterRevision default = 0;
12841304
}
12851305

12861306
server cluster GeneralDiagnostics {
@@ -1425,7 +1445,7 @@ endpoint 0 {
14251445
}
14261446
}
14271447
endpoint 1 {
1428-
device type ma_network_infrastructure_manager = 4293984272, version 1;
1448+
device type ma_network_infrastructure_manager = 144, version 1;
14291449

14301450

14311451
server cluster Descriptor {
@@ -1440,6 +1460,19 @@ endpoint 1 {
14401460
callback attribute featureMap;
14411461
callback attribute clusterRevision;
14421462
}
1463+
1464+
server cluster WiFiNetworkManagement {
1465+
callback attribute ssid;
1466+
callback attribute generatedCommandList;
1467+
callback attribute acceptedCommandList;
1468+
callback attribute eventList;
1469+
callback attribute attributeList;
1470+
ram attribute featureMap default = 0;
1471+
ram attribute clusterRevision default = 1;
1472+
1473+
handle command NetworkPassphraseRequest;
1474+
handle command NetworkPassphraseResponse;
1475+
}
14431476
}
14441477

14451478

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

+20
Original file line numberDiff line numberDiff line change
@@ -8855,6 +8855,26 @@ deprecated cluster ElectricalMeasurement = 2820 {
88558855
command GetMeasurementProfileCommand(GetMeasurementProfileCommandRequest): DefaultSuccess = 1;
88568856
}
88578857

8858+
/** Functionality to retrieve operational information about a managed Wi-Fi network. */
8859+
cluster WiFiNetworkManagement = 3072 {
8860+
revision 1;
8861+
8862+
readonly attribute nullable octet_string<32> ssid = 1;
8863+
readonly attribute command_id generatedCommandList[] = 65528;
8864+
readonly attribute command_id acceptedCommandList[] = 65529;
8865+
readonly attribute event_id eventList[] = 65530;
8866+
readonly attribute attrib_id attributeList[] = 65531;
8867+
readonly attribute bitmap32 featureMap = 65532;
8868+
readonly attribute int16u clusterRevision = 65533;
8869+
8870+
response struct NetworkPassphraseResponse = 1 {
8871+
octet_string<64> passphrase = 0;
8872+
}
8873+
8874+
/** Request the current WPA-Personal passphrase or PSK associated with the managed Wi-Fi network. */
8875+
command access(invoke: administer) NetworkPassphraseRequest(): NetworkPassphraseResponse = 0;
8876+
}
8877+
88588878
/** The Test Cluster is meant to validate the generated code */
88598879
internal cluster UnitTesting = 4294048773 {
88608880
revision 1; // NOTE: Default/not specifically set

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

+254
Original file line numberDiff line numberDiff line change
@@ -61942,6 +61942,260 @@ public void onSuccess(byte[] tlv) {
6194261942
}
6194361943
}
6194461944

61945+
public static class WiFiNetworkManagementCluster extends BaseChipCluster {
61946+
public static final long CLUSTER_ID = 3072L;
61947+
61948+
private static final long SSID_ATTRIBUTE_ID = 1L;
61949+
private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
61950+
private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
61951+
private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
61952+
private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L;
61953+
private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
61954+
private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
61955+
61956+
public WiFiNetworkManagementCluster(long devicePtr, int endpointId) {
61957+
super(devicePtr, endpointId, CLUSTER_ID);
61958+
}
61959+
61960+
@Override
61961+
@Deprecated
61962+
public long initWithDevice(long devicePtr, int endpointId) {
61963+
return 0L;
61964+
}
61965+
61966+
public void networkPassphraseRequest(NetworkPassphraseResponseCallback callback) {
61967+
networkPassphraseRequest(callback, 0);
61968+
}
61969+
61970+
public void networkPassphraseRequest(NetworkPassphraseResponseCallback callback, int timedInvokeTimeoutMs) {
61971+
final long commandId = 0L;
61972+
61973+
ArrayList<StructElement> elements = new ArrayList<>();
61974+
StructType commandArgs = new StructType(elements);
61975+
invoke(new InvokeCallbackImpl(callback) {
61976+
@Override
61977+
public void onResponse(StructType invokeStructValue) {
61978+
final long passphraseFieldID = 0L;
61979+
byte[] passphrase = null;
61980+
for (StructElement element: invokeStructValue.value()) {
61981+
if (element.contextTagNum() == passphraseFieldID) {
61982+
if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
61983+
ByteArrayType castingValue = element.value(ByteArrayType.class);
61984+
passphrase = castingValue.value(byte[].class);
61985+
}
61986+
}
61987+
}
61988+
callback.onSuccess(passphrase);
61989+
}}, commandId, commandArgs, timedInvokeTimeoutMs);
61990+
}
61991+
61992+
public interface NetworkPassphraseResponseCallback extends BaseClusterCallback {
61993+
void onSuccess(byte[] passphrase);
61994+
}
61995+
61996+
public interface SsidAttributeCallback extends BaseAttributeCallback {
61997+
void onSuccess(@Nullable byte[] value);
61998+
}
61999+
62000+
public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
62001+
void onSuccess(List<Long> value);
62002+
}
62003+
62004+
public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
62005+
void onSuccess(List<Long> value);
62006+
}
62007+
62008+
public interface EventListAttributeCallback extends BaseAttributeCallback {
62009+
void onSuccess(List<Long> value);
62010+
}
62011+
62012+
public interface AttributeListAttributeCallback extends BaseAttributeCallback {
62013+
void onSuccess(List<Long> value);
62014+
}
62015+
62016+
public void readSsidAttribute(
62017+
SsidAttributeCallback callback) {
62018+
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SSID_ATTRIBUTE_ID);
62019+
62020+
readAttribute(new ReportCallbackImpl(callback, path) {
62021+
@Override
62022+
public void onSuccess(byte[] tlv) {
62023+
@Nullable byte[] value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
62024+
callback.onSuccess(value);
62025+
}
62026+
}, SSID_ATTRIBUTE_ID, true);
62027+
}
62028+
62029+
public void subscribeSsidAttribute(
62030+
SsidAttributeCallback callback, int minInterval, int maxInterval) {
62031+
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SSID_ATTRIBUTE_ID);
62032+
62033+
subscribeAttribute(new ReportCallbackImpl(callback, path) {
62034+
@Override
62035+
public void onSuccess(byte[] tlv) {
62036+
@Nullable byte[] value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
62037+
callback.onSuccess(value);
62038+
}
62039+
}, SSID_ATTRIBUTE_ID, minInterval, maxInterval);
62040+
}
62041+
62042+
public void readGeneratedCommandListAttribute(
62043+
GeneratedCommandListAttributeCallback callback) {
62044+
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
62045+
62046+
readAttribute(new ReportCallbackImpl(callback, path) {
62047+
@Override
62048+
public void onSuccess(byte[] tlv) {
62049+
List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
62050+
callback.onSuccess(value);
62051+
}
62052+
}, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true);
62053+
}
62054+
62055+
public void subscribeGeneratedCommandListAttribute(
62056+
GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
62057+
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
62058+
62059+
subscribeAttribute(new ReportCallbackImpl(callback, path) {
62060+
@Override
62061+
public void onSuccess(byte[] tlv) {
62062+
List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
62063+
callback.onSuccess(value);
62064+
}
62065+
}, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
62066+
}
62067+
62068+
public void readAcceptedCommandListAttribute(
62069+
AcceptedCommandListAttributeCallback callback) {
62070+
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
62071+
62072+
readAttribute(new ReportCallbackImpl(callback, path) {
62073+
@Override
62074+
public void onSuccess(byte[] tlv) {
62075+
List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
62076+
callback.onSuccess(value);
62077+
}
62078+
}, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true);
62079+
}
62080+
62081+
public void subscribeAcceptedCommandListAttribute(
62082+
AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
62083+
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
62084+
62085+
subscribeAttribute(new ReportCallbackImpl(callback, path) {
62086+
@Override
62087+
public void onSuccess(byte[] tlv) {
62088+
List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
62089+
callback.onSuccess(value);
62090+
}
62091+
}, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
62092+
}
62093+
62094+
public void readEventListAttribute(
62095+
EventListAttributeCallback callback) {
62096+
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
62097+
62098+
readAttribute(new ReportCallbackImpl(callback, path) {
62099+
@Override
62100+
public void onSuccess(byte[] tlv) {
62101+
List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
62102+
callback.onSuccess(value);
62103+
}
62104+
}, EVENT_LIST_ATTRIBUTE_ID, true);
62105+
}
62106+
62107+
public void subscribeEventListAttribute(
62108+
EventListAttributeCallback callback, int minInterval, int maxInterval) {
62109+
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
62110+
62111+
subscribeAttribute(new ReportCallbackImpl(callback, path) {
62112+
@Override
62113+
public void onSuccess(byte[] tlv) {
62114+
List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
62115+
callback.onSuccess(value);
62116+
}
62117+
}, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
62118+
}
62119+
62120+
public void readAttributeListAttribute(
62121+
AttributeListAttributeCallback callback) {
62122+
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
62123+
62124+
readAttribute(new ReportCallbackImpl(callback, path) {
62125+
@Override
62126+
public void onSuccess(byte[] tlv) {
62127+
List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
62128+
callback.onSuccess(value);
62129+
}
62130+
}, ATTRIBUTE_LIST_ATTRIBUTE_ID, true);
62131+
}
62132+
62133+
public void subscribeAttributeListAttribute(
62134+
AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
62135+
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
62136+
62137+
subscribeAttribute(new ReportCallbackImpl(callback, path) {
62138+
@Override
62139+
public void onSuccess(byte[] tlv) {
62140+
List<Long> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
62141+
callback.onSuccess(value);
62142+
}
62143+
}, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval);
62144+
}
62145+
62146+
public void readFeatureMapAttribute(
62147+
LongAttributeCallback callback) {
62148+
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
62149+
62150+
readAttribute(new ReportCallbackImpl(callback, path) {
62151+
@Override
62152+
public void onSuccess(byte[] tlv) {
62153+
Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
62154+
callback.onSuccess(value);
62155+
}
62156+
}, FEATURE_MAP_ATTRIBUTE_ID, true);
62157+
}
62158+
62159+
public void subscribeFeatureMapAttribute(
62160+
LongAttributeCallback callback, int minInterval, int maxInterval) {
62161+
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
62162+
62163+
subscribeAttribute(new ReportCallbackImpl(callback, path) {
62164+
@Override
62165+
public void onSuccess(byte[] tlv) {
62166+
Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
62167+
callback.onSuccess(value);
62168+
}
62169+
}, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
62170+
}
62171+
62172+
public void readClusterRevisionAttribute(
62173+
IntegerAttributeCallback callback) {
62174+
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
62175+
62176+
readAttribute(new ReportCallbackImpl(callback, path) {
62177+
@Override
62178+
public void onSuccess(byte[] tlv) {
62179+
Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
62180+
callback.onSuccess(value);
62181+
}
62182+
}, CLUSTER_REVISION_ATTRIBUTE_ID, true);
62183+
}
62184+
62185+
public void subscribeClusterRevisionAttribute(
62186+
IntegerAttributeCallback callback, int minInterval, int maxInterval) {
62187+
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
62188+
62189+
subscribeAttribute(new ReportCallbackImpl(callback, path) {
62190+
@Override
62191+
public void onSuccess(byte[] tlv) {
62192+
Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
62193+
callback.onSuccess(value);
62194+
}
62195+
}, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval);
62196+
}
62197+
}
62198+
6194562199
public static class UnitTestingCluster extends BaseChipCluster {
6194662200
public static final long CLUSTER_ID = 4294048773L;
6194762201

0 commit comments

Comments
 (0)