Skip to content

Commit

Permalink
update remaining
Browse files Browse the repository at this point in the history
  • Loading branch information
@ethanzhouyc
ethanzhouyc committed Oct 1, 2024
1 parent 05c83d9 commit 0f7882e
Show file tree
Hide file tree
Showing 81 changed files with 3,892 additions and 566 deletions.
27 changes: 22 additions & 5 deletions src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,27 @@ limitations under the License.
<feature bit="0" code="TAGLIST" name="TagList" summary="The TagList attribute is present"/>
</features>

<attribute side="server" code="0x0000" define="DEVICE_LIST" type="array" entryType="DeviceTypeStruct" writable="false" optional="false">DeviceTypeList</attribute>
<attribute side="server" code="0x0001" define="SERVER_LIST" type="array" entryType="cluster_id" writable="false" optional="false">ServerList</attribute>
<attribute side="server" code="0x0002" define="CLIENT_LIST" type="array" entryType="cluster_id" writable="false" optional="false">ClientList</attribute>
<attribute side="server" code="0x0003" define="PARTS_LIST" type="array" entryType="endpoint_no" writable="false" optional="false">PartsList</attribute>
<attribute side="server" code="0x0004" define="TAG_LIST" type="array" entryType="SemanticTagStruct" writable="false" optional="true" length="6">TagList</attribute>
<attribute side="server" code="0x0000" define="DEVICE_LIST" type="array" entryType="DeviceTypeStruct" writable="false" optional="false">
<description>DeviceTypeList</description>
<mandatoryConform/>
</attribute>
<attribute side="server" code="0x0001" define="SERVER_LIST" type="array" entryType="cluster_id" writable="false" optional="false">
<description>ServerList</description>
<mandatoryConform/>
</attribute>
<attribute side="server" code="0x0002" define="CLIENT_LIST" type="array" entryType="cluster_id" writable="false" optional="false">
<description>ClientList</description>
<mandatoryConform/>
</attribute>
<attribute side="server" code="0x0003" define="PARTS_LIST" type="array" entryType="endpoint_no" writable="false" optional="false">
<description>PartsList</description>
<mandatoryConform/>
</attribute>
<attribute side="server" code="0x0004" define="TAG_LIST" type="array" entryType="SemanticTagStruct" writable="false" optional="true" length="6">
<description>TagList</description>
<mandatoryConform>
<feature name="TAGLIST"/>
</mandatoryConform>
</attribute>
</cluster>
</configurator>
83 changes: 75 additions & 8 deletions src/app/zap-templates/zcl/data-model/chip/device-energy-management-cluster.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,58 +75,125 @@ planned operation.">
</feature>
</features>
<!--Attributes-->
<attribute code="0x0000" side="server" type="ESATypeEnum" define="ESA_TYPE" min="0x00" max="0xFF" default="0xFF">ESAType</attribute>
<attribute code="0x0001" side="server" type="boolean" define="ESA_CAN_GENERATE" default="0">ESACanGenerate</attribute>
<attribute code="0x0002" side="server" type="ESAStateEnum" define="ESA_STATE" default="0x00" min="0x00" max="0x04">ESAState</attribute>
<attribute code="0x0003" side="server" type="power_mw" define="ABS_MIN_POWER" default="0">AbsMinPower</attribute>
<attribute code="0x0004" side="server" type="power_mw" define="ABS_MAX_POWER" default="0">AbsMaxPower</attribute>
<attribute code="0x0000" side="server" type="ESATypeEnum" define="ESA_TYPE" min="0x00" max="0xFF" default="0xFF">
<description>ESAType</description>
<mandatoryConform/>
</attribute>
<attribute code="0x0001" side="server" type="boolean" define="ESA_CAN_GENERATE" default="0">
<description>ESACanGenerate</description>
<mandatoryConform/>
</attribute>
<attribute code="0x0002" side="server" type="ESAStateEnum" define="ESA_STATE" default="0x00" min="0x00" max="0x04">
<description>ESAState</description>
<mandatoryConform/>
</attribute>
<attribute code="0x0003" side="server" type="power_mw" define="ABS_MIN_POWER" default="0">
<description>AbsMinPower</description>
<mandatoryConform/>
</attribute>
<attribute code="0x0004" side="server" type="power_mw" define="ABS_MAX_POWER" default="0">
<description>AbsMaxPower</description>
<mandatoryConform/>
</attribute>
<!--Conformance feature PA - for now optional-->
<attribute code="0x0005" side="server" type="PowerAdjustCapabilityStruct" define="POWER_ADJUSTMENT_CAPABILITY" isNullable="true" optional="true">PowerAdjustmentCapability</attribute>
<attribute code="0x0005" side="server" type="PowerAdjustCapabilityStruct" define="POWER_ADJUSTMENT_CAPABILITY" isNullable="true" optional="true">
<description>PowerAdjustmentCapability</description>
<mandatoryConform>
<feature name="PA"/>
</mandatoryConform>
</attribute>
<!--Conformance feature PFR \| SFR - for now optional-->
<attribute code="0x0006" side="server" type="ForecastStruct" define="FORECAST" isNullable="true" optional="true">Forecast</attribute>
<attribute code="0x0007" side="server" type="OptOutStateEnum" define="OPT_OUT_STATE" min="0x00" max="0x03" default="0x00" optional="true">OptOutState</attribute>
<attribute code="0x0006" side="server" type="ForecastStruct" define="FORECAST" isNullable="true" optional="true">
<description>Forecast</description>
<mandatoryConform>
<orTerm>
<feature name="PFR"/>
<feature name="SFR"/>
</orTerm>
</mandatoryConform>
</attribute>
<attribute code="0x0007" side="server" type="OptOutStateEnum" define="OPT_OUT_STATE" min="0x00" max="0x03" default="0x00" optional="true">
<description>OptOutState</description>
<mandatoryConform>
<orTerm>
<feature name="PA"/>
<feature name="STA"/>
<feature name="PAU"/>
<feature name="FA"/>
<feature name="CON"/>
</orTerm>
</mandatoryConform>
</attribute>
<command source="client" code="0x00" name="PowerAdjustRequest" optional="true" apiMaturity="provisional">
<description>Allows a client to request an adjustment in the power consumption of an ESA for a specified duration.</description>
<mandatoryConform>
<feature name="PA"/>
</mandatoryConform>
<arg id="0" name="Power" type="power_mw"/>
<arg id="1" name="Duration" type="elapsed_s"/>
<arg id="2" name="Cause" type="AdjustmentCauseEnum" min="0x00" max="0x01"/>
</command>

