Skip to content

Commit 2aaf2f8

Browse files
tersaltersal
authored
Generate dishwasher alarm alchemy (project-chip#37861)
* Add Alchemy generated files for Dishwasher Alarm * Revert change in zap_cluster_list
1 parent a579c8d commit 2aaf2f8

File tree

5 files changed

+44
-47
lines changed

5 files changed

+44
-47
lines changed

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

+3-3
Original file line numberDiff line numberDiff line change
@@ -3648,7 +3648,7 @@ cluster SmokeCoAlarm = 92 {
36483648

36493649
/** Attributes and commands for configuring the Dishwasher alarm. */
36503650
cluster DishwasherAlarm = 93 {
3651-
revision 1; // NOTE: Default/not specifically set
3651+
revision 1;
36523652

36533653
bitmap AlarmBitmap : bitmap32 {
36543654
kInflowError = 0x1;
@@ -3689,9 +3689,9 @@ cluster DishwasherAlarm = 93 {
36893689
AlarmBitmap mask = 0;
36903690
}
36913691

3692-
/** Reset alarm */
3692+
/** This command resets active and latched alarms (if possible). */
36933693
command Reset(ResetRequest): DefaultSuccess = 0;
3694-
/** Modify enabled alarms */
3694+
/** This command allows a client to request that an alarm be enabled or suppressed at the server. */
36953695
command ModifyEnabledAlarms(ModifyEnabledAlarmsRequest): DefaultSuccess = 1;
36963696
}
36973697

‎examples/chef/devices/rootnode_dishwasher_cc105034fe.matter

+3-3
Original file line numberDiff line numberDiff line change
@@ -1512,7 +1512,7 @@ cluster DishwasherMode = 89 {
15121512

15131513
/** Attributes and commands for configuring the Dishwasher alarm. */
15141514
cluster DishwasherAlarm = 93 {
1515-
revision 1; // NOTE: Default/not specifically set
1515+
revision 1;
15161516

15171517
bitmap AlarmBitmap : bitmap32 {
15181518
kInflowError = 0x1;
@@ -1553,9 +1553,9 @@ cluster DishwasherAlarm = 93 {
15531553
AlarmBitmap mask = 0;
15541554
}
15551555

1556-
/** Reset alarm */
1556+
/** This command resets active and latched alarms (if possible). */
15571557
command Reset(ResetRequest): DefaultSuccess = 0;
1558-
/** Modify enabled alarms */
1558+
/** This command allows a client to request that an alarm be enabled or suppressed at the server. */
15591559
command ModifyEnabledAlarms(ModifyEnabledAlarmsRequest): DefaultSuccess = 1;
15601560
}
15611561

‎src/app/zap-templates/zcl/data-model/chip/dishwasher-alarm-cluster.xml

+33-36
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0"?>
22
<!--
3-
Copyright (c) 2023 Project CHIP Authors
3+
Copyright (c) 2023-2025 Project CHIP Authors
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.
@@ -14,71 +14,68 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1414
See the License for the specific language governing permissions and
1515
limitations under the License.
1616
-->
17-
<configurator>
17+
<!--
18+
XML generated by Alchemy; DO NOT EDIT.
19+
Source: src/app_clusters/DishwasherAlarm.adoc
20+
Parameters: in-progress
21+
Git:
22+
-->
23+
<configurator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../zcl.xsd">
1824
<domain name="CHIP"/>
19-
2025
<bitmap name="AlarmBitmap" type="bitmap32">
21-
<cluster code="0x005D" />
22-
<field name="InflowError" mask="0x01"/>
23-
<field name="DrainError" mask="0x02"/>
24-
<field name="DoorError" mask="0x04"/>
25-
<field name="TempTooLow" mask="0x08"/>
26-
<field name="TempTooHigh" mask="0x10"/>
27-
<field name="WaterLevelError" mask="0x20"/>
26+
<cluster code="0x005D"/>
27+
<field name="InflowError" mask="0x01"/>
28+
<field name="DrainError" mask="0x02"/>
29+
<field name="DoorError" mask="0x04"/>
30+
<field name="TempTooLow" mask="0x08"/>
31+
<field name="TempTooHigh" mask="0x10"/>
32+
<field name="WaterLevelError" mask="0x20"/>
2833
</bitmap>
29-
34+
3035
<cluster>
3136
<name>Dishwasher Alarm</name>
3237
<domain>Appliances</domain>
3338
<description>Attributes and commands for configuring the Dishwasher alarm.</description>
3439
<code>0x005D</code>
3540
<define>DISHWASHER_ALARM_CLUSTER</define>
36-
3741
<client tick="false" init="false">true</client>
3842
<server tick="false" init="false">true</server>
39-
43+
<globalAttribute code="0xFFFD" side="either" value="1"/>
4044
<features>
4145
<feature bit="0" code="RESET" name="Reset" summary="Supports the ability to reset alarms">
4246
<optionalConform/>
4347
</feature>
4448
</features>
45-
46-
<attribute side="server" code="0x0000" name="Mask" define="MASK" type="AlarmBitmap" default="0">
47-
<mandatoryConform/>
48-
</attribute>
49-
<attribute side="server" code="0x0001" name="Latch" define="LATCH" type="AlarmBitmap" default="0" optional="true">
49+
<attribute side="server" code="0x0000" name="Mask" define="MASK" type="AlarmBitmap" default="0" min="0x00000000" max="0x0000003F">Mask</attribute>
50+
<attribute side="server" code="0x0001" name="Latch" define="LATCH" type="AlarmBitmap" default="0" optional="true" min="0x00000000" max="0x0000003F">
51+
<description>Latch</description>
5052
<mandatoryConform>
5153
<feature name="RESET"/>
5254
</mandatoryConform>
5355
</attribute>
54-
<attribute side="server" code="0x0002" name="State" define="STATE" type="AlarmBitmap" default="0">
55-
<mandatoryConform/>
56-
</attribute>
57-
<attribute side="server" code="0x0003" name="Supported" define="SUPPORTED" type="AlarmBitmap" default="0">
58-
<mandatoryConform/>
59-
</attribute>
60-
56+
<attribute side="server" code="0x0002" name="State" define="STATE" type="AlarmBitmap" default="0" min="0x00000000" max="0x0000003F">State</attribute>
57+
<attribute side="server" code="0x0003" name="Supported" define="SUPPORTED" type="AlarmBitmap" default="0" min="0x00000000" max="0x0000003F">Supported</attribute>
6158
<command source="client" code="0x00" name="Reset" optional="true">
62-
<description>Reset alarm</description>
63-
<arg name="Alarms" type="AlarmBitmap" optional="false"/>
59+
<description>This command resets active and latched alarms (if possible).</description>
60+
<arg id="0" name="Alarms" type="AlarmBitmap" default="0x00000000" min="0x00000000" max="0x0000003F"/>
6461
<mandatoryConform>
6562
<feature name="RESET"/>
6663
</mandatoryConform>
6764
</command>
6865

6966
<command source="client" code="0x01" name="ModifyEnabledAlarms" optional="true">
70-
<description>Modify enabled alarms</description>
71-
<arg name="Mask" type="AlarmBitmap" optional="false"/>
67+
<description>This command allows a client to request that an alarm be enabled or suppressed at the server.</description>
68+
<arg id="0" name="Mask" type="AlarmBitmap" default="0x00000000" min="0x00000000" max="0x0000003F"/>
7269
<optionalConform/>
7370
</command>
7471

75-
<event side="server" code="0x00" priority="info" name="Notify" optional="false">
76-
<description>Notify</description>
77-
<field id="0" name="Active" type="AlarmBitmap"/>
78-
<field id="1" name="Inactive" type="AlarmBitmap"/>
79-
<field id="2" name="State" type="AlarmBitmap"/>
80-
<field id="3" name="Mask" type="AlarmBitmap"/>
81-
<mandatoryConform/>
72+
<event side="server" code="0x00" priority="info" name="Notify">
73+
<description>This event SHALL be generated when one or more alarms change state, and SHALL have these fields: </description>
74+
<field id="0" name="Active" type="AlarmBitmap" default="0x00000000" min="0x00000000" max="0x0000003F"/>
75+
<field id="1" name="Inactive" type="AlarmBitmap" default="0x00000000" min="0x00000000" max="0x0000003F"/>
76+
<field id="2" name="State" type="AlarmBitmap" default="0x00000000" min="0x00000000" max="0x0000003F"/>
77+
<field id="3" name="Mask" type="AlarmBitmap" default="0x00000000" min="0x00000000" max="0x0000003F"/>
8278
</event>
79+
8380
</cluster>
8481
</configurator>

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -3866,7 +3866,7 @@ cluster SmokeCoAlarm = 92 {
38663866

38673867
/** Attributes and commands for configuring the Dishwasher alarm. */
38683868
cluster DishwasherAlarm = 93 {
3869-
revision 1; // NOTE: Default/not specifically set
3869+
revision 1;
38703870

38713871
bitmap AlarmBitmap : bitmap32 {
38723872
kInflowError = 0x1;
@@ -3907,9 +3907,9 @@ cluster DishwasherAlarm = 93 {
39073907
AlarmBitmap mask = 0;
39083908
}
39093909

3910-
/** Reset alarm */
3910+
/** This command resets active and latched alarms (if possible). */
39113911
command Reset(ResetRequest): DefaultSuccess = 0;
3912-
/** Modify enabled alarms */
3912+
/** This command allows a client to request that an alarm be enabled or suppressed at the server. */
39133913
command ModifyEnabledAlarms(ModifyEnabledAlarmsRequest): DefaultSuccess = 1;
39143914
}
39153915

‎src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h

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

0 commit comments

Comments
 (0)