Skip to content

Commit c05c603

Browse files
marktrayermarktrayer
committed
Update of Appliance Cluster XML to reflect Spec changes that took place
in 1.4.
1 parent dedef1f commit c05c603

7 files changed

+12
-52
lines changed

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

+3-11
Original file line numberDiff line numberDiff line change
@@ -50,22 +50,14 @@ limitations under the License.
5050
<description>Attributes and commands for selecting a mode from a list of supported options.</description>
5151
<globalAttribute side="either" code="0xFFFD" value="2"/>
5252

53-
<features>
54-
<feature bit="0" code="DEPONOFF" name="OnOff" summary="Dependency with the OnOff cluster">
55-
<optionalConform/>
56-
</feature>
57-
</features>
58-
59-
<!-- Base data types -->
53+
<!-- Base data types -->
6054
<attribute side="server" code="0x0000" name="SupportedModes" define="SUPPORTED_MODES" type="array" entryType="ModeOptionStruct" length="255">
6155
<mandatoryConform/>
6256
</attribute>
6357
<attribute side="server" code="0x0001" name="CurrentMode" define="CURRENT_MODE" type="int8u" reportable="true">
6458
<mandatoryConform/>
6559
</attribute>
66-
<attribute side="server" code="0x0002" define="START_UP_MODE" type="int8u" writable="true" optional="true" isNullable="true">StartUpMode</attribute>
67-
<attribute side="server" code="0x0003" define="ON_MODE" type="int8u" writable="true" optional="true" isNullable="true">OnMode</attribute>
68-
60+
6961
<!-- Commands -->
7062
<command source="client" code="0x00" name="ChangeToMode" response="ChangeToModeResponse" optional="false">
7163
<description>
@@ -81,7 +73,7 @@ limitations under the License.
8173
This command is sent by the device on receipt of the ChangeToModeWithStatus command.
8274
</description>
8375
<arg name="Status" type="enum8" optional="false"/>
84-
<arg name="StatusText" type="char_string" lenght="64" optional="true"/>
76+
<arg name="StatusText" type="char_string" length="64" optional="true"/>
8577
<mandatoryConform/>
8678
</command>
8779
</cluster>

‎src/app/zap-templates/zcl/data-model/chip/laundry-washer-mode-cluster.xml

+2-10
Original file line numberDiff line numberDiff line change
@@ -51,22 +51,14 @@ limitations under the License.
5151
<description>Attributes and commands for selecting a mode from a list of supported options.</description>
5252
<globalAttribute side="either" code="0xFFFD" value="2"/>
5353

54-
<features>
55-
<feature bit="0" code="DEPONOFF" name="OnOff" summary="Dependency with the OnOff cluster">
56-
<optionalConform/>
57-
</feature>
58-
</features>
59-
6054
<!-- Base data types -->
6155
<attribute side="server" code="0x0000" name="SupportedModes" define="SUPPORTED_MODES" type="array" entryType="ModeOptionStruct" length="255">
6256
<mandatoryConform/>
6357
</attribute>
6458
<attribute side="server" code="0x0001" name="CurrentMode" define="CURRENT_MODE" type="int8u" reportable="true">
6559
<mandatoryConform/>
6660
</attribute>
67-
<attribute side="server" code="0x0002" define="START_UP_MODE" type="int8u" writable="true" optional="true" isNullable="true">StartUpMode</attribute>
68-
<attribute side="server" code="0x0003" define="ON_MODE" type="int8u" writable="true" optional="true" isNullable="true">OnMode</attribute>
69-
61+
7062
<!-- Commands -->
7163
<command source="client" code="0x00" name="ChangeToMode" response="ChangeToModeResponse" optional="false">
7264
<description>
@@ -82,7 +74,7 @@ limitations under the License.
8274
This command is sent by the device on receipt of the ChangeToModeWithStatus command.
8375
</description>
8476
<arg name="Status" type="enum8" optional="false"/>
85-
<arg name="StatusText" type="char_string" lenght="64" optional="true"/>
77+
<arg name="StatusText" type="char_string" length="64" optional="true"/>
8678
<mandatoryConform/>
8779
</command>
8880
</cluster>

‎src/app/zap-templates/zcl/data-model/chip/microwave-oven-mode-cluster.xml

-6
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,6 @@ limitations under the License.
4848
<description>Attributes and commands for selecting a mode from a list of supported options.</description>
4949
<globalAttribute side="either" code="0xFFFD" value="1"/>
5050

51-
<features>
52-
<feature bit="0" code="DEPONOFF" name="OnOff" summary="Dependency with the OnOff cluster">
53-
<optionalConform/>
54-
</feature>
55-
</features>
56-
5751
<!-- Base data types -->
5852
<attribute side="server" code="0x0000" name="SupportedModes" define="SUPPORTED_MODES" type="array" entryType="ModeOptionStruct" length="255">
5953
<mandatoryConform/>

‎src/app/zap-templates/zcl/data-model/chip/mode-base-cluster.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ Each of these enum values is also listed/copied in the derived clusters.
8686
<!-- This command is sent by the device on receipt of the ChangeToModeWithStatus command.-->
8787
<!-- </description>-->
8888
<!-- <arg name="Status" type="enum8" optional="false"/>-->
89-
<!-- <arg name="StatusText" type="char_string" lenght="64" optional="true"/>-->
89+
<!-- <arg name="StatusText" type="char_string" length="64" optional="true"/>-->
9090
<!-- </command>-->
9191
<!-- </cluster>-->
9292