<command source="client" code="0x01" name="CancelPowerAdjustRequest" optional="true" apiMaturity="provisional">
<description>Allows a client to cancel an ongoing PowerAdjustmentRequest operation.</description>
<mandatoryConform>
<feature name="PA"/>
</mandatoryConform>
</command>

<command source="client" code="0x02" name="StartTimeAdjustRequest" optional="true" apiMaturity="provisional">
<description>Allows a client to adjust the start time of a Forecast sequence that has not yet started operation (i.e. where the current Forecast StartTime is in the future).</description>
<mandatoryConform>
<feature name="STA"/>
</mandatoryConform>
<arg id="0" name="RequestedStartTime" type="epoch_s"/>
<arg id="1" name="Cause" type="AdjustmentCauseEnum" min="0x00" max="0x01"/>
</command>

<command source="client" code="0x03" name="PauseRequest" optional="true" apiMaturity="provisional">
<description>Allows a client to temporarily pause an operation and reduce the ESAs energy demand.</description>
<mandatoryConform>
<feature name="PAU"/>
</mandatoryConform>
<arg id="0" name="Duration" type="elapsed_s"/>
<arg id="1" name="Cause" type="AdjustmentCauseEnum" min="0x00" max="0x01"/>
</command>

<command source="client" code="0x04" name="ResumeRequest" optional="true" apiMaturity="provisional">
<description>Allows a client to cancel the PauseRequest command and enable earlier resumption of operation.</description>
<mandatoryConform>
<feature name="PAU"/>
</mandatoryConform>
</command>

