Skip to content

Commit 4b8b11b

Browse files
jamesharrowjamesharrow
authored
Merge branch 'master' into add-water-heater-mode-sdk-code
2 parents 5571e88 + 351d6eb commit 4b8b11b

File tree

509 files changed

+6123
-2622
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

509 files changed

+6123
-2622
lines changed

‎.github/workflows/tests.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -582,6 +582,7 @@ jobs:
582582
scripts/run_in_python_env.sh out/venv './scripts/tests/TestTimeSyncTrustedTimeSourceRunner.py'
583583
scripts/run_in_python_env.sh out/venv './src/python_testing/test_testing/test_TC_ICDM_2_1.py'
584584
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestIdChecks.py'
585+
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestConformanceSupport.py'
585586
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/test_testing/test_IDM_10_4.py'
586587
587588
- name: Uploading core files

‎data_model/1.3/clusters/ACL-Cluster.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -169,19 +169,19 @@ Davis, CA 95616, USA
169169
</attribute>
170170
<attribute id="0x0002" name="SubjectsPerAccessControlEntry" type="uint16" default="4">
171171
<access read="true" readPrivilege="view"/>
172-
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
172+
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false" sourceAttribution="false" quieterReporting="false"/>
173173
<mandatoryConform/>
174174
<constraint type="min" value="4"/>
175175
</attribute>
176176
<attribute id="0x0003" name="TargetsPerAccessControlEntry" type="uint16" default="3">
177177
<access read="true" readPrivilege="view"/>
178-
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
178+
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false" sourceAttribution="false" quieterReporting="false"/>
179179
<mandatoryConform/>
180180
<constraint type="min" value="3"/>
181181
</attribute>
182182
<attribute id="0x0004" name="AccessControlEntriesPerFabric" type="uint16" default="4">
183183
<access read="true" readPrivilege="view"/>
184-
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
184+
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false" sourceAttribution="false" quieterReporting="false"/>
185185
<mandatoryConform/>
186186
<constraint type="min" value="4"/>
187187
</attribute>

‎data_model/1.3/clusters/AdminCommissioningCluster.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,12 @@ Davis, CA 95616, USA
9191
</attribute>
9292
<attribute id="0x0001" name="AdminFabricIndex" type="fabric-idx">
9393
<access read="true" readPrivilege="view"/>
94-
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
94+
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
9595
<mandatoryConform/>
9696
</attribute>
9797
<attribute id="0x0002" name="AdminVendorId" type="vendor-id">
9898
<access read="true" readPrivilege="view"/>
99-
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
99+
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
100100
<mandatoryConform/>
101101
</attribute>
102102
</attributes>

‎data_model/1.3/clusters/AlarmBase.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Davis, CA 95616, USA
8080
</attribute>
8181
<attribute id="0x0001" name="Latch" type="AlarmBitmap" default="0">
8282
<access read="true" readPrivilege="view"/>
83-
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
83+
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false" sourceAttribution="false" quieterReporting="false"/>
8484
<mandatoryConform>
8585
<feature name="RESET"/>
8686
</mandatoryConform>
@@ -91,7 +91,7 @@ Davis, CA 95616, USA
9191
</attribute>
9292
<attribute id="0x0003" name="Supported" type="AlarmBitmap" default="0">
9393
<access read="true" readPrivilege="view"/>
94-
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
94+
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false" sourceAttribution="false" quieterReporting="false"/>
9595
<mandatoryConform/>
9696
</attribute>
9797
</attributes>

‎data_model/1.3/clusters/ApplicationBasic.xml

