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

Number of rinses change washer controls xml #27436

Merged
merged 9 commits into from
Jun 26, 2023
Merged

Number of rinses change washer controls xml #27436

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2fe9cba
Fixes for Number Of Rinses Enum to add to XMl and align with spec
abeck-riis Jun 22, 2023
2495cb4
Spacing
abeck-riis Jun 23, 2023
5986902
Fixing code gen for XML
abeck-riis Jun 23, 2023
9936931
Updating build.gn for failing test
abeck-riis Jun 23, 2023
f9f154b
Update src/app/zap-templates/zcl/data-model/chip/washer-controls-clus…
abeck-whirlpool Jun 23, 2023
cc07486
Update src/app/zap-templates/zcl/data-model/chip/washer-controls-clus…
abeck-whirlpool Jun 23, 2023
3698b1c
Regen again with changes
abeck-riis Jun 24, 2023
cdc63d9
Merge branch 'master' into NumberOfRinsesChangeWasherControlsXML
abeck-whirlpool Jun 24, 2023
eadd4c6
Merge branch 'master' into NumberOfRinsesChangeWasherControlsXML
abeck-whirlpool Jun 26, 2023
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
17 changes: 13 additions & 4 deletions src/app/zap-templates/zcl/data-model/chip/washer-controls-cluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,19 @@ limitations under the License.
<field mask="0x02" name="Rinse"/>
</bitmap>

<enum name="NumberOfRinsesEnum" type="ENUM8">
<cluster code="0x0053"/>
<item name="None" value="0x0"/>
<item name="Normal" value="0x1"/>
<item name="Extra" value="0x2"/>
<item name="Max" value="0x3"/>
</enum>

<cluster>
<domain>Appliances</domain>
<name>Washer Controls</name>
<name>Laundry Washer Controls</name>
<code>0x0053</code>
<define>WASHER_CONTROLS_CLUSTER</define>
<define>LAUNDRY_WASHER_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 washing device, such as a washing machine.</description>
Expand All @@ -36,7 +44,8 @@ limitations under the License.

<attribute side="server" code="0x0000" define="SPIN_SPEEDS" type="ARRAY" entryType="CHAR_STRING" writable="false" isNullable="false" optional="true">SpinSpeeds</attribute>
<attribute side="server" code="0x0001" define="SPIN_SPEED_CURRENT" type="INT8U" min="0x00" max="0x1F" writable="true" isNullable="true" optional="true">SpinSpeedCurrent</attribute>
<attribute side="server" code="0x0002" define="NUMBER_OF_RINSES" type="INT8U" writable="true" isNullable="true" optional="true">NumberOfRinses</attribute>
<attribute side="server" code="0x0003" define="MAXRINSES" type="INT8U" min="0x00" max="0x08" writable="false" optional="true">MaxRinses</attribute>
<attribute side="server" code="0x0002" define="NUMBER_OF_RINSES" type="NumberOfRinsesEnum" writable="true" isNullable="true" optional="true">NumberOfRinses</attribute>
abeck-whirlpool marked this conversation as resolved.
Show resolved Hide resolved
<attribute side="server" code="0x0003" define="SUPPORTED_RINSES" type="ARRAY" entryType="NumberOfRinsesEnum" writable="true" isNullable="true" optional="true">SupportedRinses</attribute>
bzbarsky-apple marked this conversation as resolved.
Show resolved Hide resolved
abeck-whirlpool marked this conversation as resolved.
Show resolved Hide resolved
</cluster>
</configurator>

