Skip to content

Commit 2529609

Browse files
mkardous-silabspull[bot]
authored andcommitted
[ICD] Add onTransitionToActiveMode Event to the ICDM cluster (#31303)
* Add onTransitionToActiveMode event to the ICDM cluster * generated files
1 parent 5f293e1 commit 2529609

File tree

23 files changed

+240
-5
lines changed

23 files changed

+240
-5
lines changed

examples/light-switch-app/light-switch-common/light-switch-app.matter

+3
Original file line numberDiff line numberDiff line change
@@ -2147,6 +2147,9 @@ cluster IcdManagement = 70 {
21472147
fabric_idx fabricIndex = 254;
21482148
}
21492149

2150+
critical event OnTransitionToActiveMode = 0 {
2151+
}
2152+
21502153
readonly attribute int32u idleModeDuration = 0;
21512154
readonly attribute int32u activeModeDuration = 1;
21522155
readonly attribute int16u activeModeThreshold = 2;

examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter

+4
Original file line numberDiff line numberDiff line change
@@ -1412,6 +1412,9 @@ cluster IcdManagement = 70 {
14121412
fabric_idx fabricIndex = 254;
14131413
}
14141414

1415+
critical event OnTransitionToActiveMode = 0 {
1416+
}
1417+
14151418
readonly attribute int32u idleModeDuration = 0;
14161419
readonly attribute int32u activeModeDuration = 1;
14171420
readonly attribute int16u activeModeThreshold = 2;
@@ -1734,6 +1737,7 @@ endpoint 0 {
17341737
}
17351738

17361739
server cluster IcdManagement {
1740+
emits event OnTransitionToActiveMode;
17371741
callback attribute idleModeDuration;
17381742
callback attribute activeModeDuration;
17391743
callback attribute activeModeThreshold;

examples/lit-icd-app/lit-icd-common/lit-icd-server-app.zap

+10-1
Original file line numberDiff line numberDiff line change
@@ -1781,7 +1781,7 @@
17811781
"storageOption": "External",
17821782
"singleton": 0,
17831783
"bounded": 0,
1784-
"defaultValue": "0x0000000000000000",
1784+
"defaultValue": null,
17851785
"reportable": 1,
17861786
"minInterval": 1,
17871787
"maxInterval": 65534,
@@ -3615,6 +3615,15 @@
36153615
"maxInterval": 65534,
36163616
"reportableChange": 0
36173617
}
3618+
],
3619+
"events": [
3620+
{
3621+
"name": "OnTransitionToActiveMode",
3622+
"code": 0,
3623+
"mfgCode": null,
3624+
"side": "server",
3625+
"included": 1
3626+
}
36183627
]
36193628
}
36203629
]

examples/lock-app/lock-common/lock-app.matter

+3
Original file line numberDiff line numberDiff line change
@@ -1772,6 +1772,9 @@ cluster IcdManagement = 70 {
17721772
fabric_idx fabricIndex = 254;
17731773
}
17741774

1775+
critical event OnTransitionToActiveMode = 0 {
1776+
}
1777+
17751778
readonly attribute int32u idleModeDuration = 0;
17761779
readonly attribute int32u activeModeDuration = 1;
17771780
readonly attribute int16u activeModeThreshold = 2;

examples/lock-app/qpg/zap/lock.matter

+3
Original file line numberDiff line numberDiff line change
@@ -1428,6 +1428,9 @@ cluster IcdManagement = 70 {
14281428
fabric_idx fabricIndex = 254;
14291429
}
14301430

1431+
critical event OnTransitionToActiveMode = 0 {
1432+
}
1433+
14311434
readonly attribute int32u idleModeDuration = 0;
14321435
readonly attribute int32u activeModeDuration = 1;
14331436
readonly attribute int16u activeModeThreshold = 2;

examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter

+3
Original file line numberDiff line numberDiff line change
@@ -1748,6 +1748,9 @@ cluster IcdManagement = 70 {
17481748
fabric_idx fabricIndex = 254;
17491749
}
17501750