<command source="client" code="0x05" name="ModifyForecastRequest" optional="true" apiMaturity="provisional">
<description>Allows a client to modify a Forecast within the limits allowed by the ESA.</description>
<mandatoryConform>
<feature name="FA"/>
</mandatoryConform>
<arg id="0" name="ForecastID" type="int32u"/>
<arg id="1" name="SlotAdjustments" array="true" type="SlotAdjustmentStruct" length="10"/>
<arg id="2" name="Cause" type="AdjustmentCauseEnum" min="0x00" max="0x01"/>
</command>

<command source="client" code="0x06" name="RequestConstraintBasedForecast" optional="true" apiMaturity="provisional">
<description>Allows a client to ask the ESA to recompute its Forecast based on power and time constraints.</description>
<mandatoryConform>
<feature name="CON"/>
</mandatoryConform>
<arg id="0" name="Constraints" array="true" type="ConstraintsStruct" length="10"/>
<arg id="1" name="Cause" type="AdjustmentCauseEnum" min="0x00" max="0x01"/>
</command>

<command source="client" code="0x07" name="CancelRequest" optional="true">
<description>Allows a client to request cancellation of a previous adjustment request in a StartTimeAdjustRequest, ModifyForecastRequest or RequestConstraintBasedForecast command</description>
<mandatoryConform>
<orTerm>
<feature name="STA"/>
<feature name="FA"/>
<feature name="CON"/>
</orTerm>
</mandatoryConform>
</command>

<event code="0x00" name="PowerAdjustStart" priority="info" side="server" apiMaturity="provisional" optional="true">
Expand Down
24 changes: 20 additions & 4 deletions src/app/zap-templates/zcl/data-model/chip/device-energy-management-mode-cluster.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,24 +57,40 @@ limitations under the License.
</features>

<!-- Base data types -->
<attribute side="server" code="0x0000" define="SUPPORTED_MODES" type="array" entryType="ModeOptionStruct" writable="false" optional="false" isNullable="false" length="255">SupportedModes</attribute>
<attribute side="server" code="0x0001" define="CURRENT_MODE" type="int8u" writable="false" optional="false" isNullable="false" reportable="true">CurrentMode</attribute>
<attribute side="server" code="0x0002" define="START_UP_MODE" type="int8u" writable="true" optional="true" isNullable="true">StartUpMode</attribute>
<attribute side="server" code="0x0003" define="ON_MODE" type="int8u" writable="true" optional="true" isNullable="true">OnMode</attribute>
<attribute side="server" code="0x0000" define="SUPPORTED_MODES" type="array" entryType="ModeOptionStruct" writable="false" optional="false" isNullable="false" length="255">
<description>SupportedModes</description>
<mandatoryConform/>
</attribute>
<attribute side="server" code="0x0001" define="CURRENT_MODE" type="int8u" writable="false" optional="false" isNullable="false" reportable="true">
<description>CurrentMode</description>
<mandatoryConform/>
</attribute>
<attribute side="server" code="0x0002" define="START_UP_MODE" type="int8u" writable="true" optional="true" isNullable="true">
<description>StartUpMode</description>
<optionalConform/>
</attribute>
<attribute side="server" code="0x0003" define="ON_MODE" type="int8u" writable="true" optional="true" isNullable="true">
<description>OnMode</description>
<mandatoryConform>
<feature name="DEPONOFF"/>
</mandatoryConform>
</attribute>

<!-- Commands -->
<command source="client" code="0x00" name="ChangeToMode" response="ChangeToModeResponse" optional="false">
<description>
This command is used to change device modes.
On receipt of this command the device SHALL respond with a ChangeToModeResponse command.
</description>
<mandatoryConform/>
<arg name="NewMode" type="int8u" optional="false"/>
</command>

