Skip to content

Commit a454ccd

Browse files
lpbeliveau-silabslpbeliveau-silabs
authored
Converted attributes wrongfully Identified as external or having callback in zap/matter files (project-chip#30619)
1 parent 0c9c547 commit a454ccd

File tree

4 files changed

+19
-23
lines changed

4 files changed

+19
-23
lines changed

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -4429,9 +4429,9 @@ endpoint 1 {
44294429
}
44304430

44314431
server cluster Scenes {
4432-
callback attribute nameSupport default = 0x80;
4433-
callback attribute lastConfiguredBy;
4434-
callback attribute sceneTableSize default = 16;
4432+
ram attribute nameSupport default = 0x80;
4433+
ram attribute lastConfiguredBy;
4434+
ram attribute sceneTableSize default = 16;
44354435
callback attribute fabricSceneInfo;
44364436
callback attribute generatedCommandList;
44374437
callback attribute acceptedCommandList;
@@ -4989,8 +4989,8 @@ endpoint 2 {
49894989
}
49904990

49914991
server cluster Scenes {
4992-
callback attribute nameSupport default = 0x80;
4993-
callback attribute sceneTableSize default = 16;
4992+
ram attribute nameSupport default = 0x80;
4993+
ram attribute sceneTableSize default = 16;
49944994
callback attribute fabricSceneInfo;
49954995
callback attribute generatedCommandList;
49964996
callback attribute acceptedCommandList;

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

+6-8
Original file line numberDiff line numberDiff line change
@@ -4672,7 +4672,7 @@
46724672
"side": "server",
46734673
"type": "NameSupportBitmap",
46744674
"included": 1,
4675-
"storageOption": "External",
4675+
"storageOption": "RAM",
46764676
"singleton": 0,
46774677
"bounded": 0,
46784678
"defaultValue": "0x80",
@@ -4688,7 +4688,7 @@
46884688
"side": "server",
46894689
"type": "node_id",
46904690
"included": 1,
4691-
"storageOption": "External",
4691+
"storageOption": "RAM",
46924692
"singleton": 0,
46934693
"bounded": 0,
46944694
"defaultValue": "",
@@ -4704,7 +4704,7 @@
47044704
"side": "server",
47054705
"type": "int16u",
47064706
"included": 1,
4707-
"storageOption": "External",
4707+
"storageOption": "RAM",
47084708
"singleton": 0,
47094709
"bounded": 0,
47104710
"defaultValue": "16",
@@ -10908,7 +10908,7 @@
1090810908
"side": "server",
1090910909
"type": "NameSupportBitmap",
1091010910
"included": 1,
10911-
"storageOption": "External",
10911+
"storageOption": "RAM",
1091210912
"singleton": 0,
1091310913
"bounded": 0,
1091410914
"defaultValue": "0x80",
@@ -10924,7 +10924,7 @@
1092410924
"side": "server",
1092510925
"type": "int16u",
1092610926
"included": 1,
10927-
"storageOption": "External",
10927+
"storageOption": "RAM",
1092810928
"singleton": 0,
1092910929
"bounded": 0,
1093010930
"defaultValue": "16",
@@ -11004,7 +11004,7 @@
1100411004
"side": "server",
1100511005
"type": "array",
1100611006
"included": 1,
11007-
"storageOption": "External",
11007+
"storageOption": "RAM",
1100811008
"singleton": 0,
1100911009
"bounded": 0,
1101011010
"defaultValue": "",
@@ -12254,5 +12254,3 @@
1225412254
}
1225512255
]
1225612256
}
12257-
12258-

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -2531,15 +2531,15 @@ endpoint 1 {
25312531
}
25322532

25332533
server cluster Scenes {
2534-
callback attribute nameSupport default = 0x80;
2535-
callback attribute lastConfiguredBy;
2536-
callback attribute sceneTableSize default = 16;
2534+
ram attribute nameSupport default = 0x80;
2535+
ram attribute lastConfiguredBy;
2536+
ram attribute sceneTableSize default = 16;
25372537
callback attribute fabricSceneInfo;
25382538
callback attribute generatedCommandList;
25392539
callback attribute acceptedCommandList;
25402540
callback attribute eventList;
25412541
callback attribute attributeList;
2542-
callback attribute featureMap default = 15;
2542+
ram attribute featureMap default = 15;
25432543
ram attribute clusterRevision default = 5;
25442544

25452545
handle command AddScene;

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

+4-6
Original file line numberDiff line numberDiff line change
@@ -4111,7 +4111,7 @@
41114111
"side": "server",
41124112
"type": "NameSupportBitmap",
41134113
"included": 1,
4114-
"storageOption": "External",
4114+
"storageOption": "RAM",
41154115
"singleton": 0,
41164116
"bounded": 0,
41174117
"defaultValue": "0x80",
@@ -4127,7 +4127,7 @@
41274127
"side": "server",
41284128
"type": "node_id",
41294129
"included": 1,
4130-
"storageOption": "External",
4130+
"storageOption": "RAM",
41314131
"singleton": 0,
41324132
"bounded": 0,
41334133
"defaultValue": "",
@@ -4143,7 +4143,7 @@
41434143
"side": "server",
41444144
"type": "int16u",
41454145
"included": 1,
4146-
"storageOption": "External",
4146+
"storageOption": "RAM",
41474147
"singleton": 0,
41484148
"bounded": 0,
41494149
"defaultValue": "16",
@@ -4239,7 +4239,7 @@
42394239
"side": "server",
42404240
"type": "bitmap32",
42414241
"included": 1,
4242-
"storageOption": "External",
4242+
"storageOption": "RAM",
42434243
"singleton": 0,
42444244
"bounded": 0,
42454245
"defaultValue": "15",
@@ -5902,5 +5902,3 @@
59025902
}
59035903
]
59045904
}
5905-
5906-

0 commit comments

Comments
 (0)