1751+
critical event OnTransitionToActiveMode = 0 {
1752+
}
1753+
17511754
readonly attribute int32u idleModeDuration = 0;
17521755
readonly attribute int32u activeModeDuration = 1;
17531756
readonly attribute int16u activeModeThreshold = 2;

src/app/zap-templates/zcl/data-model/chip/icd-management-cluster.xml

+4
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,10 @@ limitations under the License.
8080
<attribute side="server" code="0x06" define="USER_ACTIVE_MODE_TRIGGER_HINT" type="UserActiveModeTriggerBitmap" writable="false" optional="true" isNullable="false">UserActiveModeTriggerHint</attribute>
8181
<attribute side="server" code="0x07" define="USER_ACTIVE_MODE_TRIGGER_INSTRUCTION" type="char_string" length="128" writable="false" optional="true" isNullable="false">UserActiveModeTriggerInstruction</attribute>
8282

83+
<event side="server" code="0x00" priority="critical" name="OnTransitionToActiveMode" optional="true">
84+
<description>OnTransitionToActiveMode</description>
85+
</event>
86+
8387
<command source="client" code="0x00" name="RegisterClient" response="RegisterClientResponse" isFabricScoped="true" optional="true">
8488
<description>Register a client to the end device</description>
8589
<arg name="CheckInNodeID" type="node_id" optional="false"/>

src/controller/data_model/controller-clusters.matter

+3
Original file line numberDiff line numberDiff line change
@@ -2880,6 +2880,9 @@ cluster IcdManagement = 70 {
28802880
fabric_idx fabricIndex = 254;
28812881
}
28822882

2883+
critical event OnTransitionToActiveMode = 0 {
2884+
}
2885+
28832886
readonly attribute int32u idleModeDuration = 0;
28842887
readonly attribute int32u activeModeDuration = 1;
28852888
readonly attribute int16u activeModeThreshold = 2;

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

+28
Original file line numberDiff line numberDiff line change
@@ -2297,6 +2297,34 @@ public String toString() {
22972297
return output.toString();
22982298
}
22992299
}
2300+
public static class IcdManagementClusterOnTransitionToActiveModeEvent {
2301+
2302+
public IcdManagementClusterOnTransitionToActiveModeEvent(
2303+
) {
2304+
}
2305+
2306+
public StructType encodeTlv() {
2307+
ArrayList<StructElement> values = new ArrayList<>();
2308+
2309+
return new StructType(values);
2310+
}
2311+
2312+
public static IcdManagementClusterOnTransitionToActiveModeEvent decodeTlv(BaseTLVType tlvValue) {
2313+
if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
2314+
return null;
2315+
}
2316+
return new IcdManagementClusterOnTransitionToActiveModeEvent(
2317+
);
2318+
}
2319+
2320+
@Override
2321+
public String toString() {
2322+
StringBuilder output = new StringBuilder();
2323+
output.append("IcdManagementClusterOnTransitionToActiveModeEvent {\n");
2324+
output.append("}\n");
2325+
return output.toString();
2326+
}
2327+
}
23002328
public static class OvenCavityOperationalStateClusterOperationalErrorEvent {
23012329
public ChipStructs.OvenCavityOperationalStateClusterErrorStateStruct errorState;
23022330
private static final long ERROR_STATE_ID = 0L;

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -6060,7 +6060,8 @@ public static Attribute value(long id) throws NoSuchFieldError {
60606060
}
60616061
}
60626062

6063-
public enum Event {;
6063+
public enum Event {
6064+
OnTransitionToActiveMode(0L),;
60646065
private final long id;
60656066
Event(long id) {
60666067
this.id = id;

src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp

+27
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/controller/python/chip/clusters/Objects.py

+17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm

+11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm

+23
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp

+23-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

zzz_generated/app-common/app-common/zap-generated/cluster-objects.h

+30
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

zzz_generated/app-common/app-common/zap-generated/ids/Events.h

+10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

zzz_generated/chip-tool/zap-generated/cluster/Commands.h

+5-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)