<command source="server" code="0x01" name="ChangeToModeResponse" disableDefaultResponse="true" optional="false">
<description>
This command is sent by the device on receipt of the ChangeToModeWithStatus command.
</description>
<mandatoryConform/>
<arg name="Status" type="enum8" optional="false"/>
<arg name="StatusText" type="char_string" length="64" optional="true"/>
</command>
Expand Down
2 changes: 2 additions & 0 deletions src/app/zap-templates/zcl/data-model/chip/diagnostic-logs-cluster.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,14 @@ limitations under the License.
<server tick="false" init="false">true</server>
<command source="client" code="0x00" name="RetrieveLogsRequest" response="RetrieveLogsResponse" optional="false" cli="chip logs retrieve">
<description>Retrieving diagnostic logs from a Node</description>
<mandatoryConform/>
<arg name="Intent" type="IntentEnum"/>
<arg name="RequestedProtocol" type="TransferProtocolEnum"/>
<arg name="TransferFileDesignator" type="char_string" length="32" optional="true"/>
</command>
<command source="server" code="0x01" name="RetrieveLogsResponse" optional="false" cli="chip logs response">
<description>Response to the RetrieveLogsRequest</description>
<mandatoryConform/>
<arg name="Status" type="StatusEnum"/>
<arg name="LogContent" type="long_octet_string"/>
<arg name="UTCTimeStamp" type="epoch_us" optional="true"/>
Expand Down
26 changes: 22 additions & 4 deletions src/app/zap-templates/zcl/data-model/chip/dishwasher-alarm-cluster.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,36 @@ limitations under the License.
</feature>
</features>

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

<command source="client" code="0x00" name="Reset" optional="true">
<description>Reset alarm</description>
<mandatoryConform>
<feature name="RESET"/>
</mandatoryConform>
<arg name="Alarms" type="AlarmBitmap" optional="false"/>
</command>

<command source="client" code="0x01" name="ModifyEnabledAlarms" optional="true">
<description>Modify enabled alarms</description>
<optionalConform/>
<arg name="Mask" type="AlarmBitmap" optional="false"/>
</command>

Expand Down
24 changes: 20 additions & 4 deletions src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-cluster.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,24 +57,40 @@ limitations under the License.
</features>

<!-- Base data types -->
<attribute side="server" code="0x0000" define="SUPPORTED_MODES" type="array" entryType="ModeOptionStruct" writable="false" optional="false" isNullable="false" length="255">SupportedModes</attribute>
<attribute side="server" code="0x0001" define="CURRENT_MODE" type="int8u" writable="false" optional="false" isNullable="false" reportable="true">CurrentMode</attribute>
<attribute side="server" code="0x0002" define="START_UP_MODE" type="int8u" writable="true" optional="true" isNullable="true">StartUpMode</attribute>
<attribute side="server" code="0x0003" define="ON_MODE" type="int8u" writable="true" optional="true" isNullable="true">OnMode</attribute>
<attribute side="server" code="0x0000" define="SUPPORTED_MODES" type="array" entryType="ModeOptionStruct" writable="false" optional="false" isNullable="false" length="255">
<description>SupportedModes</description>
<mandatoryConform/>
</attribute>
<attribute side="server" code="0x0001" define="CURRENT_MODE" type="int8u" writable="false" optional="false" isNullable="false" reportable="true">
<description>CurrentMode</description>
<mandatoryConform/>
</attribute>
<attribute side="server" code="0x0002" define="START_UP_MODE" type="int8u" writable="true" optional="true" isNullable="true">
<description>StartUpMode</description>
<optionalConform/>
</attribute>
<attribute side="server" code="0x0003" define="ON_MODE" type="int8u" writable="true" optional="true" isNullable="true">
<description>OnMode</description>
<mandatoryConform>
<feature name="DEPONOFF"/>
</mandatoryConform>
</attribute>

<!-- Commands -->
<command source="client" code="0x00" name="ChangeToMode" response="ChangeToModeResponse" optional="false">
<description>
This command is used to change device modes.
On receipt of this command the device SHALL respond with a ChangeToModeResponse command.
</description>
<mandatoryConform/>
<arg name="NewMode" type="int8u" optional="false"/>
</command>

<command source="server" code="0x01" name="ChangeToModeResponse" disableDefaultResponse="true" optional="false">
<description>
This command is sent by the device on receipt of the ChangeToModeWithStatus command.
</description>
<mandatoryConform/>
<arg name="Status" type="enum8" optional="false"/>
<arg name="StatusText" type="char_string" lenght="64" optional="true"/>
</command>
Expand Down
Loading

0 comments on commit 0f7882e

Please sign in to comment.