Skip to content

Commit b0d8bb0

Browse files
markus-becker-tridonic-commarkus-becker-tridonic-com
committed
regenerated files
1 parent 1e783c8 commit b0d8bb0

Some content is hidden

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

48 files changed

+501
-507
lines changed

‎docs/ids_and_codes/zap_clusters.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,4 +139,4 @@ Generally regenerate using one of:
139139
| 1873 | 0x751 | CommissionerControl |
140140
| 4294048773 | 0xFFF1FC05 | UnitTesting |
141141
| 4294048774 | 0xFFF1FC06 | FaultInjection |
142-
| 4294048800 | 0xFFF1FC20 | SampleManufacturerSpecificCluster |
142+
| 4294048800 | 0xFFF1FC20 | SampleManufacturerSpecific |

‎examples/chef/devices/rootnode_onofflight_manufacturer_specific_sample.matter

+3-3
Original file line numberDiff line numberDiff line change
@@ -1755,8 +1755,8 @@ cluster FixedLabel = 64 {
17551755
readonly attribute int16u clusterRevision = 65533;
17561756
}
17571757

1758-
/** The Sample Manufacturer-specific cluster showcases a cluster manufacturer extensions */
1759-
cluster SampleManufacturerSpecificCluster = 4294048800 {
1758+
/** A manufacturer-specific sample cluster */
1759+
cluster SampleManufacturerSpecific = 4294048800 {
17601760
revision 1; // NOTE: Default/not specifically set
17611761

17621762
fabric_sensitive info event PingCountEvent = 0 {
@@ -2082,7 +2082,7 @@ endpoint 1 {
20822082
callback attribute clusterRevision;
20832083
}
20842084

2085-
server cluster SampleManufacturerSpecificCluster {
2085+
server cluster SampleManufacturerSpecific {
20862086
emits event PingCountEvent;
20872087
ram attribute flipFlop default = false;
20882088
callback attribute generatedCommandList;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -10804,8 +10804,8 @@ internal cluster FaultInjection = 4294048774 {
1080410804
command access(invoke: manage) FailRandomlyAtFault(FailRandomlyAtFaultRequest): DefaultSuccess = 1;
1080510805
}
1080610806

10807-
/** The Sample Manufacturer-specific cluster showcases a cluster manufacturer extensions */
10808-
cluster SampleManufacturerSpecificCluster = 4294048800 {
10807+
/** A manufacturer-specific sample cluster */
10808+
cluster SampleManufacturerSpecific = 4294048800 {
1080910809
revision 1; // NOTE: Default/not specifically set
1081010810

1081110811
fabric_sensitive info event PingCountEvent = 0 {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -68865,7 +68865,7 @@ public void onSuccess(byte[] tlv) {
6886568865
}
6886668866
}
6886768867

68868-
public static class SampleManufacturerSpecificClusterCluster extends BaseChipCluster {
68868+
public static class SampleManufacturerSpecificCluster extends BaseChipCluster {
6886968869
public static final long CLUSTER_ID = 4294048800L;
6887068870

6887168871
private static final long FLIP_FLOP_ATTRIBUTE_ID = 0L;
@@ -68876,7 +68876,7 @@ public static class SampleManufacturerSpecificClusterCluster extends BaseChipClu
6887668876
private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L;
6887768877
private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L;
6887868878

68879-
public SampleManufacturerSpecificClusterCluster(long devicePtr, int endpointId) {
68879+
public SampleManufacturerSpecificCluster(long devicePtr, int endpointId) {
6888068880
super(devicePtr, endpointId, CLUSTER_ID);
6888168881
}
6888268882

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -7081,13 +7081,13 @@ public String toString() {
70817081
return output.toString();
70827082
}
70837083
}
7084-
public static class SampleManufacturerSpecificClusterClusterPingCountEventEvent {
7084+
public static class SampleManufacturerSpecificClusterPingCountEventEvent {
70857085
public Long count;
70867086
public Integer fabricIndex;
70877087
private static final long COUNT_ID = 1L;
70887088
private static final long FABRIC_INDEX_ID = 254L;
70897089

7090-
public SampleManufacturerSpecificClusterClusterPingCountEventEvent(
7090+
public SampleManufacturerSpecificClusterPingCountEventEvent(
70917091
Long count,
70927092
Integer fabricIndex
70937093
) {
@@ -7103,7 +7103,7 @@ public StructType encodeTlv() {
71037103
return new StructType(values);
71047104
}
71057105

7106-
public static SampleManufacturerSpecificClusterClusterPingCountEventEvent decodeTlv(BaseTLVType tlvValue) {
7106+
public static SampleManufacturerSpecificClusterPingCountEventEvent decodeTlv(BaseTLVType tlvValue) {
71077107
if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
71087108
return null;
71097109
}
@@ -7122,7 +7122,7 @@ public static SampleManufacturerSpecificClusterClusterPingCountEventEvent decode
71227122
}
71237123
}
71247124
}
7125-
return new SampleManufacturerSpecificClusterClusterPingCountEventEvent(
7125+
return new SampleManufacturerSpecificClusterPingCountEventEvent(
71267126
count,
71277127
fabricIndex
71287128
);
@@ -7131,7 +7131,7 @@ public static SampleManufacturerSpecificClusterClusterPingCountEventEvent decode
71317131
@Override
71327132
public String toString() {
71337133
StringBuilder output = new StringBuilder();
7134-
output.append("SampleManufacturerSpecificClusterClusterPingCountEventEvent {\n");
7134+
output.append("SampleManufacturerSpecificClusterPingCountEventEvent {\n");
71357135
output.append("\tcount: ");
71367136
output.append(count);
71377137
output.append("\n");

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -409,8 +409,8 @@ public static BaseCluster getCluster(long clusterId) {
409409
if (clusterId == FaultInjection.ID) {
410410
return new FaultInjection();
411411
}
412-
if (clusterId == SampleManufacturerSpecificCluster.ID) {
413-
return new SampleManufacturerSpecificCluster();
412+
if (clusterId == SampleManufacturerSpecific.ID) {
413+
return new SampleManufacturerSpecific();
414414
}return null;
415415
}
416416
public static class Identify implements BaseCluster {
@@ -19047,7 +19047,7 @@ public long getCommandID(String name) throws IllegalArgumentException {
1904719047
return Command.valueOf(name).getID();
1904819048
}
1904919049
}
19050-
public static class SampleManufacturerSpecificCluster implements BaseCluster {
19050+
public static class SampleManufacturerSpecific implements BaseCluster {
1905119051
public static final long ID = 4294048800L;
1905219052
public long getID() {
1905319053
return ID;

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

+27-27
Original file line numberDiff line numberDiff line change
@@ -22752,7 +22752,7 @@ public void onError(Exception ex) {
2275222752
}
2275322753

2275422754

22755-
public static class DelegatedSampleManufacturerSpecificClusterClusterAddArgumentsResponseCallback implements ChipClusters.SampleManufacturerSpecificClusterCluster.AddArgumentsResponseCallback, DelegatedClusterCallback {
22755+
public static class DelegatedSampleManufacturerSpecificClusterAddArgumentsResponseCallback implements ChipClusters.SampleManufacturerSpecificCluster.AddArgumentsResponseCallback, DelegatedClusterCallback {
2275622756
private ClusterCommandCallback callback;
2275722757
@Override
2275822758
public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -22773,7 +22773,7 @@ public void onError(Exception error) {
2277322773
callback.onFailure(error);
2277422774
}
2277522775
}
22776-
public static class DelegatedSampleManufacturerSpecificClusterClusterGeneratedCommandListAttributeCallback implements ChipClusters.SampleManufacturerSpecificClusterCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
22776+
public static class DelegatedSampleManufacturerSpecificClusterGeneratedCommandListAttributeCallback implements ChipClusters.SampleManufacturerSpecificCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
2277722777
private ClusterCommandCallback callback;
2277822778
@Override
2277922779
public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -22794,7 +22794,7 @@ public void onError(Exception ex) {
2279422794
}
2279522795
}
2279622796

22797-
public static class DelegatedSampleManufacturerSpecificClusterClusterAcceptedCommandListAttributeCallback implements ChipClusters.SampleManufacturerSpecificClusterCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
22797+
public static class DelegatedSampleManufacturerSpecificClusterAcceptedCommandListAttributeCallback implements ChipClusters.SampleManufacturerSpecificCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
2279822798
private ClusterCommandCallback callback;
2279922799
@Override
2280022800
public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -22815,7 +22815,7 @@ public void onError(Exception ex) {
2281522815
}
2281622816
}
2281722817

22818-
public static class DelegatedSampleManufacturerSpecificClusterClusterEventListAttributeCallback implements ChipClusters.SampleManufacturerSpecificClusterCluster.EventListAttributeCallback, DelegatedClusterCallback {
22818+
public static class DelegatedSampleManufacturerSpecificClusterEventListAttributeCallback implements ChipClusters.SampleManufacturerSpecificCluster.EventListAttributeCallback, DelegatedClusterCallback {
2281922819
private ClusterCommandCallback callback;
2282022820
@Override
2282122821
public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -22836,7 +22836,7 @@ public void onError(Exception ex) {
2283622836
}
2283722837
}
2283822838

22839-
public static class DelegatedSampleManufacturerSpecificClusterClusterAttributeListAttributeCallback implements ChipClusters.SampleManufacturerSpecificClusterCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
22839+
public static class DelegatedSampleManufacturerSpecificClusterAttributeListAttributeCallback implements ChipClusters.SampleManufacturerSpecificCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
2284022840
private ClusterCommandCallback callback;
2284122841
@Override
2284222842
public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -23380,9 +23380,9 @@ public Map<String, ClusterInfo> initializeClusterMap() {
2338023380
(ptr, endpointId) -> new ChipClusters.FaultInjectionCluster(ptr, endpointId), new HashMap<>());
2338123381
clusterMap.put("faultInjection", faultInjectionClusterInfo);
2338223382

23383-
ClusterInfo sampleManufacturerSpecificClusterClusterInfo = new ClusterInfo(
23384-
(ptr, endpointId) -> new ChipClusters.SampleManufacturerSpecificClusterCluster(ptr, endpointId), new HashMap<>());
23385-
clusterMap.put("sampleManufacturerSpecificCluster", sampleManufacturerSpecificClusterClusterInfo);
23383+
ClusterInfo sampleManufacturerSpecificClusterInfo = new ClusterInfo(
23384+
(ptr, endpointId) -> new ChipClusters.SampleManufacturerSpecificCluster(ptr, endpointId), new HashMap<>());
23385+
clusterMap.put("sampleManufacturerSpecific", sampleManufacturerSpecificClusterInfo);
2338623386

2338723387
return clusterMap;
2338823388
}
@@ -23515,7 +23515,7 @@ public void combineCommand(Map<String, ClusterInfo> destination, Map<String, Map
2351523515
destination.get("commissionerControl").combineCommands(source.get("commissionerControl"));
2351623516
destination.get("unitTesting").combineCommands(source.get("unitTesting"));
2351723517
destination.get("faultInjection").combineCommands(source.get("faultInjection"));
23518-
destination.get("sampleManufacturerSpecificCluster").combineCommands(source.get("sampleManufacturerSpecificCluster"));
23518+
destination.get("sampleManufacturerSpecific").combineCommands(source.get("sampleManufacturerSpecific"));
2351923519
}
2352023520

2352123521
@SuppressWarnings("unchecked")
@@ -31210,31 +31210,31 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
3121031210

3121131211
commandMap.put("faultInjection", faultInjectionClusterInteractionInfoMap);
3121231212

31213-
Map<String, InteractionInfo> sampleManufacturerSpecificClusterClusterInteractionInfoMap = new LinkedHashMap<>();
31213+
Map<String, InteractionInfo> sampleManufacturerSpecificClusterInteractionInfoMap = new LinkedHashMap<>();
3121431214

31215-
Map<String, CommandParameterInfo> sampleManufacturerSpecificClusterpingCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
31216-
InteractionInfo sampleManufacturerSpecificClusterpingInteractionInfo = new InteractionInfo(
31215+
Map<String, CommandParameterInfo> sampleManufacturerSpecificpingCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
31216+
InteractionInfo sampleManufacturerSpecificpingInteractionInfo = new InteractionInfo(
3121731217
(cluster, callback, commandArguments) -> {
31218-
((ChipClusters.SampleManufacturerSpecificClusterCluster) cluster)
31218+
((ChipClusters.SampleManufacturerSpecificCluster) cluster)
3121931219
.ping((DefaultClusterCallback) callback
3122031220
);
3122131221
},
3122231222
() -> new DelegatedDefaultClusterCallback(),
31223-
sampleManufacturerSpecificClusterpingCommandParams
31223+
sampleManufacturerSpecificpingCommandParams
3122431224
);
31225-
sampleManufacturerSpecificClusterClusterInteractionInfoMap.put("ping", sampleManufacturerSpecificClusterpingInteractionInfo);
31225+
sampleManufacturerSpecificClusterInteractionInfoMap.put("ping", sampleManufacturerSpecificpingInteractionInfo);
3122631226

31227-
Map<String, CommandParameterInfo> sampleManufacturerSpecificClusteraddArgumentsCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
31227+
Map<String, CommandParameterInfo> sampleManufacturerSpecificaddArgumentsCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
3122831228

31229-
CommandParameterInfo sampleManufacturerSpecificClusteraddArgumentsarg1CommandParameterInfo = new CommandParameterInfo("arg1", Integer.class, Integer.class);
31230-
sampleManufacturerSpecificClusteraddArgumentsCommandParams.put("arg1",sampleManufacturerSpecificClusteraddArgumentsarg1CommandParameterInfo);
31229+
CommandParameterInfo sampleManufacturerSpecificaddArgumentsarg1CommandParameterInfo = new CommandParameterInfo("arg1", Integer.class, Integer.class);
31230+
sampleManufacturerSpecificaddArgumentsCommandParams.put("arg1",sampleManufacturerSpecificaddArgumentsarg1CommandParameterInfo);
3123131231

31232-
CommandParameterInfo sampleManufacturerSpecificClusteraddArgumentsarg2CommandParameterInfo = new CommandParameterInfo("arg2", Integer.class, Integer.class);
31233-
sampleManufacturerSpecificClusteraddArgumentsCommandParams.put("arg2",sampleManufacturerSpecificClusteraddArgumentsarg2CommandParameterInfo);
31234-
InteractionInfo sampleManufacturerSpecificClusteraddArgumentsInteractionInfo = new InteractionInfo(
31232+
CommandParameterInfo sampleManufacturerSpecificaddArgumentsarg2CommandParameterInfo = new CommandParameterInfo("arg2", Integer.class, Integer.class);
31233+
sampleManufacturerSpecificaddArgumentsCommandParams.put("arg2",sampleManufacturerSpecificaddArgumentsarg2CommandParameterInfo);
31234+
InteractionInfo sampleManufacturerSpecificaddArgumentsInteractionInfo = new InteractionInfo(
3123531235
(cluster, callback, commandArguments) -> {
31236-
((ChipClusters.SampleManufacturerSpecificClusterCluster) cluster)
31237-
.addArguments((ChipClusters.SampleManufacturerSpecificClusterCluster.AddArgumentsResponseCallback) callback
31236+
((ChipClusters.SampleManufacturerSpecificCluster) cluster)
31237+
.addArguments((ChipClusters.SampleManufacturerSpecificCluster.AddArgumentsResponseCallback) callback
3123831238
, (Integer)
3123931239
commandArguments.get("arg1")
3124031240

@@ -31243,12 +31243,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
3124331243

3124431244
);
3124531245
},
31246-
() -> new DelegatedSampleManufacturerSpecificClusterClusterAddArgumentsResponseCallback(),
31247-
sampleManufacturerSpecificClusteraddArgumentsCommandParams
31246+
() -> new DelegatedSampleManufacturerSpecificClusterAddArgumentsResponseCallback(),
31247+
sampleManufacturerSpecificaddArgumentsCommandParams
3124831248
);
31249-
sampleManufacturerSpecificClusterClusterInteractionInfoMap.put("addArguments", sampleManufacturerSpecificClusteraddArgumentsInteractionInfo);
31249+
sampleManufacturerSpecificClusterInteractionInfoMap.put("addArguments", sampleManufacturerSpecificaddArgumentsInteractionInfo);
3125031250

31251-
commandMap.put("sampleManufacturerSpecificCluster", sampleManufacturerSpecificClusterClusterInteractionInfoMap);
31251+
commandMap.put("sampleManufacturerSpecific", sampleManufacturerSpecificClusterInteractionInfoMap);
3125231252

3125331253
return commandMap;
3125431254
}

0 commit comments

Comments
 (0)