2 changes: 1 addition & 1 deletion src/app/zap_cluster_list.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
"UV_FILTER_MONITORING_CLUSTER": [],
"TVOC_CONCENTRATION_MEASUREMENT_CLUSTER": [],
"WAKE_ON_LAN_CLUSTER": [],
"WASHER_CONTROLS_CLUSTER": [],
"LAUNDRY_WASHER_CONTROLS_CLUSTER": [],
"WATER_TANK_MONITORING_CLUSTER": [],
"WIFI_NETWORK_DIAGNOSTICS_CLUSTER": [],
"WINDOW_COVERING_CLUSTER": [],
Expand Down
4 changes: 2 additions & 2 deletions src/controller/data_model/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,8 +298,8 @@ if (current_os == "android" || matter_enable_java_compilation) {
"jni/UvFilterMonitoringClient-ReadImpl.cpp",
"jni/WakeOnLanClient-InvokeSubscribeImpl.cpp",
"jni/WakeOnLanClient-ReadImpl.cpp",
"jni/WasherControlsClient-InvokeSubscribeImpl.cpp",
"jni/WasherControlsClient-ReadImpl.cpp",
"jni/LaundryWasherControlsClient-InvokeSubscribeImpl.cpp",
"jni/LaundryWasherControlsClient-ReadImpl.cpp",
"jni/WaterTankMonitoringClient-InvokeSubscribeImpl.cpp",
"jni/WaterTankMonitoringClient-ReadImpl.cpp",
"jni/WiFiNetworkDiagnosticsClient-InvokeSubscribeImpl.cpp",
Expand Down
13 changes: 10 additions & 3 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 @@ -2895,16 +2895,23 @@ client cluster RefrigeratorAndTemperatureControlledCabinetMode = 82 {
}

/** This cluster supports remotely monitoring and controling the different typs of functionality available to a washing device, such as a washing machine. */
client cluster WasherControls = 83 {
client cluster LaundryWasherControls = 83 {
enum NumberOfRinsesEnum : ENUM8 {
kNone = 0;
kNormal = 1;
kExtra = 2;
kMax = 3;
}

bitmap Feature : BITMAP32 {
kSpin = 0x1;
kRinse = 0x2;
}

readonly attribute optional CHAR_STRING spinSpeeds[] = 0;
attribute optional nullable int8u spinSpeedCurrent = 1;
attribute optional nullable int8u numberOfRinses = 2;
readonly attribute optional int8u maxRinses = 3;
attribute optional nullable NumberOfRinsesEnum numberOfRinses = 2;
attribute optional nullable NumberOfRinsesEnum supportedRinses[] = 3;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down
8 changes: 4 additions & 4 deletions src/controller/data_model/controller-clusters.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11202,10 +11202,10 @@
]
},
{
"name": "Washer Controls",
"name": "Laundry Washer Controls",
"code": 83,
"mfgCode": null,
"define": "WASHER_CONTROLS_CLUSTER",
"define": "LAUNDRY_WASHER_CONTROLS_CLUSTER",
"side": "client",
"enabled": 1,
"attributes": [
Expand Down Expand Up @@ -11244,10 +11244,10 @@
]
},
{
"name": "Washer Controls",
"name": "Laundry Washer Controls",
"code": 83,
"mfgCode": null,
"define": "WASHER_CONTROLS_CLUSTER",
"define": "LAUNDRY_WASHER_CONTROLS_CLUSTER",
"side": "server",
"enabled": 0,
"attributes": [
Expand Down
8 changes: 4 additions & 4 deletions src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,8 @@ public static BaseCluster getCluster(long clusterId) {
if (clusterId == RefrigeratorAndTemperatureControlledCabinetMode.ID) {
return new RefrigeratorAndTemperatureControlledCabinetMode();
}
if (clusterId == WasherControls.ID) {
return new WasherControls();
if (clusterId == LaundryWasherControls.ID) {
return new LaundryWasherControls();
}
if (clusterId == RvcRunMode.ID) {
return new RvcRunMode();
Expand Down Expand Up @@ -6562,7 +6562,7 @@ public long getCommandID(String name) throws IllegalArgumentException {
return Command.valueOf(name).getID();
}
}
public static class WasherControls implements BaseCluster {
public static class LaundryWasherControls implements BaseCluster {
public static final long ID = 83L;
public long getID() {
return ID;
Expand All @@ -6572,7 +6572,7 @@ public enum Attribute {
SpinSpeeds(0L),
SpinSpeedCurrent(1L),
NumberOfRinses(2L),
MaxRinses(3L),
SupportedRinses(3L),
GeneratedCommandList(65528L),
AcceptedCommandList(65529L),
EventList(65530L),
Expand Down
Loading