Skip to content

Commit 1ed09a8

Browse files
gmarcosbgmarcosb
committed
Generated using ./scripts/tools/zap_regen_all.py
1 parent 0306bea commit 1ed09a8

35 files changed

+478
-220
lines changed

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

+5-3
Original file line numberDiff line numberDiff line change
@@ -9443,6 +9443,7 @@ provisional cluster ZoneManagement = 1360 {
94439443

94449444
bitmap Feature : bitmap32 {
94459445
kTwoDimensionalCartesianZone = 0x1;
9446+
kPerZoneSensitivity = 0x2;
94469447
}
94479448

94489449
struct TwoDCartesianVertexStruct {
@@ -9463,11 +9464,12 @@ provisional cluster ZoneManagement = 1360 {
94639464
ZoneSourceEnum zoneSource = 2;
94649465
}
94659466

9466-
struct ZoneTriggeringTimeControlStruct {
9467+
struct ZoneTriggerControlStruct {
94679468
int16u initialDuration = 0;
94689469
int16u augmentationDuration = 1;
94699470
elapsed_s maxDuration = 2;
94709471
int16u blindDuration = 3;
9472+
optional int8u sensitivity = 4;
94719473
}
94729474

94739475
info event ZoneTriggered = 0 {
@@ -9482,8 +9484,8 @@ provisional cluster ZoneManagement = 1360 {
94829484

94839485
readonly attribute ZoneSourceEnum supportedZoneSources[] = 0;
94849486
readonly attribute optional ZoneInformationStruct zones[] = 1;
9485-
attribute ZoneTriggeringTimeControlStruct timeControl[] = 2;
9486-
attribute int8u sensitivity = 3;
9487+
attribute ZoneTriggerControlStruct triggers[] = 2;
9488+
attribute optional int8u sensitivity = 3;
94879489
readonly attribute command_id generatedCommandList[] = 65528;
94889490
readonly attribute command_id acceptedCommandList[] = 65529;
94899491
readonly attribute event_id eventList[] = 65530;

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

+17-17
Original file line numberDiff line numberDiff line change
@@ -59283,7 +59283,7 @@ public static class ZoneManagementCluster extends BaseChipCluster {
5928359283

5928459284
private static final long SUPPORTED_ZONE_SOURCES_ATTRIBUTE_ID = 0L;
5928559285
private static final long ZONES_ATTRIBUTE_ID = 1L;
59286-
private static final long TIME_CONTROL_ATTRIBUTE_ID = 2L;
59286+
private static final long TRIGGERS_ATTRIBUTE_ID = 2L;
5928759287
private static final long SENSITIVITY_ATTRIBUTE_ID = 3L;
5928859288
private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
5928959289
private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
@@ -59422,8 +59422,8 @@ public interface ZonesAttributeCallback extends BaseAttributeCallback {
5942259422
void onSuccess(List<ChipStructs.ZoneManagementClusterZoneInformationStruct> value);
5942359423
}
5942459424

59425-
public interface TimeControlAttributeCallback extends BaseAttributeCallback {
59426-
void onSuccess(List<ChipStructs.ZoneManagementClusterZoneTriggeringTimeControlStruct> value);
59425+
public interface TriggersAttributeCallback extends BaseAttributeCallback {
59426+
void onSuccess(List<ChipStructs.ZoneManagementClusterZoneTriggerControlStruct> value);
5942759427
}
5942859428

5942959429
public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
@@ -59494,39 +59494,39 @@ public void onSuccess(byte[] tlv) {
5949459494
}, ZONES_ATTRIBUTE_ID, minInterval, maxInterval);
5949559495
}
5949659496

59497-
public void readTimeControlAttribute(
59498-
TimeControlAttributeCallback callback) {
59499-
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TIME_CONTROL_ATTRIBUTE_ID);
59497+
public void readTriggersAttribute(
59498+
TriggersAttributeCallback callback) {
59499+
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TRIGGERS_ATTRIBUTE_ID);
5950059500

5950159501
readAttribute(new ReportCallbackImpl(callback, path) {
5950259502
@Override
5950359503
public void onSuccess(byte[] tlv) {
59504-
List<ChipStructs.ZoneManagementClusterZoneTriggeringTimeControlStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
59504+
List<ChipStructs.ZoneManagementClusterZoneTriggerControlStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
5950559505
callback.onSuccess(value);
5950659506
}
59507-
}, TIME_CONTROL_ATTRIBUTE_ID, true);
59507+
}, TRIGGERS_ATTRIBUTE_ID, true);
5950859508
}
5950959509

59510-
public void writeTimeControlAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.ZoneManagementClusterZoneTriggeringTimeControlStruct> value) {
59511-
writeTimeControlAttribute(callback, value, 0);
59510+
public void writeTriggersAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.ZoneManagementClusterZoneTriggerControlStruct> value) {
59511+
writeTriggersAttribute(callback, value, 0);
5951259512
}
5951359513

59514-
public void writeTimeControlAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.ZoneManagementClusterZoneTriggeringTimeControlStruct> value, int timedWriteTimeoutMs) {
59514+
public void writeTriggersAttribute(DefaultClusterCallback callback, ArrayList<ChipStructs.ZoneManagementClusterZoneTriggerControlStruct> value, int timedWriteTimeoutMs) {
5951559515
BaseTLVType tlvValue = ArrayType.generateArrayType(value, (elementvalue) -> elementvalue.encodeTlv());
59516-
writeAttribute(new WriteAttributesCallbackImpl(callback), TIME_CONTROL_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
59516+
writeAttribute(new WriteAttributesCallbackImpl(callback), TRIGGERS_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
5951759517
}
5951859518

59519-
public void subscribeTimeControlAttribute(
59520-
TimeControlAttributeCallback callback, int minInterval, int maxInterval) {
59521-
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TIME_CONTROL_ATTRIBUTE_ID);
59519+
public void subscribeTriggersAttribute(
59520+
TriggersAttributeCallback callback, int minInterval, int maxInterval) {
59521+
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TRIGGERS_ATTRIBUTE_ID);
5952259522

5952359523
subscribeAttribute(new ReportCallbackImpl(callback, path) {
5952459524
@Override
5952559525
public void onSuccess(byte[] tlv) {
59526-
List<ChipStructs.ZoneManagementClusterZoneTriggeringTimeControlStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
59526+
List<ChipStructs.ZoneManagementClusterZoneTriggerControlStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
5952759527
callback.onSuccess(value);
5952859528
}
59529-
}, TIME_CONTROL_ATTRIBUTE_ID, minInterval, maxInterval);
59529+
}, TRIGGERS_ATTRIBUTE_ID, minInterval, maxInterval);
5953059530
}
5953159531

