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

Make UpTime attribute mandatory in ZAP RootNode #31535

Merged
merged 1 commit into from
Jan 19, 2024
Merged

Make UpTime attribute mandatory in ZAP RootNode #31535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ limitations under the License.
<globalAttribute side="either" code="0xFFFD" value="2"/>
<attribute side="server" code="0x00" define="NETWORK_INTERFACES" type="array" entryType="NetworkInterface" length="8" writable="false" optional="false">NetworkInterfaces</attribute>
<attribute side="server" code="0x01" define="REBOOT_COUNT" type="int16u" writable="false" default="0x0000" optional="false">RebootCount</attribute>
<!-- TODO(#30023): Make Uptime conditionally mandatory at rev >= 2 -->
<!-- ***NOTE***: UpTime attribute is mandatory starting at Rev >= 2, but because of backwards compatibility, has to be optional here.
The device type config and cert tests (TC-DGGEN-1.1/2.1) ensure that it is present. -->
<attribute side="server" code="0x02" define="UP_TIME" type="int64u" writable="false" default="0x0000000000000000" optional="true">UpTime</attribute>
<attribute side="server" code="0x03" define="TOTAL_OPERATIONAL_HOURS" type="int32u" writable="false" default="0x00000000" optional="true">TotalOperationalHours</attribute>
<attribute side="server" code="0x04" define="BOOT_REASONS" type="BootReasonEnum" writable="false" optional="true">BootReason</attribute>
Expand Down
6 changes: 4 additions & 2 deletions src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,9 @@ limitations under the License.
<requireAttribute>HOUR_FORMAT</requireAttribute>
</include>
<include cluster="Unit Localization" client="false" server="true" clientLocked="true" serverLocked="false"></include>
<include cluster="General Diagnostics" client="false" server="true" clientLocked="true" serverLocked="true"></include>
<include cluster="General Diagnostics" client="false" server="true" clientLocked="true" serverLocked="true">
<requireAttribute>UP_TIME</requireAttribute>
</include>
<include cluster="Diagnostic Logs" client="false" server="false" clientLocked="true" serverLocked="false"></include>
<include cluster="Software Diagnostics" client="false" server="false" clientLocked="true" serverLocked="false"></include>
<include cluster="Ethernet Network Diagnostics" client="false" server="false" clientLocked="true" serverLocked="false"></include>
Expand Down Expand Up @@ -1871,7 +1873,7 @@ limitations under the License.
<include cluster="Groups" client="false" server="false" clientLocked="true" serverLocked="false"></include>
<include cluster="Scenes Management" client="false" server="false" clientLocked="true" serverLocked="false"></include>
<include cluster="Thermostat" client="false" server="true" clientLocked="true" serverLocked="true"></include>
<include cluster="Thermostat User Interface Configuration" client="false" server="false" clientLocked="true" serverLocked="false"></include>
<include cluster="Thermostat User Interface Configuration" client="false" server="false" clientLocked="true" serverLocked="false"></include>
<include cluster="Fan Control" client="false" server="false" clientLocked="true" serverLocked="false"></include>
<include cluster="Temperature Measurement" client="false" server="false" clientLocked="true" serverLocked="false"></include>
<include cluster="Relative Humidity Measurement" client="false" server="false" clientLocked="true" serverLocked="false"></include>
Expand Down
Loading