Skip to content

Commit

Permalink
Adding laundry-dryer-controls cluster XML (#30156)
Browse files Browse the repository at this point in the history
* Steps 1.1, 1.2

* update cluster list and build.gn

This reverts commit feabe0b.

run zap and update build, clusters list

zap_regen_all & build chip-tool

regen zap

updated zap and regen

updated zap and regen

zap_regen_all & build chip-tool

Revert "regen zap"

This reverts commit f259abf.

* controller-clusters.zap and regen_all

* setting optional=false for clusters

* zap_regen_all
  • Loading branch information
eahove authored and pull[bot] committed Feb 2, 2024
1 parent 63f8ff5 commit 1255986
Show file tree
Hide file tree
Showing 46 changed files with 3,782 additions and 6 deletions.
1 change: 1 addition & 0 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ jobs:
src/app/zap-templates/zcl/data-model/chip/illuminance-measurement-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/keypad-input-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/laundry-washer-mode-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/laundry-dryer-controls-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/level-control-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/localization-configuration-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/low-power-cluster.xml \
Expand Down
1 change: 1 addition & 0 deletions scripts/rules.matterlint
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ load "../src/app/zap-templates/zcl/data-model/chip/identify-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/illuminance-measurement-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/keypad-input-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/laundry-washer-mode-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/laundry-dryer-controls-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/level-control-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/localization-configuration-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/low-power-cluster.xml";
Expand Down
1 change: 1 addition & 0 deletions src/app/zap-templates/zcl/data-model/all.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
<xi:include href="chip/level-control-cluster.xml" />
<xi:include href="chip/keypad-input-cluster.xml" />
<xi:include href="chip/laundry-washer-mode-cluster.xml" />
<xi:include href="chip/laundry-dryer-controls-cluster.xml" />
<xi:include href="chip/localization-configuration-cluster.xml" />
<xi:include href="chip/low-power-cluster.xml" />
<xi:include href="chip/media-input-cluster.xml" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?xml version="1.0"?>
<!--
Copyright (c) 2023 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.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
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>
<domain name="CHIP" />

<enum name="DrynessLevelEnum" type="enum8">
<cluster code="0x004A" />
<item name="Low" value="0x0" />
<item name="Normal" value="0x1" />
<item name="Extra" value="0x2" />
<item name="Max" value="0x3" />
</enum>

<cluster>
<domain>Appliances</domain>
<name>Laundry Dryer Controls</name>
<code>0x004A</code>
<define>LAUNDRY_DRYER_CONTROLS_CLUSTER</define>
<client init="false" tick="false">true</client>
<server init="false" tick="false">true</server>
<description>This cluster supports remotely monitoring and controling the different typs of
functionality available to a drying device, such as a laundry dryer.</description>

<globalAttribute side="server" code="0xFFFD" value="1" />

<attribute side="server" code="0x0000" define="SUPPORTED_DRYNESS_LEVELS" type="ARRAY" entryType="DrynessLevelEnum" writable="false" isNullable="false" optional="false" min="0x01" max="0x04">SupportedDrynessLevels</attribute>
<attribute side="server" code="0x0001" define="SELECTED_DRYNESS_LEVEL" type="DrynessLevelEnum" writable="true" isNullable="true" optional="false">SelectedDrynessLevel</attribute>
</cluster>
</configurator>
1 change: 1 addition & 0 deletions src/app/zap-templates/zcl/zcl-with-test-extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
"input-output-value-clusters.xml",
"keypad-input-cluster.xml",
"laundry-washer-mode-cluster.xml",
"laundry-dryer-controls-cluster.xml",
"level-control-cluster.xml",
"localization-configuration-cluster.xml",
"low-power-cluster.xml",
Expand Down
1 change: 1 addition & 0 deletions src/app/zap-templates/zcl/zcl.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
"input-output-value-clusters.xml",
"keypad-input-cluster.xml",
"laundry-washer-mode-cluster.xml",
"laundry-dryer-controls-cluster.xml",
"level-control-cluster.xml",
"localization-configuration-cluster.xml",
"low-power-cluster.xml",
Expand Down
1 change: 1 addition & 0 deletions src/app/zap_cluster_list.json
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@
"VALVE_CONFIGURATION_AND_CONTROL_CLUSTER": [],
"WAKE_ON_LAN_CLUSTER": [],
"LAUNDRY_WASHER_CONTROLS_CLUSTER": [],
"LAUNDRY_DRYER_CONTROLS_CLUSTER": [],
"WIFI_NETWORK_DIAGNOSTICS_CLUSTER": [],
"WINDOW_COVERING_CLUSTER": [],
"ZLL_COMMISSIONING_CLUSTER": []
Expand Down
2 changes: 2 additions & 0 deletions src/controller/data_model/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,8 @@ if (current_os == "android" || matter_enable_java_compilation) {
"jni/WakeOnLanClient-ReadImpl.cpp",
"jni/LaundryWasherControlsClient-InvokeSubscribeImpl.cpp",
"jni/LaundryWasherControlsClient-ReadImpl.cpp",
"jni/LaundryDryerControlsClient-InvokeSubscribeImpl.cpp",
"jni/LaundryDryerControlsClient-ReadImpl.cpp",
"jni/WiFiNetworkDiagnosticsClient-InvokeSubscribeImpl.cpp",
"jni/WiFiNetworkDiagnosticsClient-ReadImpl.cpp",
"jni/WindowCoveringClient-InvokeSubscribeImpl.cpp",
Expand Down
20 changes: 20 additions & 0 deletions src/controller/data_model/controller-clusters.matter
Original file line number Diff line number Diff line change
Expand Up @@ -2938,6 +2938,26 @@ provisional client cluster OvenMode = 73 {
command ChangeToMode(ChangeToModeRequest): ChangeToModeResponse = 0;
}

/** This cluster supports remotely monitoring and controling the different typs of
functionality available to a drying device, such as a laundry dryer. */
client cluster LaundryDryerControls = 74 {
enum DrynessLevelEnum : enum8 {
kLow = 0;
kNormal = 1;
kExtra = 2;
kMax = 3;
}

readonly attribute DrynessLevelEnum supportedDrynessLevels[] = 0;
attribute nullable DrynessLevelEnum selectedDrynessLevel = 1;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
}

/** Attributes and commands for selecting a mode from a list of supported options. */
client cluster ModeSelect = 80 {
bitmap Feature : bitmap32 {
Expand Down
54 changes: 48 additions & 6 deletions src/controller/data_model/controller-clusters.zap
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@
}
],
"package": [
{
"pathRelativity": "relativeToZap",
"path": "../../app/zap-templates/app-templates.json",
"type": "gen-templates-json",
"version": "chip-v1"
},
{
"pathRelativity": "relativeToZap",
"path": "../../app/zap-templates/zcl/zcl.json",
"type": "zcl-properties",
"category": "matter",
"version": 1,
"description": "Matter SDK ZCL data"
},
{
"pathRelativity": "relativeToZap",
"path": "../../app/zap-templates/app-templates.json",
"type": "gen-templates-json",
"version": "chip-v1"
}
],
"endpointTypes": [
Expand Down Expand Up @@ -2113,6 +2113,48 @@
}
]
},
{
"name": "Laundry Dryer Controls",
"code": 74,
"mfgCode": null,
"define": "LAUNDRY_DRYER_CONTROLS_CLUSTER",
"side": "client",
"enabled": 1,
"attributes": [
{
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
"side": "client",
"type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "client",
"type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
}
]
},
{
"name": "Mode Select",
"code": 80,
Expand Down
Loading

0 comments on commit 1255986

Please sign in to comment.