‎src/app/zap-templates/zcl/data-model/chip/operational-state-oven-cluster.xml

+2-12
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ limitations under the License.
5353
<description>This cluster supports remotely monitoring and, where supported, changing the operational state of an Oven.</description>
5454

5555
<globalAttribute side="either" code="0xFFFD" value="1"/>
56-
56+
5757
<attribute side="server" code="0x0000" name="PhaseList" define="PHASE_LIST" type="array" entryType="char_string" isNullable="true">
5858
<mandatoryConform/>
5959
</attribute>
@@ -73,11 +73,7 @@ limitations under the License.
7373
<mandatoryConform/>
7474
</attribute>
7575

76-
<command source="client" code="0x00" name="Pause" response="OperationalCommandResponse" optional="true">
77-
<description>Upon receipt, the device SHALL pause its operation if it is possible based on the current function of the server.</description>
78-
</command>
79-
80-
<command source="client" code="0x01" name="Stop" response="OperationalCommandResponse" optional="true">
76+
<command source="client" code="0x01" name="Stop" response="OperationalCommandResponse" optional="true">
8177
<description>Upon receipt, the device SHALL stop its operation if it is at a position where it is safe to do so and/or permitted.</description>
8278
<otherwiseConform>
8379
<mandatoryConform>
@@ -92,19 +88,13 @@ limitations under the License.
9288
<optionalConform/>
9389
</command>
9490

95-
<command source="client" code="0x03" name="Resume" response="OperationalCommandResponse" optional="true">
96-
<description>Upon receipt, the device SHALL resume its operation from the point it was at when it received the Pause command, or from the point when it was paused by means outside of this cluster (for example by manual button press).</description>
97-
</command>
98-
9991
<command source="server" code="0x04" name="OperationalCommandResponse" optional="true">
10092
<description>This command SHALL be generated in response to any of the Start, Stop, Pause, or Resume commands.</description>
10193
<arg name="CommandResponseState" type="ErrorStateStruct"/>
10294
<mandatoryConform>
10395
<orTerm>
104-
<command name="Pause"/>
10596
<command name="Stop"/>
10697
<command name="Start"/>
107-
<command name="Resume"/>
10898
</orTerm>
10999
</mandatoryConform>
110100
</command>

‎src/app/zap-templates/zcl/data-model/chip/oven-mode-cluster.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ limitations under the License.
7070
</attribute>
7171
<attribute side="server" code="0x0002" define="START_UP_MODE" type="int8u" writable="true" optional="true" isNullable="true">StartUpMode</attribute>
7272
<attribute side="server" code="0x0003" define="ON_MODE" type="int8u" writable="true" optional="true" isNullable="true">OnMode</attribute>
73-
73+
7474
<!-- Commands -->
7575
<command source="client" code="0x00" name="ChangeToMode" response="ChangeToModeResponse" optional="false">
7676
<description>
@@ -86,7 +86,7 @@ limitations under the License.
8686
This command is sent by the device on receipt of the ChangeToModeWithStatus command.
8787
</description>
8888
<arg name="Status" type="enum8" optional="false"/>
89-
<arg name="StatusText" type="char_string" lenght="64" optional="true"/>
89+
<arg name="StatusText" type="char_string" length="64" optional="true"/>
9090
<mandatoryConform/>
9191
</command>
9292
</cluster>

‎src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-cluster.xml

+2-10
Original file line numberDiff line numberDiff line change
@@ -49,22 +49,14 @@ limitations under the License.
4949
<description>Attributes and commands for selecting a mode from a list of supported options.</description>
5050
<globalAttribute side="either" code="0xFFFD" value="2"/>
5151

52-
<features>
53-
<feature bit="0" code="DEPONOFF" name="OnOff" summary="Dependency with the OnOff cluster">
54-
<optionalConform/>
55-
</feature>
56-
</features>
57-
5852
<!-- Base data types -->
5953
<attribute side="server" code="0x0000" name="SupportedModes" define="SUPPORTED_MODES" type="array" entryType="ModeOptionStruct" length="255">
6054
<mandatoryConform/>
6155
</attribute>
6256
<attribute side="server" code="0x0001" name="CurrentMode" define="CURRENT_MODE" type="int8u" reportable="true">
6357
<mandatoryConform/>
6458
</attribute>
65-
<attribute side="server" code="0x0002" define="START_UP_MODE" type="int8u" writable="true" optional="true" isNullable="true">StartUpMode</attribute>
66-
<attribute side="server" code="0x0003" define="ON_MODE" type="int8u" writable="true" optional="true" isNullable="true">OnMode</attribute>
67-
59+
6860
<!-- Commands -->
6961
<command source="client" code="0x00" name="ChangeToMode" response="ChangeToModeResponse" optional="false">
7062
<description>
@@ -80,7 +72,7 @@ limitations under the License.
8072
This command is sent by the device on receipt of the ChangeToModeWithStatus command.
8173
</description>
8274
<arg name="Status" type="enum8" optional="false"/>
83-
<arg name="StatusText" type="char_string" lenght="64" optional="true"/>
75+
<arg name="StatusText" type="char_string" length="64" optional="true"/>
8476
<mandatoryConform/>
8577
</command>
8678
</cluster>

0 commit comments

Comments
 (0)