Skip to content

Commit 1567113

Browse files
bzbarsky-applepull[bot]
bzbarsky-apple
authored and
pull[bot]
committed
Mark the non-volatile Color Control attributes as NVM in some examples. (#26808)
Fixes #26793
1 parent c80979a commit 1567113

File tree

4 files changed

+56
-54
lines changed

4 files changed

+56
-54
lines changed

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

+11-11
Original file line numberDiff line numberDiff line change
@@ -5293,14 +5293,14 @@ endpoint 1 {
52935293
}
52945294

52955295
server cluster ColorControl {
5296-
ram attribute currentHue default = 0x00;
5297-
ram attribute currentSaturation default = 0x00;
5296+
persist attribute currentHue default = 0x00;
5297+
persist attribute currentSaturation default = 0x00;
52985298
ram attribute remainingTime default = 0x0000;
5299-
ram attribute currentX default = 0x616B;
5300-
ram attribute currentY default = 0x607D;
5299+
persist attribute currentX default = 0x616B;
5300+
persist attribute currentY default = 0x607D;
53015301
ram attribute driftCompensation;
53025302
ram attribute compensationText;
5303-
ram attribute colorTemperatureMireds default = 0x00FA;
5303+
persist attribute colorTemperatureMireds default = 0x00FA;
53045304
ram attribute colorMode default = 0x01;
53055305
ram attribute options default = 0x00;
53065306
ram attribute numberOfPrimaries;
@@ -5333,18 +5333,18 @@ endpoint 1 {
53335333
ram attribute colorPointBX;
53345334
ram attribute colorPointBY;
53355335
ram attribute colorPointBIntensity;
5336-
ram attribute enhancedCurrentHue default = 0x0000;
5337-
ram attribute enhancedColorMode default = 0x01;
5338-
ram attribute colorLoopActive default = 0x00;
5339-
ram attribute colorLoopDirection default = 0x00;
5340-
ram attribute colorLoopTime default = 0x0019;
5336+
persist attribute enhancedCurrentHue default = 0x0000;
5337+
persist attribute enhancedColorMode default = 0x01;
5338+
persist attribute colorLoopActive default = 0x00;
5339+
persist attribute colorLoopDirection default = 0x00;
5340+
persist attribute colorLoopTime default = 0x0019;
53415341
ram attribute colorLoopStartEnhancedHue default = 0x2300;
53425342
ram attribute colorLoopStoredEnhancedHue default = 0x0000;
53435343
ram attribute colorCapabilities default = 0x1F;
53445344
ram attribute colorTempPhysicalMinMireds default = 0x0000;
53455345
ram attribute colorTempPhysicalMaxMireds default = 0xFEFF;
53465346
ram attribute coupleColorTempToLevelMinMireds;
5347-
ram attribute startUpColorTemperatureMireds;
5347+
persist attribute startUpColorTemperatureMireds;
53485348
ram attribute featureMap default = 0x1F;
53495349
ram attribute clusterRevision default = 5;
53505350
}

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

+13-12
Original file line numberDiff line numberDiff line change
@@ -16083,7 +16083,7 @@
1608316083
"side": "server",
1608416084
"type": "int8u",
1608516085
"included": 1,
16086-
"storageOption": "RAM",
16086+
"storageOption": "NVM",
1608716087
"singleton": 0,
1608816088
"bounded": 0,
1608916089
"defaultValue": "0x00",
@@ -16099,7 +16099,7 @@
1609916099
"side": "server",
1610016100
"type": "int8u",
1610116101
"included": 1,
16102-
"storageOption": "RAM",
16102+
"storageOption": "NVM",
1610316103
"singleton": 0,
1610416104
"bounded": 0,
1610516105
"defaultValue": "0x00",
@@ -16131,7 +16131,7 @@
1613116131
"side": "server",
1613216132
"type": "int16u",
1613316133
"included": 1,
16134-
"storageOption": "RAM",
16134+
"storageOption": "NVM",
1613516135
"singleton": 0,
1613616136
"bounded": 0,
1613716137
"defaultValue": "0x616B",
@@ -16147,7 +16147,7 @@
1614716147
"side": "server",
1614816148
"type": "int16u",
1614916149
"included": 1,
16150-
"storageOption": "RAM",
16150+
"storageOption": "NVM",
1615116151
"singleton": 0,
1615216152
"bounded": 0,
1615316153
"defaultValue": "0x607D",
@@ -16195,7 +16195,7 @@
1619516195
"side": "server",
1619616196
"type": "int16u",
1619716197
"included": 1,
16198-
"storageOption": "RAM",
16198+
"storageOption": "NVM",
1619916199
"singleton": 0,
1620016200
"bounded": 0,
1620116201
"defaultValue": "0x00FA",
@@ -16723,7 +16723,7 @@
1672316723
"side": "server",
1672416724
"type": "int16u",
1672516725
"included": 1,
16726-
"storageOption": "RAM",
16726+
"storageOption": "NVM",
1672716727
"singleton": 0,
1672816728
"bounded": 0,
1672916729
"defaultValue": "0x0000",
@@ -16739,7 +16739,7 @@
1673916739
"side": "server",
1674016740
"type": "enum8",
1674116741
"included": 1,
16742-
"storageOption": "RAM",
16742+
"storageOption": "NVM",
1674316743
"singleton": 0,
1674416744
"bounded": 0,
1674516745
"defaultValue": "0x01",
@@ -16755,7 +16755,7 @@
1675516755
"side": "server",
1675616756
"type": "int8u",
1675716757
"included": 1,
16758-
"storageOption": "RAM",
16758+
"storageOption": "NVM",
1675916759
"singleton": 0,
1676016760
"bounded": 0,
1676116761
"defaultValue": "0x00",
@@ -16771,7 +16771,7 @@
1677116771
"side": "server",
1677216772
"type": "int8u",
1677316773
"included": 1,
16774-
"storageOption": "RAM",
16774+
"storageOption": "NVM",
1677516775
"singleton": 0,
1677616776
"bounded": 0,
1677716777
"defaultValue": "0x00",
@@ -16787,7 +16787,7 @@
1678716787
"side": "server",
1678816788
"type": "int16u",
1678916789
"included": 1,
16790-
"storageOption": "RAM",
16790+
"storageOption": "NVM",
1679116791
"singleton": 0,
1679216792
"bounded": 0,
1679316793
"defaultValue": "0x0019",
@@ -16899,7 +16899,7 @@
1689916899
"side": "server",
1690016900
"type": "int16u",
1690116901
"included": 1,
16902-
"storageOption": "RAM",
16902+
"storageOption": "NVM",
1690316903
"singleton": 0,
1690416904
"bounded": 0,
1690516905
"defaultValue": "",
@@ -25580,5 +25580,6 @@
2558025580
"endpointVersion": 1,
2558125581
"deviceIdentifier": 61442
2558225582
}
25583-
]
25583+
],
25584+
"log": []
2558425585
}

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

