Skip to content

Commit 26e94b4

Browse files
Michail-AntropovMichail-Antropov
committed
Update darwin and java generated files
1 parent b663c8e commit 26e94b4

20 files changed

+3438
-0
lines changed

‎docs/zap_clusters.md

+1
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ Generally regenerate using one of:
129129
| 1294 | 0x50E | AccountLogin |
130130
| 1295 | 0x50F | ContentControl |
131131
| 1296 | 0x510 | ContentAppObserver |
132+
| 2817 | 0xB01 | MeterIdentification |
132133
| 2820 | 0xB04 | ElectricalMeasurement |
133134
| 4294048773 | 0xFFF1FC05 | UnitTesting |
134135
| 4294048774 | 0xFFF1FC06 | FaultInjection |

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

+388
Large diffs are not rendered by default.

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

+109
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,9 @@ public static BaseCluster getCluster(long clusterId) {
379379
if (clusterId == ContentAppObserver.ID) {
380380
return new ContentAppObserver();
381381
}
382+
if (clusterId == MeterIdentification.ID) {
383+
return new MeterIdentification();
384+
}
382385
if (clusterId == ElectricalMeasurement.ID) {
383386
return new ElectricalMeasurement();
384387
}
@@ -16780,6 +16783,112 @@ public long getCommandID(String name) throws IllegalArgumentException {
1678016783
return Command.valueOf(name).getID();
1678116784
}
1678216785
}
16786+
public static class MeterIdentification implements BaseCluster {
16787+
public static final long ID = 2817L;
16788+
public long getID() {
16789+
return ID;
16790+
}
16791+
16792+
public enum Attribute {
16793+
MeterType(0L),
16794+
CustomerName(1L),
16795+
UtilityName(2L),
16796+
PointOfDelivery(3L),
16797+
PowerThreshold(4L),
16798+
PowerThresholdSource(5L),
16799+
GeneratedCommandList(65528L),
16800+
AcceptedCommandList(65529L),
16801+
EventList(65530L),
16802+
AttributeList(65531L),
16803+
FeatureMap(65532L),
16804+
ClusterRevision(65533L),;
16805+
private final long id;
16806+
Attribute(long id) {
16807+
this.id = id;
16808+
}
16809+
16810+
public long getID() {
16811+
return id;
16812+
}
16813+
16814+
public static Attribute value(long id) throws NoSuchFieldError {
16815+
for (Attribute attribute : Attribute.values()) {
16816+
if (attribute.getID() == id) {
16817+
return attribute;
16818+
}
16819+
}
16820+
throw new NoSuchFieldError();
16821+
}
16822+
}
16823+
16824+
public enum Event {;
16825+
private final long id;
16826+
Event(long id) {
16827+
this.id = id;
16828+
}
16829+
16830+
public long getID() {
16831+
return id;
16832+
}
16833+
16834+
public static Event value(long id) throws NoSuchFieldError {
16835+
for (Event event : Event.values()) {
16836+
if (event.getID() == id) {
16837+
return event;
16838+
}
16839+
}
16840+
throw new NoSuchFieldError();
16841+
}
16842+
}
16843+
16844+
public enum Command {;
16845+
private final long id;
16846+
Command(long id) {
16847+
this.id = id;
16848+
}
16849+
16850+
public long getID() {
16851+
return id;
16852+
}
16853+
16854+
public static Command value(long id) throws NoSuchFieldError {
16855+
for (Command command : Command.values()) {
16856+
if (command.getID() == id) {
16857+
return command;
16858+
}
16859+
}
16860+
throw new NoSuchFieldError();
16861+
}
16862+
}@Override
16863+
public String getAttributeName(long id) throws NoSuchFieldError {
16864+
return Attribute.value(id).toString();
16865+
}
16866+
16867+
@Override
16868+
public String getEventName(long id) throws NoSuchFieldError {
16869+
return Event.value(id).toString();
16870+
}
16871+
16872+
@Override
16873+
public String getCommandName(long id) throws NoSuchFieldError {
16874+
return Command.value(id).toString();
16875+
}
16876+
16877+
@Override
16878+
public long getAttributeID(String name) throws IllegalArgumentException {
16879+
return Attribute.valueOf(name).getID();
16880+
}
16881+
16882+
@Override
16883+
public long getEventID(String name) throws IllegalArgumentException {
16884+
return Event.valueOf(name).getID();
16885+
}
16886+
16887+
@Override
16888+
public long getCommandID(String name) throws IllegalArgumentException {
16889+
return Command.valueOf(name).getID();
16890+
}
16891+
}
1678316892
public static class ElectricalMeasurement implements BaseCluster {
1678416893
public static final long ID = 2820L;
1678516894
public long getID() {

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

+219
Original file line numberDiff line numberDiff line change
@@ -19576,6 +19576,216 @@ public void onError(Exception ex) {
1957619576
}
1957719577
}
1957819578

19579+
public static class DelegatedMeterIdentificationClusterMeterTypeAttributeCallback implements ChipClusters.MeterIdentificationCluster.MeterTypeAttributeCallback, DelegatedClusterCallback {
19580+
private ClusterCommandCallback callback;
19581+
@Override
19582+
public void setCallbackDelegate(ClusterCommandCallback callback) {
19583+
this.callback = callback;
19584+
}
19585+
19586+
@Override
19587+
public void onSuccess(@Nullable Integer value) {
19588+
Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
19589+
CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
19590+
responseValues.put(commandResponseInfo, value);
19591+
callback.onSuccess(responseValues);
19592+
}
19593+
19594+
@Override
19595+
public void onError(Exception ex) {
19596+
callback.onFailure(ex);
19597+
}
19598+
}
19599+
19600+
public static class DelegatedMeterIdentificationClusterCustomerNameAttributeCallback implements ChipClusters.MeterIdentificationCluster.CustomerNameAttributeCallback, DelegatedClusterCallback {
19601+
private ClusterCommandCallback callback;
19602+
@Override
19603+
public void setCallbackDelegate(ClusterCommandCallback callback) {
19604+
this.callback = callback;
19605+
}
19606+
19607+
@Override
19608+
public void onSuccess(@Nullable String value) {
19609+
Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
19610+
CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "String");
19611+
responseValues.put(commandResponseInfo, value);
19612+
callback.onSuccess(responseValues);
19613+
}
19614+
19615+
@Override
19616+
public void onError(Exception ex) {
19617+
callback.onFailure(ex);
19618+
}
19619+
}
19620+
19621+
public static class DelegatedMeterIdentificationClusterUtilityNameAttributeCallback implements ChipClusters.MeterIdentificationCluster.UtilityNameAttributeCallback, DelegatedClusterCallback {
19622+
private ClusterCommandCallback callback;
19623+
@Override
19624+
public void setCallbackDelegate(ClusterCommandCallback callback) {
19625+
this.callback = callback;
19626+
}
19627+
19628+
@Override
19629+
public void onSuccess(@Nullable String value) {
19630+
Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
19631+
CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "String");
19632+
responseValues.put(commandResponseInfo, value);
19633+
callback.onSuccess(responseValues);
19634+
}
19635+
19636+
@Override
19637+
public void onError(Exception ex) {
19638+
callback.onFailure(ex);
19639+
}
19640+
}
19641+
19642+
public static class DelegatedMeterIdentificationClusterPointOfDeliveryAttributeCallback implements ChipClusters.MeterIdentificationCluster.PointOfDeliveryAttributeCallback, DelegatedClusterCallback {
19643+
private ClusterCommandCallback callback;
19644+
@Override
19645+
public void setCallbackDelegate(ClusterCommandCallback callback) {
19646+
this.callback = callback;
19647+
}
19648+
19649+
@Override
19650+
public void onSuccess(@Nullable String value) {
19651+
Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
19652+
CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "String");
19653+
responseValues.put(commandResponseInfo, value);
19654+
callback.onSuccess(responseValues);
19655+
}
19656+
19657+
@Override
19658+
public void onError(Exception ex) {
19659+
callback.onFailure(ex);
19660+
}
19661+
}
19662+
19663+
public static class DelegatedMeterIdentificationClusterPowerThresholdAttributeCallback implements ChipClusters.MeterIdentificationCluster.PowerThresholdAttributeCallback, DelegatedClusterCallback {
19664+
private ClusterCommandCallback callback;
19665+
@Override
19666+
public void setCallbackDelegate(ClusterCommandCallback callback) {
19667+
this.callback = callback;
19668+
}
19669+
19670+
@Override
19671+
public void onSuccess(@Nullable Long value) {
19672+
Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
19673+
CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Long");
19674+
responseValues.put(commandResponseInfo, value);
19675+
callback.onSuccess(responseValues);
19676+
}
19677+
19678+
@Override
19679+
public void onError(Exception ex) {
19680+
callback.onFailure(ex);
19681+
}
19682+
}
19683+
19684+
public static class DelegatedMeterIdentificationClusterPowerThresholdSourceAttributeCallback implements ChipClusters.MeterIdentificationCluster.PowerThresholdSourceAttributeCallback, DelegatedClusterCallback {
19685+
private ClusterCommandCallback callback;
19686+
@Override
19687+
public void setCallbackDelegate(ClusterCommandCallback callback) {
19688+
this.callback = callback;
19689+
}
19690+
19691+
@Override
19692+
public void onSuccess(@Nullable Integer value) {
19693+
Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
19694+
CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
19695+
responseValues.put(commandResponseInfo, value);
19696+
callback.onSuccess(responseValues);
19697+
}
19698+
19699+
@Override
19700+
public void onError(Exception ex) {
19701+
callback.onFailure(ex);
19702+
}
19703+
}
19704+
19705+
public static class DelegatedMeterIdentificationClusterGeneratedCommandListAttributeCallback implements ChipClusters.MeterIdentificationCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
19706+
private ClusterCommandCallback callback;
19707+
@Override
19708+
public void setCallbackDelegate(ClusterCommandCallback callback) {
19709+
this.callback = callback;
19710+
}
19711+
19712+
@Override
19713+
public void onSuccess(List<Long> valueList) {
19714+
Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
19715+
CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
19716+
responseValues.put(commandResponseInfo, valueList);
19717+
callback.onSuccess(responseValues);
19718+
}
19719+
19720+
@Override
19721+
public void onError(Exception ex) {
19722+
callback.onFailure(ex);
19723+
}
19724+
}
19725+
19726+
public static class DelegatedMeterIdentificationClusterAcceptedCommandListAttributeCallback implements ChipClusters.MeterIdentificationCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
19727+
private ClusterCommandCallback callback;
19728+
@Override
19729+
public void setCallbackDelegate(ClusterCommandCallback callback) {
19730+
this.callback = callback;
19731+
}
19732+
19733+
@Override
19734+
public void onSuccess(List<Long> valueList) {
19735+
Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
19736+
CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
19737+
responseValues.put(commandResponseInfo, valueList);
19738+
callback.onSuccess(responseValues);
19739+
}
19740+
19741+
@Override
19742+
public void onError(Exception ex) {
19743+
callback.onFailure(ex);
19744+
}
19745+
}
19746+
19747+
public static class DelegatedMeterIdentificationClusterEventListAttributeCallback implements ChipClusters.MeterIdentificationCluster.EventListAttributeCallback, DelegatedClusterCallback {
19748+
private ClusterCommandCallback callback;
19749+
@Override
19750+
public void setCallbackDelegate(ClusterCommandCallback callback) {
19751+
this.callback = callback;
19752+
}
19753+
19754+
@Override
19755+
public void onSuccess(List<Long> valueList) {
19756+
Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
19757+
CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
19758+
responseValues.put(commandResponseInfo, valueList);
19759+
callback.onSuccess(responseValues);
19760+
}
19761+
19762+
@Override
19763+
public void onError(Exception ex) {
19764+
callback.onFailure(ex);
19765+
}
19766+
}
19767+
19768+
public static class DelegatedMeterIdentificationClusterAttributeListAttributeCallback implements ChipClusters.MeterIdentificationCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
19769+
private ClusterCommandCallback callback;
19770+
@Override
19771+
public void setCallbackDelegate(ClusterCommandCallback callback) {
19772+
this.callback = callback;
19773+
}
19774+
19775+
@Override
19776+
public void onSuccess(List<Long> valueList) {
19777+
Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
19778+
CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
19779+
responseValues.put(commandResponseInfo, valueList);
19780+
callback.onSuccess(responseValues);
19781+
}
19782+
19783+
@Override
19784+
public void onError(Exception ex) {
19785+
callback.onFailure(ex);
19786+
}
19787+
}
19788+
1957919789
public static class DelegatedElectricalMeasurementClusterGeneratedCommandListAttributeCallback implements ChipClusters.ElectricalMeasurementCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
1958019790
private ClusterCommandCallback callback;
1958119791
@Override
@@ -21647,6 +21857,10 @@ public Map<String, ClusterInfo> initializeClusterMap() {
2164721857
(ptr, endpointId) -> new ChipClusters.ContentAppObserverCluster(ptr, endpointId), new HashMap<>());
2164821858
clusterMap.put("contentAppObserver", contentAppObserverClusterInfo);
2164921859