5953259532
public void readSensitivityAttribute(

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

+22-7
Original file line numberDiff line numberDiff line change
@@ -12952,26 +12952,30 @@ public String toString() {
1295212952
return output.toString();
1295312953
}
1295412954
}
12955-
public static class ZoneManagementClusterZoneTriggeringTimeControlStruct {
12955+
public static class ZoneManagementClusterZoneTriggerControlStruct {
1295612956
public Integer initialDuration;
1295712957
public Integer augmentationDuration;
1295812958
public Long maxDuration;
1295912959
public Integer blindDuration;
12960+
public Optional<Integer> sensitivity;
1296012961
private static final long INITIAL_DURATION_ID = 0L;
1296112962
private static final long AUGMENTATION_DURATION_ID = 1L;
1296212963
private static final long MAX_DURATION_ID = 2L;
1296312964
private static final long BLIND_DURATION_ID = 3L;
12965+
private static final long SENSITIVITY_ID = 4L;
1296412966

12965-
public ZoneManagementClusterZoneTriggeringTimeControlStruct(
12967+
public ZoneManagementClusterZoneTriggerControlStruct(
1296612968
Integer initialDuration,
1296712969
Integer augmentationDuration,
1296812970
Long maxDuration,
12969-
Integer blindDuration
12971+
Integer blindDuration,
12972+
Optional<Integer> sensitivity
1297012973
) {
1297112974
this.initialDuration = initialDuration;
1297212975
this.augmentationDuration = augmentationDuration;
1297312976
this.maxDuration = maxDuration;
1297412977
this.blindDuration = blindDuration;
12978+
this.sensitivity = sensitivity;
1297512979
}
1297612980

1297712981
public StructType encodeTlv() {
@@ -12980,18 +12984,20 @@ public StructType encodeTlv() {
1298012984
values.add(new StructElement(AUGMENTATION_DURATION_ID, new UIntType(augmentationDuration)));
1298112985
values.add(new StructElement(MAX_DURATION_ID, new UIntType(maxDuration)));
1298212986
values.add(new StructElement(BLIND_DURATION_ID, new UIntType(blindDuration)));
12987+
values.add(new StructElement(SENSITIVITY_ID, sensitivity.<BaseTLVType>map((nonOptionalsensitivity) -> new UIntType(nonOptionalsensitivity)).orElse(new EmptyType())));
1298312988

1298412989
return new StructType(values);
1298512990
}
1298612991

12987-
public static ZoneManagementClusterZoneTriggeringTimeControlStruct decodeTlv(BaseTLVType tlvValue) {
12992+
public static ZoneManagementClusterZoneTriggerControlStruct decodeTlv(BaseTLVType tlvValue) {
1298812993
if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
1298912994
return null;
1299012995
}
1299112996
Integer initialDuration = null;
1299212997
Integer augmentationDuration = null;
1299312998
Long maxDuration = null;
1299412999
Integer blindDuration = null;
13000+
Optional<Integer> sensitivity = Optional.empty();
1299513001
for (StructElement element: ((StructType)tlvValue).value()) {
1299613002
if (element.contextTagNum() == INITIAL_DURATION_ID) {
1299713003
if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
@@ -13013,20 +13019,26 @@ public static ZoneManagementClusterZoneTriggeringTimeControlStruct decodeTlv(Bas
1301313019
UIntType castingValue = element.value(UIntType.class);
1301413020
blindDuration = castingValue.value(Integer.class);
1301513021
}
13022+
} else if (element.contextTagNum() == SENSITIVITY_ID) {
13023+
if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
13024+
UIntType castingValue = element.value(UIntType.class);
13025+
sensitivity = Optional.of(castingValue.value(Integer.class));
13026+
}
1301613027
}
1301713028
}
13018-
return new ZoneManagementClusterZoneTriggeringTimeControlStruct(
13029+
return new ZoneManagementClusterZoneTriggerControlStruct(
1301913030
initialDuration,
1302013031
augmentationDuration,
1302113032
maxDuration,
13022-
blindDuration
13033+
blindDuration,
13034+
sensitivity
1302313035
);
1302413036
}
1302513037

1302613038
@Override
1302713039
public String toString() {
1302813040
StringBuilder output = new StringBuilder();
13029-
output.append("ZoneManagementClusterZoneTriggeringTimeControlStruct {\n");
13041+
output.append("ZoneManagementClusterZoneTriggerControlStruct {\n");
1303013042
output.append("\tinitialDuration: ");
1303113043
output.append(initialDuration);
1303213044
output.append("\n");
@@ -13039,6 +13051,9 @@ public String toString() {
1303913051
output.append("\tblindDuration: ");
1304013052
output.append(blindDuration);
1304113053
output.append("\n");
13054+
output.append("\tsensitivity: ");
13055+
output.append(sensitivity);
13056+
output.append("\n");
1304213057
output.append("}\n");
1304313058
return output.toString();
1304413059
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -16897,7 +16897,7 @@ public long getID() {
1689716897
public enum Attribute {
1689816898
SupportedZoneSources(0L),
1689916899
Zones(1L),
16900-
TimeControl(2L),
16900+
Triggers(2L),
1690116901
Sensitivity(3L),
1690216902
GeneratedCommandList(65528L),
1690316903
AcceptedCommandList(65529L),

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -19955,17 +19955,17 @@ public void onError(Exception ex) {
1995519955
}
1995619956
}
1995719957

19958-
public static class DelegatedZoneManagementClusterTimeControlAttributeCallback implements ChipClusters.ZoneManagementCluster.TimeControlAttributeCallback, DelegatedClusterCallback {
19958+
public static class DelegatedZoneManagementClusterTriggersAttributeCallback implements ChipClusters.ZoneManagementCluster.TriggersAttributeCallback, DelegatedClusterCallback {
1995919959
private ClusterCommandCallback callback;
1996019960
@Override
1996119961
public void setCallbackDelegate(ClusterCommandCallback callback) {
1996219962
this.callback = callback;
1996319963
}
1996419964

1996519965
@Override
19966-
public void onSuccess(List<ChipStructs.ZoneManagementClusterZoneTriggeringTimeControlStruct> valueList) {
19966+
public void onSuccess(List<ChipStructs.ZoneManagementClusterZoneTriggerControlStruct> valueList) {
1996719967
Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
19968-
CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.ZoneManagementClusterZoneTriggeringTimeControlStruct>");
19968+
CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.ZoneManagementClusterZoneTriggerControlStruct>");
1996919969
responseValues.put(commandResponseInfo, valueList);
1997019970
callback.onSuccess(responseValues);
1997119971
}

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -18204,17 +18204,17 @@ private static Map<String, InteractionInfo> readZoneManagementInteractionInfo()
1820418204
readZoneManagementZonesCommandParams
1820518205
);
1820618206
result.put("readZonesAttribute", readZoneManagementZonesAttributeInteractionInfo);
18207-
Map<String, CommandParameterInfo> readZoneManagementTimeControlCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
18208-
InteractionInfo readZoneManagementTimeControlAttributeInteractionInfo = new InteractionInfo(
18207+
Map<String, CommandParameterInfo> readZoneManagementTriggersCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
18208+
InteractionInfo readZoneManagementTriggersAttributeInteractionInfo = new InteractionInfo(
1820918209
(cluster, callback, commandArguments) -> {
18210-
((ChipClusters.ZoneManagementCluster) cluster).readTimeControlAttribute(
18211-
(ChipClusters.ZoneManagementCluster.TimeControlAttributeCallback) callback
18210+
((ChipClusters.ZoneManagementCluster) cluster).readTriggersAttribute(
18211+
(ChipClusters.ZoneManagementCluster.TriggersAttributeCallback) callback
1821218212
);
1821318213
},
18214-
() -> new ClusterInfoMapping.DelegatedZoneManagementClusterTimeControlAttributeCallback(),
18215-
readZoneManagementTimeControlCommandParams
18214+
() -> new ClusterInfoMapping.DelegatedZoneManagementClusterTriggersAttributeCallback(),
18215+
readZoneManagementTriggersCommandParams
1821618216
);
18217-
result.put("readTimeControlAttribute", readZoneManagementTimeControlAttributeInteractionInfo);
18217+
result.put("readTriggersAttribute", readZoneManagementTriggersAttributeInteractionInfo);
1821818218
Map<String, CommandParameterInfo> readZoneManagementSensitivityCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
1821918219
InteractionInfo readZoneManagementSensitivityAttributeInteractionInfo = new InteractionInfo(
1822018220
(cluster, callback, commandArguments) -> {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ structs_sources = [
176176
"${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ZoneManagementClusterTwoDCartesianVertexStruct.kt",
177177
"${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ZoneManagementClusterTwoDCartesianZoneStruct.kt",
178178
"${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ZoneManagementClusterZoneInformationStruct.kt",
179-
"${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ZoneManagementClusterZoneTriggeringTimeControlStruct.kt",
179+
"${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ZoneManagementClusterZoneTriggerControlStruct.kt",
180180
]
181181

182182
eventstructs_sources = [

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

+89
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
/*
2+
*
3+
* Copyright (c) 2023 Project CHIP Authors
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
package chip.devicecontroller.cluster.structs
18+
19+
import chip.devicecontroller.cluster.*
20+
import java.util.Optional
21+
import matter.tlv.ContextSpecificTag
22+
import matter.tlv.Tag
23+
import matter.tlv.TlvReader
24+
import matter.tlv.TlvWriter
25+
26+
class ZoneManagementClusterZoneTriggerControlStruct(
27+
val initialDuration: UInt,
28+
val augmentationDuration: UInt,
29+
val maxDuration: ULong,
30+
val blindDuration: UInt,
31+
val sensitivity: Optional<UInt>,
32+
) {
33+
override fun toString(): String = buildString {
34+
append("ZoneManagementClusterZoneTriggerControlStruct {\n")
35+
append("\tinitialDuration : $initialDuration\n")
36+
append("\taugmentationDuration : $augmentationDuration\n")
37+
append("\tmaxDuration : $maxDuration\n")
38+
append("\tblindDuration : $blindDuration\n")
39+
append("\tsensitivity : $sensitivity\n")
40+
append("}\n")
41+
}
42+
43+
fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
44+
tlvWriter.apply {
45+
startStructure(tlvTag)
46+
put(ContextSpecificTag(TAG_INITIAL_DURATION), initialDuration)
47+
put(ContextSpecificTag(TAG_AUGMENTATION_DURATION), augmentationDuration)
48+
put(ContextSpecificTag(TAG_MAX_DURATION), maxDuration)
49+
put(ContextSpecificTag(TAG_BLIND_DURATION), blindDuration)
50+
if (sensitivity.isPresent) {
51+
val optsensitivity = sensitivity.get()
52+
put(ContextSpecificTag(TAG_SENSITIVITY), optsensitivity)
53+
}
54+
endStructure()
55+
}
56+
}
57+
58+
companion object {
59+
private const val TAG_INITIAL_DURATION = 0
60+
private const val TAG_AUGMENTATION_DURATION = 1
61+
private const val TAG_MAX_DURATION = 2
62+
private const val TAG_BLIND_DURATION = 3
63+
private const val TAG_SENSITIVITY = 4
64+
65+
fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ZoneManagementClusterZoneTriggerControlStruct {
66+
tlvReader.enterStructure(tlvTag)
67+
val initialDuration = tlvReader.getUInt(ContextSpecificTag(TAG_INITIAL_DURATION))
68+
val augmentationDuration = tlvReader.getUInt(ContextSpecificTag(TAG_AUGMENTATION_DURATION))
69+
val maxDuration = tlvReader.getULong(ContextSpecificTag(TAG_MAX_DURATION))
70+
val blindDuration = tlvReader.getUInt(ContextSpecificTag(TAG_BLIND_DURATION))
71+
val sensitivity =
72+
if (tlvReader.isNextTag(ContextSpecificTag(TAG_SENSITIVITY))) {
73+
Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_SENSITIVITY)))
74+
} else {
75+
Optional.empty()
76+
}
77+
78+
tlvReader.exitContainer()
79+
80+
return ZoneManagementClusterZoneTriggerControlStruct(
81+
initialDuration,
82+
augmentationDuration,
83+
maxDuration,
84+
blindDuration,
85+
sensitivity,
86+
)
87+
}
88+
}
89+
}

0 commit comments

Comments
 (0)