+12-12
Original file line numberDiff line numberDiff line change
@@ -2285,27 +2285,27 @@ endpoint 1 {
22852285
}
22862286

22872287
server cluster ColorControl {
2288-
ram attribute currentHue default = 0x00;
2289-
ram attribute currentSaturation default = 0x00;
2288+
persist attribute currentHue default = 0x00;
2289+
persist attribute currentSaturation default = 0x00;
22902290
ram attribute remainingTime default = 0x0000;
2291-
ram attribute currentX default = 0x616B;
2292-
ram attribute currentY default = 0x607D;
2293-
ram attribute colorTemperatureMireds default = 0x00FA;
2294-
ram attribute colorMode default = 0x01;
2291+
persist attribute currentX default = 0x616B;
2292+
persist attribute currentY default = 0x607D;
2293+
persist attribute colorTemperatureMireds default = 0x00FA;
2294+
persist attribute colorMode default = 0x01;
22952295
ram attribute options default = 0x00;
22962296
ram attribute numberOfPrimaries;
2297-
ram attribute enhancedCurrentHue default = 0x0000;
2298-
ram attribute enhancedColorMode default = 0x01;
2299-
ram attribute colorLoopActive default = 0x00;
2300-
ram attribute colorLoopDirection default = 0x00;
2301-
ram attribute colorLoopTime default = 0x0019;
2297+
persist attribute enhancedCurrentHue default = 0x0000;
2298+
persist attribute enhancedColorMode default = 0x01;
2299+
persist attribute colorLoopActive default = 0x00;
2300+
persist attribute colorLoopDirection default = 0x00;
2301+
persist attribute colorLoopTime default = 0x0019;
23022302
ram attribute colorLoopStartEnhancedHue default = 0x2300;
23032303
ram attribute colorLoopStoredEnhancedHue default = 0x0000;
23042304
ram attribute colorCapabilities default = 0x1F;
23052305
ram attribute colorTempPhysicalMinMireds default = 0x0000;
23062306
ram attribute colorTempPhysicalMaxMireds default = 0xFEFF;
23072307
ram attribute coupleColorTempToLevelMinMireds;
2308-
ram attribute startUpColorTemperatureMireds;
2308+
persist attribute startUpColorTemperatureMireds;
23092309
ram attribute featureMap default = 0x1F;
23102310
ram attribute clusterRevision default = 5;
23112311
}

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

