Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DRAFT] Add generated files for Dishwasher alarm #37775

Closed
wants to merge 3 commits into from
Closed

[DRAFT] Add generated files for Dishwasher alarm #37775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a2ca40
Add generated files with Alchemy and ZAP
tersal Feb 25, 2025
aa55b51
Restyled by whitespace
restyled-commits Feb 25, 2025
84a2a5e
Restyled by prettier-json
restyled-commits Feb 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3648,7 +3648,7 @@ cluster SmokeCoAlarm = 92 {

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

bitmap AlarmBitmap : bitmap32 {
kInflowError = 0x1;
Expand All @@ -3664,10 +3664,10 @@ cluster DishwasherAlarm = 93 {
}

info event Notify = 0 {
AlarmBitmap active = 0;
AlarmBitmap inactive = 1;
AlarmBitmap state = 2;
AlarmBitmap mask = 3;
AlarmBitmap active = 1;
AlarmBitmap inactive = 2;
AlarmBitmap state = 3;
AlarmBitmap mask = 4;
}

readonly attribute AlarmBitmap mask = 0;
Expand All @@ -3689,9 +3689,9 @@ cluster DishwasherAlarm = 93 {
AlarmBitmap mask = 0;
}

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

Expand Down
14 changes: 7 additions & 7 deletions examples/chef/devices/rootnode_dishwasher_cc105034fe.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1512,7 +1512,7 @@ cluster DishwasherMode = 89 {

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

bitmap AlarmBitmap : bitmap32 {
kInflowError = 0x1;
Expand All @@ -1528,10 +1528,10 @@ cluster DishwasherAlarm = 93 {
}

info event Notify = 0 {
AlarmBitmap active = 0;
AlarmBitmap inactive = 1;
AlarmBitmap state = 2;
AlarmBitmap mask = 3;
AlarmBitmap active = 1;
AlarmBitmap inactive = 2;
AlarmBitmap state = 3;
AlarmBitmap mask = 4;
}

readonly attribute AlarmBitmap mask = 0;
Expand All @@ -1553,9 +1553,9 @@ cluster DishwasherAlarm = 93 {
AlarmBitmap mask = 0;
}

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

Expand Down
69 changes: 33 additions & 36 deletions src/app/zap-templates/zcl/data-model/chip/dishwasher-alarm-cluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!--
Copyright (c) 2023 Project CHIP Authors
Copyright (c) 2023-2025 Project CHIP Authors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -14,71 +14,68 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<configurator>
<!--
XML generated by Alchemy; DO NOT EDIT.
Source: src/app_clusters/DishwasherAlarm.adoc
Parameters: in-progress
Git: 0.7-summer-2025-253-gd51479a48
-->
<configurator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../zcl.xsd">
<domain name="CHIP"/>

<bitmap name="AlarmBitmap" type="bitmap32">
<cluster code="0x005D" />
<field name="InflowError" mask="0x01"/>
<field name="DrainError" mask="0x02"/>
<field name="DoorError" mask="0x04"/>
<field name="TempTooLow" mask="0x08"/>
<field name="TempTooHigh" mask="0x10"/>
<field name="WaterLevelError" mask="0x20"/>
<cluster code="0x005D"/>
<field name="InflowError" mask="0x01"/>
<field name="DrainError" mask="0x02"/>
<field name="DoorError" mask="0x04"/>
<field name="TempTooLow" mask="0x08"/>
<field name="TempTooHigh" mask="0x10"/>
<field name="WaterLevelError" mask="0x20"/>
</bitmap>

<cluster>
<name>Dishwasher Alarm</name>
<domain>Appliances</domain>
<description>Attributes and commands for configuring the Dishwasher alarm.</description>
<code>0x005D</code>
<define>DISHWASHER_ALARM_CLUSTER</define>

<client tick="false" init="false">true</client>
<server tick="false" init="false">true</server>

<globalAttribute code="0xFFFD" side="either" value="1"/>
<features>
<feature bit="0" code="RESET" name="Reset" summary="Supports the ability to reset alarms">
<optionalConform/>
</feature>
</features>

<attribute side="server" code="0x0000" name="Mask" define="MASK" type="AlarmBitmap" default="0">
<mandatoryConform/>
</attribute>
<attribute side="server" code="0x0001" name="Latch" define="LATCH" type="AlarmBitmap" default="0" optional="true">
<attribute side="server" code="0x0000" name="Mask" define="MASK" type="AlarmBitmap" default="0" min="0x00000000" max="0x0000003F">Mask</attribute>
<attribute side="server" code="0x0001" name="Latch" define="LATCH" type="AlarmBitmap" default="0" optional="true" min="0x00000000" max="0x0000003F">
<description>Latch</description>
<mandatoryConform>
<feature name="RESET"/>
</mandatoryConform>
</attribute>
<attribute side="server" code="0x0002" name="State" define="STATE" type="AlarmBitmap" default="0">
<mandatoryConform/>
</attribute>
<attribute side="server" code="0x0003" name="Supported" define="SUPPORTED" type="AlarmBitmap" default="0">
<mandatoryConform/>
</attribute>

<attribute side="server" code="0x0002" name="State" define="STATE" type="AlarmBitmap" default="0" min="0x00000000" max="0x0000003F">State</attribute>
<attribute side="server" code="0x0003" name="Supported" define="SUPPORTED" type="AlarmBitmap" default="0" min="0x00000000" max="0x0000003F">Supported</attribute>
<command source="client" code="0x00" name="Reset" optional="true">
<description>Reset alarm</description>
<arg name="Alarms" type="AlarmBitmap" optional="false"/>
<description>This command resets active and latched alarms (if possible).</description>
<arg id="0" name="Alarms" type="AlarmBitmap" default="0x00000000" min="0x00000000" max="0x0000003F"/>
<mandatoryConform>
<feature name="RESET"/>
</mandatoryConform>
</command>

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

<event side="server" code="0x00" priority="info" name="Notify" optional="false">
<description>Notify</description>
<field id="0" name="Active" type="AlarmBitmap"/>
<field id="1" name="Inactive" type="AlarmBitmap"/>
<field id="2" name="State" type="AlarmBitmap"/>
<field id="3" name="Mask" type="AlarmBitmap"/>
<mandatoryConform/>
<event side="server" code="0x00" priority="info" name="Notify">
<description>This event SHALL be generated when one or more alarms change state, and SHALL have these fields: </description>
<field id="1" name="Active" type="AlarmBitmap" default="0x00000000" min="0x00000000" max="0x0000003F"/>
<field id="2" name="Inactive" type="AlarmBitmap" default="0x00000000" min="0x00000000" max="0x0000003F"/>
<field id="3" name="State" type="AlarmBitmap" default="0x00000000" min="0x00000000" max="0x0000003F"/>
<field id="4" name="Mask" type="AlarmBitmap" default="0x00000000" min="0x00000000" max="0x0000003F"/>
</event>

</cluster>
</configurator>
14 changes: 7 additions & 7 deletions src/controller/data_model/controller-clusters.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3866,7 +3866,7 @@ cluster SmokeCoAlarm = 92 {

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

bitmap AlarmBitmap : bitmap32 {
kInflowError = 0x1;
Expand All @@ -3882,10 +3882,10 @@ cluster DishwasherAlarm = 93 {
}

info event Notify = 0 {
AlarmBitmap active = 0;
AlarmBitmap inactive = 1;
AlarmBitmap state = 2;
AlarmBitmap mask = 3;
AlarmBitmap active = 1;
AlarmBitmap inactive = 2;
AlarmBitmap state = 3;
AlarmBitmap mask = 4;
}

readonly attribute AlarmBitmap mask = 0;
Expand All @@ -3907,9 +3907,9 @@ cluster DishwasherAlarm = 93 {
AlarmBitmap mask = 0;
}

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

Expand Down
8 changes: 4 additions & 4 deletions src/controller/python/chip/clusters/Objects.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading