Skip to content

Commit 8b2d488

Browse files
lpbeliveau-silabslpbeliveau-silabs
committed
Revert the renumbering of scenes management attributes
1 parent 815e1bb commit 8b2d488

File tree

40 files changed

+111
-111
lines changed

40 files changed

+111
-111
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -3918,8 +3918,8 @@ provisional cluster ScenesManagement = 98 {
39183918
fabric_idx fabricIndex = 254;
39193919
}
39203920

3921-
readonly attribute int16u sceneTableSize = 0;
3922-
readonly attribute SceneInfoStruct fabricSceneInfo[] = 1;
3921+
readonly attribute int16u sceneTableSize = 1;
3922+
readonly attribute SceneInfoStruct fabricSceneInfo[] = 2;
39233923
readonly attribute command_id generatedCommandList[] = 65528;
39243924
readonly attribute command_id acceptedCommandList[] = 65529;
39253925
readonly attribute event_id eventList[] = 65530;
@@ -4017,7 +4017,7 @@ provisional cluster ScenesManagement = 98 {
40174017
int8u sceneIdentifierFrom = 2;
40184018
}
40194019

4020-
/** It is not mandatory for an extension field set to be included in the command for every cluster on that endpoint that has a defined extension field set. */
4020+
/** Add a scene to the scene table. Extension field sets are input as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeID": VALUE, "Value*": VALUE}]}'. */
40214021
fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
40224022
/** Retrieves the requested scene entry from its Scene table. */
40234023
fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -11018,7 +11018,7 @@
1101811018
"attributes": [
1101911019
{
1102011020
"name": "SceneTableSize",
11021-
"code": 0,
11021+
"code": 1,
1102211022
"mfgCode": null,
1102311023
"side": "server",
1102411024
"type": "int16u",
@@ -11034,7 +11034,7 @@
1103411034
},
1103511035
{
1103611036
"name": "FabricSceneInfo",
11037-
"code": 1,
11037+
"code": 2,
1103811038
"mfgCode": null,
1103911039
"side": "server",
1104011040
"type": "array",
@@ -23932,7 +23932,7 @@
2393223932
"attributes": [
2393323933
{
2393423934
"name": "SceneTableSize",
23935-
"code": 0,
23935+
"code": 1,
2393623936
"mfgCode": null,
2393723937
"side": "server",
2393823938
"type": "int16u",
@@ -23948,7 +23948,7 @@
2394823948
},
2394923949
{
2395023950
"name": "FabricSceneInfo",
23951-
"code": 1,
23951+
"code": 2,
2395223952
"mfgCode": null,
2395323953
"side": "server",
2395423954
"type": "array",

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -2787,8 +2787,8 @@ provisional cluster ScenesManagement = 98 {
27872787
fabric_idx fabricIndex = 254;
27882788
}
27892789

2790-
readonly attribute int16u sceneTableSize = 0;
2791-
readonly attribute SceneInfoStruct fabricSceneInfo[] = 1;
2790+
readonly attribute int16u sceneTableSize = 1;
2791+
readonly attribute SceneInfoStruct fabricSceneInfo[] = 2;
27922792
readonly attribute command_id generatedCommandList[] = 65528;
27932793
readonly attribute command_id acceptedCommandList[] = 65529;
27942794
readonly attribute event_id eventList[] = 65530;
@@ -2886,7 +2886,7 @@ provisional cluster ScenesManagement = 98 {
28862886
int8u sceneIdentifierFrom = 2;
28872887
}
28882888

2889-
/** It is not mandatory for an extension field set to be included in the command for every cluster on that endpoint that has a defined extension field set. */
2889+
/** Add a scene to the scene table. Extension field sets are input as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeID": VALUE, "Value*": VALUE}]}'. */
28902890
fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
28912891
/** Retrieves the requested scene entry from its Scene table. */
28922892
fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -5804,7 +5804,7 @@
58045804
"attributes": [
58055805
{
58065806
"name": "SceneTableSize",
5807-
"code": 0,
5807+
"code": 1,
58085808
"mfgCode": null,
58095809
"side": "server",
58105810
"type": "int16u",
@@ -5820,7 +5820,7 @@
58205820
},
58215821
{
58225822
"name": "FabricSceneInfo",
5823-
"code": 1,
5823+
"code": 2,
58245824
"mfgCode": null,
58255825
"side": "server",
58265826
"type": "array",
@@ -11217,7 +11217,7 @@
1121711217
"attributes": [
1121811218
{
1121911219
"name": "SceneTableSize",
11220-
"code": 0,
11220+
"code": 1,
1122111221
"mfgCode": null,
1122211222
"side": "server",
1122311223
"type": "int16u",
@@ -11233,7 +11233,7 @@
1123311233
},
1123411234
{
1123511235
"name": "FabricSceneInfo",
11236-
"code": 1,
11236+
"code": 2,
1123711237
"mfgCode": null,
1123811238
"side": "server",
1123911239
"type": "array",

‎examples/chef/devices/rootnode_dimmablepluginunit_f8a9a0b9d4.matter

+3-3
Original file line numberDiff line numberDiff line change
@@ -1816,8 +1816,8 @@ provisional cluster ScenesManagement = 98 {
18161816
fabric_idx fabricIndex = 254;
18171817
}
18181818

1819-
readonly attribute int16u sceneTableSize = 0;
1820-
readonly attribute SceneInfoStruct fabricSceneInfo[] = 1;
1819+
readonly attribute int16u sceneTableSize = 1;
1820+
readonly attribute SceneInfoStruct fabricSceneInfo[] = 2;
18211821
readonly attribute command_id generatedCommandList[] = 65528;
18221822
readonly attribute command_id acceptedCommandList[] = 65529;
18231823
readonly attribute event_id eventList[] = 65530;
@@ -1915,7 +1915,7 @@ provisional cluster ScenesManagement = 98 {
19151915
int8u sceneIdentifierFrom = 2;
19161916
}
19171917

1918-
/** It is not mandatory for an extension field set to be included in the command for every cluster on that endpoint that has a defined extension field set. */
1918+
/** Add a scene to the scene table. Extension field sets are input as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeID": VALUE, "Value*": VALUE}]}'. */
19191919
fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
19201920
/** Retrieves the requested scene entry from its Scene table. */
19211921
fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;

‎examples/chef/devices/rootnode_dimmablepluginunit_f8a9a0b9d4.zap

+2-2
Original file line numberDiff line numberDiff line change
@@ -3410,7 +3410,7 @@
34103410
"attributes": [
34113411
{
34123412
"name": "SceneTableSize",
3413-
"code": 0,
3413+
"code": 1,
34143414
"mfgCode": null,
34153415
"side": "server",
34163416
"type": "int16u",
@@ -3426,7 +3426,7 @@
34263426
},
34273427
{
34283428
"name": "FabricSceneInfo",
3429-
"code": 1,
3429+
"code": 2,
34303430
"mfgCode": null,
34313431
"side": "server",
34323432
"type": "array",

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -2346,8 +2346,8 @@ provisional cluster ScenesManagement = 98 {
23462346
fabric_idx fabricIndex = 254;
23472347
}
23482348

2349-
readonly attribute int16u sceneTableSize = 0;
2350-
readonly attribute SceneInfoStruct fabricSceneInfo[] = 1;
2349+
readonly attribute int16u sceneTableSize = 1;
2350+
readonly attribute SceneInfoStruct fabricSceneInfo[] = 2;
23512351
readonly attribute command_id generatedCommandList[] = 65528;
23522352
readonly attribute command_id acceptedCommandList[] = 65529;
23532353
readonly attribute event_id eventList[] = 65530;
@@ -2445,7 +2445,7 @@ provisional cluster ScenesManagement = 98 {
24452445
int8u sceneIdentifierFrom = 2;
24462446
}
24472447

2448-
/** It is not mandatory for an extension field set to be included in the command for every cluster on that endpoint that has a defined extension field set. */
2448+
/** Add a scene to the scene table. Extension field sets are input as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeID": VALUE, "Value*": VALUE}]}'. */
24492449
fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
24502450
/** Retrieves the requested scene entry from its Scene table. */
24512451
fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -2346,8 +2346,8 @@ provisional cluster ScenesManagement = 98 {
23462346
fabric_idx fabricIndex = 254;
23472347
}
23482348

2349-
readonly attribute int16u sceneTableSize = 0;
2350-
readonly attribute SceneInfoStruct fabricSceneInfo[] = 1;
2349+
readonly attribute int16u sceneTableSize = 1;
2350+
readonly attribute SceneInfoStruct fabricSceneInfo[] = 2;
23512351
readonly attribute command_id generatedCommandList[] = 65528;
23522352
readonly attribute command_id acceptedCommandList[] = 65529;
23532353
readonly attribute event_id eventList[] = 65530;
@@ -2445,7 +2445,7 @@ provisional cluster ScenesManagement = 98 {
24452445
int8u sceneIdentifierFrom = 2;
24462446
}
24472447

2448-
/** It is not mandatory for an extension field set to be included in the command for every cluster on that endpoint that has a defined extension field set. */
2448+
/** Add a scene to the scene table. Extension field sets are input as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeID": VALUE, "Value*": VALUE}]}'. */
24492449
fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
24502450
/** Retrieves the requested scene entry from its Scene table. */
24512451
fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;

‎examples/light-switch-app/qpg/zap/switch.matter

+3-3
Original file line numberDiff line numberDiff line change
@@ -2463,8 +2463,8 @@ provisional cluster ScenesManagement = 98 {
24632463
fabric_idx fabricIndex = 254;
24642464
}
24652465

2466-
readonly attribute int16u sceneTableSize = 0;
2467-
readonly attribute SceneInfoStruct fabricSceneInfo[] = 1;
2466+
readonly attribute int16u sceneTableSize = 1;
2467+
readonly attribute SceneInfoStruct fabricSceneInfo[] = 2;
24682468
readonly attribute command_id generatedCommandList[] = 65528;
24692469
readonly attribute command_id acceptedCommandList[] = 65529;
24702470
readonly attribute event_id eventList[] = 65530;
@@ -2562,7 +2562,7 @@ provisional cluster ScenesManagement = 98 {
25622562
int8u sceneIdentifierFrom = 2;
25632563
}
25642564

2565-
/** It is not mandatory for an extension field set to be included in the command for every cluster on that endpoint that has a defined extension field set. */
2565+
/** Add a scene to the scene table. Extension field sets are input as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeID": VALUE, "Value*": VALUE}]}'. */
25662566
fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
25672567
/** Retrieves the requested scene entry from its Scene table. */
25682568
fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;

‎examples/lighting-app-data-mode-no-unique-id/lighting-common/lighting-app.matter

+3-3
Original file line numberDiff line numberDiff line change
@@ -2154,8 +2154,8 @@ provisional cluster ScenesManagement = 98 {
21542154
fabric_idx fabricIndex = 254;
21552155
}
21562156

2157-
readonly attribute int16u sceneTableSize = 0;
2158-
readonly attribute SceneInfoStruct fabricSceneInfo[] = 1;
2157+
readonly attribute int16u sceneTableSize = 1;
2158+
readonly attribute SceneInfoStruct fabricSceneInfo[] = 2;
21592159
readonly attribute command_id generatedCommandList[] = 65528;
21602160
readonly attribute command_id acceptedCommandList[] = 65529;
21612161
readonly attribute event_id eventList[] = 65530;
@@ -2253,7 +2253,7 @@ provisional cluster ScenesManagement = 98 {
22532253
int8u sceneIdentifierFrom = 2;
22542254
}
22552255

2256-
/** It is not mandatory for an extension field set to be included in the command for every cluster on that endpoint that has a defined extension field set. */
2256+
/** Add a scene to the scene table. Extension field sets are input as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeID": VALUE, "Value*": VALUE}]}'. */
22572257
fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
22582258
/** Retrieves the requested scene entry from its Scene table. */
22592259
fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;

‎examples/lighting-app-data-mode-no-unique-id/lighting-common/lighting-app.zap

+2-2
Original file line numberDiff line numberDiff line change
@@ -4967,7 +4967,7 @@
49674967
"attributes": [
49684968
{
49694969
"name": "SceneTableSize",
4970-
"code": 0,
4970+
"code": 1,
49714971
"mfgCode": null,
49724972
"side": "server",
49734973
"type": "int16u",
@@ -4983,7 +4983,7 @@
49834983
},
49844984
{
49854985
"name": "FabricSceneInfo",
4986-
"code": 1,
4986+
"code": 2,
49874987
"mfgCode": null,
49884988
"side": "server",
49894989
"type": "array",

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1858,8 +1858,8 @@ provisional cluster ScenesManagement = 98 {
18581858
fabric_idx fabricIndex = 254;
18591859
}
18601860

1861-
readonly attribute int16u sceneTableSize = 0;
1862-
readonly attribute SceneInfoStruct fabricSceneInfo[] = 1;
1861+
readonly attribute int16u sceneTableSize = 1;
1862+
readonly attribute SceneInfoStruct fabricSceneInfo[] = 2;
18631863
readonly attribute command_id generatedCommandList[] = 65528;
18641864
readonly attribute command_id acceptedCommandList[] = 65529;
18651865
readonly attribute event_id eventList[] = 65530;
@@ -1957,7 +1957,7 @@ provisional cluster ScenesManagement = 98 {
19571957
int8u sceneIdentifierFrom = 2;
19581958
}
19591959

1960-
/** It is not mandatory for an extension field set to be included in the command for every cluster on that endpoint that has a defined extension field set. */
1960+
/** Add a scene to the scene table. Extension field sets are input as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeID": VALUE, "Value*": VALUE}]}'. */
19611961
fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
19621962
/** Retrieves the requested scene entry from its Scene table. */
19631963
fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -4326,7 +4326,7 @@
43264326
"attributes": [
43274327
{
43284328
"name": "SceneTableSize",
4329-
"code": 0,
4329+
"code": 1,
43304330
"mfgCode": null,
43314331
"side": "server",
43324332
"type": "int16u",
@@ -4342,7 +4342,7 @@
43424342
},
43434343
{
43444344
"name": "FabricSceneInfo",
4345-
"code": 1,
4345+
"code": 2,
43464346
"mfgCode": null,
43474347
"side": "server",
43484348
"type": "array",

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -2149,8 +2149,8 @@ provisional cluster ScenesManagement = 98 {
21492149
fabric_idx fabricIndex = 254;
21502150
}
21512151

2152-
readonly attribute int16u sceneTableSize = 0;
2153-
readonly attribute SceneInfoStruct fabricSceneInfo[] = 1;
2152+
readonly attribute int16u sceneTableSize = 1;
2153+
readonly attribute SceneInfoStruct fabricSceneInfo[] = 2;
21542154
readonly attribute command_id generatedCommandList[] = 65528;
21552155
readonly attribute command_id acceptedCommandList[] = 65529;
21562156
readonly attribute event_id eventList[] = 65530;
@@ -2248,7 +2248,7 @@ provisional cluster ScenesManagement = 98 {
22482248
int8u sceneIdentifierFrom = 2;
22492249
}
22502250

2251-
/** It is not mandatory for an extension field set to be included in the command for every cluster on that endpoint that has a defined extension field set. */
2251+
/** Add a scene to the scene table. Extension field sets are input as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeID": VALUE, "Value*": VALUE}]}'. */
22522252
fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
22532253
/** Retrieves the requested scene entry from its Scene table. */
22542254
fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -4086,7 +4086,7 @@
40864086
"attributes": [
40874087
{
40884088
"name": "SceneTableSize",
4089-
"code": 0,
4089+
"code": 1,
40904090
"mfgCode": null,
40914091
"side": "server",
40924092
"type": "int16u",
@@ -4102,7 +4102,7 @@
41024102
},
41034103
{
41044104
"name": "FabricSceneInfo",
4105-
"code": 1,
4105+
"code": 2,
41064106
"mfgCode": null,
41074107
"side": "server",
41084108
"type": "array",

‎examples/placeholder/linux/apps/app1/config.matter

+3-3
Original file line numberDiff line numberDiff line change
@@ -3445,8 +3445,8 @@ provisional cluster ScenesManagement = 98 {
34453445
fabric_idx fabricIndex = 254;
34463446
}
34473447

3448-
readonly attribute int16u sceneTableSize = 0;
3449-
readonly attribute SceneInfoStruct fabricSceneInfo[] = 1;
3448+
readonly attribute int16u sceneTableSize = 1;
3449+
readonly attribute SceneInfoStruct fabricSceneInfo[] = 2;
34503450
readonly attribute command_id generatedCommandList[] = 65528;
34513451
readonly attribute command_id acceptedCommandList[] = 65529;
34523452
readonly attribute event_id eventList[] = 65530;
@@ -3544,7 +3544,7 @@ provisional cluster ScenesManagement = 98 {
35443544
int8u sceneIdentifierFrom = 2;
35453545
}
35463546

3547-
/** It is not mandatory for an extension field set to be included in the command for every cluster on that endpoint that has a defined extension field set. */
3547+
/** Add a scene to the scene table. Extension field sets are input as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeID": VALUE, "Value*": VALUE}]}'. */
35483548
fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
35493549
/** Retrieves the requested scene entry from its Scene table. */
35503550
fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;

‎examples/placeholder/linux/apps/app1/config.zap

+2-2
Original file line numberDiff line numberDiff line change
@@ -12673,7 +12673,7 @@
1267312673
"attributes": [
1267412674
{
1267512675
"name": "SceneTableSize",
12676-
"code": 0,
12676+
"code": 1,
1267712677
"mfgCode": null,
1267812678
"side": "server",
1267912679
"type": "int16u",
@@ -12689,7 +12689,7 @@
1268912689
},
1269012690
{
1269112691
"name": "FabricSceneInfo",
12692-
"code": 1,
12692+
"code": 2,
1269312693
"mfgCode": null,
1269412694
"side": "server",
1269512695
"type": "array",

‎examples/placeholder/linux/apps/app2/config.matter

+3-3
Original file line numberDiff line numberDiff line change
@@ -3402,8 +3402,8 @@ provisional cluster ScenesManagement = 98 {
34023402
fabric_idx fabricIndex = 254;
34033403
}
34043404

3405-
readonly attribute int16u sceneTableSize = 0;
3406-
readonly attribute SceneInfoStruct fabricSceneInfo[] = 1;
3405+
readonly attribute int16u sceneTableSize = 1;
3406+
readonly attribute SceneInfoStruct fabricSceneInfo[] = 2;
34073407
readonly attribute command_id generatedCommandList[] = 65528;
34083408
readonly attribute command_id acceptedCommandList[] = 65529;
34093409
readonly attribute event_id eventList[] = 65530;
@@ -3501,7 +3501,7 @@ provisional cluster ScenesManagement = 98 {
35013501
int8u sceneIdentifierFrom = 2;
35023502
}
35033503

3504-
/** It is not mandatory for an extension field set to be included in the command for every cluster on that endpoint that has a defined extension field set. */
3504+
/** Add a scene to the scene table. Extension field sets are input as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeID": VALUE, "Value*": VALUE}]}'. */
35053505
fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
35063506
/** Retrieves the requested scene entry from its Scene table. */
35073507
fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;

0 commit comments

Comments
 (0)