+7-7
Original file line numberDiff line numberDiff line change
@@ -92,29 +92,29 @@ Davis, CA 95616, USA
9292
<attributes>
9393
<attribute id="0x0000" name="VendorName" type="string" default="empty">
9494
<access read="true" readPrivilege="view"/>
95-
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
95+
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false" sourceAttribution="false" quieterReporting="false"/>
9696
<optionalConform/>
9797
<constraint type="maxLength" value="32"/>
9898
</attribute>
9999
<attribute id="0x0001" name="VendorID" type="vendor-id">
100100
<access read="true" readPrivilege="view"/>
101-
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
101+
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false" sourceAttribution="false" quieterReporting="false"/>
102102
<optionalConform/>
103103
</attribute>
104104
<attribute id="0x0002" name="ApplicationName" type="string">
105105
<access read="true" readPrivilege="view"/>
106-
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
106+
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false" sourceAttribution="false" quieterReporting="false"/>
107107
<mandatoryConform/>
108108
<constraint type="desc"/>
109109
</attribute>
110110
<attribute id="0x0003" name="ProductID" type="uint16">
111111
<access read="true" readPrivilege="view"/>
112-
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
112+
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false" sourceAttribution="false" quieterReporting="false"/>
113113
<optionalConform/>
114114
</attribute>
115115
<attribute id="0x0004" name="Application" type="ApplicationStruct">
116116
<access read="true" readPrivilege="view"/>
117-
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
117+
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false" sourceAttribution="false" quieterReporting="false"/>
118118
<mandatoryConform/>
119119
<constraint type="desc"/>
120120
</attribute>
@@ -125,14 +125,14 @@ Davis, CA 95616, USA
125125
</attribute>
126126
<attribute id="0x0006" name="ApplicationVersion" type="string">
127127
<access read="true" readPrivilege="view"/>
128-
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
128+
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false" sourceAttribution="false" quieterReporting="false"/>
129129
<mandatoryConform/>
130130
<constraint type="maxLength" value="32"/>
131131
</attribute>
132132
<attribute id="0x0007" name="AllowedVendorList" type="list">
133133
<entry type="vendor-id"/>
134134
<access read="true" readPrivilege="admin"/>
135-
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
135+
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false" sourceAttribution="false" quieterReporting="false"/>
136136
<mandatoryConform/>
137137
</attribute>
138138
</attributes>

‎data_model/1.3/clusters/ApplicationLauncher.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,14 @@ Davis, CA 95616, USA
103103
<attribute id="0x0000" name="CatalogList" type="list">
104104
<entry type="uint16"/>
105105
<access read="true" readPrivilege="view"/>
106-
<quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
106+
<quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
107107
<mandatoryConform>
108108
<feature name="AP"/>
109109
</mandatoryConform>
110110
</attribute>
111111
<attribute id="0x0001" name="CurrentApp" type="ApplicationEPStruct" default="null">
112112
<access read="true" readPrivilege="view"/>
113-
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
113+
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
114114
<optionalConform/>
115115
<constraint type="desc"/>
116116
</attribute>

‎data_model/1.3/clusters/BallastConfiguration.xml

+8-6
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@ Davis, CA 95616, USA
6565
<revision revision="4" summary="New data model format and notation"/>
6666
</revisionHistory>
6767
<clusterIds>
68-
<clusterId id="0x0301" name="Ballast Configuration"/>
68+
<clusterId id="0x0301" name="Ballast Configuration">
69+
<provisionalConform/>
70+
</clusterId>
6971
</clusterIds>
7072
<classification hierarchy="base" role="application" picsCode="BC" scope="Endpoint"/>
7173
<dataTypes>
@@ -116,12 +118,12 @@ Davis, CA 95616, USA
116118
</attribute>
117119
<attribute id="0x0014" name="IntrinsicBallastFactor" type="uint8">
118120
<access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
119-
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
121+
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
120122
<optionalConform/>
121123
</attribute>
122124
<attribute id="0x0015" name="BallastFactorAdjustment" type="uint8" default="null">
123125
<access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
124-
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
126+
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
125127
<optionalConform/>
126128
<constraint type="between" from="100" to="MS"/>
127129
</attribute>
@@ -141,12 +143,12 @@ Davis, CA 95616, USA
141143
</attribute>
142144
<attribute id="0x0032" name="LampRatedHours" type="uint24" default="null">
143145
<access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
144-
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
146+
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
145147
<optionalConform/>
146148
</attribute>
147149
<attribute id="0x0033" name="LampBurnHours" type="uint24" default="0">
148150
<access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
149-
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
151+
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
150152
<optionalConform/>
151153
</attribute>
152154
<attribute id="0x0034" name="LampAlarmMode" type="LampAlarmModeBitmap" default="0">
@@ -155,7 +157,7 @@ Davis, CA 95616, USA
155157
</attribute>
156158
<attribute id="0x0035" name="LampBurnHoursTripPoint" type="uint24" default="null">
157159
<access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
158-
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
160+
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
159161
<optionalConform/>
160162
</attribute>
161163
</attributes>

0 commit comments

Comments
 (0)