Skip to content

Commit

Permalink
Mark the non-volatile Color Control attributes as NVM in some example…
Browse files Browse the repository at this point in the history
…s. (#26808)

Fixes #26793
  • Loading branch information
bzbarsky-apple authored and pull[bot] committed Jul 22, 2023
1 parent c80979a commit 1567113
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 54 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5293,14 +5293,14 @@ endpoint 1 {
}

server cluster ColorControl {
ram attribute currentHue default = 0x00;
ram attribute currentSaturation default = 0x00;
persist attribute currentHue default = 0x00;
persist attribute currentSaturation default = 0x00;
ram attribute remainingTime default = 0x0000;
ram attribute currentX default = 0x616B;
ram attribute currentY default = 0x607D;
persist attribute currentX default = 0x616B;
persist attribute currentY default = 0x607D;
ram attribute driftCompensation;
ram attribute compensationText;
ram attribute colorTemperatureMireds default = 0x00FA;
persist attribute colorTemperatureMireds default = 0x00FA;
ram attribute colorMode default = 0x01;
ram attribute options default = 0x00;
ram attribute numberOfPrimaries;
Expand Down Expand Up @@ -5333,18 +5333,18 @@ endpoint 1 {
ram attribute colorPointBX;
ram attribute colorPointBY;
ram attribute colorPointBIntensity;
ram attribute enhancedCurrentHue default = 0x0000;
ram attribute enhancedColorMode default = 0x01;
ram attribute colorLoopActive default = 0x00;
ram attribute colorLoopDirection default = 0x00;
ram attribute colorLoopTime default = 0x0019;
persist attribute enhancedCurrentHue default = 0x0000;
persist attribute enhancedColorMode default = 0x01;
persist attribute colorLoopActive default = 0x00;
persist attribute colorLoopDirection default = 0x00;
persist attribute colorLoopTime default = 0x0019;
ram attribute colorLoopStartEnhancedHue default = 0x2300;
ram attribute colorLoopStoredEnhancedHue default = 0x0000;
ram attribute colorCapabilities default = 0x1F;
ram attribute colorTempPhysicalMinMireds default = 0x0000;
ram attribute colorTempPhysicalMaxMireds default = 0xFEFF;
ram attribute coupleColorTempToLevelMinMireds;
ram attribute startUpColorTemperatureMireds;
persist attribute startUpColorTemperatureMireds;
ram attribute featureMap default = 0x1F;
ram attribute clusterRevision default = 5;
}
Expand Down
25 changes: 13 additions & 12 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -16083,7 +16083,7 @@
"side": "server",
"type": "int8u",
"included": 1,
"storageOption": "RAM",
"storageOption": "NVM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
Expand All @@ -16099,7 +16099,7 @@
"side": "server",
"type": "int8u",
"included": 1,
"storageOption": "RAM",
"storageOption": "NVM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
Expand Down Expand Up @@ -16131,7 +16131,7 @@
"side": "server",
"type": "int16u",
"included": 1,
"storageOption": "RAM",
"storageOption": "NVM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x616B",
Expand All @@ -16147,7 +16147,7 @@
"side": "server",
"type": "int16u",
"included": 1,
"storageOption": "RAM",
"storageOption": "NVM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x607D",
Expand Down Expand Up @@ -16195,7 +16195,7 @@
"side": "server",
"type": "int16u",
"included": 1,
"storageOption": "RAM",
"storageOption": "NVM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00FA",
Expand Down Expand Up @@ -16723,7 +16723,7 @@
"side": "server",
"type": "int16u",
"included": 1,
"storageOption": "RAM",
"storageOption": "NVM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
Expand All @@ -16739,7 +16739,7 @@
"side": "server",
"type": "enum8",
"included": 1,
"storageOption": "RAM",
"storageOption": "NVM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x01",
Expand All @@ -16755,7 +16755,7 @@
"side": "server",
"type": "int8u",
"included": 1,
"storageOption": "RAM",
"storageOption": "NVM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
Expand All @@ -16771,7 +16771,7 @@
"side": "server",
"type": "int8u",
"included": 1,
"storageOption": "RAM",
"storageOption": "NVM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
Expand All @@ -16787,7 +16787,7 @@
"side": "server",
"type": "int16u",
"included": 1,
"storageOption": "RAM",
"storageOption": "NVM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0019",
Expand Down Expand Up @@ -16899,7 +16899,7 @@
"side": "server",
"type": "int16u",
"included": 1,
"storageOption": "RAM",
"storageOption": "NVM",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand Down Expand Up @@ -25580,5 +25580,6 @@
"endpointVersion": 1,
"deviceIdentifier": 61442
}
]
],
"log": []
}
24 changes: 12 additions & 12 deletions examples/lighting-app/lighting-common/lighting-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -2285,27 +2285,27 @@ endpoint 1 {
}

server cluster ColorControl {
ram attribute currentHue default = 0x00;
ram attribute currentSaturation default = 0x00;
persist attribute currentHue default = 0x00;
persist attribute currentSaturation default = 0x00;
ram attribute remainingTime default = 0x0000;
ram attribute currentX default = 0x616B;
ram attribute currentY default = 0x607D;
ram attribute colorTemperatureMireds default = 0x00FA;
ram attribute colorMode default = 0x01;
persist attribute currentX default = 0x616B;
persist attribute currentY default = 0x607D;
persist attribute colorTemperatureMireds default = 0x00FA;
persist attribute colorMode default = 0x01;
ram attribute options default = 0x00;
ram attribute numberOfPrimaries;
ram attribute enhancedCurrentHue default = 0x0000;
ram attribute enhancedColorMode default = 0x01;
ram attribute colorLoopActive default = 0x00;
ram attribute colorLoopDirection default = 0x00;
ram attribute colorLoopTime default = 0x0019;
persist attribute enhancedCurrentHue default = 0x0000;
persist attribute enhancedColorMode default = 0x01;
persist attribute colorLoopActive default = 0x00;
persist attribute colorLoopDirection default = 0x00;
persist attribute colorLoopTime default = 0x0019;
ram attribute colorLoopStartEnhancedHue default = 0x2300;
ram attribute colorLoopStoredEnhancedHue default = 0x0000;
ram attribute colorCapabilities default = 0x1F;
ram attribute colorTempPhysicalMinMireds default = 0x0000;
ram attribute colorTempPhysicalMaxMireds default = 0xFEFF;
ram attribute coupleColorTempToLevelMinMireds;
ram attribute startUpColorTemperatureMireds;
persist attribute startUpColorTemperatureMireds;
ram attribute featureMap default = 0x1F;
ram attribute clusterRevision default = 5;
}
Expand Down
39 changes: 20 additions & 19 deletions examples/lighting-app/lighting-common/lighting-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@
}
],
"package": [
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
"type": "gen-templates-json",
"version": "chip-v1"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/zcl/zcl.json",
"type": "zcl-properties",
"category": "matter",
"version": 1,
"description": "Matter SDK ZCL data"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
"type": "gen-templates-json",
"version": "chip-v1"
}
],
"endpointTypes": [
Expand Down Expand Up @@ -7296,7 +7296,7 @@
"side": "server",
"type": "int8u",
"included": 1,
"storageOption": "RAM",
"storageOption": "NVM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
Expand All @@ -7312,7 +7312,7 @@
"side": "server",
"type": "int8u",
"included": 1,
"storageOption": "RAM",
"storageOption": "NVM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
Expand Down Expand Up @@ -7344,7 +7344,7 @@
"side": "server",
"type": "int16u",
"included": 1,
"storageOption": "RAM",
"storageOption": "NVM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x616B",
Expand All @@ -7360,7 +7360,7 @@
"side": "server",
"type": "int16u",
"included": 1,
"storageOption": "RAM",
"storageOption": "NVM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x607D",
Expand Down Expand Up @@ -7408,7 +7408,7 @@
"side": "server",
"type": "int16u",
"included": 1,
"storageOption": "RAM",
"storageOption": "NVM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00FA",
Expand All @@ -7424,7 +7424,7 @@
"side": "server",
"type": "enum8",
"included": 1,
"storageOption": "RAM",
"storageOption": "NVM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x01",
Expand Down Expand Up @@ -7936,7 +7936,7 @@
"side": "server",
"type": "int16u",
"included": 1,
"storageOption": "RAM",
"storageOption": "NVM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
Expand All @@ -7952,7 +7952,7 @@
"side": "server",
"type": "enum8",
"included": 1,
"storageOption": "RAM",
"storageOption": "NVM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x01",
Expand All @@ -7968,7 +7968,7 @@
"side": "server",
"type": "int8u",
"included": 1,
"storageOption": "RAM",
"storageOption": "NVM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
Expand All @@ -7984,7 +7984,7 @@
"side": "server",
"type": "int8u",
"included": 1,
"storageOption": "RAM",
"storageOption": "NVM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
Expand All @@ -8000,7 +8000,7 @@
"side": "server",
"type": "int16u",
"included": 1,
"storageOption": "RAM",
"storageOption": "NVM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0019",
Expand Down Expand Up @@ -8112,7 +8112,7 @@
"side": "server",
"type": "int16u",
"included": 1,
"storageOption": "RAM",
"storageOption": "NVM",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand Down Expand Up @@ -8341,5 +8341,6 @@
"endpointVersion": 1,
"deviceIdentifier": 257
}
]
],
"log": []
}

0 comments on commit 1567113

Please sign in to comment.