21860+
ClusterInfo meterIdentificationClusterInfo = new ClusterInfo(
21861+
(ptr, endpointId) -> new ChipClusters.MeterIdentificationCluster(ptr, endpointId), new HashMap<>());
21862+
clusterMap.put("meterIdentification", meterIdentificationClusterInfo);
21863+
2165021864
ClusterInfo electricalMeasurementClusterInfo = new ClusterInfo(
2165121865
(ptr, endpointId) -> new ChipClusters.ElectricalMeasurementCluster(ptr, endpointId), new HashMap<>());
2165221866
clusterMap.put("electricalMeasurement", electricalMeasurementClusterInfo);
@@ -21784,6 +21998,7 @@ public void combineCommand(Map<String, ClusterInfo> destination, Map<String, Map
2178421998
destination.get("accountLogin").combineCommands(source.get("accountLogin"));
2178521999
destination.get("contentControl").combineCommands(source.get("contentControl"));
2178622000
destination.get("contentAppObserver").combineCommands(source.get("contentAppObserver"));
22001+
destination.get("meterIdentification").combineCommands(source.get("meterIdentification"));
2178722002
destination.get("electricalMeasurement").combineCommands(source.get("electricalMeasurement"));
2178822003
destination.get("unitTesting").combineCommands(source.get("unitTesting"));
2178922004
destination.get("faultInjection").combineCommands(source.get("faultInjection"));
@@ -27866,6 +28081,10 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
2786628081

2786728082
commandMap.put("contentAppObserver", contentAppObserverClusterInteractionInfoMap);
2786828083

28084+
Map<String, InteractionInfo> meterIdentificationClusterInteractionInfoMap = new LinkedHashMap<>();
28085+
28086+
commandMap.put("meterIdentification", meterIdentificationClusterInteractionInfoMap);
28087+
2786928088
Map<String, InteractionInfo> electricalMeasurementClusterInteractionInfoMap = new LinkedHashMap<>();
2787028089

2787128090
Map<String, CommandParameterInfo> electricalMeasurementgetProfileInfoCommandCommandParams = new LinkedHashMap<String, CommandParameterInfo>();

0 commit comments

Comments
 (0)