Skip to content

Commit 1293202

Browse files
lpbeliveau-silabspull[bot]
lpbeliveau-silabs
authored and
pull[bot]
committed
[Scenes] Explicit feature flag (#29535)
* Enforced Explicit support in scene server and added default values to scene cluster where enabled * Fixed overwrite in attributes
1 parent 4ab3458 commit 1293202

File tree

11 files changed

+67
-59
lines changed

11 files changed

+67
-59
lines changed

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -6558,15 +6558,15 @@ endpoint 1 {
65586558
ram attribute currentScene default = 0x00;
65596559
ram attribute currentGroup default = 0x0000;
65606560
ram attribute sceneValid default = 0x00;
6561-
ram attribute nameSupport;
6561+
ram attribute nameSupport default = 0x80;
65626562
ram attribute lastConfiguredBy;
6563-
ram attribute sceneTableSize;
6564-
callback attribute remainingCapacity;
6563+
ram attribute sceneTableSize default = 16;
6564+
callback attribute remainingCapacity default = 8;
65656565
callback attribute generatedCommandList;
65666566
callback attribute acceptedCommandList;
65676567
callback attribute eventList;
65686568
callback attribute attributeList;
6569-
ram attribute featureMap default = 0;
6569+
ram attribute featureMap default = 3;
65706570
ram attribute clusterRevision default = 5;
65716571
}
65726572

@@ -7606,14 +7606,14 @@ endpoint 2 {
76067606
ram attribute currentScene default = 0x00;
76077607
ram attribute currentGroup default = 0x0000;
76087608
ram attribute sceneValid default = 0x00;
7609-
ram attribute nameSupport;
7610-
ram attribute sceneTableSize;
7611-
callback attribute remainingCapacity;
7609+
ram attribute nameSupport default = 0x80;
7610+
ram attribute sceneTableSize default = 16;
7611+
callback attribute remainingCapacity default = 8;
76127612
callback attribute generatedCommandList;
76137613
callback attribute acceptedCommandList;
76147614
callback attribute eventList;
76157615
callback attribute attributeList;
7616-
ram attribute featureMap default = 0;
7616+
ram attribute featureMap default = 3;
76177617
ram attribute clusterRevision default = 5;
76187618
}
76197619

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

+16-15
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616
}
1717
],
1818
"package": [
19+
{
20+
"pathRelativity": "relativeToZap",
21+
"path": "../../../src/app/zap-templates/app-templates.json",
22+
"type": "gen-templates-json",
23+
"version": "chip-v1"
24+
},
1925
{
2026
"pathRelativity": "relativeToZap",
2127
"path": "../../../src/app/zap-templates/zcl/zcl-with-test-extensions.json",
2228
"type": "zcl-properties",
2329
"category": "matter",
2430
"version": 1,
2531
"description": "Matter SDK ZCL data with some extensions"
26-
},
27-
{
28-
"pathRelativity": "relativeToZap",
29-
"path": "../../../src/app/zap-templates/app-templates.json",
30-
"type": "gen-templates-json",
31-
"version": "chip-v1"
3232
}
3333
],
3434
"endpointTypes": [
@@ -11207,7 +11207,7 @@
1120711207
"storageOption": "RAM",
1120811208
"singleton": 0,
1120911209
"bounded": 0,
11210-
"defaultValue": "",
11210+
"defaultValue": "0x80",
1121111211
"reportable": 1,
1121211212
"minInterval": 0,
1121311213
"maxInterval": 65344,
@@ -11239,7 +11239,7 @@
1123911239
"storageOption": "RAM",
1124011240
"singleton": 0,
1124111241
"bounded": 0,
11242-
"defaultValue": "",
11242+
"defaultValue": "16",
1124311243
"reportable": 1,
1124411244
"minInterval": 1,
1124511245
"maxInterval": 65534,
@@ -11255,7 +11255,7 @@
1125511255
"storageOption": "External",
1125611256
"singleton": 0,
1125711257
"bounded": 0,
11258-
"defaultValue": "",
11258+
"defaultValue": "8",
1125911259
"reportable": 1,
1126011260
"minInterval": 1,
1126111261
"maxInterval": 65534,
@@ -11335,7 +11335,7 @@
1133511335
"storageOption": "RAM",
1133611336
"singleton": 0,
1133711337
"bounded": 0,
11338-
"defaultValue": "0",
11338+
"defaultValue": "3",
1133911339
"reportable": 1,
1134011340
"minInterval": 1,
1134111341
"maxInterval": 65534,
@@ -31301,7 +31301,7 @@
3130131301
"storageOption": "RAM",
3130231302
"singleton": 0,
3130331303
"bounded": 0,
31304-
"defaultValue": "",
31304+
"defaultValue": "0x80",
3130531305
"reportable": 1,
3130631306
"minInterval": 0,
3130731307
"maxInterval": 65344,
@@ -31333,7 +31333,7 @@
3133331333
"storageOption": "RAM",
3133431334
"singleton": 0,
3133531335
"bounded": 0,
31336-
"defaultValue": "",
31336+
"defaultValue": "16",
3133731337
"reportable": 1,
3133831338
"minInterval": 1,
3133931339
"maxInterval": 65534,
@@ -31349,7 +31349,7 @@
3134931349
"storageOption": "External",
3135031350
"singleton": 0,
3135131351
"bounded": 0,
31352-
"defaultValue": "",
31352+
"defaultValue": "8",
3135331353
"reportable": 1,
3135431354
"minInterval": 1,
3135531355
"maxInterval": 65534,
@@ -31429,7 +31429,7 @@
3142931429
"storageOption": "RAM",
3143031430
"singleton": 0,
3143131431
"bounded": 0,
31432-
"defaultValue": "0",
31432+
"defaultValue": "3",
3143331433
"reportable": 1,
3143431434
"minInterval": 1,
3143531435
"maxInterval": 65534,
@@ -35392,5 +35392,6 @@
3539235392
"endpointId": 65534,
3539335393
"networkId": 0
3539435394
}
35395-
]
35395+
],
35396+
"log": []
3539635397
}

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -4285,15 +4285,15 @@ endpoint 1 {
42854285
ram attribute currentScene default = 0x00;
42864286
ram attribute currentGroup default = 0x0000;
42874287
ram attribute sceneValid default = 0x00;
4288-
ram attribute nameSupport;
4288+
ram attribute nameSupport default = 0x80;
42894289
ram attribute lastConfiguredBy;
4290-
ram attribute sceneTableSize;
4291-
callback attribute remainingCapacity;
4290+
ram attribute sceneTableSize default = 16;
4291+
callback attribute remainingCapacity default = 8;
42924292
callback attribute generatedCommandList;
42934293
callback attribute acceptedCommandList;
42944294
callback attribute eventList;
42954295
callback attribute attributeList;
4296-
ram attribute featureMap default = 0;
4296+
ram attribute featureMap default = 3;
42974297
ram attribute clusterRevision default = 5;
42984298
}
42994299

@@ -4733,14 +4733,14 @@ endpoint 2 {
47334733
ram attribute currentScene default = 0x00;
47344734
ram attribute currentGroup default = 0x0000;
47354735
ram attribute sceneValid default = 0x00;
4736-
ram attribute nameSupport;
4737-
ram attribute sceneTableSize;
4738-
callback attribute remainingCapacity;
4736+
ram attribute nameSupport default = 0x80;
4737+
ram attribute sceneTableSize default = 16;
4738+
callback attribute remainingCapacity default = 8;
47394739
callback attribute generatedCommandList;
47404740
callback attribute acceptedCommandList;
47414741
callback attribute eventList;
47424742
callback attribute attributeList;
4743-
ram attribute featureMap default = 0;
4743+
ram attribute featureMap default = 3;
47444744
ram attribute clusterRevision default = 5;
47454745
}
47464746

‎examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap

+10-9
Original file line numberDiff line numberDiff line change
@@ -10259,7 +10259,7 @@
1025910259
"storageOption": "RAM",
1026010260
"singleton": 0,
1026110261
"bounded": 0,
10262-
"defaultValue": "",
10262+
"defaultValue": "0x80",
1026310263
"reportable": 1,
1026410264
"minInterval": 0,
1026510265
"maxInterval": 65344,
@@ -10291,7 +10291,7 @@
1029110291
"storageOption": "RAM",
1029210292
"singleton": 0,
1029310293
"bounded": 0,
10294-
"defaultValue": "",
10294+
"defaultValue": "16",
1029510295
"reportable": 1,
1029610296
"minInterval": 1,
1029710297
"maxInterval": 65534,
@@ -10307,7 +10307,7 @@
1030710307
"storageOption": "External",
1030810308
"singleton": 0,
1030910309
"bounded": 0,
10310-
"defaultValue": "",
10310+
"defaultValue": "8",
1031110311
"reportable": 1,
1031210312
"minInterval": 1,
1031310313
"maxInterval": 65534,
@@ -10387,7 +10387,7 @@
1038710387
"storageOption": "RAM",
1038810388
"singleton": 0,
1038910389
"bounded": 0,
10390-
"defaultValue": "0",
10390+
"defaultValue": "3",
1039110391
"reportable": 1,
1039210392
"minInterval": 1,
1039310393
"maxInterval": 65534,
@@ -23497,7 +23497,7 @@
2349723497
"storageOption": "RAM",
2349823498
"singleton": 0,
2349923499
"bounded": 0,
23500-
"defaultValue": "",
23500+
"defaultValue": "0x80",
2350123501
"reportable": 1,
2350223502
"minInterval": 0,
2350323503
"maxInterval": 65344,
@@ -23529,7 +23529,7 @@
2352923529
"storageOption": "RAM",
2353023530
"singleton": 0,
2353123531
"bounded": 0,
23532-
"defaultValue": "",
23532+
"defaultValue": "16",
2353323533
"reportable": 1,
2353423534
"minInterval": 1,
2353523535
"maxInterval": 65534,
@@ -23545,7 +23545,7 @@
2354523545
"storageOption": "External",
2354623546
"singleton": 0,
2354723547
"bounded": 0,
23548-
"defaultValue": "",
23548+
"defaultValue": "8",
2354923549
"reportable": 1,
2355023550
"minInterval": 1,
2355123551
"maxInterval": 65534,
@@ -23625,7 +23625,7 @@
2362523625
"storageOption": "RAM",
2362623626
"singleton": 0,
2362723627
"bounded": 0,
23628-
"defaultValue": "0",
23628+
"defaultValue": "3",
2362923629
"reportable": 1,
2363023630
"minInterval": 1,
2363123631
"maxInterval": 65534,
@@ -27588,5 +27588,6 @@
2758827588
"endpointId": 65534,
2758927589
"networkId": 0
2759027590
}
27591-
]
27591+
],
27592+
"log": []
2759227593
}

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -2409,12 +2409,12 @@ endpoint 1 {
24092409
ram attribute sceneValid default = 0x00;
24102410
ram attribute nameSupport default = 0x80;
24112411
ram attribute lastConfiguredBy;
2412-
ram attribute sceneTableSize;
2413-
callback attribute remainingCapacity;
2412+
ram attribute sceneTableSize default = 16;
2413+
callback attribute remainingCapacity default = 8;
24142414
callback attribute generatedCommandList;
24152415
callback attribute acceptedCommandList;
24162416
callback attribute attributeList;
2417-
ram attribute featureMap default = 1;
2417+
ram attribute featureMap default = 3;
24182418
ram attribute clusterRevision default = 5;
24192419
}
24202420

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

+5-4
Original file line numberDiff line numberDiff line change
@@ -5332,7 +5332,7 @@
53325332
"storageOption": "RAM",
53335333
"singleton": 0,
53345334
"bounded": 0,
5335-
"defaultValue": "",
5335+
"defaultValue": "16",
53365336
"reportable": 1,
53375337
"minInterval": 1,
53385338
"maxInterval": 65534,
@@ -5348,7 +5348,7 @@
53485348
"storageOption": "External",
53495349
"singleton": 0,
53505350
"bounded": 0,
5351-
"defaultValue": "",
5351+
"defaultValue": "8",
53525352
"reportable": 1,
53535353
"minInterval": 1,
53545354
"maxInterval": 65534,
@@ -5428,7 +5428,7 @@
54285428
"storageOption": "RAM",
54295429
"singleton": 0,
54305430
"bounded": 0,
5431-
"defaultValue": "1",
5431+
"defaultValue": "3",
54325432
"reportable": 1,
54335433
"minInterval": 1,
54345434
"maxInterval": 65534,
@@ -7796,5 +7796,6 @@
77967796
"endpointId": 1,
77977797
"networkId": 0
77987798
}
7799-
]
7799+
],
7800+
"log": []
78007801
}

‎examples/lighting-app/silabs/data_model/lighting-thread-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -2435,7 +2435,7 @@ endpoint 1 {
24352435
callback attribute acceptedCommandList;
24362436
callback attribute eventList;
24372437
callback attribute attributeList;
2438-
ram attribute featureMap default = 0;
2438+
ram attribute featureMap default = 3;
24392439
ram attribute clusterRevision default = 5;
24402440
}
24412441

‎examples/lighting-app/silabs/data_model/lighting-thread-app.zap

+3-2
Original file line numberDiff line numberDiff line change
@@ -6673,7 +6673,7 @@
66736673
"storageOption": "RAM",
66746674
"singleton": 0,
66756675
"bounded": 0,
6676-
"defaultValue": "0",
6676+
"defaultValue": "3",
66776677
"reportable": 1,
66786678
"minInterval": 1,
66796679
"maxInterval": 65534,
@@ -9546,5 +9546,6 @@
95469546
"endpointId": 1,
95479547
"networkId": 0
95489548
}
9549-
]
9549+
],
9550+
"log": []
95509551
}

‎examples/lighting-app/silabs/data_model/lighting-wifi-app.matter

+3-3
Original file line numberDiff line numberDiff line change
@@ -2269,13 +2269,13 @@ endpoint 1 {
22692269
ram attribute sceneValid default = 0x00;
22702270
ram attribute nameSupport default = 0x80;
22712271
ram attribute lastConfiguredBy;
2272-
ram attribute sceneTableSize;
2273-
callback attribute remainingCapacity;
2272+
ram attribute sceneTableSize default = 16;
2273+
callback attribute remainingCapacity default = 8;
22742274
callback attribute generatedCommandList;
22752275
callback attribute acceptedCommandList;
22762276
callback attribute eventList;
22772277
callback attribute attributeList;
2278-
ram attribute featureMap default = 1;
2278+
ram attribute featureMap default = 3;
22792279
ram attribute clusterRevision default = 5;
22802280
}
22812281

‎examples/lighting-app/silabs/data_model/lighting-wifi-app.zap

+5-4
Original file line numberDiff line numberDiff line change
@@ -6299,7 +6299,7 @@
62996299
"storageOption": "RAM",
63006300
"singleton": 0,
63016301
"bounded": 0,
6302-
"defaultValue": "",
6302+
"defaultValue": "16",
63036303
"reportable": 1,
63046304
"minInterval": 1,
63056305
"maxInterval": 65534,
@@ -6315,7 +6315,7 @@
63156315
"storageOption": "External",
63166316
"singleton": 0,
63176317
"bounded": 0,
6318-
"defaultValue": "",
6318+
"defaultValue": "8",
63196319
"reportable": 1,
63206320
"minInterval": 1,
63216321
"maxInterval": 65534,
@@ -6395,7 +6395,7 @@
63956395
"storageOption": "RAM",
63966396
"singleton": 0,
63976397
"bounded": 0,
6398-
"defaultValue": "1",
6398+
"defaultValue": "3",
63996399
"reportable": 1,
64006400
"minInterval": 1,
64016401
"maxInterval": 65534,
@@ -9631,5 +9631,6 @@
96319631
"endpointId": 1,
96329632
"networkId": 0
96339633
}
9634-
]
9634+
],
9635+
"log": []
96359636
}

0 commit comments

Comments
 (0)