Skip to content

Commit 5b1d9f2

Browse files
lpbeliveau-silabslpbeliveau-silabs
authored
[Scenes] LastConfiguredBy Removal (#38003)
* Updated xml to spec with Alchemy * zap_regen_all on with new xml * Removed the LastConfiguredBy attribute in the cpp code * Updated the zap files for the LastConfiguredBy removal * Update of the Yaml tests, removed tests on LastConfiguredBy * Update the unit tests * Revert the renumbering of scenes management attributes
1 parent cbf664f commit 5b1d9f2

File tree

77 files changed

+531
-1501
lines changed

Some content is hidden

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

77 files changed

+531
-1501
lines changed

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

+8-11
Original file line numberDiff line numberDiff line change
@@ -3904,7 +3904,7 @@ provisional cluster ScenesManagement = 98 {
39043904
optional int64s valueSigned64 = 8;
39053905
}
39063906

3907-
struct ExtensionFieldSet {
3907+
struct ExtensionFieldSetStruct {
39083908
cluster_id clusterID = 0;
39093909
AttributeValuePairStruct attributeValueList[] = 1;
39103910
}
@@ -3918,7 +3918,6 @@ provisional cluster ScenesManagement = 98 {
39183918
fabric_idx fabricIndex = 254;
39193919
}
39203920

3921-
readonly attribute optional nullable node_id lastConfiguredBy = 0;
39223921
readonly attribute int16u sceneTableSize = 1;
39233922
readonly attribute SceneInfoStruct fabricSceneInfo[] = 2;
39243923
readonly attribute command_id generatedCommandList[] = 65528;
@@ -3932,8 +3931,8 @@ provisional cluster ScenesManagement = 98 {
39323931
group_id groupID = 0;
39333932
int8u sceneID = 1;
39343933
int32u transitionTime = 2;
3935-
char_string sceneName = 3;
3936-
ExtensionFieldSet extensionFieldSets[] = 4;
3934+
char_string<16> sceneName = 3;
3935+
ExtensionFieldSetStruct extensionFieldSetStructs[] = 4;
39373936
}
39383937

39393938
response struct AddSceneResponse = 0 {
@@ -3952,8 +3951,8 @@ provisional cluster ScenesManagement = 98 {
39523951
group_id groupID = 1;
39533952
int8u sceneID = 2;
39543953
optional int32u transitionTime = 3;
3955-
optional char_string sceneName = 4;
3956-
optional ExtensionFieldSet extensionFieldSets[] = 5;
3954+
optional char_string<16> sceneName = 4;
3955+
optional ExtensionFieldSetStruct extensionFieldSetStructs[] = 5;
39573956
}
39583957

39593958
request struct RemoveSceneRequest {
@@ -4018,7 +4017,7 @@ provisional cluster ScenesManagement = 98 {
40184017
int8u sceneIdentifierFrom = 2;
40194018
}
40204019

4021-
/** Add a scene to the scene table. Extension field sets are supported, and are inputed as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeID": VALUE, "Value*": VALUE}]}' */
4020+
/** Add a scene to the scene table. Extension field sets are input as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeID": VALUE, "Value*": VALUE}]}'. */
40224021
fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
40234022
/** Retrieves the requested scene entry from its Scene table. */
40244023
fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
@@ -4030,9 +4029,9 @@ provisional cluster ScenesManagement = 98 {
40304029
fabric command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
40314030
/** Set the attributes and corresponding state for each other cluster implemented on the endpoint accordingly to the resquested scene entry in the Scene Table */
40324031
fabric command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
4033-
/** Get an unused scene identifier when no commissioning tool is in the network, or for a commissioning tool to get the used scene identifiers within a certain group */
4032+
/** This command can be used to get the used scene identifiers within a certain group, for the endpoint that implements this cluster. */
40344033
fabric command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
4035-
/** Allows a client to efficiently copy scenes from one group/scene identifier pair to another group/scene identifier pair. */
4034+
/** This command allows a client to efficiently copy scenes from one group/scene identifier pair to another group/scene identifier pair. */
40364035
fabric command access(invoke: manage) CopyScene(CopySceneRequest): CopySceneResponse = 64;
40374036
}
40384037

@@ -8813,7 +8812,6 @@ endpoint 1 {
88138812
}
88148813

88158814
server cluster ScenesManagement {
8816-
ram attribute lastConfiguredBy;
88178815
ram attribute sceneTableSize default = 16;
88188816
callback attribute fabricSceneInfo;
88198817
callback attribute generatedCommandList;
@@ -9851,7 +9849,6 @@ endpoint 2 {
98519849
}
98529850

98539851
server cluster ScenesManagement {
9854-
ram attribute lastConfiguredBy;
98559852
ram attribute sceneTableSize default = 16;
98569853
callback attribute fabricSceneInfo;
98579854
callback attribute generatedCommandList;

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

-32
Original file line numberDiff line numberDiff line change
@@ -11016,22 +11016,6 @@
1101611016
}
1101711017
],
1101811018
"attributes": [
11019-
{
11020-
"name": "LastConfiguredBy",
11021-
"code": 0,
11022-
"mfgCode": null,
11023-
"side": "server",
11024-
"type": "node_id",
11025-
"included": 1,
11026-
"storageOption": "RAM",
11027-
"singleton": 0,
11028-
"bounded": 0,
11029-
"defaultValue": "",
11030-
"reportable": 1,
11031-
"minInterval": 1,
11032-
"maxInterval": 65534,
11033-
"reportableChange": 0
11034-
},
1103511019
{
1103611020
"name": "SceneTableSize",
1103711021
"code": 1,
@@ -24199,22 +24183,6 @@
2419924183
}
2420024184
],
2420124185
"attributes": [
24202-
{
24203-
"name": "LastConfiguredBy",
24204-
"code": 0,
24205-
"mfgCode": null,
24206-
"side": "server",
24207-
"type": "node_id",
24208-
"included": 1,
24209-
"storageOption": "RAM",
24210-
"singleton": 0,
24211-
"bounded": 0,
24212-
"defaultValue": "",
24213-
"reportable": 1,
24214-
"minInterval": 1,
24215-
"maxInterval": 65534,
24216-
"reportableChange": 0
24217-
},
2421824186
{
2421924187
"name": "SceneTableSize",
2422024188
"code": 1,

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

+8-11
Original file line numberDiff line numberDiff line change
@@ -2773,7 +2773,7 @@ provisional cluster ScenesManagement = 98 {
27732773
optional int64s valueSigned64 = 8;
27742774
}
27752775

2776-
struct ExtensionFieldSet {
2776+
struct ExtensionFieldSetStruct {
27772777
cluster_id clusterID = 0;
27782778
AttributeValuePairStruct attributeValueList[] = 1;
27792779
}
@@ -2787,7 +2787,6 @@ provisional cluster ScenesManagement = 98 {
27872787
fabric_idx fabricIndex = 254;
27882788
}
27892789

2790-
readonly attribute optional nullable node_id lastConfiguredBy = 0;
27912790
readonly attribute int16u sceneTableSize = 1;
27922791
readonly attribute SceneInfoStruct fabricSceneInfo[] = 2;
27932792
readonly attribute command_id generatedCommandList[] = 65528;
@@ -2801,8 +2800,8 @@ provisional cluster ScenesManagement = 98 {
28012800
group_id groupID = 0;
28022801
int8u sceneID = 1;
28032802
int32u transitionTime = 2;
2804-
char_string sceneName = 3;
2805-
ExtensionFieldSet extensionFieldSets[] = 4;
2803+
char_string<16> sceneName = 3;
2804+
ExtensionFieldSetStruct extensionFieldSetStructs[] = 4;
28062805
}
28072806

28082807
response struct AddSceneResponse = 0 {
@@ -2821,8 +2820,8 @@ provisional cluster ScenesManagement = 98 {
28212820
group_id groupID = 1;
28222821
int8u sceneID = 2;
28232822
optional int32u transitionTime = 3;
2824-
optional char_string sceneName = 4;
2825-
optional ExtensionFieldSet extensionFieldSets[] = 5;
2823+
optional char_string<16> sceneName = 4;
2824+
optional ExtensionFieldSetStruct extensionFieldSetStructs[] = 5;
28262825
}
28272826

28282827
request struct RemoveSceneRequest {
@@ -2887,7 +2886,7 @@ provisional cluster ScenesManagement = 98 {
28872886
int8u sceneIdentifierFrom = 2;
28882887
}
28892888

2890-
/** Add a scene to the scene table. Extension field sets are supported, and are inputed as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeID": VALUE, "Value*": VALUE}]}' */
2889+
/** Add a scene to the scene table. Extension field sets are input as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeID": VALUE, "Value*": VALUE}]}'. */
28912890
fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
28922891
/** Retrieves the requested scene entry from its Scene table. */
28932892
fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
@@ -2899,9 +2898,9 @@ provisional cluster ScenesManagement = 98 {
28992898
fabric command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
29002899
/** Set the attributes and corresponding state for each other cluster implemented on the endpoint accordingly to the resquested scene entry in the Scene Table */
29012900
fabric command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
2902-
/** Get an unused scene identifier when no commissioning tool is in the network, or for a commissioning tool to get the used scene identifiers within a certain group */
2901+
/** This command can be used to get the used scene identifiers within a certain group, for the endpoint that implements this cluster. */
29032902
fabric command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
2904-
/** Allows a client to efficiently copy scenes from one group/scene identifier pair to another group/scene identifier pair. */
2903+
/** This command allows a client to efficiently copy scenes from one group/scene identifier pair to another group/scene identifier pair. */
29052904
fabric command access(invoke: manage) CopyScene(CopySceneRequest): CopySceneResponse = 64;
29062905
}
29072906

@@ -6773,7 +6772,6 @@ endpoint 1 {
67736772
}
67746773

67756774
server cluster ScenesManagement {
6776-
ram attribute lastConfiguredBy;
67776775
ram attribute sceneTableSize default = 16;
67786776
callback attribute fabricSceneInfo;
67796777
callback attribute generatedCommandList;
@@ -7258,7 +7256,6 @@ endpoint 2 {
72587256
}
72597257

72607258
server cluster ScenesManagement {
7261-
ram attribute lastConfiguredBy;
72627259
ram attribute sceneTableSize default = 16;
72637260
callback attribute fabricSceneInfo;
72647261
callback attribute generatedCommandList;

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

-32
Original file line numberDiff line numberDiff line change
@@ -5802,22 +5802,6 @@
58025802
}
58035803
],
58045804
"attributes": [
5805-
{
5806-
"name": "LastConfiguredBy",
5807-
"code": 0,
5808-
"mfgCode": null,
5809-
"side": "server",
5810-
"type": "node_id",
5811-
"included": 1,
5812-
"storageOption": "RAM",
5813-
"singleton": 0,
5814-
"bounded": 0,
5815-
"defaultValue": "",
5816-
"reportable": 1,
5817-
"minInterval": 1,
5818-
"maxInterval": 65534,
5819-
"reportableChange": 0
5820-
},
58215805
{
58225806
"name": "SceneTableSize",
58235807
"code": 1,
@@ -11231,22 +11215,6 @@
1123111215
}
1123211216
],
1123311217
"attributes": [
11234-
{
11235-
"name": "LastConfiguredBy",
11236-
"code": 0,
11237-
"mfgCode": null,
11238-
"side": "server",
11239-
"type": "node_id",
11240-
"included": 1,
11241-
"storageOption": "RAM",
11242-
"singleton": 0,
11243-
"bounded": 0,
11244-
"defaultValue": "",
11245-
"reportable": 1,
11246-
"minInterval": 1,
11247-
"maxInterval": 65534,
11248-
"reportableChange": 0
11249-
},
1125011218
{
1125111219
"name": "SceneTableSize",
1125211220
"code": 1,

‎examples/chef/devices/rootnode_dimmablepluginunit_f8a9a0b9d4.matter

+8-9
Original file line numberDiff line numberDiff line change
@@ -1802,7 +1802,7 @@ provisional cluster ScenesManagement = 98 {
18021802
optional int64s valueSigned64 = 8;
18031803
}
18041804

1805-
struct ExtensionFieldSet {
1805+
struct ExtensionFieldSetStruct {
18061806
cluster_id clusterID = 0;
18071807
AttributeValuePairStruct attributeValueList[] = 1;
18081808
}
@@ -1816,7 +1816,6 @@ provisional cluster ScenesManagement = 98 {
18161816
fabric_idx fabricIndex = 254;
18171817
}
18181818

1819-
readonly attribute optional nullable node_id lastConfiguredBy = 0;
18201819
readonly attribute int16u sceneTableSize = 1;
18211820
readonly attribute SceneInfoStruct fabricSceneInfo[] = 2;
18221821
readonly attribute command_id generatedCommandList[] = 65528;
@@ -1830,8 +1829,8 @@ provisional cluster ScenesManagement = 98 {
18301829
group_id groupID = 0;
18311830
int8u sceneID = 1;
18321831
int32u transitionTime = 2;
1833-
char_string sceneName = 3;
1834-
ExtensionFieldSet extensionFieldSets[] = 4;
1832+
char_string<16> sceneName = 3;
1833+
ExtensionFieldSetStruct extensionFieldSetStructs[] = 4;
18351834
}
18361835

18371836
response struct AddSceneResponse = 0 {
@@ -1850,8 +1849,8 @@ provisional cluster ScenesManagement = 98 {
18501849
group_id groupID = 1;
18511850
int8u sceneID = 2;
18521851
optional int32u transitionTime = 3;
1853-
optional char_string sceneName = 4;
1854-
optional ExtensionFieldSet extensionFieldSets[] = 5;
1852+
optional char_string<16> sceneName = 4;
1853+
optional ExtensionFieldSetStruct extensionFieldSetStructs[] = 5;
18551854
}
18561855

18571856
request struct RemoveSceneRequest {
@@ -1916,7 +1915,7 @@ provisional cluster ScenesManagement = 98 {
19161915
int8u sceneIdentifierFrom = 2;
19171916
}
19181917

1919-
/** Add a scene to the scene table. Extension field sets are supported, and are inputed as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeID": VALUE, "Value*": VALUE}]}' */
1918+
/** Add a scene to the scene table. Extension field sets are input as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeID": VALUE, "Value*": VALUE}]}'. */
19201919
fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
19211920
/** Retrieves the requested scene entry from its Scene table. */
19221921
fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
@@ -1928,9 +1927,9 @@ provisional cluster ScenesManagement = 98 {
19281927
fabric command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
19291928
/** Set the attributes and corresponding state for each other cluster implemented on the endpoint accordingly to the resquested scene entry in the Scene Table */
19301929
fabric command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
1931-
/** Get an unused scene identifier when no commissioning tool is in the network, or for a commissioning tool to get the used scene identifiers within a certain group */
1930+
/** This command can be used to get the used scene identifiers within a certain group, for the endpoint that implements this cluster. */
19321931
fabric command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
1933-
/** Allows a client to efficiently copy scenes from one group/scene identifier pair to another group/scene identifier pair. */
1932+
/** This command allows a client to efficiently copy scenes from one group/scene identifier pair to another group/scene identifier pair. */
19341933
fabric command access(invoke: manage) CopyScene(CopySceneRequest): CopySceneResponse = 64;
19351934
}
19361935

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

+8-9
Original file line numberDiff line numberDiff line change
@@ -2332,7 +2332,7 @@ provisional cluster ScenesManagement = 98 {
23322332
optional int64s valueSigned64 = 8;
23332333
}
23342334

2335-
struct ExtensionFieldSet {
2335+
struct ExtensionFieldSetStruct {
23362336
cluster_id clusterID = 0;
23372337
AttributeValuePairStruct attributeValueList[] = 1;
23382338
}
@@ -2346,7 +2346,6 @@ provisional cluster ScenesManagement = 98 {
23462346
fabric_idx fabricIndex = 254;
23472347
}
23482348

2349-
readonly attribute optional nullable node_id lastConfiguredBy = 0;
23502349
readonly attribute int16u sceneTableSize = 1;
23512350
readonly attribute SceneInfoStruct fabricSceneInfo[] = 2;
23522351
readonly attribute command_id generatedCommandList[] = 65528;
@@ -2360,8 +2359,8 @@ provisional cluster ScenesManagement = 98 {
23602359
group_id groupID = 0;
23612360
int8u sceneID = 1;
23622361
int32u transitionTime = 2;
2363-
char_string sceneName = 3;
2364-
ExtensionFieldSet extensionFieldSets[] = 4;
2362+
char_string<16> sceneName = 3;
2363+
ExtensionFieldSetStruct extensionFieldSetStructs[] = 4;
23652364
}
23662365

23672366
response struct AddSceneResponse = 0 {
@@ -2380,8 +2379,8 @@ provisional cluster ScenesManagement = 98 {
23802379
group_id groupID = 1;
23812380
int8u sceneID = 2;
23822381
optional int32u transitionTime = 3;
2383-
optional char_string sceneName = 4;
2384-
optional ExtensionFieldSet extensionFieldSets[] = 5;
2382+
optional char_string<16> sceneName = 4;
2383+
optional ExtensionFieldSetStruct extensionFieldSetStructs[] = 5;
23852384
}
23862385

23872386
request struct RemoveSceneRequest {
@@ -2446,7 +2445,7 @@ provisional cluster ScenesManagement = 98 {
24462445
int8u sceneIdentifierFrom = 2;
24472446
}
24482447

2449-
/** Add a scene to the scene table. Extension field sets are supported, and are inputed as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeID": VALUE, "Value*": VALUE}]}' */
2448+
/** Add a scene to the scene table. Extension field sets are input as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeID": VALUE, "Value*": VALUE}]}'. */
24502449
fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
24512450
/** Retrieves the requested scene entry from its Scene table. */
24522451
fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
@@ -2458,9 +2457,9 @@ provisional cluster ScenesManagement = 98 {
24582457
fabric command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
24592458
/** Set the attributes and corresponding state for each other cluster implemented on the endpoint accordingly to the resquested scene entry in the Scene Table */
24602459
fabric command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
2461-
/** Get an unused scene identifier when no commissioning tool is in the network, or for a commissioning tool to get the used scene identifiers within a certain group */
2460+
/** This command can be used to get the used scene identifiers within a certain group, for the endpoint that implements this cluster. */
24622461
fabric command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
2463-
/** Allows a client to efficiently copy scenes from one group/scene identifier pair to another group/scene identifier pair. */
2462+
/** This command allows a client to efficiently copy scenes from one group/scene identifier pair to another group/scene identifier pair. */
24642463
fabric command access(invoke: manage) CopyScene(CopySceneRequest): CopySceneResponse = 64;
24652464
}
24662465

0 commit comments

Comments
 (0)