Skip to content

Commit

Permalink
Added the TableSize bit to the Scenes feature map and ensured the
Browse files Browse the repository at this point in the history
ScenesTableImpl would get the value from zap
  • Loading branch information
lpbeliveau-silabs committed Oct 13, 2023
1 parent d1b59df commit 42852dd
Show file tree
Hide file tree
Showing 22 changed files with 302 additions and 245 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6717,7 +6717,7 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 3;
ram attribute featureMap default = 7;
ram attribute clusterRevision default = 5;

handle command AddScene;
Expand Down Expand Up @@ -7947,7 +7947,7 @@ endpoint 2 {
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 3;
ram attribute featureMap default = 7;
ram attribute clusterRevision default = 5;

handle command AddScene;
Expand Down
67 changes: 34 additions & 33 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"fileFormat": 2,
"featureLevel": 98,
"featureLevel": 99,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -3059,7 +3059,7 @@
"side": "server",
"type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
Expand Down Expand Up @@ -5676,7 +5676,7 @@
"side": "server",
"type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
Expand All @@ -5692,7 +5692,7 @@
"side": "server",
"type": "int16u",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
Expand Down Expand Up @@ -6998,7 +6998,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "3",
"defaultValue": "7",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -9013,7 +9013,7 @@
"side": "server",
"type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
Expand Down Expand Up @@ -9185,7 +9185,7 @@
"side": "server",
"type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
Expand Down Expand Up @@ -9527,7 +9527,7 @@
"side": "server",
"type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
Expand Down Expand Up @@ -9699,7 +9699,7 @@
"side": "server",
"type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
Expand Down Expand Up @@ -10150,7 +10150,7 @@
"side": "server",
"type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
Expand Down Expand Up @@ -10256,7 +10256,7 @@
"side": "server",
"type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
Expand Down Expand Up @@ -11444,7 +11444,7 @@
"side": "server",
"type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "7",
Expand Down Expand Up @@ -11640,7 +11640,7 @@
"side": "server",
"type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "7",
Expand Down Expand Up @@ -12580,7 +12580,7 @@
"code": 8,
"mfgCode": null,
"side": "server",
"type": "Percent",
"type": "percent",
"included": 1,
"storageOption": "NVM",
"singleton": 0,
Expand All @@ -12596,7 +12596,7 @@
"code": 9,
"mfgCode": null,
"side": "server",
"type": "Percent",
"type": "percent",
"included": 1,
"storageOption": "NVM",
"singleton": 0,
Expand Down Expand Up @@ -12628,7 +12628,7 @@
"code": 11,
"mfgCode": null,
"side": "server",
"type": "Percent100ths",
"type": "percent100ths",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand All @@ -12644,7 +12644,7 @@
"code": 12,
"mfgCode": null,
"side": "server",
"type": "Percent100ths",
"type": "percent100ths",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down Expand Up @@ -12676,7 +12676,7 @@
"code": 14,
"mfgCode": null,
"side": "server",
"type": "Percent100ths",
"type": "percent100ths",
"included": 1,
"storageOption": "NVM",
"singleton": 0,
Expand All @@ -12692,7 +12692,7 @@
"code": 15,
"mfgCode": null,
"side": "server",
"type": "Percent100ths",
"type": "percent100ths",
"included": 1,
"storageOption": "NVM",
"singleton": 0,
Expand Down Expand Up @@ -13794,7 +13794,7 @@
"code": 2,
"mfgCode": null,
"side": "server",
"type": "Percent",
"type": "percent",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand All @@ -13810,7 +13810,7 @@
"code": 3,
"mfgCode": null,
"side": "server",
"type": "Percent",
"type": "percent",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down Expand Up @@ -16274,7 +16274,7 @@
"side": "server",
"type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
Expand Down Expand Up @@ -16540,7 +16540,7 @@
"side": "server",
"type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
Expand Down Expand Up @@ -16806,7 +16806,7 @@
"side": "server",
"type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
Expand Down Expand Up @@ -17072,7 +17072,7 @@
"side": "server",
"type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
Expand Down Expand Up @@ -17338,7 +17338,7 @@
"side": "server",
"type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
Expand Down Expand Up @@ -17604,7 +17604,7 @@
"side": "server",
"type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
Expand Down Expand Up @@ -17870,7 +17870,7 @@
"side": "server",
"type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
Expand Down Expand Up @@ -18136,7 +18136,7 @@
"side": "server",
"type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
Expand Down Expand Up @@ -18402,7 +18402,7 @@
"side": "server",
"type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
Expand Down Expand Up @@ -18668,7 +18668,7 @@
"side": "server",
"type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
Expand Down Expand Up @@ -22206,7 +22206,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "3",
"defaultValue": "7",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -23371,5 +23371,6 @@
"endpointId": 65534,
"networkId": 0
}
]
],
"log": []
}
Original file line number Diff line number Diff line change
Expand Up @@ -4377,7 +4377,7 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 3;
ram attribute featureMap default = 7;
ram attribute clusterRevision default = 5;

handle command AddScene;
Expand Down Expand Up @@ -4940,7 +4940,7 @@ endpoint 2 {
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 3;
ram attribute featureMap default = 7;
ram attribute clusterRevision default = 5;

handle command AddScene;
Expand Down
Loading

0 comments on commit 42852dd

Please sign in to comment.