+20-19
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.json",
2228
"type": "zcl-properties",
2329
"category": "matter",
2430
"version": 1,
2531
"description": "Matter SDK ZCL data"
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": [
@@ -7296,7 +7296,7 @@
72967296
"side": "server",
72977297
"type": "int8u",
72987298
"included": 1,
7299-
"storageOption": "RAM",
7299+
"storageOption": "NVM",
73007300
"singleton": 0,
73017301
"bounded": 0,
73027302
"defaultValue": "0x00",
@@ -7312,7 +7312,7 @@
73127312
"side": "server",
73137313
"type": "int8u",
73147314
"included": 1,
7315-
"storageOption": "RAM",
7315+
"storageOption": "NVM",
73167316
"singleton": 0,
73177317
"bounded": 0,
73187318
"defaultValue": "0x00",
@@ -7344,7 +7344,7 @@
73447344
"side": "server",
73457345
"type": "int16u",
73467346
"included": 1,
7347-
"storageOption": "RAM",
7347+
"storageOption": "NVM",
73487348
"singleton": 0,
73497349
"bounded": 0,
73507350
"defaultValue": "0x616B",
@@ -7360,7 +7360,7 @@
73607360
"side": "server",
73617361
"type": "int16u",
73627362
"included": 1,
7363-
"storageOption": "RAM",
7363+
"storageOption": "NVM",
73647364
"singleton": 0,
73657365
"bounded": 0,
73667366
"defaultValue": "0x607D",
@@ -7408,7 +7408,7 @@
74087408
"side": "server",
74097409
"type": "int16u",
74107410
"included": 1,
7411-
"storageOption": "RAM",
7411+
"storageOption": "NVM",
74127412
"singleton": 0,
74137413
"bounded": 0,
74147414
"defaultValue": "0x00FA",
@@ -7424,7 +7424,7 @@
74247424
"side": "server",
74257425
"type": "enum8",
74267426
"included": 1,
7427-
"storageOption": "RAM",
7427+
"storageOption": "NVM",
74287428
"singleton": 0,
74297429
"bounded": 0,
74307430
"defaultValue": "0x01",
@@ -7936,7 +7936,7 @@
79367936
"side": "server",
79377937
"type": "int16u",
79387938
"included": 1,
7939-
"storageOption": "RAM",
7939+
"storageOption": "NVM",
79407940
"singleton": 0,
79417941
"bounded": 0,
79427942
"defaultValue": "0x0000",
@@ -7952,7 +7952,7 @@
79527952
"side": "server",
79537953
"type": "enum8",
79547954
"included": 1,
7955-
"storageOption": "RAM",
7955+
"storageOption": "NVM",
79567956
"singleton": 0,
79577957
"bounded": 0,
79587958
"defaultValue": "0x01",
@@ -7968,7 +7968,7 @@
79687968
"side": "server",
79697969
"type": "int8u",
79707970
"included": 1,
7971-
"storageOption": "RAM",
7971+
"storageOption": "NVM",
79727972
"singleton": 0,
79737973
"bounded": 0,
79747974
"defaultValue": "0x00",
@@ -7984,7 +7984,7 @@
79847984
"side": "server",
79857985
"type": "int8u",
79867986
"included": 1,
7987-
"storageOption": "RAM",
7987+
"storageOption": "NVM",
79887988
"singleton": 0,
79897989
"bounded": 0,
79907990
"defaultValue": "0x00",
@@ -8000,7 +8000,7 @@
80008000
"side": "server",
80018001
"type": "int16u",
80028002
"included": 1,
8003-
"storageOption": "RAM",
8003+
"storageOption": "NVM",
80048004
"singleton": 0,
80058005
"bounded": 0,
80068006
"defaultValue": "0x0019",
@@ -8112,7 +8112,7 @@
81128112
"side": "server",
81138113
"type": "int16u",
81148114
"included": 1,
8115-
"storageOption": "RAM",
8115+
"storageOption": "NVM",
81168116
"singleton": 0,
81178117
"bounded": 0,
81188118
"defaultValue": "",
@@ -8341,5 +8341,6 @@
83418341
"endpointVersion": 1,
83428342
"deviceIdentifier": 257
83438343
}
8344-
]
8344+
],
8345+
"log": []
83458346
}

0 commit comments

Comments
 (0)