Skip to content

Commit 1121848

Browse files
cecillepull[bot]
cecille
authored and
pull[bot]
committed
use more specific enum for Regulatory location (#15322)
* Use more specific enum for regulatory location. * Run zap regen
1 parent 8607335 commit 1121848

File tree

26 files changed

+98
-90
lines changed

26 files changed

+98
-90
lines changed

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -1366,8 +1366,8 @@ server cluster GeneralCommissioning = 48 {
13661366

13671367
attribute int64u breadcrumb = 0;
13681368
readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
1369-
readonly attribute enum8 regulatoryConfig = 2;
1370-
readonly attribute enum8 locationCapability = 3;
1369+
readonly attribute RegulatoryLocationType regulatoryConfig = 2;
1370+
readonly attribute RegulatoryLocationType locationCapability = 3;
13711371
readonly global attribute bitmap32 featureMap = 65532;
13721372
readonly global attribute int16u clusterRevision = 65533;
13731373

‎examples/bridge-app/bridge-common/bridge-app.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,8 @@ server cluster GeneralCommissioning = 48 {
298298

299299
attribute int64u breadcrumb = 0;
300300
readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
301-
readonly attribute enum8 regulatoryConfig = 2;
302-
readonly attribute enum8 locationCapability = 3;
301+
readonly attribute RegulatoryLocationType regulatoryConfig = 2;
302+
readonly attribute RegulatoryLocationType locationCapability = 3;
303303
readonly global attribute bitmap32 featureMap = 65532;
304304
readonly global attribute int16u clusterRevision = 65533;
305305

‎examples/door-lock-app/door-lock-common/door-lock-app.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -776,8 +776,8 @@ server cluster GeneralCommissioning = 48 {
776776

777777
attribute int64u breadcrumb = 0;
778778
readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
779-
readonly attribute enum8 regulatoryConfig = 2;
780-
readonly attribute enum8 locationCapability = 3;
779+
readonly attribute RegulatoryLocationType regulatoryConfig = 2;
780+
readonly attribute RegulatoryLocationType locationCapability = 3;
781781
readonly global attribute bitmap32 featureMap = 65532;
782782
readonly global attribute int16u clusterRevision = 65533;
783783

‎examples/light-switch-app/light-switch-common/light-switch-app.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -487,8 +487,8 @@ server cluster GeneralCommissioning = 48 {
487487

488488
attribute int64u breadcrumb = 0;
489489
readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
490-
readonly attribute enum8 regulatoryConfig = 2;
491-
readonly attribute enum8 locationCapability = 3;
490+
readonly attribute RegulatoryLocationType regulatoryConfig = 2;
491+
readonly attribute RegulatoryLocationType locationCapability = 3;
492492
readonly global attribute bitmap32 featureMap = 65532;
493493
readonly global attribute int16u clusterRevision = 65533;
494494

‎examples/lighting-app/lighting-common/lighting-app.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -492,8 +492,8 @@ server cluster GeneralCommissioning = 48 {
492492

493493
attribute int64u breadcrumb = 0;
494494
readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
495-
readonly attribute enum8 regulatoryConfig = 2;
496-
readonly attribute enum8 locationCapability = 3;
495+
readonly attribute RegulatoryLocationType regulatoryConfig = 2;
496+
readonly attribute RegulatoryLocationType locationCapability = 3;
497497
readonly global attribute bitmap32 featureMap = 65532;
498498
readonly global attribute int16u clusterRevision = 65533;
499499

‎examples/lock-app/lock-common/lock-app.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,8 @@ server cluster GeneralCommissioning = 48 {
238238

239239
attribute int64u breadcrumb = 0;
240240
readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
241-
readonly attribute enum8 regulatoryConfig = 2;
242-
readonly attribute enum8 locationCapability = 3;
241+
readonly attribute RegulatoryLocationType regulatoryConfig = 2;
242+
readonly attribute RegulatoryLocationType locationCapability = 3;
243243
readonly global attribute bitmap32 featureMap = 65532;
244244
readonly global attribute int16u clusterRevision = 65533;
245245

‎examples/ota-provider-app/ota-provider-common/ota-provider-app.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,8 @@ server cluster GeneralCommissioning = 48 {
192192

193193
attribute int64u breadcrumb = 0;
194194
readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
195-
readonly attribute enum8 regulatoryConfig = 2;
196-
readonly attribute enum8 locationCapability = 3;
195+
readonly attribute RegulatoryLocationType regulatoryConfig = 2;
196+
readonly attribute RegulatoryLocationType locationCapability = 3;
197197
readonly global attribute bitmap32 featureMap = 65532;
198198
readonly global attribute int16u clusterRevision = 65533;
199199

‎examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ server cluster GeneralCommissioning = 48 {
166166

167167
attribute int64u breadcrumb = 0;
168168
readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
169-
readonly attribute enum8 regulatoryConfig = 2;
170-
readonly attribute enum8 locationCapability = 3;
169+
readonly attribute RegulatoryLocationType regulatoryConfig = 2;
170+
readonly attribute RegulatoryLocationType locationCapability = 3;
171171
readonly global attribute bitmap32 featureMap = 65532;
172172
readonly global attribute int16u clusterRevision = 65533;
173173

‎examples/pump-app/pump-common/pump-app.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,8 @@ server cluster GeneralCommissioning = 48 {
223223

224224
attribute int64u breadcrumb = 0;
225225
readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
226-
readonly attribute enum8 regulatoryConfig = 2;
227-
readonly attribute enum8 locationCapability = 3;
226+
readonly attribute RegulatoryLocationType regulatoryConfig = 2;
227+
readonly attribute RegulatoryLocationType locationCapability = 3;
228228
readonly global attribute bitmap32 featureMap = 65532;
229229
readonly global attribute int16u clusterRevision = 65533;
230230

‎examples/pump-controller-app/pump-controller-common/pump-controller-app.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,8 @@ server cluster GeneralCommissioning = 48 {
243243

244244
attribute int64u breadcrumb = 0;
245245
readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
246-
readonly attribute enum8 regulatoryConfig = 2;
247-
readonly attribute enum8 locationCapability = 3;
246+
readonly attribute RegulatoryLocationType regulatoryConfig = 2;
247+
readonly attribute RegulatoryLocationType locationCapability = 3;
248248
readonly global attribute bitmap32 featureMap = 65532;
249249
readonly global attribute int16u clusterRevision = 65533;
250250

‎examples/temperature-measurement-app/esp32/main/temperature-measurement.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,8 @@ server cluster GeneralCommissioning = 48 {
236236

237237
attribute int64u breadcrumb = 0;
238238
readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
239-
readonly attribute enum8 regulatoryConfig = 2;
240-
readonly attribute enum8 locationCapability = 3;
239+
readonly attribute RegulatoryLocationType regulatoryConfig = 2;
240+
readonly attribute RegulatoryLocationType locationCapability = 3;
241241
readonly global attribute bitmap32 featureMap = 65532;
242242
readonly global attribute int16u clusterRevision = 65533;
243243

‎examples/thermostat/thermostat-common/thermostat.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,8 @@ server cluster GeneralCommissioning = 48 {
257257

258258
attribute int64u breadcrumb = 0;
259259
readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
260-
readonly attribute enum8 regulatoryConfig = 2;
261-
readonly attribute enum8 locationCapability = 3;
260+
readonly attribute RegulatoryLocationType regulatoryConfig = 2;
261+
readonly attribute RegulatoryLocationType locationCapability = 3;
262262
readonly global attribute bitmap32 featureMap = 65532;
263263
readonly global attribute int16u clusterRevision = 65533;
264264

‎examples/tv-app/tv-common/tv-app.matter

+4-4
Original file line numberDiff line numberDiff line change
@@ -565,8 +565,8 @@ client cluster GeneralCommissioning = 48 {
565565

566566
attribute int64u breadcrumb = 0;
567567
readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
568-
readonly attribute enum8 regulatoryConfig = 2;
569-
readonly attribute enum8 locationCapability = 3;
568+
readonly attribute RegulatoryLocationType regulatoryConfig = 2;
569+
readonly attribute RegulatoryLocationType locationCapability = 3;
570570
readonly global attribute bitmap32 featureMap = 65532;
571571
readonly global attribute int16u clusterRevision = 65533;
572572

@@ -623,8 +623,8 @@ server cluster GeneralCommissioning = 48 {
623623

624624
attribute int64u breadcrumb = 0;
625625
readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
626-
readonly attribute enum8 regulatoryConfig = 2;
627-
readonly attribute enum8 locationCapability = 3;
626+
readonly attribute RegulatoryLocationType regulatoryConfig = 2;
627+
readonly attribute RegulatoryLocationType locationCapability = 3;
628628
readonly global attribute bitmap32 featureMap = 65532;
629629
readonly global attribute int16u clusterRevision = 65533;
630630

‎examples/tv-casting-app/tv-casting-common/tv-casting-app.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -1289,8 +1289,8 @@ server cluster GeneralCommissioning = 48 {
12891289

12901290
attribute int64u breadcrumb = 0;
12911291
readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
1292-
readonly attribute enum8 regulatoryConfig = 2;
1293-
readonly attribute enum8 locationCapability = 3;
1292+
readonly attribute RegulatoryLocationType regulatoryConfig = 2;
1293+
readonly attribute RegulatoryLocationType locationCapability = 3;
12941294
readonly global attribute bitmap32 featureMap = 65532;
12951295
readonly global attribute int16u clusterRevision = 65533;
12961296

‎examples/window-app/common/window-app.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,8 @@ server cluster GeneralCommissioning = 48 {
206206

207207
attribute int64u breadcrumb = 0;
208208
readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
209-
readonly attribute enum8 regulatoryConfig = 2;
210-
readonly attribute enum8 locationCapability = 3;
209+
readonly attribute RegulatoryLocationType regulatoryConfig = 2;
210+
readonly attribute RegulatoryLocationType locationCapability = 3;
211211
readonly global attribute bitmap32 featureMap = 65532;
212212
readonly global attribute int16u clusterRevision = 65533;
213213

‎src/app/zap-templates/zcl/data-model/chip/general-commissioning-cluster.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ limitations under the License.
4141
<description>This cluster is used to set, remove and update fabric information on a commissionee.</description>
4242
<attribute side="server" code="0x00" define="BREADCRUMB" type="INT64U" writable="true" default="0x0000000000000000" optional="false">Breadcrumb</attribute>
4343
<attribute side="server" code="0x01" define="BASICCOMMISSIONINGINFO" type="BasicCommissioningInfo" writable="false" optional="false">BasicCommissioningInfo</attribute>
44-
<attribute side="server" code="0x02" define="REGULATORYCONFIG" type="ENUM8" writable="false" optional="true">RegulatoryConfig</attribute>
45-
<attribute side="server" code="0x03" define="LOCATIONCAPABILITY" type="ENUM8" writable="false" optional="true">LocationCapability</attribute>
44+
<attribute side="server" code="0x02" define="REGULATORYCONFIG" type="RegulatoryLocationType" writable="false" optional="true">RegulatoryConfig</attribute>
45+
<attribute side="server" code="0x03" define="LOCATIONCAPABILITY" type="RegulatoryLocationType" writable="false" optional="true">LocationCapability</attribute>
4646
<command source="client" code="0x00" name="ArmFailSafe" response="ArmFailSafeResponse" optional="false" cli="chip fabric_commissioning armfailsafe">
4747
<description>Arm the persistent fail-safe timer with an expiry time of now + ExpiryLengthSeconds using device clock</description>
4848
<arg name="expiryLengthSeconds" type="INT16U"/>

‎src/controller/data_model/controller-clusters.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -1691,8 +1691,8 @@ client cluster GeneralCommissioning = 48 {
16911691

16921692
attribute int64u breadcrumb = 0;
16931693
readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
1694-
readonly attribute enum8 regulatoryConfig = 2;
1695-
readonly attribute enum8 locationCapability = 3;
1694+
readonly attribute RegulatoryLocationType regulatoryConfig = 2;
1695+
readonly attribute RegulatoryLocationType locationCapability = 3;
16961696
readonly global attribute command_id serverGeneratedCommandList[] = 65528;
16971697
readonly global attribute command_id clientGeneratedCommandList[] = 65529;
16981698
readonly global attribute attrib_id attributeList[] = 65531;

‎src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/controller/python/chip/clusters/Objects.py

+8-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)