Align Actions cluster better with spec. (#21638)
The primary change is the change in the cluster name.
Specific actions taken to generate this PR:
* Install the git-extras package
* git sed -f g bridged-actions-cluster.xml actions-cluster.xml
* git sed -f g "Bridged Actions" Actions
* git sed -f g BridgedActions Actions
* git sed -f g BRIDGED_ACTIONS_CLUSTER ACTIONS_CLUSTER
* Manual fixup of src/app/tests/suites/README.md to realign the table.
* Remove Actions from .wordlist.txt
* Manual naming alignment with the spec in actions-cluster.xml.
* git sed -f g EndpointList::Id EndpointLists::Id
* git sed -f g SetupUrl::Id SetupURL::Id
* Ran ./scripts/tools/zap_convert_all.py (and fixed the script to work with the
chef not-real-zap-file bits).
* Ran ./scripts/tools/zap_regen_all.py
* Ran restyle
diff --git a/.github/.wordlist.txt b/.github/.wordlist.txt
index 7333ca2..106462b 100644
--- a/.github/.wordlist.txt
+++ b/.github/.wordlist.txt
@@ -151,7 +151,6 @@
BRD
breakpoint
bredr
-BridgedActions
BridgedDeviceBasic
bridgedLightEndpoint
bringup
diff --git a/docs/guides/repl/Matter - Basic Interactions.ipynb b/docs/guides/repl/Matter - Basic Interactions.ipynb
index 5c036bb..53e5740 100644
--- a/docs/guides/repl/Matter - Basic Interactions.ipynb
+++ b/docs/guides/repl/Matter - Basic Interactions.ipynb
@@ -1799,11 +1799,11 @@
"<span style=\"color: #7fbf7f; text-decoration-color: #7fbf7f\">│ │ </span><span style=\"font-weight: bold\"><</span><span style=\"color: #ff00ff; text-decoration-color: #ff00ff; font-weight: bold\">class</span><span style=\"color: #000000; text-decoration-color: #000000\"> </span><span style=\"color: #008000; text-decoration-color: #008000\">'chip.clusters.Objects.Binding'</span><span style=\"font-weight: bold\">></span>: <span style=\"font-weight: bold\">{</span>\n",
"<span style=\"color: #7fbf7f; text-decoration-color: #7fbf7f\">│ │ │ </span><span style=\"font-weight: bold\"><</span><span style=\"color: #ff00ff; text-decoration-color: #ff00ff; font-weight: bold\">class</span><span style=\"color: #000000; text-decoration-color: #000000\"> </span><span style=\"color: #008000; text-decoration-color: #008000\">'chip.clusters.Objects.Binding.Attributes.ClusterRevision'</span><span style=\"font-weight: bold\">></span>: <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">1</span>\n",
"<span style=\"color: #7fbf7f; text-decoration-color: #7fbf7f\">│ │ </span><span style=\"font-weight: bold\">}</span>,\n",
- "<span style=\"color: #7fbf7f; text-decoration-color: #7fbf7f\">│ │ </span><span style=\"font-weight: bold\"><</span><span style=\"color: #ff00ff; text-decoration-color: #ff00ff; font-weight: bold\">class</span><span style=\"color: #000000; text-decoration-color: #000000\"> </span><span style=\"color: #008000; text-decoration-color: #008000\">'chip.clusters.Objects.BridgedActions'</span><span style=\"font-weight: bold\">></span>: <span style=\"font-weight: bold\">{</span>\n",
- "<span style=\"color: #7fbf7f; text-decoration-color: #7fbf7f\">│ │ │ </span><span style=\"font-weight: bold\"><</span><span style=\"color: #ff00ff; text-decoration-color: #ff00ff; font-weight: bold\">class</span><span style=\"color: #000000; text-decoration-color: #000000\"> </span><span style=\"color: #008000; text-decoration-color: #008000\">'chip.clusters.Objects.BridgedActions.Attributes.ActionList'</span><span style=\"font-weight: bold\">></span>: <span style=\"font-weight: bold\">[]</span>,\n",
- "<span style=\"color: #7fbf7f; text-decoration-color: #7fbf7f\">│ │ │ </span><span style=\"font-weight: bold\"><</span><span style=\"color: #ff00ff; text-decoration-color: #ff00ff; font-weight: bold\">class</span><span style=\"color: #000000; text-decoration-color: #000000\"> </span><span style=\"color: #008000; text-decoration-color: #008000\">'chip.clusters.Objects.BridgedActions.Attributes.EndpointList'</span><span style=\"font-weight: bold\">></span>: <span style=\"font-weight: bold\">[]</span>,\n",
- "<span style=\"color: #7fbf7f; text-decoration-color: #7fbf7f\">│ │ │ </span><span style=\"font-weight: bold\"><</span><span style=\"color: #ff00ff; text-decoration-color: #ff00ff; font-weight: bold\">class</span><span style=\"color: #000000; text-decoration-color: #000000\"> </span><span style=\"color: #008000; text-decoration-color: #008000\">'chip.clusters.Objects.BridgedActions.Attributes.SetupUrl'</span><span style=\"font-weight: bold\">></span>: <span style=\"color: #008000; text-decoration-color: #008000\">'https://example.com'</span>,\n",
- "<span style=\"color: #7fbf7f; text-decoration-color: #7fbf7f\">│ │ │ </span><span style=\"font-weight: bold\"><</span><span style=\"color: #ff00ff; text-decoration-color: #ff00ff; font-weight: bold\">class</span><span style=\"color: #000000; text-decoration-color: #000000\"> </span><span style=\"color: #008000; text-decoration-color: #008000\">'chip.clusters.Objects.BridgedActions.Attributes.ClusterRevision'</span><span style=\"font-weight: bold\">></span>: <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">1</span>\n",
+ "<span style=\"color: #7fbf7f; text-decoration-color: #7fbf7f\">│ │ </span><span style=\"font-weight: bold\"><</span><span style=\"color: #ff00ff; text-decoration-color: #ff00ff; font-weight: bold\">class</span><span style=\"color: #000000; text-decoration-color: #000000\"> </span><span style=\"color: #008000; text-decoration-color: #008000\">'chip.clusters.Objects.Actions'</span><span style=\"font-weight: bold\">></span>: <span style=\"font-weight: bold\">{</span>\n",
+ "<span style=\"color: #7fbf7f; text-decoration-color: #7fbf7f\">│ │ │ </span><span style=\"font-weight: bold\"><</span><span style=\"color: #ff00ff; text-decoration-color: #ff00ff; font-weight: bold\">class</span><span style=\"color: #000000; text-decoration-color: #000000\"> </span><span style=\"color: #008000; text-decoration-color: #008000\">'chip.clusters.Objects.Actions.Attributes.ActionList'</span><span style=\"font-weight: bold\">></span>: <span style=\"font-weight: bold\">[]</span>,\n",
+ "<span style=\"color: #7fbf7f; text-decoration-color: #7fbf7f\">│ │ │ </span><span style=\"font-weight: bold\"><</span><span style=\"color: #ff00ff; text-decoration-color: #ff00ff; font-weight: bold\">class</span><span style=\"color: #000000; text-decoration-color: #000000\"> </span><span style=\"color: #008000; text-decoration-color: #008000\">'chip.clusters.Objects.Actions.Attributes.EndpointList'</span><span style=\"font-weight: bold\">></span>: <span style=\"font-weight: bold\">[]</span>,\n",
+ "<span style=\"color: #7fbf7f; text-decoration-color: #7fbf7f\">│ │ │ </span><span style=\"font-weight: bold\"><</span><span style=\"color: #ff00ff; text-decoration-color: #ff00ff; font-weight: bold\">class</span><span style=\"color: #000000; text-decoration-color: #000000\"> </span><span style=\"color: #008000; text-decoration-color: #008000\">'chip.clusters.Objects.Actions.Attributes.SetupUrl'</span><span style=\"font-weight: bold\">></span>: <span style=\"color: #008000; text-decoration-color: #008000\">'https://example.com'</span>,\n",
+ "<span style=\"color: #7fbf7f; text-decoration-color: #7fbf7f\">│ │ │ </span><span style=\"font-weight: bold\"><</span><span style=\"color: #ff00ff; text-decoration-color: #ff00ff; font-weight: bold\">class</span><span style=\"color: #000000; text-decoration-color: #000000\"> </span><span style=\"color: #008000; text-decoration-color: #008000\">'chip.clusters.Objects.Actions.Attributes.ClusterRevision'</span><span style=\"font-weight: bold\">></span>: <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">1</span>\n",
"<span style=\"color: #7fbf7f; text-decoration-color: #7fbf7f\">│ │ </span><span style=\"font-weight: bold\">}</span>,\n",
"<span style=\"color: #7fbf7f; text-decoration-color: #7fbf7f\">│ │ </span><span style=\"font-weight: bold\"><</span><span style=\"color: #ff00ff; text-decoration-color: #ff00ff; font-weight: bold\">class</span><span style=\"color: #000000; text-decoration-color: #000000\"> </span><span style=\"color: #008000; text-decoration-color: #008000\">'chip.clusters.Objects.PowerSource'</span><span style=\"font-weight: bold\">></span>: <span style=\"font-weight: bold\">{</span>\n",
"<span style=\"color: #7fbf7f; text-decoration-color: #7fbf7f\">│ │ │ </span><span style=\"font-weight: bold\"><</span><span style=\"color: #ff00ff; text-decoration-color: #ff00ff; font-weight: bold\">class</span><span style=\"color: #000000; text-decoration-color: #000000\"> </span><span style=\"color: #008000; text-decoration-color: #008000\">'chip.clusters.Objects.PowerSource.Attributes.Status'</span><span style=\"font-weight: bold\">></span>: <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">0</span>,\n",
@@ -2815,11 +2815,11 @@
"\u001b[2;32m│ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.Binding'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1m{\u001b[0m\n",
"\u001b[2;32m│ │ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.Binding.Attributes.ClusterRevision'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1;36m1\u001b[0m\n",
"\u001b[2;32m│ │ \u001b[0m\u001b[1m}\u001b[0m,\n",
- "\u001b[2;32m│ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.BridgedActions'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1m{\u001b[0m\n",
- "\u001b[2;32m│ │ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.BridgedActions.Attributes.ActionList'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1m[\u001b[0m\u001b[1m]\u001b[0m,\n",
- "\u001b[2;32m│ │ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.BridgedActions.Attributes.EndpointList'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1m[\u001b[0m\u001b[1m]\u001b[0m,\n",
- "\u001b[2;32m│ │ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.BridgedActions.Attributes.SetupUrl'\u001b[0m\u001b[1m>\u001b[0m: \u001b[32m'https://example.com'\u001b[0m,\n",
- "\u001b[2;32m│ │ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.BridgedActions.Attributes.ClusterRevision'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1;36m1\u001b[0m\n",
+ "\u001b[2;32m│ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.Actions'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1m{\u001b[0m\n",
+ "\u001b[2;32m│ │ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.Actions.Attributes.ActionList'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1m[\u001b[0m\u001b[1m]\u001b[0m,\n",
+ "\u001b[2;32m│ │ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.Actions.Attributes.EndpointList'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1m[\u001b[0m\u001b[1m]\u001b[0m,\n",
+ "\u001b[2;32m│ │ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.Actions.Attributes.SetupUrl'\u001b[0m\u001b[1m>\u001b[0m: \u001b[32m'https://example.com'\u001b[0m,\n",
+ "\u001b[2;32m│ │ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.Actions.Attributes.ClusterRevision'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1;36m1\u001b[0m\n",
"\u001b[2;32m│ │ \u001b[0m\u001b[1m}\u001b[0m,\n",
"\u001b[2;32m│ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.PowerSource'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1m{\u001b[0m\n",
"\u001b[2;32m│ │ │ \u001b[0m\u001b[1m<\u001b[0m\u001b[1;95mclass\u001b[0m\u001b[39m \u001b[0m\u001b[32m'chip.clusters.Objects.PowerSource.Attributes.Status'\u001b[0m\u001b[1m>\u001b[0m: \u001b[1;36m0\u001b[0m,\n",
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
index ca1e64e..54f96f3 100644
--- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
+++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -482,7 +482,7 @@
readonly attribute int16u clusterRevision = 65533;
}
-server cluster BridgedActions = 37 {
+server cluster Actions = 37 {
enum ActionErrorEnum : ENUM8 {
kUnknown = 0;
kInterrupted = 1;
@@ -531,8 +531,8 @@
char_string<32> name = 1;
ActionTypeEnum type = 2;
int16u endpointListID = 3;
- int16u supportedCommands = 4;
- ActionStateEnum status = 5;
+ CommandBits supportedCommands = 4;
+ ActionStateEnum state = 5;
}
struct EndpointListStruct {
@@ -556,8 +556,8 @@
}
readonly attribute ActionStruct actionList[] = 0;
- readonly attribute EndpointListStruct endpointList[] = 1;
- readonly attribute long_char_string<512> setupUrl = 2;
+ readonly attribute EndpointListStruct endpointLists[] = 1;
+ readonly attribute long_char_string<512> setupURL = 2;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
}
@@ -4230,10 +4230,10 @@
ram attribute clusterRevision default = 1;
}
- server cluster BridgedActions {
+ server cluster Actions {
callback attribute actionList;
- callback attribute endpointList;
- callback attribute setupUrl;
+ callback attribute endpointLists;
+ callback attribute setupURL;
ram attribute featureMap;
callback attribute clusterRevision default = 1;
}
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
index cb6cd6c..1bd7433 100644
--- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
+++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
@@ -759,7 +759,7 @@
"enabled": 0,
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -9443,7 +9443,7 @@
"enabled": 1,
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -9459,7 +9459,7 @@
"reportableChange": 0
},
{
- "name": "remaining time",
+ "name": "RemainingTime",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -9475,7 +9475,7 @@
"reportableChange": 0
},
{
- "name": "min level",
+ "name": "MinLevel",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -9491,7 +9491,7 @@
"reportableChange": 0
},
{
- "name": "max level",
+ "name": "MaxLevel",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -9507,7 +9507,7 @@
"reportableChange": 0
},
{
- "name": "current frequency",
+ "name": "CurrentFrequency",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -9523,7 +9523,7 @@
"reportableChange": 0
},
{
- "name": "min frequency",
+ "name": "MinFrequency",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -9539,7 +9539,7 @@
"reportableChange": 0
},
{
- "name": "max frequency",
+ "name": "MaxFrequency",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -9555,7 +9555,7 @@
"reportableChange": 0
},
{
- "name": "options",
+ "name": "Options",
"code": 15,
"mfgCode": null,
"side": "server",
@@ -9571,7 +9571,7 @@
"reportableChange": 0
},
{
- "name": "on off transition time",
+ "name": "OnOffTransitionTime",
"code": 16,
"mfgCode": null,
"side": "server",
@@ -9587,7 +9587,7 @@
"reportableChange": 0
},
{
- "name": "on level",
+ "name": "OnLevel",
"code": 17,
"mfgCode": null,
"side": "server",
@@ -9603,7 +9603,7 @@
"reportableChange": 0
},
{
- "name": "on transition time",
+ "name": "OnTransitionTime",
"code": 18,
"mfgCode": null,
"side": "server",
@@ -9619,7 +9619,7 @@
"reportableChange": 0
},
{
- "name": "off transition time",
+ "name": "OffTransitionTime",
"code": 19,
"mfgCode": null,
"side": "server",
@@ -9635,7 +9635,7 @@
"reportableChange": 0
},
{
- "name": "default move rate",
+ "name": "DefaultMoveRate",
"code": 20,
"mfgCode": null,
"side": "server",
@@ -9651,7 +9651,7 @@
"reportableChange": 0
},
{
- "name": "start up current level",
+ "name": "StartUpCurrentLevel",
"code": 16384,
"mfgCode": null,
"side": "server",
@@ -10081,10 +10081,10 @@
]
},
{
- "name": "Bridged Actions",
+ "name": "Actions",
"code": 37,
"mfgCode": null,
- "define": "BRIDGED_ACTIONS_CLUSTER",
+ "define": "ACTIONS_CLUSTER",
"side": "client",
"enabled": 0,
"attributes": [
@@ -10107,15 +10107,15 @@
]
},
{
- "name": "Bridged Actions",
+ "name": "Actions",
"code": 37,
"mfgCode": null,
- "define": "BRIDGED_ACTIONS_CLUSTER",
+ "define": "ACTIONS_CLUSTER",
"side": "server",
"enabled": 1,
"attributes": [
{
- "name": "action list",
+ "name": "ActionList",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -10131,7 +10131,7 @@
"reportableChange": 0
},
{
- "name": "endpoint list",
+ "name": "EndpointLists",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -10147,7 +10147,7 @@
"reportableChange": 0
},
{
- "name": "setup url",
+ "name": "SetupURL",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -14789,7 +14789,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -14805,7 +14805,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -14821,7 +14821,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -21353,7 +21353,7 @@
"enabled": 0,
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -24558,6 +24558,5 @@
"endpointVersion": 1,
"deviceIdentifier": 61442
}
- ],
- "log": []
+ ]
}
\ No newline at end of file
diff --git a/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp b/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp
index af3b476..ff5a7a7 100644
--- a/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp
+++ b/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp
@@ -27,15 +27,15 @@
using namespace chip;
using namespace chip::app;
using namespace chip::app::Clusters;
-using namespace chip::app::Clusters::BridgedActions::Attributes;
+using namespace chip::app::Clusters::Actions::Attributes;
namespace {
-class BridgedActionsAttrAccess : public AttributeAccessInterface
+class ActionsAttrAccess : public AttributeAccessInterface
{
public:
- // Register for the Bridged Actions cluster on all endpoints.
- BridgedActionsAttrAccess() : AttributeAccessInterface(Optional<EndpointId>::Missing(), BridgedActions::Id) {}
+ // Register for the Actions cluster on all endpoints.
+ ActionsAttrAccess() : AttributeAccessInterface(Optional<EndpointId>::Missing(), Actions::Id) {}
CHIP_ERROR Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder) override;
@@ -48,44 +48,44 @@
CHIP_ERROR ReadClusterRevision(EndpointId endpoint, AttributeValueEncoder & aEncoder);
};
-constexpr uint16_t BridgedActionsAttrAccess::ClusterRevision;
+constexpr uint16_t ActionsAttrAccess::ClusterRevision;
-CHIP_ERROR BridgedActionsAttrAccess::ReadActionListAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder)
+CHIP_ERROR ActionsAttrAccess::ReadActionListAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder)
{
// Just return an empty list
return aEncoder.EncodeEmptyList();
}
-CHIP_ERROR BridgedActionsAttrAccess::ReadEndpointListAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder)
+CHIP_ERROR ActionsAttrAccess::ReadEndpointListAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder)
{
// Just return an empty list
return aEncoder.EncodeEmptyList();
}
-CHIP_ERROR BridgedActionsAttrAccess::ReadSetupUrlAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder)
+CHIP_ERROR ActionsAttrAccess::ReadSetupUrlAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder)
{
const char SetupUrl[] = "https://example.com";
return aEncoder.Encode(chip::Span<const char>(SetupUrl, strlen(SetupUrl)));
}
-CHIP_ERROR BridgedActionsAttrAccess::ReadClusterRevision(EndpointId endpoint, AttributeValueEncoder & aEncoder)
+CHIP_ERROR ActionsAttrAccess::ReadClusterRevision(EndpointId endpoint, AttributeValueEncoder & aEncoder)
{
return aEncoder.Encode(ClusterRevision);
}
-BridgedActionsAttrAccess gAttrAccess;
+ActionsAttrAccess gAttrAccess;
-CHIP_ERROR BridgedActionsAttrAccess::Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder)
+CHIP_ERROR ActionsAttrAccess::Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder)
{
- VerifyOrDie(aPath.mClusterId == BridgedActions::Id);
+ VerifyOrDie(aPath.mClusterId == Actions::Id);
switch (aPath.mAttributeId)
{
case ActionList::Id:
return ReadActionListAttribute(aPath.mEndpointId, aEncoder);
- case EndpointList::Id:
+ case EndpointLists::Id:
return ReadEndpointListAttribute(aPath.mEndpointId, aEncoder);
- case SetupUrl::Id:
+ case SetupURL::Id:
return ReadSetupUrlAttribute(aPath.mEndpointId, aEncoder);
case ClusterRevision::Id:
return ReadClusterRevision(aPath.mEndpointId, aEncoder);
@@ -96,7 +96,7 @@
}
} // anonymous namespace
-void MatterBridgedActionsPluginServerInitCallback(void)
+void MatterActionsPluginServerInitCallback(void)
{
registerAttributeAccessOverride(&gAttrAccess);
}
diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
index 2c81c4a..a1e8488 100644
--- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
+++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
@@ -426,7 +426,7 @@
readonly attribute int16u clusterRevision = 65533;
}
-server cluster BridgedActions = 37 {
+server cluster Actions = 37 {
enum ActionErrorEnum : ENUM8 {
kUnknown = 0;
kInterrupted = 1;
@@ -475,8 +475,8 @@
char_string<32> name = 1;
ActionTypeEnum type = 2;
int16u endpointListID = 3;
- int16u supportedCommands = 4;
- ActionStateEnum status = 5;
+ CommandBits supportedCommands = 4;
+ ActionStateEnum state = 5;
}
struct EndpointListStruct {
@@ -500,7 +500,7 @@
}
readonly attribute ActionStruct actionList[] = 0;
- readonly attribute EndpointListStruct endpointList[] = 1;
+ readonly attribute EndpointListStruct endpointLists[] = 1;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
}
@@ -3546,9 +3546,9 @@
ram attribute clusterRevision default = 1;
}
- server cluster BridgedActions {
+ server cluster Actions {
callback attribute actionList;
- callback attribute endpointList;
+ callback attribute endpointLists;
ram attribute featureMap;
callback attribute clusterRevision default = 1;
}
diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
index 238a2ff..7d8f8a6 100644
--- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
+++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 72,
+ "featureLevel": 77,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,14 +19,16 @@
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/zcl/zcl.json",
- "version": "ZCL Test Data",
- "type": "zcl-properties"
+ "type": "zcl-properties",
+ "category": "matter",
+ "version": 1,
+ "description": "Matter SDK ZCL data"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
- "version": "chip-v1",
- "type": "gen-templates-json"
+ "type": "gen-templates-json",
+ "version": "chip-v1"
}
],
"endpointTypes": [
@@ -87,7 +89,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "identify time",
@@ -622,7 +623,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -757,10 +757,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -800,7 +799,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -827,7 +825,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -934,7 +931,6 @@
"define": "BINDING_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -961,7 +957,6 @@
"define": "BINDING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "Binding",
@@ -1019,9 +1014,7 @@
"mfgCode": null,
"define": "ACCESS_CONTROL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Access Control",
@@ -1030,7 +1023,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ACL",
@@ -1153,7 +1145,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1180,7 +1171,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -1707,7 +1697,6 @@
"define": "OTA_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DefaultOtaProviders",
@@ -1829,9 +1818,7 @@
"mfgCode": null,
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Localization Configuration",
@@ -1840,7 +1827,6 @@
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ActiveLocale",
@@ -1914,9 +1900,7 @@
"mfgCode": null,
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Time Format Localization",
@@ -1925,7 +1909,6 @@
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "HourFormat",
@@ -2063,9 +2046,7 @@
"mfgCode": null,
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Unit Localization",
@@ -2074,7 +2055,6 @@
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "TemperatureUnit",
@@ -2132,9 +2112,7 @@
"mfgCode": null,
"define": "POWER_SOURCE_CONFIGURATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Power Source Configuration",
@@ -2143,7 +2121,6 @@
"define": "POWER_SOURCE_CONFIGURATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "Sources",
@@ -2201,9 +2178,7 @@
"mfgCode": null,
"define": "POWER_SOURCE_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Power Source",
@@ -2212,7 +2187,6 @@
"define": "POWER_SOURCE_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "Status",
@@ -3339,7 +3313,6 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -3646,7 +3619,6 @@
"define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ThreadMetrics",
@@ -3762,8 +3734,7 @@
"incoming": 0,
"outgoing": 0
}
- ],
- "attributes": []
+ ]
},
{
"name": "Thread Network Diagnostics",
@@ -3772,7 +3743,6 @@
"define": "THREAD_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "channel",
@@ -4859,7 +4829,6 @@
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "bssid",
@@ -5146,7 +5115,6 @@
"define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "PHYRate",
@@ -5333,7 +5301,6 @@
"define": "SWITCH_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -5360,7 +5327,6 @@
"define": "SWITCH_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "number of positions",
@@ -5487,7 +5453,6 @@
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "WindowStatus",
@@ -5790,7 +5755,7 @@
"code": 5,
"mfgCode": null,
"side": "server",
- "type": "fabric_idx",
+ "type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -6025,9 +5990,7 @@
"mfgCode": null,
"define": "FIXED_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Fixed Label",
@@ -6036,7 +5999,6 @@
"define": "FIXED_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -6094,9 +6056,7 @@
"mfgCode": null,
"define": "USER_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "User Label",
@@ -6105,7 +6065,6 @@
"define": "USER_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -6208,7 +6167,6 @@
"define": "DOOR_LOCK_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "LockState",
@@ -6567,7 +6525,6 @@
"define": "BARRIER_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "barrier moving state",
@@ -6798,7 +6755,6 @@
"define": "COLOR_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "CurrentHue",
@@ -7625,7 +7581,6 @@
"define": "ILLUMINANCE_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -7652,7 +7607,6 @@
"define": "ILLUMINANCE_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "MeasuredValue",
@@ -7759,7 +7713,6 @@
"define": "TEMP_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -7786,7 +7739,6 @@
"define": "TEMP_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "MeasuredValue",
@@ -7877,7 +7829,6 @@
"define": "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -7904,7 +7855,6 @@
"define": "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "measured value",
@@ -8011,7 +7961,6 @@
"define": "OCCUPANCY_SENSING_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -8038,7 +7987,6 @@
"define": "OCCUPANCY_SENSING_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "occupancy",
@@ -8557,7 +8505,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "identify time",
@@ -9132,7 +9079,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -9303,7 +9249,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -9330,7 +9275,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "switch type",
@@ -9497,10 +9441,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -9516,7 +9459,7 @@
"reportableChange": 0
},
{
- "name": "remaining time",
+ "name": "RemainingTime",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -9532,7 +9475,7 @@
"reportableChange": 0
},
{
- "name": "min level",
+ "name": "MinLevel",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -9548,7 +9491,7 @@
"reportableChange": 0
},
{
- "name": "max level",
+ "name": "MaxLevel",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -9564,7 +9507,7 @@
"reportableChange": 0
},
{
- "name": "current frequency",
+ "name": "CurrentFrequency",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -9580,7 +9523,7 @@
"reportableChange": 0
},
{
- "name": "min frequency",
+ "name": "MinFrequency",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -9596,7 +9539,7 @@
"reportableChange": 0
},
{
- "name": "max frequency",
+ "name": "MaxFrequency",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -9612,7 +9555,7 @@
"reportableChange": 0
},
{
- "name": "options",
+ "name": "Options",
"code": 15,
"mfgCode": null,
"side": "server",
@@ -9628,7 +9571,7 @@
"reportableChange": 0
},
{
- "name": "on off transition time",
+ "name": "OnOffTransitionTime",
"code": 16,
"mfgCode": null,
"side": "server",
@@ -9644,7 +9587,7 @@
"reportableChange": 0
},
{
- "name": "on level",
+ "name": "OnLevel",
"code": 17,
"mfgCode": null,
"side": "server",
@@ -9660,7 +9603,7 @@
"reportableChange": 0
},
{
- "name": "on transition time",
+ "name": "OnTransitionTime",
"code": 18,
"mfgCode": null,
"side": "server",
@@ -9676,7 +9619,7 @@
"reportableChange": 0
},
{
- "name": "off transition time",
+ "name": "OffTransitionTime",
"code": 19,
"mfgCode": null,
"side": "server",
@@ -9692,7 +9635,7 @@
"reportableChange": 0
},
{
- "name": "default move rate",
+ "name": "DefaultMoveRate",
"code": 20,
"mfgCode": null,
"side": "server",
@@ -9708,7 +9651,7 @@
"reportableChange": 0
},
{
- "name": "start up current level",
+ "name": "StartUpCurrentLevel",
"code": 16384,
"mfgCode": null,
"side": "server",
@@ -9812,7 +9755,6 @@
"define": "BINARY_INPUT_BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -9839,7 +9781,6 @@
"define": "BINARY_INPUT_BASIC_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "out of service",
@@ -9930,7 +9871,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -9957,7 +9897,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -10064,7 +10003,6 @@
"define": "BINDING_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -10091,7 +10029,6 @@
"define": "BINDING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "Binding",
@@ -10144,13 +10081,12 @@
]
},
{
- "name": "Bridged Actions",
+ "name": "Actions",
"code": 37,
"mfgCode": null,
- "define": "BRIDGED_ACTIONS_CLUSTER",
+ "define": "ACTIONS_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -10171,16 +10107,15 @@
]
},
{
- "name": "Bridged Actions",
+ "name": "Actions",
"code": 37,
"mfgCode": null,
- "define": "BRIDGED_ACTIONS_CLUSTER",
+ "define": "ACTIONS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
- "name": "action list",
+ "name": "ActionList",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -10196,7 +10131,7 @@
"reportableChange": 0
},
{
- "name": "endpoint list",
+ "name": "EndpointLists",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -10212,7 +10147,7 @@
"reportableChange": 0
},
{
- "name": "setup url",
+ "name": "SetupURL",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -10316,7 +10251,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -10343,7 +10277,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -10770,7 +10703,6 @@
"define": "OTA_REQUESTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -10797,7 +10729,6 @@
"define": "OTA_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -10824,7 +10755,6 @@
"define": "POWER_SOURCE_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -10851,7 +10781,6 @@
"define": "POWER_SOURCE_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "Status",
@@ -11846,7 +11775,6 @@
"define": "SWITCH_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -11873,7 +11801,6 @@
"define": "SWITCH_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "number of positions",
@@ -11964,7 +11891,6 @@
"define": "GROUP_KEY_MANAGEMENT_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -11991,7 +11917,6 @@
"define": "GROUP_KEY_MANAGEMENT_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "GroupKeyMap",
@@ -12050,7 +11975,6 @@
"define": "FIXED_LABEL_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -12077,7 +12001,6 @@
"define": "FIXED_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -12135,9 +12058,7 @@
"mfgCode": null,
"define": "USER_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "User Label",
@@ -12146,7 +12067,6 @@
"define": "USER_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -12205,7 +12125,6 @@
"define": "BOOLEAN_STATE_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -12232,7 +12151,6 @@
"define": "BOOLEAN_STATE_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "StateValue",
@@ -12327,7 +12245,6 @@
"define": "MODE_SELECT_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "Description",
@@ -13430,7 +13347,6 @@
"define": "WINDOW_COVERING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "Type",
@@ -13853,7 +13769,6 @@
"define": "BARRIER_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "barrier moving state",
@@ -13960,7 +13875,6 @@
"define": "PUMP_CONFIG_CONTROL_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -13987,7 +13901,6 @@
"define": "PUMP_CONFIG_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "MaxPressure",
@@ -14829,9 +14742,7 @@
"mfgCode": null,
"define": "FAN_CONTROL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Fan Control",
@@ -14840,7 +14751,6 @@
"define": "FAN_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "fan mode",
@@ -15107,7 +15017,6 @@
"define": "THERMOSTAT_UI_CONFIG_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -15134,7 +15043,6 @@
"define": "THERMOSTAT_UI_CONFIG_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "temperature display mode",
@@ -15405,7 +15313,6 @@
"define": "COLOR_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "CurrentHue",
@@ -16280,7 +16187,6 @@
"define": "ILLUMINANCE_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -16307,7 +16213,6 @@
"define": "ILLUMINANCE_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "MeasuredValue",
@@ -16430,7 +16335,6 @@
"define": "TEMP_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -16457,7 +16361,6 @@
"define": "TEMP_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "MeasuredValue",
@@ -16564,7 +16467,6 @@
"define": "PRESSURE_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -16591,7 +16493,6 @@
"define": "PRESSURE_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "MeasuredValue",
@@ -16730,7 +16631,6 @@
"define": "FLOW_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -16757,7 +16657,6 @@
"define": "FLOW_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "MeasuredValue",
@@ -16864,7 +16763,6 @@
"define": "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -16891,7 +16789,6 @@
"define": "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "measured value",
@@ -16998,7 +16895,6 @@
"define": "OCCUPANCY_SENSING_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -17025,7 +16921,6 @@
"define": "OCCUPANCY_SENSING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "occupancy",
@@ -17116,7 +17011,6 @@
"define": "WAKE_ON_LAN_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -17143,7 +17037,6 @@
"define": "WAKE_ON_LAN_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "MACAddress",
@@ -17302,7 +17195,6 @@
"define": "CHANNEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ChannelList",
@@ -17893,7 +17785,6 @@
"define": "MEDIA_INPUT_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "InputList",
@@ -18020,7 +17911,6 @@
"define": "LOW_POWER_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -18195,7 +18085,6 @@
"define": "CONTENT_LAUNCH_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "AcceptHeader",
@@ -18314,7 +18203,6 @@
"define": "AUDIO_OUTPUT_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "OutputList",
@@ -18525,7 +18413,6 @@
"define": "APPLICATION_BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -18552,7 +18439,6 @@
"define": "APPLICATION_BASIC_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "VendorName",
@@ -18575,7 +18461,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "int16u",
+ "type": "vendor_id",
"included": 0,
"storageOption": "RAM",
"singleton": 0,
@@ -18827,7 +18713,6 @@
"define": "ELECTRICAL_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -18854,7 +18739,6 @@
"define": "ELECTRICAL_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "measurement type",
@@ -20709,7 +20593,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "identify time",
@@ -21212,7 +21095,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -21427,10 +21309,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -21470,7 +21351,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -21497,7 +21377,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -21604,7 +21483,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -21631,7 +21509,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -21977,9 +21854,7 @@
"mfgCode": null,
"define": "POWER_SOURCE_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Power Source",
@@ -21988,7 +21863,6 @@
"define": "POWER_SOURCE_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "Status",
@@ -22619,7 +22493,6 @@
"define": "DOOR_LOCK_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "LockState",
@@ -22978,7 +22851,6 @@
"define": "BARRIER_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "barrier moving state",
@@ -23209,7 +23081,6 @@
"define": "COLOR_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "CurrentHue",
@@ -24036,7 +23907,6 @@
"define": "TEMP_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -24063,7 +23933,6 @@
"define": "TEMP_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "MeasuredValue",
@@ -24154,7 +24023,6 @@
"define": "OCCUPANCY_SENSING_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -24181,7 +24049,6 @@
"define": "OCCUPANCY_SENSING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "occupancy",
diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter
index 5c0e2e6..a5e458b 100644
--- a/examples/bridge-app/bridge-common/bridge-app.matter
+++ b/examples/bridge-app/bridge-common/bridge-app.matter
@@ -356,7 +356,7 @@
readonly attribute int16u clusterRevision = 65533;
}
-server cluster BridgedActions = 37 {
+server cluster Actions = 37 {
enum ActionErrorEnum : ENUM8 {
kUnknown = 0;
kInterrupted = 1;
@@ -405,8 +405,8 @@
char_string<32> name = 1;
ActionTypeEnum type = 2;
int16u endpointListID = 3;
- int16u supportedCommands = 4;
- ActionStateEnum status = 5;
+ CommandBits supportedCommands = 4;
+ ActionStateEnum state = 5;
}
struct EndpointListStruct {
@@ -430,8 +430,8 @@
}
readonly attribute ActionStruct actionList[] = 0;
- readonly attribute EndpointListStruct endpointList[] = 1;
- readonly attribute long_char_string<512> setupUrl = 2;
+ readonly attribute EndpointListStruct endpointLists[] = 1;
+ readonly attribute long_char_string<512> setupURL = 2;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
@@ -1755,10 +1755,10 @@
ram attribute clusterRevision default = 1;
}
- server cluster BridgedActions {
+ server cluster Actions {
callback attribute actionList;
- callback attribute endpointList;
- ram attribute setupUrl default = "https://example.com";
+ callback attribute endpointLists;
+ ram attribute setupURL default = "https://example.com";
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
diff --git a/examples/bridge-app/bridge-common/bridge-app.zap b/examples/bridge-app/bridge-common/bridge-app.zap
index 65b34ec..e9ca95c 100644
--- a/examples/bridge-app/bridge-common/bridge-app.zap
+++ b/examples/bridge-app/bridge-common/bridge-app.zap
@@ -4469,7 +4469,7 @@
"code": 5,
"mfgCode": null,
"side": "server",
- "type": "fabric_idx",
+ "type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -5477,10 +5477,10 @@
]
},
{
- "name": "Bridged Actions",
+ "name": "Actions",
"code": 37,
"mfgCode": null,
- "define": "BRIDGED_ACTIONS_CLUSTER",
+ "define": "ACTIONS_CLUSTER",
"side": "client",
"enabled": 0,
"commands": [
@@ -5529,15 +5529,15 @@
]
},
{
- "name": "Bridged Actions",
+ "name": "Actions",
"code": 37,
"mfgCode": null,
- "define": "BRIDGED_ACTIONS_CLUSTER",
+ "define": "ACTIONS_CLUSTER",
"side": "server",
"enabled": 1,
"attributes": [
{
- "name": "action list",
+ "name": "ActionList",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -5553,7 +5553,7 @@
"reportableChange": 0
},
{
- "name": "endpoint list",
+ "name": "EndpointLists",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -5569,7 +5569,7 @@
"reportableChange": 0
},
{
- "name": "setup url",
+ "name": "SetupURL",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -6355,7 +6355,7 @@
"enabled": 1,
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -6371,7 +6371,7 @@
"reportableChange": 0
},
{
- "name": "remaining time",
+ "name": "RemainingTime",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -6387,7 +6387,7 @@
"reportableChange": 0
},
{
- "name": "min level",
+ "name": "MinLevel",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -6403,7 +6403,7 @@
"reportableChange": 0
},
{
- "name": "max level",
+ "name": "MaxLevel",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -6419,7 +6419,7 @@
"reportableChange": 0
},
{
- "name": "current frequency",
+ "name": "CurrentFrequency",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -6435,7 +6435,7 @@
"reportableChange": 0
},
{
- "name": "min frequency",
+ "name": "MinFrequency",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -6451,7 +6451,7 @@
"reportableChange": 0
},
{
- "name": "max frequency",
+ "name": "MaxFrequency",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -6467,7 +6467,7 @@
"reportableChange": 0
},
{
- "name": "options",
+ "name": "Options",
"code": 15,
"mfgCode": null,
"side": "server",
@@ -6483,7 +6483,7 @@
"reportableChange": 0
},
{
- "name": "on off transition time",
+ "name": "OnOffTransitionTime",
"code": 16,
"mfgCode": null,
"side": "server",
@@ -6499,7 +6499,7 @@
"reportableChange": 0
},
{
- "name": "on level",
+ "name": "OnLevel",
"code": 17,
"mfgCode": null,
"side": "server",
@@ -6515,7 +6515,7 @@
"reportableChange": 0
},
{
- "name": "on transition time",
+ "name": "OnTransitionTime",
"code": 18,
"mfgCode": null,
"side": "server",
@@ -6531,7 +6531,7 @@
"reportableChange": 0
},
{
- "name": "off transition time",
+ "name": "OffTransitionTime",
"code": 19,
"mfgCode": null,
"side": "server",
@@ -6547,7 +6547,7 @@
"reportableChange": 0
},
{
- "name": "default move rate",
+ "name": "DefaultMoveRate",
"code": 20,
"mfgCode": null,
"side": "server",
@@ -6563,7 +6563,7 @@
"reportableChange": 0
},
{
- "name": "start up current level",
+ "name": "StartUpCurrentLevel",
"code": 16384,
"mfgCode": null,
"side": "server",
@@ -7543,6 +7543,5 @@
"endpointVersion": 1,
"deviceIdentifier": 257
}
- ],
- "log": []
+ ]
}
\ No newline at end of file
diff --git a/examples/bridge-app/esp32/main/DeviceCallbacks.cpp b/examples/bridge-app/esp32/main/DeviceCallbacks.cpp
index 51d23c3..b7e5a2b 100644
--- a/examples/bridge-app/esp32/main/DeviceCallbacks.cpp
+++ b/examples/bridge-app/esp32/main/DeviceCallbacks.cpp
@@ -32,7 +32,7 @@
using namespace ::chip;
using namespace ::chip::app;
using namespace ::chip::app::Clusters;
-using namespace ::chip::app::Clusters::BridgedActions::Attributes;
+using namespace ::chip::app::Clusters::Actions::Attributes;
using namespace ::chip::Inet;
using namespace ::chip::System;
@@ -46,11 +46,11 @@
namespace {
-class BridgedActionsAttrAccess : public AttributeAccessInterface
+class ActionsAttrAccess : public AttributeAccessInterface
{
public:
- // Register for the Bridged Actions cluster on all endpoints.
- BridgedActionsAttrAccess() : AttributeAccessInterface(Optional<EndpointId>::Missing(), BridgedActions::Id) {}
+ // Register for the Actions cluster on all endpoints.
+ ActionsAttrAccess() : AttributeAccessInterface(Optional<EndpointId>::Missing(), Actions::Id) {}
CHIP_ERROR Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder) override;
@@ -63,44 +63,44 @@
CHIP_ERROR ReadClusterRevision(EndpointId endpoint, AttributeValueEncoder & aEncoder);
};
-constexpr uint16_t BridgedActionsAttrAccess::ClusterRevision;
+constexpr uint16_t ActionsAttrAccess::ClusterRevision;
-CHIP_ERROR BridgedActionsAttrAccess::ReadActionListAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder)
+CHIP_ERROR ActionsAttrAccess::ReadActionListAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder)
{
// Just return an empty list
return aEncoder.EncodeEmptyList();
}
-CHIP_ERROR BridgedActionsAttrAccess::ReadEndpointListAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder)
+CHIP_ERROR ActionsAttrAccess::ReadEndpointListAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder)
{
// Just return an empty list
return aEncoder.EncodeEmptyList();
}
-CHIP_ERROR BridgedActionsAttrAccess::ReadSetupUrlAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder)
+CHIP_ERROR ActionsAttrAccess::ReadSetupUrlAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder)
{
const char SetupUrl[] = "https://example.com";
return aEncoder.Encode(chip::CharSpan::fromCharString(SetupUrl));
}
-CHIP_ERROR BridgedActionsAttrAccess::ReadClusterRevision(EndpointId endpoint, AttributeValueEncoder & aEncoder)
+CHIP_ERROR ActionsAttrAccess::ReadClusterRevision(EndpointId endpoint, AttributeValueEncoder & aEncoder)
{
return aEncoder.Encode(ClusterRevision);
}
-BridgedActionsAttrAccess gAttrAccess;
+ActionsAttrAccess gAttrAccess;
-CHIP_ERROR BridgedActionsAttrAccess::Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder)
+CHIP_ERROR ActionsAttrAccess::Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder)
{
- VerifyOrDie(aPath.mClusterId == BridgedActions::Id);
+ VerifyOrDie(aPath.mClusterId == Actions::Id);
switch (aPath.mAttributeId)
{
case ActionList::Id:
return ReadActionListAttribute(aPath.mEndpointId, aEncoder);
- case EndpointList::Id:
+ case EndpointLists::Id:
return ReadEndpointListAttribute(aPath.mEndpointId, aEncoder);
- case SetupUrl::Id:
+ case SetupURL::Id:
return ReadSetupUrlAttribute(aPath.mEndpointId, aEncoder);
case ClusterRevision::Id:
return ReadClusterRevision(aPath.mEndpointId, aEncoder);
@@ -111,7 +111,7 @@
}
} // anonymous namespace
-void MatterBridgedActionsPluginServerInitCallback(void)
+void MatterActionsPluginServerInitCallback(void)
{
registerAttributeAccessOverride(&gAttrAccess);
}
diff --git a/examples/bridge-app/esp32/main/main.cpp b/examples/bridge-app/esp32/main/main.cpp
index 4f86e18..5f3a3de 100644
--- a/examples/bridge-app/esp32/main/main.cpp
+++ b/examples/bridge-app/esp32/main/main.cpp
@@ -329,9 +329,8 @@
}
}
-bool emberAfBridgedActionsClusterInstantActionCallback(app::CommandHandler * commandObj,
- const app::ConcreteCommandPath & commandPath,
- const BridgedActions::Commands::InstantAction::DecodableType & commandData)
+bool emberAfActionsClusterInstantActionCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
+ const Actions::Commands::InstantAction::DecodableType & commandData)
{
// No actions are implemented, just return status NotFound.
commandObj->AddStatus(commandPath, Protocols::InteractionModel::Status::NotFound);
diff --git a/examples/bridge-app/linux/Device.cpp b/examples/bridge-app/linux/Device.cpp
index 6ecaecf..eae3eff 100644
--- a/examples/bridge-app/linux/Device.cpp
+++ b/examples/bridge-app/linux/Device.cpp
@@ -22,7 +22,7 @@
#include <cstdio>
#include <platform/CHIPDeviceLayer.h>
-using namespace chip::app::Clusters::BridgedActions;
+using namespace chip::app::Clusters::Actions;
// LightingManager LightingManager::sLight;
diff --git a/examples/bridge-app/linux/bridged-actions-stub.cpp b/examples/bridge-app/linux/bridged-actions-stub.cpp
index debf253..9f7173e 100644
--- a/examples/bridge-app/linux/bridged-actions-stub.cpp
+++ b/examples/bridge-app/linux/bridged-actions-stub.cpp
@@ -32,15 +32,15 @@
using namespace chip;
using namespace chip::app;
using namespace chip::app::Clusters;
-using namespace chip::app::Clusters::BridgedActions::Attributes;
+using namespace chip::app::Clusters::Actions::Attributes;
namespace {
-class BridgedActionsAttrAccess : public AttributeAccessInterface
+class ActionsAttrAccess : public AttributeAccessInterface
{
public:
- // Register for the Bridged Actions cluster on all endpoints.
- BridgedActionsAttrAccess() : AttributeAccessInterface(Optional<EndpointId>::Missing(), BridgedActions::Id) {}
+ // Register for the Actions cluster on all endpoints.
+ ActionsAttrAccess() : AttributeAccessInterface(Optional<EndpointId>::Missing(), Actions::Id) {}
CHIP_ERROR Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder) override;
@@ -53,9 +53,9 @@
CHIP_ERROR ReadClusterRevision(EndpointId endpoint, AttributeValueEncoder & aEncoder);
};
-constexpr uint16_t BridgedActionsAttrAccess::ClusterRevision;
+constexpr uint16_t ActionsAttrAccess::ClusterRevision;
-CHIP_ERROR BridgedActionsAttrAccess::ReadActionListAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder)
+CHIP_ERROR ActionsAttrAccess::ReadActionListAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder)
{
CHIP_ERROR err = aEncoder.EncodeList([&endpoint](const auto & encoder) -> CHIP_ERROR {
std::vector<Action *> actionList = GetActionListInfo(endpoint);
@@ -64,12 +64,12 @@
{
if (action->getIsVisible())
{
- BridgedActions::Structs::ActionStruct::Type actionStruct = { action->getActionId(),
- CharSpan::fromCharString(action->getName().c_str()),
- action->getType(),
- action->getEndpointListId(),
- action->getSupportedCommands(),
- action->getStatus() };
+ Actions::Structs::ActionStruct::Type actionStruct = { action->getActionId(),
+ CharSpan::fromCharString(action->getName().c_str()),
+ action->getType(),
+ action->getEndpointListId(),
+ action->getSupportedCommands(),
+ action->getStatus() };
ReturnErrorOnFailure(encoder.Encode(actionStruct));
}
}
@@ -79,14 +79,14 @@
return err;
}
-CHIP_ERROR BridgedActionsAttrAccess::ReadEndpointListAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder)
+CHIP_ERROR ActionsAttrAccess::ReadEndpointListAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder)
{
std::vector<EndpointListInfo> infoList = GetEndpointListInfo(endpoint);
CHIP_ERROR err = aEncoder.EncodeList([&infoList](const auto & encoder) -> CHIP_ERROR {
for (auto info : infoList)
{
- BridgedActions::Structs::EndpointListStruct::Type endpointListStruct = {
+ Actions::Structs::EndpointListStruct::Type endpointListStruct = {
info.GetEndpointListId(), CharSpan::fromCharString(info.GetName().c_str()), info.GetType(),
DataModel::List<chip::EndpointId>(info.GetEndpointListData(), info.GetEndpointListSize())
};
@@ -97,30 +97,30 @@
return err;
}
-CHIP_ERROR BridgedActionsAttrAccess::ReadSetupUrlAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder)
+CHIP_ERROR ActionsAttrAccess::ReadSetupUrlAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder)
{
const char SetupUrl[] = "https://example.com";
return aEncoder.Encode(chip::CharSpan::fromCharString(SetupUrl));
}
-CHIP_ERROR BridgedActionsAttrAccess::ReadClusterRevision(EndpointId endpoint, AttributeValueEncoder & aEncoder)
+CHIP_ERROR ActionsAttrAccess::ReadClusterRevision(EndpointId endpoint, AttributeValueEncoder & aEncoder)
{
return aEncoder.Encode(ClusterRevision);
}
-BridgedActionsAttrAccess gAttrAccess;
+ActionsAttrAccess gAttrAccess;
-CHIP_ERROR BridgedActionsAttrAccess::Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder)
+CHIP_ERROR ActionsAttrAccess::Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder)
{
- VerifyOrDie(aPath.mClusterId == BridgedActions::Id);
+ VerifyOrDie(aPath.mClusterId == Actions::Id);
switch (aPath.mAttributeId)
{
case ActionList::Id:
return ReadActionListAttribute(aPath.mEndpointId, aEncoder);
- case EndpointList::Id:
+ case EndpointLists::Id:
return ReadEndpointListAttribute(aPath.mEndpointId, aEncoder);
- case SetupUrl::Id:
+ case SetupURL::Id:
return ReadSetupUrlAttribute(aPath.mEndpointId, aEncoder);
case ClusterRevision::Id:
return ReadClusterRevision(aPath.mEndpointId, aEncoder);
@@ -131,7 +131,7 @@
}
} // anonymous namespace
-void MatterBridgedActionsPluginServerInitCallback(void)
+void MatterActionsPluginServerInitCallback(void)
{
registerAttributeAccessOverride(&gAttrAccess);
}
diff --git a/examples/bridge-app/linux/include/Device.h b/examples/bridge-app/linux/include/Device.h
index 77322de..b85633c 100644
--- a/examples/bridge-app/linux/include/Device.h
+++ b/examples/bridge-app/linux/include/Device.h
@@ -209,51 +209,50 @@
class EndpointListInfo
{
public:
- EndpointListInfo(uint16_t endpointListId, std::string name, chip::app::Clusters::BridgedActions::EndpointListTypeEnum type);
- EndpointListInfo(uint16_t endpointListId, std::string name, chip::app::Clusters::BridgedActions::EndpointListTypeEnum type,
+ EndpointListInfo(uint16_t endpointListId, std::string name, chip::app::Clusters::Actions::EndpointListTypeEnum type);
+ EndpointListInfo(uint16_t endpointListId, std::string name, chip::app::Clusters::Actions::EndpointListTypeEnum type,
chip::EndpointId endpointId);
void AddEndpointId(chip::EndpointId endpointId);
inline uint16_t GetEndpointListId() { return mEndpointListId; };
std::string GetName() { return mName; };
- inline chip::app::Clusters::BridgedActions::EndpointListTypeEnum GetType() { return mType; };
+ inline chip::app::Clusters::Actions::EndpointListTypeEnum GetType() { return mType; };
inline chip::EndpointId * GetEndpointListData() { return mEndpoints.data(); };
inline size_t GetEndpointListSize() { return mEndpoints.size(); };
private:
uint16_t mEndpointListId = static_cast<uint16_t>(0);
std::string mName;
- chip::app::Clusters::BridgedActions::EndpointListTypeEnum mType =
- static_cast<chip::app::Clusters::BridgedActions::EndpointListTypeEnum>(0);
+ chip::app::Clusters::Actions::EndpointListTypeEnum mType = static_cast<chip::app::Clusters::Actions::EndpointListTypeEnum>(0);
std::vector<chip::EndpointId> mEndpoints;
};
class Room
{
public:
- Room(std::string name, uint16_t endpointListId, chip::app::Clusters::BridgedActions::EndpointListTypeEnum type, bool isVisible);
+ Room(std::string name, uint16_t endpointListId, chip::app::Clusters::Actions::EndpointListTypeEnum type, bool isVisible);
inline void setIsVisible(bool isVisible) { mIsVisible = isVisible; };
inline bool getIsVisible() { return mIsVisible; };
inline void setName(std::string name) { mName = name; };
inline std::string getName() { return mName; };
- inline chip::app::Clusters::BridgedActions::EndpointListTypeEnum getType() { return mType; };
+ inline chip::app::Clusters::Actions::EndpointListTypeEnum getType() { return mType; };
inline uint16_t getEndpointListId() { return mEndpointListId; };
private:
bool mIsVisible;
std::string mName;
uint16_t mEndpointListId;
- chip::app::Clusters::BridgedActions::EndpointListTypeEnum mType;
+ chip::app::Clusters::Actions::EndpointListTypeEnum mType;
};
class Action
{
public:
- Action(uint16_t actionId, std::string name, chip::app::Clusters::BridgedActions::ActionTypeEnum type, uint16_t endpointListId,
- uint16_t supportedCommands, chip::app::Clusters::BridgedActions::ActionStateEnum status, bool isVisible);
+ Action(uint16_t actionId, std::string name, chip::app::Clusters::Actions::ActionTypeEnum type, uint16_t endpointListId,
+ uint16_t supportedCommands, chip::app::Clusters::Actions::ActionStateEnum status, bool isVisible);
inline void setName(std::string name) { mName = name; };
inline std::string getName() { return mName; };
- inline chip::app::Clusters::BridgedActions::ActionTypeEnum getType() { return mType; };
- inline chip::app::Clusters::BridgedActions::ActionStateEnum getStatus() { return mStatus; };
+ inline chip::app::Clusters::Actions::ActionTypeEnum getType() { return mType; };
+ inline chip::app::Clusters::Actions::ActionStateEnum getStatus() { return mStatus; };
inline uint16_t getActionId() { return mActionId; };
inline uint16_t getEndpointListId() { return mEndpointListId; };
inline uint16_t getSupportedCommands() { return mSupportedCommands; };
@@ -262,8 +261,8 @@
private:
std::string mName;
- chip::app::Clusters::BridgedActions::ActionTypeEnum mType;
- chip::app::Clusters::BridgedActions::ActionStateEnum mStatus;
+ chip::app::Clusters::Actions::ActionTypeEnum mType;
+ chip::app::Clusters::Actions::ActionStateEnum mStatus;
uint16_t mActionId;
uint16_t mEndpointListId;
uint16_t mSupportedCommands;
diff --git a/examples/bridge-app/linux/main.cpp b/examples/bridge-app/linux/main.cpp
index 5d26ba4..ee545d5 100644
--- a/examples/bridge-app/linux/main.cpp
+++ b/examples/bridge-app/linux/main.cpp
@@ -172,16 +172,15 @@
DeviceOnOff ActionLight3("Action Light 3", "Room 2");
DeviceOnOff ActionLight4("Action Light 4", "Room 2");
-Room room1("Room 1", 0xE001, BridgedActions::EndpointListTypeEnum::kRoom, true);
-Room room2("Room 2", 0xE002, BridgedActions::EndpointListTypeEnum::kRoom, true);
-Room room3("Zone 3", 0xE003, BridgedActions::EndpointListTypeEnum::kZone, false);
+Room room1("Room 1", 0xE001, Actions::EndpointListTypeEnum::kRoom, true);
+Room room2("Room 2", 0xE002, Actions::EndpointListTypeEnum::kRoom, true);
+Room room3("Zone 3", 0xE003, Actions::EndpointListTypeEnum::kZone, false);
-Action action1(0x1001, "Room 1 On", BridgedActions::ActionTypeEnum::kAutomation, 0xE001, 0x1,
- BridgedActions::ActionStateEnum::kInactive, true);
-Action action2(0x1002, "Turn On Room 2", BridgedActions::ActionTypeEnum::kAutomation, 0xE002, 0x01,
- BridgedActions::ActionStateEnum::kInactive, true);
-Action action3(0x1003, "Turn Off Room 1", BridgedActions::ActionTypeEnum::kAutomation, 0xE003, 0x01,
- BridgedActions::ActionStateEnum::kInactive, false);
+Action action1(0x1001, "Room 1 On", Actions::ActionTypeEnum::kAutomation, 0xE001, 0x1, Actions::ActionStateEnum::kInactive, true);
+Action action2(0x1002, "Turn On Room 2", Actions::ActionTypeEnum::kAutomation, 0xE002, 0x01, Actions::ActionStateEnum::kInactive,
+ true);
+Action action3(0x1003, "Turn Off Room 1", Actions::ActionTypeEnum::kAutomation, 0xE003, 0x01, Actions::ActionStateEnum::kInactive,
+ false);
// ---------------------------------------------------------------------------
//
@@ -339,7 +338,7 @@
if ((gDevices[index] != nullptr) && (gDevices[index]->GetParentEndpointId() == parentId))
{
std::string location;
- if (room->getType() == BridgedActions::EndpointListTypeEnum::kZone)
+ if (room->getType() == Actions::EndpointListTypeEnum::kZone)
{
location = gDevices[index]->GetZone();
}
@@ -654,7 +653,7 @@
{
if (hasInvokeID)
{
- BridgedActions::Events::StateChanged::Type event{ actionID, invokeID, BridgedActions::ActionStateEnum::kActive };
+ Actions::Events::StateChanged::Type event{ actionID, invokeID, Actions::ActionStateEnum::kActive };
EventNumber eventNumber;
chip::app::LogEvent(event, endpointId, eventNumber);
}
@@ -679,15 +678,14 @@
if (hasInvokeID)
{
- BridgedActions::Events::StateChanged::Type event{ actionID, invokeID, BridgedActions::ActionStateEnum::kInactive };
+ Actions::Events::StateChanged::Type event{ actionID, invokeID, Actions::ActionStateEnum::kInactive };
EventNumber eventNumber;
chip::app::LogEvent(event, endpointId, eventNumber);
}
}
-bool emberAfBridgedActionsClusterInstantActionCallback(app::CommandHandler * commandObj,
- const app::ConcreteCommandPath & commandPath,
- const BridgedActions::Commands::InstantAction::DecodableType & commandData)
+bool emberAfActionsClusterInstantActionCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
+ const Actions::Commands::InstantAction::DecodableType & commandData)
{
bool hasInvokeID = false;
uint32_t invokeID = 0;
diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap
index 3b32fd6..e7a428e 100644
--- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap
+++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 70,
+ "featureLevel": 77,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,14 +19,16 @@
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/zcl/zcl.json",
- "version": "ZCL Test Data",
- "type": "zcl-properties"
+ "type": "zcl-properties",
+ "category": "matter",
+ "version": 1,
+ "description": "Matter SDK ZCL data"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
- "version": "chip-v1",
- "type": "gen-templates-json"
+ "type": "gen-templates-json",
+ "version": "chip-v1"
}
],
"endpointTypes": [
@@ -51,14 +53,6 @@
"source": "client",
"incoming": 1,
"outgoing": 0
- },
- {
- "name": "IdentifyQuery",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -87,16 +81,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [
- {
- "name": "IdentifyQueryResponse",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
"attributes": [
{
"name": "identify time",
@@ -443,7 +427,7 @@
],
"attributes": [
{
- "name": "scene count",
+ "name": "SceneCount",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -459,7 +443,7 @@
"reportableChange": 0
},
{
- "name": "current scene",
+ "name": "CurrentScene",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -475,11 +459,11 @@
"reportableChange": 0
},
{
- "name": "current group",
+ "name": "CurrentGroup",
"code": 2,
"mfgCode": null,
"side": "server",
- "type": "int16u",
+ "type": "group_id",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -491,7 +475,7 @@
"reportableChange": 0
},
{
- "name": "scene valid",
+ "name": "SceneValid",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -507,7 +491,7 @@
"reportableChange": 0
},
{
- "name": "name support",
+ "name": "NameSupport",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -599,7 +583,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -642,7 +625,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -669,7 +651,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "switch type",
@@ -820,10 +801,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -863,7 +843,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -890,7 +869,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -997,7 +975,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1024,7 +1001,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ACL",
@@ -1115,7 +1091,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1142,7 +1117,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -1653,7 +1627,6 @@
"define": "OTA_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DefaultOtaProviders",
@@ -1775,9 +1748,7 @@
"mfgCode": null,
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Localization Configuration",
@@ -1786,27 +1757,10 @@
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
- "name": "ActiveLocale",
- "code": 1,
- "mfgCode": null,
- "side": "server",
- "type": "char_string",
- "included": 1,
- "storageOption": "NVM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "en-US",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "SupportedLocales",
- "code": 2,
+ "code": 1,
"mfgCode": null,
"side": "server",
"type": "array",
@@ -1814,7 +1768,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": "en-US",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -1860,9 +1814,7 @@
"mfgCode": null,
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Time Format Localization",
@@ -1871,7 +1823,6 @@
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "HourFormat",
@@ -1961,9 +1912,7 @@
"mfgCode": null,
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Unit Localization",
@@ -1972,7 +1921,6 @@
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "TemperatureUnit",
@@ -2149,7 +2097,7 @@
"side": "server",
"type": "RegulatoryLocationType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2165,7 +2113,7 @@
"side": "server",
"type": "RegulatoryLocationType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2539,7 +2487,6 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -2600,7 +2547,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -2616,7 +2563,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2632,7 +2579,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -2648,7 +2595,7 @@
"side": "server",
"type": "enum8",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2798,7 +2745,6 @@
"define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ThreadMetrics",
@@ -2823,7 +2769,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2839,7 +2785,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2855,7 +2801,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2941,7 +2887,6 @@
"define": "THREAD_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "channel",
@@ -2950,7 +2895,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2964,9 +2909,9 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "enum8",
+ "type": "RoutingRole",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2982,7 +2927,7 @@
"side": "server",
"type": "char_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2998,7 +2943,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3014,7 +2959,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3030,7 +2975,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3046,7 +2991,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3094,7 +3039,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3110,7 +3055,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3126,7 +3071,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3142,7 +3087,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3158,7 +3103,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3174,7 +3119,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3190,7 +3135,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3206,7 +3151,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3222,7 +3167,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3238,7 +3183,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3254,7 +3199,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3270,7 +3215,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3286,7 +3231,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3302,7 +3247,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3318,7 +3263,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3334,7 +3279,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3350,7 +3295,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3366,7 +3311,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3382,7 +3327,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3398,7 +3343,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3414,7 +3359,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3430,7 +3375,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3446,7 +3391,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3462,7 +3407,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3478,7 +3423,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3494,7 +3439,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3510,7 +3455,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3526,7 +3471,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3542,7 +3487,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3558,7 +3503,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3574,7 +3519,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3590,7 +3535,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3606,7 +3551,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3622,7 +3567,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3638,7 +3583,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3654,7 +3599,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3670,7 +3615,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3686,7 +3631,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3702,7 +3647,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3718,7 +3663,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3734,7 +3679,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3750,7 +3695,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3766,7 +3711,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3782,7 +3727,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3798,7 +3743,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3814,7 +3759,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3830,7 +3775,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3846,7 +3791,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3862,7 +3807,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3878,7 +3823,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3892,7 +3837,7 @@
"code": 59,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "SecurityPolicy",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -3910,7 +3855,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3924,7 +3869,7 @@
"code": 61,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "OperationalDatasetComponents",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -4028,7 +3973,6 @@
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "bssid",
@@ -4037,7 +3981,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4053,7 +3997,7 @@
"side": "server",
"type": "SecurityType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4069,7 +4013,7 @@
"side": "server",
"type": "WiFiVersionType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4085,7 +4029,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -4101,7 +4045,7 @@
"side": "server",
"type": "int8s",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -4117,7 +4061,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4133,7 +4077,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4149,7 +4093,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4165,7 +4109,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4181,7 +4125,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4197,7 +4141,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4213,7 +4157,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4229,7 +4173,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4315,7 +4259,6 @@
"define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "PHYRate",
@@ -4501,9 +4444,7 @@
"mfgCode": null,
"define": "SWITCH_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Switch",
@@ -4512,7 +4453,6 @@
"define": "SWITCH_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -4607,7 +4547,6 @@
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "WindowStatus",
@@ -4762,14 +4701,6 @@
"source": "client",
"incoming": 1,
"outgoing": 1
- },
- {
- "name": "RemoveTrustedRootCertificate",
- "code": 12,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -4872,7 +4803,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4888,7 +4819,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4918,7 +4849,7 @@
"code": 5,
"mfgCode": null,
"side": "server",
- "type": "fabric_idx",
+ "type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -5003,8 +4934,7 @@
"incoming": 1,
"outgoing": 0
}
- ],
- "attributes": []
+ ]
},
{
"name": "Group Key Management",
@@ -5136,9 +5066,7 @@
"mfgCode": null,
"define": "FIXED_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Fixed Label",
@@ -5147,7 +5075,6 @@
"define": "FIXED_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5205,9 +5132,7 @@
"mfgCode": null,
"define": "USER_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "User Label",
@@ -5216,7 +5141,6 @@
"define": "USER_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5291,14 +5215,6 @@
"source": "client",
"incoming": 1,
"outgoing": 0
- },
- {
- "name": "IdentifyQuery",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -5343,16 +5259,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [
- {
- "name": "IdentifyQueryResponse",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
"attributes": [
{
"name": "identify time",
@@ -5859,7 +5765,7 @@
],
"attributes": [
{
- "name": "scene count",
+ "name": "SceneCount",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -5875,7 +5781,7 @@
"reportableChange": 0
},
{
- "name": "current scene",
+ "name": "CurrentScene",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -5891,11 +5797,11 @@
"reportableChange": 0
},
{
- "name": "current group",
+ "name": "CurrentGroup",
"code": 2,
"mfgCode": null,
"side": "server",
- "type": "int16u",
+ "type": "group_id",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -5907,7 +5813,7 @@
"reportableChange": 0
},
{
- "name": "scene valid",
+ "name": "SceneValid",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -5923,7 +5829,7 @@
"reportableChange": 0
},
{
- "name": "name support",
+ "name": "NameSupport",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -5939,7 +5845,7 @@
"reportableChange": 0
},
{
- "name": "last configured by",
+ "name": "LastConfiguredBy",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -6111,7 +6017,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -6390,10 +6295,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -6409,7 +6313,7 @@
"reportableChange": 0
},
{
- "name": "remaining time",
+ "name": "RemainingTime",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -6425,7 +6329,7 @@
"reportableChange": 0
},
{
- "name": "min level",
+ "name": "MinLevel",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -6441,7 +6345,7 @@
"reportableChange": 0
},
{
- "name": "max level",
+ "name": "MaxLevel",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -6457,7 +6361,7 @@
"reportableChange": 0
},
{
- "name": "current frequency",
+ "name": "CurrentFrequency",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -6473,7 +6377,7 @@
"reportableChange": 0
},
{
- "name": "min frequency",
+ "name": "MinFrequency",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -6489,7 +6393,7 @@
"reportableChange": 0
},
{
- "name": "max frequency",
+ "name": "MaxFrequency",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -6505,7 +6409,7 @@
"reportableChange": 0
},
{
- "name": "options",
+ "name": "Options",
"code": 15,
"mfgCode": null,
"side": "server",
@@ -6521,7 +6425,7 @@
"reportableChange": 0
},
{
- "name": "on off transition time",
+ "name": "OnOffTransitionTime",
"code": 16,
"mfgCode": null,
"side": "server",
@@ -6537,7 +6441,7 @@
"reportableChange": 0
},
{
- "name": "on level",
+ "name": "OnLevel",
"code": 17,
"mfgCode": null,
"side": "server",
@@ -6553,7 +6457,7 @@
"reportableChange": 0
},
{
- "name": "on transition time",
+ "name": "OnTransitionTime",
"code": 18,
"mfgCode": null,
"side": "server",
@@ -6569,7 +6473,7 @@
"reportableChange": 0
},
{
- "name": "off transition time",
+ "name": "OffTransitionTime",
"code": 19,
"mfgCode": null,
"side": "server",
@@ -6585,7 +6489,7 @@
"reportableChange": 0
},
{
- "name": "default move rate",
+ "name": "DefaultMoveRate",
"code": 20,
"mfgCode": null,
"side": "server",
@@ -6601,7 +6505,7 @@
"reportableChange": 0
},
{
- "name": "start up current level",
+ "name": "StartUpCurrentLevel",
"code": 16384,
"mfgCode": null,
"side": "server",
@@ -6705,7 +6609,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -6748,7 +6651,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -6903,7 +6805,6 @@
"define": "BINDING_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -6946,7 +6847,6 @@
"define": "BINDING_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "Binding",
@@ -7053,7 +6953,6 @@
"define": "OCCUPANCY_SENSING_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -7096,7 +6995,6 @@
"define": "OCCUPANCY_SENSING_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "occupancy",
@@ -7394,6 +7292,5 @@
"endpointVersion": 1,
"deviceIdentifier": 257
}
- ],
- "log": []
-}
+ ]
+}
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
index 72e2e77..cd2fce9 100644
--- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
+++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 70,
+ "featureLevel": 77,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,14 +19,16 @@
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/zcl/zcl.json",
- "version": "ZCL Test Data",
- "type": "zcl-properties"
+ "type": "zcl-properties",
+ "category": "matter",
+ "version": 1,
+ "description": "Matter SDK ZCL data"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
- "version": "chip-v1",
- "type": "gen-templates-json"
+ "type": "gen-templates-json",
+ "version": "chip-v1"
}
],
"endpointTypes": [
@@ -51,14 +53,6 @@
"source": "client",
"incoming": 1,
"outgoing": 0
- },
- {
- "name": "IdentifyQuery",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -87,16 +81,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [
- {
- "name": "IdentifyQueryResponse",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
"attributes": [
{
"name": "identify time",
@@ -443,7 +427,7 @@
],
"attributes": [
{
- "name": "scene count",
+ "name": "SceneCount",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -459,7 +443,7 @@
"reportableChange": 0
},
{
- "name": "current scene",
+ "name": "CurrentScene",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -475,11 +459,11 @@
"reportableChange": 0
},
{
- "name": "current group",
+ "name": "CurrentGroup",
"code": 2,
"mfgCode": null,
"side": "server",
- "type": "int16u",
+ "type": "group_id",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -491,7 +475,7 @@
"reportableChange": 0
},
{
- "name": "scene valid",
+ "name": "SceneValid",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -507,7 +491,7 @@
"reportableChange": 0
},
{
- "name": "name support",
+ "name": "NameSupport",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -599,7 +583,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -642,7 +625,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -669,7 +651,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "switch type",
@@ -820,10 +801,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -863,7 +843,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -890,7 +869,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -997,7 +975,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1024,7 +1001,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ACL",
@@ -1115,7 +1091,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1142,7 +1117,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -1151,7 +1125,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "10",
@@ -1653,7 +1627,6 @@
"define": "OTA_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DefaultOtaProviders",
@@ -1775,9 +1748,7 @@
"mfgCode": null,
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Localization Configuration",
@@ -1786,27 +1757,10 @@
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
- "name": "ActiveLocale",
- "code": 1,
- "mfgCode": null,
- "side": "server",
- "type": "char_string",
- "included": 1,
- "storageOption": "NVM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "en-US",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "SupportedLocales",
- "code": 2,
+ "code": 1,
"mfgCode": null,
"side": "server",
"type": "array",
@@ -1814,7 +1768,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": "en-US",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -1860,9 +1814,7 @@
"mfgCode": null,
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Time Format Localization",
@@ -1871,7 +1823,6 @@
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "HourFormat",
@@ -1961,9 +1912,7 @@
"mfgCode": null,
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Unit Localization",
@@ -1972,7 +1921,6 @@
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "TemperatureUnit",
@@ -2149,7 +2097,7 @@
"side": "server",
"type": "RegulatoryLocationType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2165,7 +2113,7 @@
"side": "server",
"type": "RegulatoryLocationType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2539,7 +2487,6 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -2600,7 +2547,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -2616,7 +2563,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2632,7 +2579,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -2648,7 +2595,7 @@
"side": "server",
"type": "enum8",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2798,7 +2745,6 @@
"define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ThreadMetrics",
@@ -2823,7 +2769,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2839,7 +2785,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2855,7 +2801,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2941,7 +2887,6 @@
"define": "THREAD_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "channel",
@@ -2950,7 +2895,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2964,9 +2909,9 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "enum8",
+ "type": "RoutingRole",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2982,7 +2927,7 @@
"side": "server",
"type": "char_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2998,7 +2943,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3014,7 +2959,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3030,7 +2975,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3046,7 +2991,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3094,7 +3039,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3110,7 +3055,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3126,7 +3071,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3142,7 +3087,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3158,7 +3103,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3174,7 +3119,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3190,7 +3135,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3206,7 +3151,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3222,7 +3167,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3238,7 +3183,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3254,7 +3199,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3270,7 +3215,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3286,7 +3231,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3302,7 +3247,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3318,7 +3263,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3334,7 +3279,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3350,7 +3295,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3366,7 +3311,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3382,7 +3327,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3398,7 +3343,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3414,7 +3359,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3430,7 +3375,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3446,7 +3391,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3462,7 +3407,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3478,7 +3423,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3494,7 +3439,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3510,7 +3455,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3526,7 +3471,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3542,7 +3487,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3558,7 +3503,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3574,7 +3519,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3590,7 +3535,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3606,7 +3551,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3622,7 +3567,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3638,7 +3583,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3654,7 +3599,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3670,7 +3615,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3686,7 +3631,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3702,7 +3647,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3718,7 +3663,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3734,7 +3679,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3750,7 +3695,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3766,7 +3711,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3782,7 +3727,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3798,7 +3743,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3814,7 +3759,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3830,7 +3775,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3846,7 +3791,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3862,7 +3807,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3878,7 +3823,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3892,7 +3837,7 @@
"code": 59,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "SecurityPolicy",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -3910,7 +3855,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3924,7 +3869,7 @@
"code": 61,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "OperationalDatasetComponents",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -4028,7 +3973,6 @@
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "bssid",
@@ -4037,7 +3981,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4053,7 +3997,7 @@
"side": "server",
"type": "SecurityType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4069,7 +4013,7 @@
"side": "server",
"type": "WiFiVersionType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4085,7 +4029,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -4101,7 +4045,7 @@
"side": "server",
"type": "int8s",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -4117,7 +4061,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4133,7 +4077,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4149,7 +4093,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4165,7 +4109,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4181,7 +4125,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4197,7 +4141,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4213,7 +4157,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4229,7 +4173,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4315,7 +4259,6 @@
"define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "PHYRate",
@@ -4324,7 +4267,7 @@
"side": "server",
"type": "PHYRateType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4340,7 +4283,7 @@
"side": "server",
"type": "boolean",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -4356,7 +4299,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4372,7 +4315,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4388,7 +4331,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4404,7 +4347,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4420,7 +4363,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4436,7 +4379,7 @@
"side": "server",
"type": "boolean",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -4452,7 +4395,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4501,9 +4444,7 @@
"mfgCode": null,
"define": "SWITCH_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Switch",
@@ -4512,7 +4453,6 @@
"define": "SWITCH_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -4607,7 +4547,6 @@
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "WindowStatus",
@@ -4762,14 +4701,6 @@
"source": "client",
"incoming": 1,
"outgoing": 1
- },
- {
- "name": "RemoveTrustedRootCertificate",
- "code": 12,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -4872,7 +4803,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4888,7 +4819,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4918,7 +4849,7 @@
"code": 5,
"mfgCode": null,
"side": "server",
- "type": "fabric_idx",
+ "type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -5003,8 +4934,7 @@
"incoming": 1,
"outgoing": 0
}
- ],
- "attributes": []
+ ]
},
{
"name": "Group Key Management",
@@ -5136,9 +5066,7 @@
"mfgCode": null,
"define": "FIXED_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Fixed Label",
@@ -5147,7 +5075,6 @@
"define": "FIXED_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5205,9 +5132,7 @@
"mfgCode": null,
"define": "USER_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "User Label",
@@ -5216,7 +5141,6 @@
"define": "USER_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5291,14 +5215,6 @@
"source": "client",
"incoming": 1,
"outgoing": 0
- },
- {
- "name": "IdentifyQuery",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -5343,16 +5259,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [
- {
- "name": "IdentifyQueryResponse",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
"attributes": [
{
"name": "identify time",
@@ -5393,7 +5299,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -5409,7 +5315,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -5425,7 +5331,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -5625,7 +5531,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -5641,7 +5547,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -5657,7 +5563,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -5707,7 +5613,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -5750,7 +5655,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -5759,7 +5663,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -5775,7 +5679,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -5791,7 +5695,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -5807,7 +5711,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -5823,7 +5727,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -5839,7 +5743,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -5855,7 +5759,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -5905,7 +5809,6 @@
"define": "BINDING_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -5948,7 +5851,6 @@
"define": "BINDING_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "Binding",
@@ -5957,7 +5859,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -5973,7 +5875,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -5989,7 +5891,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6005,7 +5907,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6055,7 +5957,6 @@
"define": "BOOLEAN_STATE_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -6098,7 +5999,6 @@
"define": "BOOLEAN_STATE_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "StateValue",
@@ -6123,7 +6023,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -6139,7 +6039,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -6155,7 +6055,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -6220,6 +6120,5 @@
"endpointVersion": 1,
"deviceIdentifier": 21
}
- ],
- "log": []
-}
+ ]
+}
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap
index a66aea8..820d114 100644
--- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap
+++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 70,
+ "featureLevel": 77,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,14 +19,16 @@
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/zcl/zcl.json",
- "version": "ZCL Test Data",
- "type": "zcl-properties"
+ "type": "zcl-properties",
+ "category": "matter",
+ "version": 1,
+ "description": "Matter SDK ZCL data"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
- "version": "chip-v1",
- "type": "gen-templates-json"
+ "type": "gen-templates-json",
+ "version": "chip-v1"
}
],
"endpointTypes": [
@@ -51,14 +53,6 @@
"source": "client",
"incoming": 1,
"outgoing": 0
- },
- {
- "name": "IdentifyQuery",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -87,16 +81,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [
- {
- "name": "IdentifyQueryResponse",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
"attributes": [
{
"name": "identify time",
@@ -443,7 +427,7 @@
],
"attributes": [
{
- "name": "scene count",
+ "name": "SceneCount",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -459,7 +443,7 @@
"reportableChange": 0
},
{
- "name": "current scene",
+ "name": "CurrentScene",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -475,11 +459,11 @@
"reportableChange": 0
},
{
- "name": "current group",
+ "name": "CurrentGroup",
"code": 2,
"mfgCode": null,
"side": "server",
- "type": "int16u",
+ "type": "group_id",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -491,7 +475,7 @@
"reportableChange": 0
},
{
- "name": "scene valid",
+ "name": "SceneValid",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -507,7 +491,7 @@
"reportableChange": 0
},
{
- "name": "name support",
+ "name": "NameSupport",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -599,7 +583,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -642,7 +625,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -669,7 +651,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "switch type",
@@ -820,10 +801,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -863,7 +843,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -890,7 +869,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -997,7 +975,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1024,7 +1001,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ACL",
@@ -1115,7 +1091,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1142,7 +1117,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -1653,7 +1627,6 @@
"define": "OTA_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DefaultOtaProviders",
@@ -1775,9 +1748,7 @@
"mfgCode": null,
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Localization Configuration",
@@ -1786,27 +1757,10 @@
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
- "name": "ActiveLocale",
- "code": 1,
- "mfgCode": null,
- "side": "server",
- "type": "char_string",
- "included": 1,
- "storageOption": "NVM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "en-US",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "SupportedLocales",
- "code": 2,
+ "code": 1,
"mfgCode": null,
"side": "server",
"type": "array",
@@ -1814,7 +1768,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": "en-US",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -1860,9 +1814,7 @@
"mfgCode": null,
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Time Format Localization",
@@ -1871,7 +1823,6 @@
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "HourFormat",
@@ -1961,9 +1912,7 @@
"mfgCode": null,
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Unit Localization",
@@ -1972,7 +1921,6 @@
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "TemperatureUnit",
@@ -2149,7 +2097,7 @@
"side": "server",
"type": "RegulatoryLocationType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2165,7 +2113,7 @@
"side": "server",
"type": "RegulatoryLocationType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2539,7 +2487,6 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -2600,7 +2547,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -2616,7 +2563,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2632,7 +2579,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -2648,7 +2595,7 @@
"side": "server",
"type": "enum8",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2798,7 +2745,6 @@
"define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ThreadMetrics",
@@ -2823,7 +2769,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2839,7 +2785,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2855,7 +2801,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2941,7 +2887,6 @@
"define": "THREAD_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "channel",
@@ -2950,7 +2895,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2964,9 +2909,9 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "enum8",
+ "type": "RoutingRole",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2982,7 +2927,7 @@
"side": "server",
"type": "char_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2998,7 +2943,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3014,7 +2959,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3030,7 +2975,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3046,7 +2991,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3094,7 +3039,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3110,7 +3055,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3126,7 +3071,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3142,7 +3087,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3158,7 +3103,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3174,7 +3119,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3190,7 +3135,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3206,7 +3151,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3222,7 +3167,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3238,7 +3183,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3254,7 +3199,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3270,7 +3215,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3286,7 +3231,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3302,7 +3247,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3318,7 +3263,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3334,7 +3279,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3350,7 +3295,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3366,7 +3311,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3382,7 +3327,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3398,7 +3343,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3414,7 +3359,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3430,7 +3375,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3446,7 +3391,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3462,7 +3407,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3478,7 +3423,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3494,7 +3439,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3510,7 +3455,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3526,7 +3471,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3542,7 +3487,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3558,7 +3503,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3574,7 +3519,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3590,7 +3535,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3606,7 +3551,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3622,7 +3567,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3638,7 +3583,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3654,7 +3599,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3670,7 +3615,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3686,7 +3631,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3702,7 +3647,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3718,7 +3663,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3734,7 +3679,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3750,7 +3695,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3766,7 +3711,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3782,7 +3727,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3798,7 +3743,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3814,7 +3759,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3830,7 +3775,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3846,7 +3791,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3862,7 +3807,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3878,7 +3823,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3892,7 +3837,7 @@
"code": 59,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "SecurityPolicy",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -3910,7 +3855,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3924,7 +3869,7 @@
"code": 61,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "OperationalDatasetComponents",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -4028,7 +3973,6 @@
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "bssid",
@@ -4037,7 +3981,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4053,7 +3997,7 @@
"side": "server",
"type": "SecurityType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4069,7 +4013,7 @@
"side": "server",
"type": "WiFiVersionType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4085,7 +4029,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -4101,7 +4045,7 @@
"side": "server",
"type": "int8s",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -4117,7 +4061,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4133,7 +4077,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4149,7 +4093,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4165,7 +4109,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4181,7 +4125,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4197,7 +4141,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4213,7 +4157,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4229,7 +4173,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4315,7 +4259,6 @@
"define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "PHYRate",
@@ -4501,9 +4444,7 @@
"mfgCode": null,
"define": "SWITCH_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Switch",
@@ -4512,7 +4453,6 @@
"define": "SWITCH_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -4607,7 +4547,6 @@
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "WindowStatus",
@@ -4762,14 +4701,6 @@
"source": "client",
"incoming": 1,
"outgoing": 1
- },
- {
- "name": "RemoveTrustedRootCertificate",
- "code": 12,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -4872,7 +4803,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4888,7 +4819,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4918,7 +4849,7 @@
"code": 5,
"mfgCode": null,
"side": "server",
- "type": "fabric_idx",
+ "type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -5003,8 +4934,7 @@
"incoming": 1,
"outgoing": 0
}
- ],
- "attributes": []
+ ]
},
{
"name": "Group Key Management",
@@ -5136,9 +5066,7 @@
"mfgCode": null,
"define": "FIXED_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Fixed Label",
@@ -5147,7 +5075,6 @@
"define": "FIXED_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5205,9 +5132,7 @@
"mfgCode": null,
"define": "USER_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "User Label",
@@ -5216,7 +5141,6 @@
"define": "USER_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5291,14 +5215,6 @@
"source": "client",
"incoming": 1,
"outgoing": 0
- },
- {
- "name": "IdentifyQuery",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -5343,16 +5259,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [
- {
- "name": "IdentifyQueryResponse",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
"attributes": [
{
"name": "identify time",
@@ -5859,7 +5765,7 @@
],
"attributes": [
{
- "name": "scene count",
+ "name": "SceneCount",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -5875,7 +5781,7 @@
"reportableChange": 0
},
{
- "name": "current scene",
+ "name": "CurrentScene",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -5891,11 +5797,11 @@
"reportableChange": 0
},
{
- "name": "current group",
+ "name": "CurrentGroup",
"code": 2,
"mfgCode": null,
"side": "server",
- "type": "int16u",
+ "type": "group_id",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -5907,7 +5813,7 @@
"reportableChange": 0
},
{
- "name": "scene valid",
+ "name": "SceneValid",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -5923,7 +5829,7 @@
"reportableChange": 0
},
{
- "name": "name support",
+ "name": "NameSupport",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -5939,7 +5845,7 @@
"reportableChange": 0
},
{
- "name": "last configured by",
+ "name": "LastConfiguredBy",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -6111,7 +6017,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -6390,10 +6295,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -6409,7 +6313,7 @@
"reportableChange": 0
},
{
- "name": "remaining time",
+ "name": "RemainingTime",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -6425,7 +6329,7 @@
"reportableChange": 0
},
{
- "name": "min level",
+ "name": "MinLevel",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -6441,7 +6345,7 @@
"reportableChange": 0
},
{
- "name": "max level",
+ "name": "MaxLevel",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -6457,7 +6361,7 @@
"reportableChange": 0
},
{
- "name": "current frequency",
+ "name": "CurrentFrequency",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -6473,7 +6377,7 @@
"reportableChange": 0
},
{
- "name": "min frequency",
+ "name": "MinFrequency",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -6489,7 +6393,7 @@
"reportableChange": 0
},
{
- "name": "max frequency",
+ "name": "MaxFrequency",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -6505,7 +6409,7 @@
"reportableChange": 0
},
{
- "name": "options",
+ "name": "Options",
"code": 15,
"mfgCode": null,
"side": "server",
@@ -6521,7 +6425,7 @@
"reportableChange": 0
},
{
- "name": "on off transition time",
+ "name": "OnOffTransitionTime",
"code": 16,
"mfgCode": null,
"side": "server",
@@ -6537,7 +6441,7 @@
"reportableChange": 0
},
{
- "name": "on level",
+ "name": "OnLevel",
"code": 17,
"mfgCode": null,
"side": "server",
@@ -6553,7 +6457,7 @@
"reportableChange": 0
},
{
- "name": "on transition time",
+ "name": "OnTransitionTime",
"code": 18,
"mfgCode": null,
"side": "server",
@@ -6569,7 +6473,7 @@
"reportableChange": 0
},
{
- "name": "off transition time",
+ "name": "OffTransitionTime",
"code": 19,
"mfgCode": null,
"side": "server",
@@ -6585,7 +6489,7 @@
"reportableChange": 0
},
{
- "name": "default move rate",
+ "name": "DefaultMoveRate",
"code": 20,
"mfgCode": null,
"side": "server",
@@ -6601,7 +6505,7 @@
"reportableChange": 0
},
{
- "name": "start up current level",
+ "name": "StartUpCurrentLevel",
"code": 16384,
"mfgCode": null,
"side": "server",
@@ -6705,7 +6609,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -6748,7 +6651,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -6903,7 +6805,6 @@
"define": "BINDING_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -6946,7 +6847,6 @@
"define": "BINDING_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "Binding",
@@ -7053,7 +6953,6 @@
"define": "OCCUPANCY_SENSING_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -7096,7 +6995,6 @@
"define": "OCCUPANCY_SENSING_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "occupancy",
@@ -7394,6 +7292,5 @@
"endpointVersion": 1,
"deviceIdentifier": 257
}
- ],
- "log": []
-}
+ ]
+}
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
index 19f5116..8228846 100644
--- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
+++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 70,
+ "featureLevel": 77,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,14 +19,16 @@
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/zcl/zcl.json",
- "version": "ZCL Test Data",
- "type": "zcl-properties"
+ "type": "zcl-properties",
+ "category": "matter",
+ "version": 1,
+ "description": "Matter SDK ZCL data"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
- "version": "chip-v1",
- "type": "gen-templates-json"
+ "type": "gen-templates-json",
+ "version": "chip-v1"
}
],
"endpointTypes": [
@@ -51,14 +53,6 @@
"source": "client",
"incoming": 1,
"outgoing": 0
- },
- {
- "name": "IdentifyQuery",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -87,16 +81,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [
- {
- "name": "IdentifyQueryResponse",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
"attributes": [
{
"name": "identify time",
@@ -443,7 +427,7 @@
],
"attributes": [
{
- "name": "scene count",
+ "name": "SceneCount",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -459,7 +443,7 @@
"reportableChange": 0
},
{
- "name": "current scene",
+ "name": "CurrentScene",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -475,11 +459,11 @@
"reportableChange": 0
},
{
- "name": "current group",
+ "name": "CurrentGroup",
"code": 2,
"mfgCode": null,
"side": "server",
- "type": "int16u",
+ "type": "group_id",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -491,7 +475,7 @@
"reportableChange": 0
},
{
- "name": "scene valid",
+ "name": "SceneValid",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -507,7 +491,7 @@
"reportableChange": 0
},
{
- "name": "name support",
+ "name": "NameSupport",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -599,7 +583,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -642,7 +625,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -669,7 +651,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "switch type",
@@ -820,10 +801,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -863,7 +843,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -890,7 +869,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -997,7 +975,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1024,7 +1001,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ACL",
@@ -1115,7 +1091,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1142,7 +1117,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -1653,7 +1627,6 @@
"define": "OTA_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DefaultOtaProviders",
@@ -1775,9 +1748,7 @@
"mfgCode": null,
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Localization Configuration",
@@ -1786,27 +1757,10 @@
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
- "name": "ActiveLocale",
- "code": 1,
- "mfgCode": null,
- "side": "server",
- "type": "char_string",
- "included": 1,
- "storageOption": "NVM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "en-US",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "SupportedLocales",
- "code": 2,
+ "code": 1,
"mfgCode": null,
"side": "server",
"type": "array",
@@ -1814,7 +1768,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": "en-US",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -1860,9 +1814,7 @@
"mfgCode": null,
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Time Format Localization",
@@ -1871,7 +1823,6 @@
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "HourFormat",
@@ -1961,9 +1912,7 @@
"mfgCode": null,
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Unit Localization",
@@ -1972,7 +1921,6 @@
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "TemperatureUnit",
@@ -2149,7 +2097,7 @@
"side": "server",
"type": "RegulatoryLocationType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2165,7 +2113,7 @@
"side": "server",
"type": "RegulatoryLocationType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2539,7 +2487,6 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -2600,7 +2547,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -2616,7 +2563,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2632,7 +2579,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -2648,7 +2595,7 @@
"side": "server",
"type": "enum8",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2798,7 +2745,6 @@
"define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ThreadMetrics",
@@ -2823,7 +2769,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2839,7 +2785,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2855,7 +2801,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2941,7 +2887,6 @@
"define": "THREAD_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "channel",
@@ -2950,7 +2895,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2964,9 +2909,9 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "enum8",
+ "type": "RoutingRole",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2982,7 +2927,7 @@
"side": "server",
"type": "char_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2998,7 +2943,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3014,7 +2959,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3030,7 +2975,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3046,7 +2991,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3094,7 +3039,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3110,7 +3055,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3126,7 +3071,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3142,7 +3087,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3158,7 +3103,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3174,7 +3119,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3190,7 +3135,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3206,7 +3151,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3222,7 +3167,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3238,7 +3183,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3254,7 +3199,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3270,7 +3215,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3286,7 +3231,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3302,7 +3247,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3318,7 +3263,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3334,7 +3279,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3350,7 +3295,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3366,7 +3311,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3382,7 +3327,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3398,7 +3343,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3414,7 +3359,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3430,7 +3375,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3446,7 +3391,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3462,7 +3407,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3478,7 +3423,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3494,7 +3439,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3510,7 +3455,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3526,7 +3471,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3542,7 +3487,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3558,7 +3503,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3574,7 +3519,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3590,7 +3535,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3606,7 +3551,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3622,7 +3567,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3638,7 +3583,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3654,7 +3599,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3670,7 +3615,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3686,7 +3631,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3702,7 +3647,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3718,7 +3663,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3734,7 +3679,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3750,7 +3695,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3766,7 +3711,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3782,7 +3727,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3798,7 +3743,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3814,7 +3759,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3830,7 +3775,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3846,7 +3791,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3862,7 +3807,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3878,7 +3823,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3892,7 +3837,7 @@
"code": 59,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "SecurityPolicy",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -3910,7 +3855,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3924,7 +3869,7 @@
"code": 61,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "OperationalDatasetComponents",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -4028,7 +3973,6 @@
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "bssid",
@@ -4037,7 +3981,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4053,7 +3997,7 @@
"side": "server",
"type": "SecurityType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4069,7 +4013,7 @@
"side": "server",
"type": "WiFiVersionType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4085,7 +4029,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -4101,7 +4045,7 @@
"side": "server",
"type": "int8s",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -4117,7 +4061,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4133,7 +4077,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4149,7 +4093,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4165,7 +4109,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4181,7 +4125,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4197,7 +4141,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4213,7 +4157,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4229,7 +4173,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4315,7 +4259,6 @@
"define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "PHYRate",
@@ -4501,9 +4444,7 @@
"mfgCode": null,
"define": "SWITCH_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Switch",
@@ -4512,7 +4453,6 @@
"define": "SWITCH_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -4607,7 +4547,6 @@
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "WindowStatus",
@@ -4762,14 +4701,6 @@
"source": "client",
"incoming": 1,
"outgoing": 1
- },
- {
- "name": "RemoveTrustedRootCertificate",
- "code": 12,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -4872,7 +4803,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4888,7 +4819,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4918,7 +4849,7 @@
"code": 5,
"mfgCode": null,
"side": "server",
- "type": "fabric_idx",
+ "type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -5003,8 +4934,7 @@
"incoming": 1,
"outgoing": 0
}
- ],
- "attributes": []
+ ]
},
{
"name": "Group Key Management",
@@ -5136,9 +5066,7 @@
"mfgCode": null,
"define": "FIXED_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Fixed Label",
@@ -5147,7 +5075,6 @@
"define": "FIXED_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5205,9 +5132,7 @@
"mfgCode": null,
"define": "USER_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "User Label",
@@ -5216,7 +5141,6 @@
"define": "USER_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5291,14 +5215,6 @@
"source": "client",
"incoming": 1,
"outgoing": 0
- },
- {
- "name": "IdentifyQuery",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -5343,16 +5259,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [
- {
- "name": "IdentifyQueryResponse",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
"attributes": [
{
"name": "identify time",
@@ -5859,7 +5765,7 @@
],
"attributes": [
{
- "name": "scene count",
+ "name": "SceneCount",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -5875,7 +5781,7 @@
"reportableChange": 0
},
{
- "name": "current scene",
+ "name": "CurrentScene",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -5891,11 +5797,11 @@
"reportableChange": 0
},
{
- "name": "current group",
+ "name": "CurrentGroup",
"code": 2,
"mfgCode": null,
"side": "server",
- "type": "int16u",
+ "type": "group_id",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -5907,7 +5813,7 @@
"reportableChange": 0
},
{
- "name": "scene valid",
+ "name": "SceneValid",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -5923,7 +5829,7 @@
"reportableChange": 0
},
{
- "name": "name support",
+ "name": "NameSupport",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -5939,7 +5845,7 @@
"reportableChange": 0
},
{
- "name": "last configured by",
+ "name": "LastConfiguredBy",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -6111,7 +6017,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -6390,10 +6295,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -6409,7 +6313,7 @@
"reportableChange": 0
},
{
- "name": "remaining time",
+ "name": "RemainingTime",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -6425,7 +6329,7 @@
"reportableChange": 0
},
{
- "name": "min level",
+ "name": "MinLevel",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -6441,7 +6345,7 @@
"reportableChange": 0
},
{
- "name": "max level",
+ "name": "MaxLevel",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -6457,7 +6361,7 @@
"reportableChange": 0
},
{
- "name": "current frequency",
+ "name": "CurrentFrequency",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -6473,7 +6377,7 @@
"reportableChange": 0
},
{
- "name": "min frequency",
+ "name": "MinFrequency",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -6489,7 +6393,7 @@
"reportableChange": 0
},
{
- "name": "max frequency",
+ "name": "MaxFrequency",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -6505,7 +6409,7 @@
"reportableChange": 0
},
{
- "name": "options",
+ "name": "Options",
"code": 15,
"mfgCode": null,
"side": "server",
@@ -6521,7 +6425,7 @@
"reportableChange": 0
},
{
- "name": "on off transition time",
+ "name": "OnOffTransitionTime",
"code": 16,
"mfgCode": null,
"side": "server",
@@ -6537,7 +6441,7 @@
"reportableChange": 0
},
{
- "name": "on level",
+ "name": "OnLevel",
"code": 17,
"mfgCode": null,
"side": "server",
@@ -6553,7 +6457,7 @@
"reportableChange": 0
},
{
- "name": "on transition time",
+ "name": "OnTransitionTime",
"code": 18,
"mfgCode": null,
"side": "server",
@@ -6569,7 +6473,7 @@
"reportableChange": 0
},
{
- "name": "off transition time",
+ "name": "OffTransitionTime",
"code": 19,
"mfgCode": null,
"side": "server",
@@ -6585,7 +6489,7 @@
"reportableChange": 0
},
{
- "name": "default move rate",
+ "name": "DefaultMoveRate",
"code": 20,
"mfgCode": null,
"side": "server",
@@ -6601,7 +6505,7 @@
"reportableChange": 0
},
{
- "name": "start up current level",
+ "name": "StartUpCurrentLevel",
"code": 16384,
"mfgCode": null,
"side": "server",
@@ -6705,7 +6609,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -6748,7 +6651,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -6903,7 +6805,6 @@
"define": "BINDING_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -6946,7 +6847,6 @@
"define": "BINDING_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "Binding",
@@ -7113,7 +7013,6 @@
"define": "DOOR_LOCK_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "LockState",
@@ -7228,22 +7127,6 @@
"reportableChange": 0
},
{
- "name": "NumberOfLogRecordsSupported",
- "code": 16,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 0,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "NumberOfTotalUsersSupported",
"code": 17,
"mfgCode": null,
@@ -7420,22 +7303,6 @@
"reportableChange": 0
},
{
- "name": "EnableLogging",
- "code": 32,
- "mfgCode": null,
- "side": "server",
- "type": "boolean",
- "included": 0,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "Language",
"code": 33,
"mfgCode": null,
@@ -7708,134 +7575,6 @@
"reportableChange": 0
},
{
- "name": "AlarmMask",
- "code": 64,
- "mfgCode": null,
- "side": "server",
- "type": "DlAlarmMask",
- "included": 0,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0xFFFF",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "KeypadOperationEventMask",
- "code": 65,
- "mfgCode": null,
- "side": "server",
- "type": "DlKeypadOperationEventMask",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0xFFFF",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "RemoteOperationEventMask",
- "code": 66,
- "mfgCode": null,
- "side": "server",
- "type": "DlRemoteOperationEventMask",
- "included": 0,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0xFFFF",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ManualOperationEventMask",
- "code": 67,
- "mfgCode": null,
- "side": "server",
- "type": "DlManualOperationEventMask",
- "included": 0,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0xFFFF",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "RFIDOperationEventMask",
- "code": 68,
- "mfgCode": null,
- "side": "server",
- "type": "DlRFIDOperationEventMask",
- "included": 0,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0xFFFF",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "KeypadProgrammingEventMask",
- "code": 69,
- "mfgCode": null,
- "side": "server",
- "type": "DlKeypadOperationEventMask",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0xFFFF",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "RemoteProgrammingEventMask",
- "code": 70,
- "mfgCode": null,
- "side": "server",
- "type": "DlRemoteProgrammingEventMask",
- "included": 0,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0xFFFF",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "RFIDProgrammingEventMask",
- "code": 71,
- "mfgCode": null,
- "side": "server",
- "type": "DlRFIDProgrammingEventMask",
- "included": 0,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0xFFFF",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "GeneratedCommandList",
"code": 65528,
"mfgCode": null,
@@ -7992,10 +7731,9 @@
"define": "COLOR_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
- "name": "current hue",
+ "name": "CurrentHue",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -8011,7 +7749,7 @@
"reportableChange": 0
},
{
- "name": "current saturation",
+ "name": "CurrentSaturation",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -8027,7 +7765,7 @@
"reportableChange": 0
},
{
- "name": "remaining time",
+ "name": "RemainingTime",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -8043,7 +7781,7 @@
"reportableChange": 0
},
{
- "name": "current x",
+ "name": "CurrentX",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -8059,7 +7797,7 @@
"reportableChange": 0
},
{
- "name": "current y",
+ "name": "CurrentY",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -8075,7 +7813,7 @@
"reportableChange": 0
},
{
- "name": "drift compensation",
+ "name": "DriftCompensation",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -8091,7 +7829,7 @@
"reportableChange": 0
},
{
- "name": "compensation text",
+ "name": "CompensationText",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -8107,7 +7845,7 @@
"reportableChange": 0
},
{
- "name": "color temperature",
+ "name": "ColorTemperature",
"code": 7,
"mfgCode": null,
"side": "server",
@@ -8123,7 +7861,7 @@
"reportableChange": 0
},
{
- "name": "color mode",
+ "name": "ColorMode",
"code": 8,
"mfgCode": null,
"side": "server",
@@ -8139,7 +7877,7 @@
"reportableChange": 0
},
{
- "name": "color control options",
+ "name": "Options",
"code": 15,
"mfgCode": null,
"side": "server",
@@ -8155,7 +7893,7 @@
"reportableChange": 0
},
{
- "name": "number of primaries",
+ "name": "NumberOfPrimaries",
"code": 16,
"mfgCode": null,
"side": "server",
@@ -8171,7 +7909,7 @@
"reportableChange": 0
},
{
- "name": "primary 1 x",
+ "name": "Primary1X",
"code": 17,
"mfgCode": null,
"side": "server",
@@ -8187,7 +7925,7 @@
"reportableChange": 0
},
{
- "name": "primary 1 y",
+ "name": "Primary1Y",
"code": 18,
"mfgCode": null,
"side": "server",
@@ -8203,7 +7941,7 @@
"reportableChange": 0
},
{
- "name": "primary 1 intensity",
+ "name": "Primary1Intensity",
"code": 19,
"mfgCode": null,
"side": "server",
@@ -8219,7 +7957,7 @@
"reportableChange": 0
},
{
- "name": "primary 2 x",
+ "name": "Primary2X",
"code": 21,
"mfgCode": null,
"side": "server",
@@ -8235,7 +7973,7 @@
"reportableChange": 0
},
{
- "name": "primary 2 y",
+ "name": "Primary2Y",
"code": 22,
"mfgCode": null,
"side": "server",
@@ -8251,7 +7989,7 @@
"reportableChange": 0
},
{
- "name": "primary 2 intensity",
+ "name": "Primary2Intensity",
"code": 23,
"mfgCode": null,
"side": "server",
@@ -8267,7 +8005,7 @@
"reportableChange": 0
},
{
- "name": "primary 3 x",
+ "name": "Primary3X",
"code": 25,
"mfgCode": null,
"side": "server",
@@ -8283,7 +8021,7 @@
"reportableChange": 0
},
{
- "name": "primary 3 y",
+ "name": "Primary3Y",
"code": 26,
"mfgCode": null,
"side": "server",
@@ -8299,7 +8037,7 @@
"reportableChange": 0
},
{
- "name": "primary 3 intensity",
+ "name": "Primary3Intensity",
"code": 27,
"mfgCode": null,
"side": "server",
@@ -8315,7 +8053,7 @@
"reportableChange": 0
},
{
- "name": "primary 4 x",
+ "name": "Primary4X",
"code": 32,
"mfgCode": null,
"side": "server",
@@ -8331,7 +8069,7 @@
"reportableChange": 0
},
{
- "name": "primary 4 y",
+ "name": "Primary4Y",
"code": 33,
"mfgCode": null,
"side": "server",
@@ -8347,7 +8085,7 @@
"reportableChange": 0
},
{
- "name": "primary 4 intensity",
+ "name": "Primary4Intensity",
"code": 34,
"mfgCode": null,
"side": "server",
@@ -8363,7 +8101,7 @@
"reportableChange": 0
},
{
- "name": "primary 5 x",
+ "name": "Primary5X",
"code": 36,
"mfgCode": null,
"side": "server",
@@ -8379,7 +8117,7 @@
"reportableChange": 0
},
{
- "name": "primary 5 y",
+ "name": "Primary5Y",
"code": 37,
"mfgCode": null,
"side": "server",
@@ -8395,7 +8133,7 @@
"reportableChange": 0
},
{
- "name": "primary 5 intensity",
+ "name": "Primary5Intensity",
"code": 38,
"mfgCode": null,
"side": "server",
@@ -8411,7 +8149,7 @@
"reportableChange": 0
},
{
- "name": "primary 6 x",
+ "name": "Primary6X",
"code": 40,
"mfgCode": null,
"side": "server",
@@ -8427,7 +8165,7 @@
"reportableChange": 0
},
{
- "name": "primary 6 y",
+ "name": "Primary6Y",
"code": 41,
"mfgCode": null,
"side": "server",
@@ -8443,7 +8181,7 @@
"reportableChange": 0
},
{
- "name": "primary 6 intensity",
+ "name": "Primary6Intensity",
"code": 42,
"mfgCode": null,
"side": "server",
@@ -8459,7 +8197,7 @@
"reportableChange": 0
},
{
- "name": "white point x",
+ "name": "WhitePointX",
"code": 48,
"mfgCode": null,
"side": "server",
@@ -8475,7 +8213,7 @@
"reportableChange": 0
},
{
- "name": "white point y",
+ "name": "WhitePointY",
"code": 49,
"mfgCode": null,
"side": "server",
@@ -8491,7 +8229,7 @@
"reportableChange": 0
},
{
- "name": "color point r x",
+ "name": "ColorPointRX",
"code": 50,
"mfgCode": null,
"side": "server",
@@ -8507,7 +8245,7 @@
"reportableChange": 0
},
{
- "name": "color point r y",
+ "name": "ColorPointRY",
"code": 51,
"mfgCode": null,
"side": "server",
@@ -8523,7 +8261,7 @@
"reportableChange": 0
},
{
- "name": "color point r intensity",
+ "name": "ColorPointRIntensity",
"code": 52,
"mfgCode": null,
"side": "server",
@@ -8539,7 +8277,7 @@
"reportableChange": 0
},
{
- "name": "color point g x",
+ "name": "ColorPointGX",
"code": 54,
"mfgCode": null,
"side": "server",
@@ -8555,7 +8293,7 @@
"reportableChange": 0
},
{
- "name": "color point g y",
+ "name": "ColorPointGY",
"code": 55,
"mfgCode": null,
"side": "server",
@@ -8571,7 +8309,7 @@
"reportableChange": 0
},
{
- "name": "color point g intensity",
+ "name": "ColorPointGIntensity",
"code": 56,
"mfgCode": null,
"side": "server",
@@ -8587,7 +8325,7 @@
"reportableChange": 0
},
{
- "name": "color point b x",
+ "name": "ColorPointBX",
"code": 58,
"mfgCode": null,
"side": "server",
@@ -8603,7 +8341,7 @@
"reportableChange": 0
},
{
- "name": "color point b y",
+ "name": "ColorPointBY",
"code": 59,
"mfgCode": null,
"side": "server",
@@ -8619,7 +8357,7 @@
"reportableChange": 0
},
{
- "name": "color point b intensity",
+ "name": "ColorPointBIntensity",
"code": 60,
"mfgCode": null,
"side": "server",
@@ -8635,7 +8373,7 @@
"reportableChange": 0
},
{
- "name": "enhanced current hue",
+ "name": "EnhancedCurrentHue",
"code": 16384,
"mfgCode": null,
"side": "server",
@@ -8651,7 +8389,7 @@
"reportableChange": 0
},
{
- "name": "enhanced color mode",
+ "name": "EnhancedColorMode",
"code": 16385,
"mfgCode": null,
"side": "server",
@@ -8667,7 +8405,7 @@
"reportableChange": 0
},
{
- "name": "color loop active",
+ "name": "ColorLoopActive",
"code": 16386,
"mfgCode": null,
"side": "server",
@@ -8683,7 +8421,7 @@
"reportableChange": 0
},
{
- "name": "color loop direction",
+ "name": "ColorLoopDirection",
"code": 16387,
"mfgCode": null,
"side": "server",
@@ -8699,7 +8437,7 @@
"reportableChange": 0
},
{
- "name": "color loop time",
+ "name": "ColorLoopTime",
"code": 16388,
"mfgCode": null,
"side": "server",
@@ -8715,7 +8453,7 @@
"reportableChange": 0
},
{
- "name": "color loop start enhanced hue",
+ "name": "ColorLoopStartEnhancedHue",
"code": 16389,
"mfgCode": null,
"side": "server",
@@ -8731,7 +8469,7 @@
"reportableChange": 0
},
{
- "name": "color loop stored enhanced hue",
+ "name": "ColorLoopStoredEnhancedHue",
"code": 16390,
"mfgCode": null,
"side": "server",
@@ -8747,7 +8485,7 @@
"reportableChange": 0
},
{
- "name": "color capabilities",
+ "name": "ColorCapabilities",
"code": 16394,
"mfgCode": null,
"side": "server",
@@ -8763,7 +8501,7 @@
"reportableChange": 0
},
{
- "name": "color temp physical min",
+ "name": "ColorTempPhysicalMinMireds",
"code": 16395,
"mfgCode": null,
"side": "server",
@@ -8779,7 +8517,7 @@
"reportableChange": 0
},
{
- "name": "color temp physical max",
+ "name": "ColorTempPhysicalMaxMireds",
"code": 16396,
"mfgCode": null,
"side": "server",
@@ -8795,7 +8533,7 @@
"reportableChange": 0
},
{
- "name": "couple color temp to level min-mireds",
+ "name": "CoupleColorTempToLevelMinMireds",
"code": 16397,
"mfgCode": null,
"side": "server",
@@ -8811,7 +8549,7 @@
"reportableChange": 0
},
{
- "name": "start up color temperature mireds",
+ "name": "StartUpColorTemperatureMireds",
"code": 16400,
"mfgCode": null,
"side": "server",
@@ -8915,7 +8653,6 @@
"define": "OCCUPANCY_SENSING_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -8958,7 +8695,6 @@
"define": "OCCUPANCY_SENSING_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "occupancy",
@@ -9256,6 +8992,5 @@
"endpointVersion": 1,
"deviceIdentifier": 10
}
- ],
- "log": []
+ ]
}
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap
index f579e02..b16c3b5 100644
--- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap
+++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 70,
+ "featureLevel": 77,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,14 +19,16 @@
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/zcl/zcl.json",
- "version": "ZCL Test Data",
- "type": "zcl-properties"
+ "type": "zcl-properties",
+ "category": "matter",
+ "version": 1,
+ "description": "Matter SDK ZCL data"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
- "version": "chip-v1",
- "type": "gen-templates-json"
+ "type": "gen-templates-json",
+ "version": "chip-v1"
}
],
"endpointTypes": [
@@ -51,14 +53,6 @@
"source": "client",
"incoming": 1,
"outgoing": 0
- },
- {
- "name": "IdentifyQuery",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -87,16 +81,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [
- {
- "name": "IdentifyQueryResponse",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
"attributes": [
{
"name": "identify time",
@@ -443,7 +427,7 @@
],
"attributes": [
{
- "name": "scene count",
+ "name": "SceneCount",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -459,7 +443,7 @@
"reportableChange": 0
},
{
- "name": "current scene",
+ "name": "CurrentScene",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -475,11 +459,11 @@
"reportableChange": 0
},
{
- "name": "current group",
+ "name": "CurrentGroup",
"code": 2,
"mfgCode": null,
"side": "server",
- "type": "int16u",
+ "type": "group_id",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -491,7 +475,7 @@
"reportableChange": 0
},
{
- "name": "scene valid",
+ "name": "SceneValid",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -507,7 +491,7 @@
"reportableChange": 0
},
{
- "name": "name support",
+ "name": "NameSupport",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -599,7 +583,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -642,7 +625,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -669,7 +651,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "switch type",
@@ -820,10 +801,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -863,7 +843,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -890,7 +869,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -997,7 +975,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1024,7 +1001,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ACL",
@@ -1115,7 +1091,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1142,7 +1117,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -1653,7 +1627,6 @@
"define": "OTA_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DefaultOtaProviders",
@@ -1775,9 +1748,7 @@
"mfgCode": null,
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Localization Configuration",
@@ -1786,27 +1757,10 @@
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
- "name": "ActiveLocale",
- "code": 1,
- "mfgCode": null,
- "side": "server",
- "type": "char_string",
- "included": 1,
- "storageOption": "NVM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "en-US",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "SupportedLocales",
- "code": 2,
+ "code": 1,
"mfgCode": null,
"side": "server",
"type": "array",
@@ -1814,7 +1768,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": "en-US",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -1860,9 +1814,7 @@
"mfgCode": null,
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Time Format Localization",
@@ -1871,7 +1823,6 @@
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "HourFormat",
@@ -1961,9 +1912,7 @@
"mfgCode": null,
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Unit Localization",
@@ -1972,7 +1921,6 @@
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "TemperatureUnit",
@@ -2149,7 +2097,7 @@
"side": "server",
"type": "RegulatoryLocationType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2165,7 +2113,7 @@
"side": "server",
"type": "RegulatoryLocationType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2539,7 +2487,6 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -2600,7 +2547,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -2616,7 +2563,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2632,7 +2579,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -2648,7 +2595,7 @@
"side": "server",
"type": "enum8",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2798,7 +2745,6 @@
"define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ThreadMetrics",
@@ -2823,7 +2769,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2839,7 +2785,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2855,7 +2801,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2941,7 +2887,6 @@
"define": "THREAD_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "channel",
@@ -2950,7 +2895,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2964,9 +2909,9 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "enum8",
+ "type": "RoutingRole",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2982,7 +2927,7 @@
"side": "server",
"type": "char_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2998,7 +2943,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3014,7 +2959,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3030,7 +2975,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3046,7 +2991,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3094,7 +3039,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3110,7 +3055,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3126,7 +3071,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3142,7 +3087,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3158,7 +3103,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3174,7 +3119,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3190,7 +3135,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3206,7 +3151,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3222,7 +3167,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3238,7 +3183,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3254,7 +3199,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3270,7 +3215,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3286,7 +3231,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3302,7 +3247,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3318,7 +3263,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3334,7 +3279,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3350,7 +3295,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3366,7 +3311,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3382,7 +3327,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3398,7 +3343,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3414,7 +3359,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3430,7 +3375,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3446,7 +3391,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3462,7 +3407,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3478,7 +3423,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3494,7 +3439,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3510,7 +3455,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3526,7 +3471,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3542,7 +3487,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3558,7 +3503,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3574,7 +3519,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3590,7 +3535,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3606,7 +3551,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3622,7 +3567,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3638,7 +3583,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3654,7 +3599,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3670,7 +3615,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3686,7 +3631,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3702,7 +3647,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3718,7 +3663,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3734,7 +3679,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3750,7 +3695,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3766,7 +3711,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3782,7 +3727,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3798,7 +3743,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3814,7 +3759,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3830,7 +3775,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3846,7 +3791,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3862,7 +3807,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3878,7 +3823,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3892,7 +3837,7 @@
"code": 59,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "SecurityPolicy",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -3910,7 +3855,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3924,7 +3869,7 @@
"code": 61,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "OperationalDatasetComponents",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -4028,7 +3973,6 @@
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "bssid",
@@ -4037,7 +3981,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4053,7 +3997,7 @@
"side": "server",
"type": "SecurityType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4069,7 +4013,7 @@
"side": "server",
"type": "WiFiVersionType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4085,7 +4029,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -4101,7 +4045,7 @@
"side": "server",
"type": "int8s",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -4117,7 +4061,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4133,7 +4077,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4149,7 +4093,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4165,7 +4109,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4181,7 +4125,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4197,7 +4141,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4213,7 +4157,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4229,7 +4173,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4315,7 +4259,6 @@
"define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "PHYRate",
@@ -4501,9 +4444,7 @@
"mfgCode": null,
"define": "SWITCH_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Switch",
@@ -4512,7 +4453,6 @@
"define": "SWITCH_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -4607,7 +4547,6 @@
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "WindowStatus",
@@ -4762,14 +4701,6 @@
"source": "client",
"incoming": 1,
"outgoing": 1
- },
- {
- "name": "RemoveTrustedRootCertificate",
- "code": 12,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -4872,7 +4803,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4888,7 +4819,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4918,7 +4849,7 @@
"code": 5,
"mfgCode": null,
"side": "server",
- "type": "fabric_idx",
+ "type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -5003,8 +4934,7 @@
"incoming": 1,
"outgoing": 0
}
- ],
- "attributes": []
+ ]
},
{
"name": "Group Key Management",
@@ -5136,9 +5066,7 @@
"mfgCode": null,
"define": "FIXED_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Fixed Label",
@@ -5147,7 +5075,6 @@
"define": "FIXED_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5205,9 +5132,7 @@
"mfgCode": null,
"define": "USER_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "User Label",
@@ -5216,7 +5141,6 @@
"define": "USER_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5291,14 +5215,6 @@
"source": "client",
"incoming": 1,
"outgoing": 0
- },
- {
- "name": "IdentifyQuery",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -5343,16 +5259,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [
- {
- "name": "IdentifyQueryResponse",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
"attributes": [
{
"name": "identify time",
@@ -5859,7 +5765,7 @@
],
"attributes": [
{
- "name": "scene count",
+ "name": "SceneCount",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -5875,7 +5781,7 @@
"reportableChange": 0
},
{
- "name": "current scene",
+ "name": "CurrentScene",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -5891,11 +5797,11 @@
"reportableChange": 0
},
{
- "name": "current group",
+ "name": "CurrentGroup",
"code": 2,
"mfgCode": null,
"side": "server",
- "type": "int16u",
+ "type": "group_id",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -5907,7 +5813,7 @@
"reportableChange": 0
},
{
- "name": "scene valid",
+ "name": "SceneValid",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -5923,7 +5829,7 @@
"reportableChange": 0
},
{
- "name": "name support",
+ "name": "NameSupport",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -5939,7 +5845,7 @@
"reportableChange": 0
},
{
- "name": "last configured by",
+ "name": "LastConfiguredBy",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -6111,7 +6017,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -6390,10 +6295,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -6409,7 +6313,7 @@
"reportableChange": 0
},
{
- "name": "remaining time",
+ "name": "RemainingTime",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -6425,7 +6329,7 @@
"reportableChange": 0
},
{
- "name": "min level",
+ "name": "MinLevel",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -6441,7 +6345,7 @@
"reportableChange": 0
},
{
- "name": "max level",
+ "name": "MaxLevel",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -6457,7 +6361,7 @@
"reportableChange": 0
},
{
- "name": "current frequency",
+ "name": "CurrentFrequency",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -6473,7 +6377,7 @@
"reportableChange": 0
},
{
- "name": "min frequency",
+ "name": "MinFrequency",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -6489,7 +6393,7 @@
"reportableChange": 0
},
{
- "name": "max frequency",
+ "name": "MaxFrequency",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -6505,7 +6409,7 @@
"reportableChange": 0
},
{
- "name": "options",
+ "name": "Options",
"code": 15,
"mfgCode": null,
"side": "server",
@@ -6521,7 +6425,7 @@
"reportableChange": 0
},
{
- "name": "on off transition time",
+ "name": "OnOffTransitionTime",
"code": 16,
"mfgCode": null,
"side": "server",
@@ -6537,7 +6441,7 @@
"reportableChange": 0
},
{
- "name": "on level",
+ "name": "OnLevel",
"code": 17,
"mfgCode": null,
"side": "server",
@@ -6553,7 +6457,7 @@
"reportableChange": 0
},
{
- "name": "on transition time",
+ "name": "OnTransitionTime",
"code": 18,
"mfgCode": null,
"side": "server",
@@ -6569,7 +6473,7 @@
"reportableChange": 0
},
{
- "name": "off transition time",
+ "name": "OffTransitionTime",
"code": 19,
"mfgCode": null,
"side": "server",
@@ -6585,7 +6489,7 @@
"reportableChange": 0
},
{
- "name": "default move rate",
+ "name": "DefaultMoveRate",
"code": 20,
"mfgCode": null,
"side": "server",
@@ -6601,7 +6505,7 @@
"reportableChange": 0
},
{
- "name": "start up current level",
+ "name": "StartUpCurrentLevel",
"code": 16384,
"mfgCode": null,
"side": "server",
@@ -6705,7 +6609,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -6748,7 +6651,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -6903,7 +6805,6 @@
"define": "BINDING_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -6946,7 +6847,6 @@
"define": "BINDING_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "Binding",
@@ -7121,10 +7021,9 @@
"define": "COLOR_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
- "name": "current hue",
+ "name": "CurrentHue",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -7140,7 +7039,7 @@
"reportableChange": 0
},
{
- "name": "current saturation",
+ "name": "CurrentSaturation",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -7156,7 +7055,7 @@
"reportableChange": 0
},
{
- "name": "remaining time",
+ "name": "RemainingTime",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -7172,7 +7071,7 @@
"reportableChange": 0
},
{
- "name": "current x",
+ "name": "CurrentX",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -7188,7 +7087,7 @@
"reportableChange": 0
},
{
- "name": "current y",
+ "name": "CurrentY",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -7204,7 +7103,7 @@
"reportableChange": 0
},
{
- "name": "drift compensation",
+ "name": "DriftCompensation",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -7220,7 +7119,7 @@
"reportableChange": 0
},
{
- "name": "compensation text",
+ "name": "CompensationText",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -7236,7 +7135,7 @@
"reportableChange": 0
},
{
- "name": "color temperature",
+ "name": "ColorTemperature",
"code": 7,
"mfgCode": null,
"side": "server",
@@ -7252,7 +7151,7 @@
"reportableChange": 0
},
{
- "name": "color mode",
+ "name": "ColorMode",
"code": 8,
"mfgCode": null,
"side": "server",
@@ -7268,7 +7167,7 @@
"reportableChange": 0
},
{
- "name": "color control options",
+ "name": "Options",
"code": 15,
"mfgCode": null,
"side": "server",
@@ -7284,7 +7183,7 @@
"reportableChange": 0
},
{
- "name": "number of primaries",
+ "name": "NumberOfPrimaries",
"code": 16,
"mfgCode": null,
"side": "server",
@@ -7300,7 +7199,7 @@
"reportableChange": 0
},
{
- "name": "primary 1 x",
+ "name": "Primary1X",
"code": 17,
"mfgCode": null,
"side": "server",
@@ -7316,7 +7215,7 @@
"reportableChange": 0
},
{
- "name": "primary 1 y",
+ "name": "Primary1Y",
"code": 18,
"mfgCode": null,
"side": "server",
@@ -7332,7 +7231,7 @@
"reportableChange": 0
},
{
- "name": "primary 1 intensity",
+ "name": "Primary1Intensity",
"code": 19,
"mfgCode": null,
"side": "server",
@@ -7348,7 +7247,7 @@
"reportableChange": 0
},
{
- "name": "primary 2 x",
+ "name": "Primary2X",
"code": 21,
"mfgCode": null,
"side": "server",
@@ -7364,7 +7263,7 @@
"reportableChange": 0
},
{
- "name": "primary 2 y",
+ "name": "Primary2Y",
"code": 22,
"mfgCode": null,
"side": "server",
@@ -7380,7 +7279,7 @@
"reportableChange": 0
},
{
- "name": "primary 2 intensity",
+ "name": "Primary2Intensity",
"code": 23,
"mfgCode": null,
"side": "server",
@@ -7396,7 +7295,7 @@
"reportableChange": 0
},
{
- "name": "primary 3 x",
+ "name": "Primary3X",
"code": 25,
"mfgCode": null,
"side": "server",
@@ -7412,7 +7311,7 @@
"reportableChange": 0
},
{
- "name": "primary 3 y",
+ "name": "Primary3Y",
"code": 26,
"mfgCode": null,
"side": "server",
@@ -7428,7 +7327,7 @@
"reportableChange": 0
},
{
- "name": "primary 3 intensity",
+ "name": "Primary3Intensity",
"code": 27,
"mfgCode": null,
"side": "server",
@@ -7444,7 +7343,7 @@
"reportableChange": 0
},
{
- "name": "primary 4 x",
+ "name": "Primary4X",
"code": 32,
"mfgCode": null,
"side": "server",
@@ -7460,7 +7359,7 @@
"reportableChange": 0
},
{
- "name": "primary 4 y",
+ "name": "Primary4Y",
"code": 33,
"mfgCode": null,
"side": "server",
@@ -7476,7 +7375,7 @@
"reportableChange": 0
},
{
- "name": "primary 4 intensity",
+ "name": "Primary4Intensity",
"code": 34,
"mfgCode": null,
"side": "server",
@@ -7492,7 +7391,7 @@
"reportableChange": 0
},
{
- "name": "primary 5 x",
+ "name": "Primary5X",
"code": 36,
"mfgCode": null,
"side": "server",
@@ -7508,7 +7407,7 @@
"reportableChange": 0
},
{
- "name": "primary 5 y",
+ "name": "Primary5Y",
"code": 37,
"mfgCode": null,
"side": "server",
@@ -7524,7 +7423,7 @@
"reportableChange": 0
},
{
- "name": "primary 5 intensity",
+ "name": "Primary5Intensity",
"code": 38,
"mfgCode": null,
"side": "server",
@@ -7540,7 +7439,7 @@
"reportableChange": 0
},
{
- "name": "primary 6 x",
+ "name": "Primary6X",
"code": 40,
"mfgCode": null,
"side": "server",
@@ -7556,7 +7455,7 @@
"reportableChange": 0
},
{
- "name": "primary 6 y",
+ "name": "Primary6Y",
"code": 41,
"mfgCode": null,
"side": "server",
@@ -7572,7 +7471,7 @@
"reportableChange": 0
},
{
- "name": "primary 6 intensity",
+ "name": "Primary6Intensity",
"code": 42,
"mfgCode": null,
"side": "server",
@@ -7588,7 +7487,7 @@
"reportableChange": 0
},
{
- "name": "white point x",
+ "name": "WhitePointX",
"code": 48,
"mfgCode": null,
"side": "server",
@@ -7604,7 +7503,7 @@
"reportableChange": 0
},
{
- "name": "white point y",
+ "name": "WhitePointY",
"code": 49,
"mfgCode": null,
"side": "server",
@@ -7620,7 +7519,7 @@
"reportableChange": 0
},
{
- "name": "color point r x",
+ "name": "ColorPointRX",
"code": 50,
"mfgCode": null,
"side": "server",
@@ -7636,7 +7535,7 @@
"reportableChange": 0
},
{
- "name": "color point r y",
+ "name": "ColorPointRY",
"code": 51,
"mfgCode": null,
"side": "server",
@@ -7652,7 +7551,7 @@
"reportableChange": 0
},
{
- "name": "color point r intensity",
+ "name": "ColorPointRIntensity",
"code": 52,
"mfgCode": null,
"side": "server",
@@ -7668,7 +7567,7 @@
"reportableChange": 0
},
{
- "name": "color point g x",
+ "name": "ColorPointGX",
"code": 54,
"mfgCode": null,
"side": "server",
@@ -7684,7 +7583,7 @@
"reportableChange": 0
},
{
- "name": "color point g y",
+ "name": "ColorPointGY",
"code": 55,
"mfgCode": null,
"side": "server",
@@ -7700,7 +7599,7 @@
"reportableChange": 0
},
{
- "name": "color point g intensity",
+ "name": "ColorPointGIntensity",
"code": 56,
"mfgCode": null,
"side": "server",
@@ -7716,7 +7615,7 @@
"reportableChange": 0
},
{
- "name": "color point b x",
+ "name": "ColorPointBX",
"code": 58,
"mfgCode": null,
"side": "server",
@@ -7732,7 +7631,7 @@
"reportableChange": 0
},
{
- "name": "color point b y",
+ "name": "ColorPointBY",
"code": 59,
"mfgCode": null,
"side": "server",
@@ -7748,7 +7647,7 @@
"reportableChange": 0
},
{
- "name": "color point b intensity",
+ "name": "ColorPointBIntensity",
"code": 60,
"mfgCode": null,
"side": "server",
@@ -7764,7 +7663,7 @@
"reportableChange": 0
},
{
- "name": "enhanced current hue",
+ "name": "EnhancedCurrentHue",
"code": 16384,
"mfgCode": null,
"side": "server",
@@ -7780,7 +7679,7 @@
"reportableChange": 0
},
{
- "name": "enhanced color mode",
+ "name": "EnhancedColorMode",
"code": 16385,
"mfgCode": null,
"side": "server",
@@ -7796,7 +7695,7 @@
"reportableChange": 0
},
{
- "name": "color loop active",
+ "name": "ColorLoopActive",
"code": 16386,
"mfgCode": null,
"side": "server",
@@ -7812,7 +7711,7 @@
"reportableChange": 0
},
{
- "name": "color loop direction",
+ "name": "ColorLoopDirection",
"code": 16387,
"mfgCode": null,
"side": "server",
@@ -7828,7 +7727,7 @@
"reportableChange": 0
},
{
- "name": "color loop time",
+ "name": "ColorLoopTime",
"code": 16388,
"mfgCode": null,
"side": "server",
@@ -7844,7 +7743,7 @@
"reportableChange": 0
},
{
- "name": "color loop start enhanced hue",
+ "name": "ColorLoopStartEnhancedHue",
"code": 16389,
"mfgCode": null,
"side": "server",
@@ -7860,7 +7759,7 @@
"reportableChange": 0
},
{
- "name": "color loop stored enhanced hue",
+ "name": "ColorLoopStoredEnhancedHue",
"code": 16390,
"mfgCode": null,
"side": "server",
@@ -7876,7 +7775,7 @@
"reportableChange": 0
},
{
- "name": "color capabilities",
+ "name": "ColorCapabilities",
"code": 16394,
"mfgCode": null,
"side": "server",
@@ -7892,7 +7791,7 @@
"reportableChange": 0
},
{
- "name": "color temp physical min",
+ "name": "ColorTempPhysicalMinMireds",
"code": 16395,
"mfgCode": null,
"side": "server",
@@ -7908,7 +7807,7 @@
"reportableChange": 0
},
{
- "name": "color temp physical max",
+ "name": "ColorTempPhysicalMaxMireds",
"code": 16396,
"mfgCode": null,
"side": "server",
@@ -7924,7 +7823,7 @@
"reportableChange": 0
},
{
- "name": "couple color temp to level min-mireds",
+ "name": "CoupleColorTempToLevelMinMireds",
"code": 16397,
"mfgCode": null,
"side": "server",
@@ -7940,7 +7839,7 @@
"reportableChange": 0
},
{
- "name": "start up color temperature mireds",
+ "name": "StartUpColorTemperatureMireds",
"code": 16400,
"mfgCode": null,
"side": "server",
@@ -8044,7 +7943,6 @@
"define": "OCCUPANCY_SENSING_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -8087,7 +7985,6 @@
"define": "OCCUPANCY_SENSING_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "occupancy",
@@ -8385,6 +8282,5 @@
"endpointVersion": 1,
"deviceIdentifier": 269
}
- ],
- "log": []
+ ]
}
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap
index aeb83c2..f10f2e6 100644
--- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap
+++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 70,
+ "featureLevel": 77,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,14 +19,16 @@
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/zcl/zcl.json",
- "version": "ZCL Test Data",
- "type": "zcl-properties"
+ "type": "zcl-properties",
+ "category": "matter",
+ "version": 1,
+ "description": "Matter SDK ZCL data"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
- "version": "chip-v1",
- "type": "gen-templates-json"
+ "type": "gen-templates-json",
+ "version": "chip-v1"
}
],
"endpointTypes": [
@@ -51,14 +53,6 @@
"source": "client",
"incoming": 1,
"outgoing": 0
- },
- {
- "name": "IdentifyQuery",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -87,16 +81,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [
- {
- "name": "IdentifyQueryResponse",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
"attributes": [
{
"name": "identify time",
@@ -443,7 +427,7 @@
],
"attributes": [
{
- "name": "scene count",
+ "name": "SceneCount",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -459,7 +443,7 @@
"reportableChange": 0
},
{
- "name": "current scene",
+ "name": "CurrentScene",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -475,11 +459,11 @@
"reportableChange": 0
},
{
- "name": "current group",
+ "name": "CurrentGroup",
"code": 2,
"mfgCode": null,
"side": "server",
- "type": "int16u",
+ "type": "group_id",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -491,7 +475,7 @@
"reportableChange": 0
},
{
- "name": "scene valid",
+ "name": "SceneValid",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -507,7 +491,7 @@
"reportableChange": 0
},
{
- "name": "name support",
+ "name": "NameSupport",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -599,7 +583,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -642,7 +625,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -669,7 +651,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "switch type",
@@ -820,10 +801,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -863,7 +843,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -890,7 +869,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -997,7 +975,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1024,7 +1001,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ACL",
@@ -1115,7 +1091,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1142,7 +1117,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -1151,7 +1125,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "10",
@@ -1653,7 +1627,6 @@
"define": "OTA_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DefaultOtaProviders",
@@ -1775,9 +1748,7 @@
"mfgCode": null,
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Localization Configuration",
@@ -1786,27 +1757,10 @@
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
- "name": "ActiveLocale",
- "code": 1,
- "mfgCode": null,
- "side": "server",
- "type": "char_string",
- "included": 1,
- "storageOption": "NVM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "en-US",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "SupportedLocales",
- "code": 2,
+ "code": 1,
"mfgCode": null,
"side": "server",
"type": "array",
@@ -1814,7 +1768,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": "en-US",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -1860,9 +1814,7 @@
"mfgCode": null,
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Time Format Localization",
@@ -1871,7 +1823,6 @@
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "HourFormat",
@@ -1961,9 +1912,7 @@
"mfgCode": null,
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Unit Localization",
@@ -1972,7 +1921,6 @@
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "TemperatureUnit",
@@ -2149,7 +2097,7 @@
"side": "server",
"type": "RegulatoryLocationType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2165,7 +2113,7 @@
"side": "server",
"type": "RegulatoryLocationType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2539,7 +2487,6 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -2600,7 +2547,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -2616,7 +2563,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2632,7 +2579,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -2648,7 +2595,7 @@
"side": "server",
"type": "enum8",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2798,7 +2745,6 @@
"define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ThreadMetrics",
@@ -2823,7 +2769,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2839,7 +2785,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2855,7 +2801,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2941,7 +2887,6 @@
"define": "THREAD_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "channel",
@@ -2950,7 +2895,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2964,9 +2909,9 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "enum8",
+ "type": "RoutingRole",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2982,7 +2927,7 @@
"side": "server",
"type": "char_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2998,7 +2943,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3014,7 +2959,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3030,7 +2975,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3046,7 +2991,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3094,7 +3039,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3110,7 +3055,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3126,7 +3071,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3142,7 +3087,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3158,7 +3103,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3174,7 +3119,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3190,7 +3135,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3206,7 +3151,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3222,7 +3167,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3238,7 +3183,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3254,7 +3199,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3270,7 +3215,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3286,7 +3231,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3302,7 +3247,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3318,7 +3263,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3334,7 +3279,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3350,7 +3295,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3366,7 +3311,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3382,7 +3327,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3398,7 +3343,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3414,7 +3359,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3430,7 +3375,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3446,7 +3391,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3462,7 +3407,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3478,7 +3423,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3494,7 +3439,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3510,7 +3455,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3526,7 +3471,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3542,7 +3487,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3558,7 +3503,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3574,7 +3519,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3590,7 +3535,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3606,7 +3551,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3622,7 +3567,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3638,7 +3583,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3654,7 +3599,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3670,7 +3615,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3686,7 +3631,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3702,7 +3647,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3718,7 +3663,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3734,7 +3679,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3750,7 +3695,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3766,7 +3711,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3782,7 +3727,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3798,7 +3743,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3814,7 +3759,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3830,7 +3775,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3846,7 +3791,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3862,7 +3807,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3878,7 +3823,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3892,7 +3837,7 @@
"code": 59,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "SecurityPolicy",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -3910,7 +3855,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3924,7 +3869,7 @@
"code": 61,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "OperationalDatasetComponents",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -4028,7 +3973,6 @@
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "bssid",
@@ -4037,7 +3981,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4053,7 +3997,7 @@
"side": "server",
"type": "SecurityType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4069,7 +4013,7 @@
"side": "server",
"type": "WiFiVersionType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4085,7 +4029,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -4101,7 +4045,7 @@
"side": "server",
"type": "int8s",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -4117,7 +4061,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4133,7 +4077,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4149,7 +4093,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4165,7 +4109,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4181,7 +4125,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4197,7 +4141,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4213,7 +4157,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4229,7 +4173,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4315,7 +4259,6 @@
"define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "PHYRate",
@@ -4324,7 +4267,7 @@
"side": "server",
"type": "PHYRateType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4340,7 +4283,7 @@
"side": "server",
"type": "boolean",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -4356,7 +4299,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4372,7 +4315,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4388,7 +4331,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4404,7 +4347,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4420,7 +4363,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4436,7 +4379,7 @@
"side": "server",
"type": "boolean",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -4452,7 +4395,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4501,9 +4444,7 @@
"mfgCode": null,
"define": "SWITCH_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Switch",
@@ -4512,7 +4453,6 @@
"define": "SWITCH_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -4607,7 +4547,6 @@
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "WindowStatus",
@@ -4762,14 +4701,6 @@
"source": "client",
"incoming": 1,
"outgoing": 1
- },
- {
- "name": "RemoveTrustedRootCertificate",
- "code": 12,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -4872,7 +4803,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4888,7 +4819,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4918,7 +4849,7 @@
"code": 5,
"mfgCode": null,
"side": "server",
- "type": "fabric_idx",
+ "type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -5003,8 +4934,7 @@
"incoming": 1,
"outgoing": 0
}
- ],
- "attributes": []
+ ]
},
{
"name": "Group Key Management",
@@ -5136,9 +5066,7 @@
"mfgCode": null,
"define": "FIXED_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Fixed Label",
@@ -5147,7 +5075,6 @@
"define": "FIXED_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5205,9 +5132,7 @@
"mfgCode": null,
"define": "USER_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "User Label",
@@ -5216,7 +5141,6 @@
"define": "USER_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5291,14 +5215,6 @@
"source": "client",
"incoming": 1,
"outgoing": 0
- },
- {
- "name": "IdentifyQuery",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -5343,16 +5259,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [
- {
- "name": "IdentifyQueryResponse",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
"attributes": [
{
"name": "identify time",
@@ -5393,7 +5299,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -5409,7 +5315,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -5425,7 +5331,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -5625,7 +5531,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -5641,7 +5547,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -5657,7 +5563,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -5707,7 +5613,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -5750,7 +5655,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -5759,7 +5663,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -5775,7 +5679,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -5791,7 +5695,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -5807,7 +5711,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -5823,7 +5727,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -5839,7 +5743,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -5855,7 +5759,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -5905,7 +5809,6 @@
"define": "BINDING_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -5948,7 +5851,6 @@
"define": "BINDING_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "Binding",
@@ -5957,7 +5859,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -5973,7 +5875,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -5989,7 +5891,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6005,7 +5907,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6055,7 +5957,6 @@
"define": "FLOW_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -6098,7 +5999,6 @@
"define": "FLOW_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "MeasuredValue",
@@ -6171,7 +6071,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -6187,7 +6087,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -6203,7 +6103,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -6268,6 +6168,5 @@
"endpointVersion": 1,
"deviceIdentifier": 774
}
- ],
- "log": []
-}
+ ]
+}
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap
index c059d2a..2eee803 100644
--- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap
+++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 70,
+ "featureLevel": 77,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,14 +19,16 @@
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/zcl/zcl.json",
- "version": "ZCL Test Data",
- "type": "zcl-properties"
+ "type": "zcl-properties",
+ "category": "matter",
+ "version": 1,
+ "description": "Matter SDK ZCL data"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
- "version": "chip-v1",
- "type": "gen-templates-json"
+ "type": "gen-templates-json",
+ "version": "chip-v1"
}
],
"endpointTypes": [
@@ -51,14 +53,6 @@
"source": "client",
"incoming": 1,
"outgoing": 0
- },
- {
- "name": "IdentifyQuery",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -87,16 +81,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [
- {
- "name": "IdentifyQueryResponse",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
"attributes": [
{
"name": "identify time",
@@ -443,7 +427,7 @@
],
"attributes": [
{
- "name": "scene count",
+ "name": "SceneCount",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -459,7 +443,7 @@
"reportableChange": 0
},
{
- "name": "current scene",
+ "name": "CurrentScene",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -475,11 +459,11 @@
"reportableChange": 0
},
{
- "name": "current group",
+ "name": "CurrentGroup",
"code": 2,
"mfgCode": null,
"side": "server",
- "type": "int16u",
+ "type": "group_id",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -491,7 +475,7 @@
"reportableChange": 0
},
{
- "name": "scene valid",
+ "name": "SceneValid",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -507,7 +491,7 @@
"reportableChange": 0
},
{
- "name": "name support",
+ "name": "NameSupport",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -599,7 +583,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -642,7 +625,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -669,7 +651,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "switch type",
@@ -820,10 +801,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -863,7 +843,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -890,7 +869,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -997,7 +975,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1024,7 +1001,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ACL",
@@ -1115,7 +1091,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1142,7 +1117,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -1653,7 +1627,6 @@
"define": "OTA_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DefaultOtaProviders",
@@ -1775,9 +1748,7 @@
"mfgCode": null,
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Localization Configuration",
@@ -1786,27 +1757,10 @@
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
- "name": "ActiveLocale",
- "code": 1,
- "mfgCode": null,
- "side": "server",
- "type": "char_string",
- "included": 1,
- "storageOption": "NVM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "en-US",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "SupportedLocales",
- "code": 2,
+ "code": 1,
"mfgCode": null,
"side": "server",
"type": "array",
@@ -1814,7 +1768,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": "en-US",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -1860,9 +1814,7 @@
"mfgCode": null,
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Time Format Localization",
@@ -1871,7 +1823,6 @@
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "HourFormat",
@@ -1961,9 +1912,7 @@
"mfgCode": null,
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Unit Localization",
@@ -1972,7 +1921,6 @@
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "TemperatureUnit",
@@ -2149,7 +2097,7 @@
"side": "server",
"type": "RegulatoryLocationType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2165,7 +2113,7 @@
"side": "server",
"type": "RegulatoryLocationType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2539,7 +2487,6 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -2600,7 +2547,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -2616,7 +2563,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2632,7 +2579,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -2648,7 +2595,7 @@
"side": "server",
"type": "enum8",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2798,7 +2745,6 @@
"define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ThreadMetrics",
@@ -2823,7 +2769,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2839,7 +2785,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2855,7 +2801,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2941,7 +2887,6 @@
"define": "THREAD_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "channel",
@@ -2950,7 +2895,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2964,9 +2909,9 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "enum8",
+ "type": "RoutingRole",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2982,7 +2927,7 @@
"side": "server",
"type": "char_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2998,7 +2943,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3014,7 +2959,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3030,7 +2975,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3046,7 +2991,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3094,7 +3039,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3110,7 +3055,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3126,7 +3071,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3142,7 +3087,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3158,7 +3103,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3174,7 +3119,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3190,7 +3135,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3206,7 +3151,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3222,7 +3167,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3238,7 +3183,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3254,7 +3199,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3270,7 +3215,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3286,7 +3231,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3302,7 +3247,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3318,7 +3263,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3334,7 +3279,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3350,7 +3295,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3366,7 +3311,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3382,7 +3327,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3398,7 +3343,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3414,7 +3359,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3430,7 +3375,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3446,7 +3391,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3462,7 +3407,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3478,7 +3423,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3494,7 +3439,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3510,7 +3455,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3526,7 +3471,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3542,7 +3487,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3558,7 +3503,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3574,7 +3519,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3590,7 +3535,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3606,7 +3551,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3622,7 +3567,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3638,7 +3583,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3654,7 +3599,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3670,7 +3615,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3686,7 +3631,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3702,7 +3647,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3718,7 +3663,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3734,7 +3679,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3750,7 +3695,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3766,7 +3711,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3782,7 +3727,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3798,7 +3743,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3814,7 +3759,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3830,7 +3775,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3846,7 +3791,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3862,7 +3807,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3878,7 +3823,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3892,7 +3837,7 @@
"code": 59,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "SecurityPolicy",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -3910,7 +3855,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3924,7 +3869,7 @@
"code": 61,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "OperationalDatasetComponents",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -4028,7 +3973,6 @@
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "bssid",
@@ -4037,7 +3981,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4053,7 +3997,7 @@
"side": "server",
"type": "SecurityType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4069,7 +4013,7 @@
"side": "server",
"type": "WiFiVersionType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4085,7 +4029,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -4101,7 +4045,7 @@
"side": "server",
"type": "int8s",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -4117,7 +4061,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4133,7 +4077,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4149,7 +4093,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4165,7 +4109,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4181,7 +4125,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4197,7 +4141,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4213,7 +4157,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4229,7 +4173,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4315,7 +4259,6 @@
"define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "PHYRate",
@@ -4501,9 +4444,7 @@
"mfgCode": null,
"define": "SWITCH_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Switch",
@@ -4512,7 +4453,6 @@
"define": "SWITCH_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -4607,7 +4547,6 @@
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "WindowStatus",
@@ -4762,14 +4701,6 @@
"source": "client",
"incoming": 1,
"outgoing": 1
- },
- {
- "name": "RemoveTrustedRootCertificate",
- "code": 12,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -4872,7 +4803,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4888,7 +4819,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4918,7 +4849,7 @@
"code": 5,
"mfgCode": null,
"side": "server",
- "type": "fabric_idx",
+ "type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -5003,8 +4934,7 @@
"incoming": 1,
"outgoing": 0
}
- ],
- "attributes": []
+ ]
},
{
"name": "Group Key Management",
@@ -5136,9 +5066,7 @@
"mfgCode": null,
"define": "FIXED_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Fixed Label",
@@ -5147,7 +5075,6 @@
"define": "FIXED_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5205,9 +5132,7 @@
"mfgCode": null,
"define": "USER_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "User Label",
@@ -5216,7 +5141,6 @@
"define": "USER_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5291,14 +5215,6 @@
"source": "client",
"incoming": 1,
"outgoing": 0
- },
- {
- "name": "IdentifyQuery",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -5343,16 +5259,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [
- {
- "name": "IdentifyQueryResponse",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
"attributes": [
{
"name": "identify time",
@@ -5764,8 +5670,7 @@
"incoming": 1,
"outgoing": 0
}
- ],
- "attributes": []
+ ]
},
{
"name": "Scenes",
@@ -5826,7 +5731,7 @@
],
"attributes": [
{
- "name": "scene count",
+ "name": "SceneCount",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -5842,7 +5747,7 @@
"reportableChange": 0
},
{
- "name": "current scene",
+ "name": "CurrentScene",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -5858,11 +5763,11 @@
"reportableChange": 0
},
{
- "name": "current group",
+ "name": "CurrentGroup",
"code": 2,
"mfgCode": null,
"side": "server",
- "type": "int16u",
+ "type": "group_id",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -5874,7 +5779,7 @@
"reportableChange": 0
},
{
- "name": "scene valid",
+ "name": "SceneValid",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -5890,7 +5795,7 @@
"reportableChange": 0
},
{
- "name": "name support",
+ "name": "NameSupport",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -5906,7 +5811,7 @@
"reportableChange": 0
},
{
- "name": "last configured by",
+ "name": "LastConfiguredBy",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -6078,7 +5983,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -6314,8 +6218,7 @@
"incoming": 1,
"outgoing": 0
}
- ],
- "attributes": []
+ ]
},
{
"name": "Level Control",
@@ -6324,10 +6227,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -6343,7 +6245,7 @@
"reportableChange": 0
},
{
- "name": "remaining time",
+ "name": "RemainingTime",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -6359,7 +6261,7 @@
"reportableChange": 0
},
{
- "name": "min level",
+ "name": "MinLevel",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -6375,7 +6277,7 @@
"reportableChange": 0
},
{
- "name": "max level",
+ "name": "MaxLevel",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -6391,7 +6293,7 @@
"reportableChange": 0
},
{
- "name": "current frequency",
+ "name": "CurrentFrequency",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -6407,7 +6309,7 @@
"reportableChange": 0
},
{
- "name": "min frequency",
+ "name": "MinFrequency",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -6423,7 +6325,7 @@
"reportableChange": 0
},
{
- "name": "max frequency",
+ "name": "MaxFrequency",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -6439,7 +6341,7 @@
"reportableChange": 0
},
{
- "name": "options",
+ "name": "Options",
"code": 15,
"mfgCode": null,
"side": "server",
@@ -6455,7 +6357,7 @@
"reportableChange": 0
},
{
- "name": "on off transition time",
+ "name": "OnOffTransitionTime",
"code": 16,
"mfgCode": null,
"side": "server",
@@ -6471,7 +6373,7 @@
"reportableChange": 0
},
{
- "name": "on level",
+ "name": "OnLevel",
"code": 17,
"mfgCode": null,
"side": "server",
@@ -6487,7 +6389,7 @@
"reportableChange": 0
},
{
- "name": "on transition time",
+ "name": "OnTransitionTime",
"code": 18,
"mfgCode": null,
"side": "server",
@@ -6503,7 +6405,7 @@
"reportableChange": 0
},
{
- "name": "off transition time",
+ "name": "OffTransitionTime",
"code": 19,
"mfgCode": null,
"side": "server",
@@ -6519,7 +6421,7 @@
"reportableChange": 0
},
{
- "name": "default move rate",
+ "name": "DefaultMoveRate",
"code": 20,
"mfgCode": null,
"side": "server",
@@ -6535,7 +6437,7 @@
"reportableChange": 0
},
{
- "name": "start up current level",
+ "name": "StartUpCurrentLevel",
"code": 16384,
"mfgCode": null,
"side": "server",
@@ -6639,7 +6541,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -6682,7 +6583,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -6837,7 +6737,6 @@
"define": "BINDING_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -6880,7 +6779,6 @@
"define": "BINDING_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "Binding",
@@ -7039,10 +6937,9 @@
"define": "THERMOSTAT_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
- "name": "local temperature",
+ "name": "LocalTemperature",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -7058,7 +6955,7 @@
"reportableChange": 0
},
{
- "name": "outdoor temperature",
+ "name": "OutdoorTemperature",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -7074,7 +6971,7 @@
"reportableChange": 0
},
{
- "name": "occupancy",
+ "name": "Occupancy",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -7090,7 +6987,7 @@
"reportableChange": 0
},
{
- "name": "abs min heat setpoint limit",
+ "name": "AbsMinHeatSetpointLimit",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -7106,7 +7003,7 @@
"reportableChange": 0
},
{
- "name": "abs max heat setpoint limit",
+ "name": "AbsMaxHeatSetpointLimit",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -7122,7 +7019,7 @@
"reportableChange": 0
},
{
- "name": "abs min cool setpoint limit",
+ "name": "AbsMinCoolSetpointLimit",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -7138,7 +7035,7 @@
"reportableChange": 0
},
{
- "name": "abs max cool setpoint limit",
+ "name": "AbsMaxCoolSetpointLimit",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -7154,7 +7051,7 @@
"reportableChange": 0
},
{
- "name": "pi cooling demand",
+ "name": "PICoolingDemand",
"code": 7,
"mfgCode": null,
"side": "server",
@@ -7170,7 +7067,7 @@
"reportableChange": 0
},
{
- "name": "pi heating demand",
+ "name": "PIHeatingDemand",
"code": 8,
"mfgCode": null,
"side": "server",
@@ -7186,7 +7083,7 @@
"reportableChange": 0
},
{
- "name": "HVAC system type configuration",
+ "name": "HVACSystemTypeConfiguration",
"code": 9,
"mfgCode": null,
"side": "server",
@@ -7202,7 +7099,7 @@
"reportableChange": 0
},
{
- "name": "local temperature calibration",
+ "name": "LocalTemperatureCalibration",
"code": 16,
"mfgCode": null,
"side": "server",
@@ -7218,7 +7115,7 @@
"reportableChange": 0
},
{
- "name": "occupied cooling setpoint",
+ "name": "OccupiedCoolingSetpoint",
"code": 17,
"mfgCode": null,
"side": "server",
@@ -7234,7 +7131,7 @@
"reportableChange": 0
},
{
- "name": "occupied heating setpoint",
+ "name": "OccupiedHeatingSetpoint",
"code": 18,
"mfgCode": null,
"side": "server",
@@ -7250,7 +7147,7 @@
"reportableChange": 0
},
{
- "name": "unoccupied cooling setpoint",
+ "name": "UnoccupiedCoolingSetpoint",
"code": 19,
"mfgCode": null,
"side": "server",
@@ -7266,7 +7163,7 @@
"reportableChange": 0
},
{
- "name": "unoccupied heating setpoint",
+ "name": "UnoccupiedHeatingSetpoint",
"code": 20,
"mfgCode": null,
"side": "server",
@@ -7282,7 +7179,7 @@
"reportableChange": 0
},
{
- "name": "min heat setpoint limit",
+ "name": "MinHeatSetpointLimit",
"code": 21,
"mfgCode": null,
"side": "server",
@@ -7298,7 +7195,7 @@
"reportableChange": 0
},
{
- "name": "max heat setpoint limit",
+ "name": "MaxHeatSetpointLimit",
"code": 22,
"mfgCode": null,
"side": "server",
@@ -7314,7 +7211,7 @@
"reportableChange": 0
},
{
- "name": "min cool setpoint limit",
+ "name": "MinCoolSetpointLimit",
"code": 23,
"mfgCode": null,
"side": "server",
@@ -7330,7 +7227,7 @@
"reportableChange": 0
},
{
- "name": "max cool setpoint limit",
+ "name": "MaxCoolSetpointLimit",
"code": 24,
"mfgCode": null,
"side": "server",
@@ -7346,7 +7243,7 @@
"reportableChange": 0
},
{
- "name": "min setpoint dead band",
+ "name": "MinSetpointDeadBand",
"code": 25,
"mfgCode": null,
"side": "server",
@@ -7362,7 +7259,7 @@
"reportableChange": 0
},
{
- "name": "remote sensing",
+ "name": "RemoteSensing",
"code": 26,
"mfgCode": null,
"side": "server",
@@ -7378,7 +7275,7 @@
"reportableChange": 0
},
{
- "name": "control sequence of operation",
+ "name": "ControlSequenceOfOperation",
"code": 27,
"mfgCode": null,
"side": "server",
@@ -7394,7 +7291,7 @@
"reportableChange": 0
},
{
- "name": "system mode",
+ "name": "SystemMode",
"code": 28,
"mfgCode": null,
"side": "server",
@@ -7410,23 +7307,7 @@
"reportableChange": 0
},
{
- "name": "alarm mask",
- "code": 29,
- "mfgCode": null,
- "side": "server",
- "type": "bitmap8",
- "included": 0,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0x00",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "thermostat running mode",
+ "name": "ThermostatRunningMode",
"code": 30,
"mfgCode": null,
"side": "server",
@@ -7442,7 +7323,7 @@
"reportableChange": 0
},
{
- "name": "start of week",
+ "name": "StartOfWeek",
"code": 32,
"mfgCode": null,
"side": "server",
@@ -7458,7 +7339,7 @@
"reportableChange": 0
},
{
- "name": "number of weekly transitions",
+ "name": "NumberOfWeeklyTransitions",
"code": 33,
"mfgCode": null,
"side": "server",
@@ -7474,7 +7355,7 @@
"reportableChange": 0
},
{
- "name": "number of daily transitions",
+ "name": "NumberOfDailyTransitions",
"code": 34,
"mfgCode": null,
"side": "server",
@@ -7490,7 +7371,7 @@
"reportableChange": 0
},
{
- "name": "temperature setpoint hold",
+ "name": "TemperatureSetpointHold",
"code": 35,
"mfgCode": null,
"side": "server",
@@ -7506,7 +7387,7 @@
"reportableChange": 0
},
{
- "name": "temperature setpoint hold duration",
+ "name": "TemperatureSetpointHoldDuration",
"code": 36,
"mfgCode": null,
"side": "server",
@@ -7522,7 +7403,7 @@
"reportableChange": 0
},
{
- "name": "thermostat programming operation mode",
+ "name": "ThermostatProgrammingOperationMode",
"code": 37,
"mfgCode": null,
"side": "server",
@@ -7538,7 +7419,7 @@
"reportableChange": 0
},
{
- "name": "thermostat running state",
+ "name": "ThermostatRunningState",
"code": 41,
"mfgCode": null,
"side": "server",
@@ -7554,7 +7435,7 @@
"reportableChange": 0
},
{
- "name": "setpoint change source",
+ "name": "SetpointChangeSource",
"code": 48,
"mfgCode": null,
"side": "server",
@@ -7570,7 +7451,7 @@
"reportableChange": 0
},
{
- "name": "setpoint change amount",
+ "name": "SetpointChangeAmount",
"code": 49,
"mfgCode": null,
"side": "server",
@@ -7586,11 +7467,11 @@
"reportableChange": 0
},
{
- "name": "setpoint change source timestamp",
+ "name": "SetpointChangeSourceTimestamp",
"code": 50,
"mfgCode": null,
"side": "server",
- "type": "epoch_s",
+ "type": "utc",
"included": 0,
"storageOption": "RAM",
"singleton": 0,
@@ -7602,7 +7483,7 @@
"reportableChange": 0
},
{
- "name": "ac type",
+ "name": "ACType",
"code": 64,
"mfgCode": null,
"side": "server",
@@ -7618,7 +7499,7 @@
"reportableChange": 0
},
{
- "name": "ac capacity",
+ "name": "ACCapacity",
"code": 65,
"mfgCode": null,
"side": "server",
@@ -7634,7 +7515,7 @@
"reportableChange": 0
},
{
- "name": "ac refrigerant type",
+ "name": "ACRefrigerantType",
"code": 66,
"mfgCode": null,
"side": "server",
@@ -7650,7 +7531,7 @@
"reportableChange": 0
},
{
- "name": "ac compressor type",
+ "name": "ACCompressorType",
"code": 67,
"mfgCode": null,
"side": "server",
@@ -7666,7 +7547,7 @@
"reportableChange": 0
},
{
- "name": "ac error code",
+ "name": "ACErrorCode",
"code": 68,
"mfgCode": null,
"side": "server",
@@ -7682,7 +7563,7 @@
"reportableChange": 0
},
{
- "name": "ac louver position",
+ "name": "ACLouverPosition",
"code": 69,
"mfgCode": null,
"side": "server",
@@ -7698,7 +7579,7 @@
"reportableChange": 0
},
{
- "name": "ac coil temperature",
+ "name": "ACCoilTemperature",
"code": 70,
"mfgCode": null,
"side": "server",
@@ -7714,7 +7595,7 @@
"reportableChange": 0
},
{
- "name": "ac capacity format",
+ "name": "ACCapacityformat",
"code": 71,
"mfgCode": null,
"side": "server",
@@ -7817,9 +7698,7 @@
"mfgCode": null,
"define": "FAN_CONTROL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Fan Control",
@@ -7828,14 +7707,13 @@
"define": "FAN_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "fan mode",
"code": 0,
"mfgCode": null,
"side": "server",
- "type": "enum8",
+ "type": "FanModeType",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -7851,7 +7729,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "enum8",
+ "type": "FanModeSequenceType",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -8110,6 +7988,5 @@
"endpointVersion": 1,
"deviceIdentifier": 768
}
- ],
- "log": []
-}
+ ]
+}
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap
index d73be7b..297a93b 100644
--- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap
+++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 70,
+ "featureLevel": 77,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,14 +19,16 @@
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/zcl/zcl.json",
- "version": "ZCL Test Data",
- "type": "zcl-properties"
+ "type": "zcl-properties",
+ "category": "matter",
+ "version": 1,
+ "description": "Matter SDK ZCL data"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
- "version": "chip-v1",
- "type": "gen-templates-json"
+ "type": "gen-templates-json",
+ "version": "chip-v1"
}
],
"endpointTypes": [
@@ -51,14 +53,6 @@
"source": "client",
"incoming": 1,
"outgoing": 0
- },
- {
- "name": "IdentifyQuery",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -87,16 +81,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [
- {
- "name": "IdentifyQueryResponse",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
"attributes": [
{
"name": "identify time",
@@ -443,7 +427,7 @@
],
"attributes": [
{
- "name": "scene count",
+ "name": "SceneCount",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -459,7 +443,7 @@
"reportableChange": 0
},
{
- "name": "current scene",
+ "name": "CurrentScene",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -475,11 +459,11 @@
"reportableChange": 0
},
{
- "name": "current group",
+ "name": "CurrentGroup",
"code": 2,
"mfgCode": null,
"side": "server",
- "type": "int16u",
+ "type": "group_id",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -491,7 +475,7 @@
"reportableChange": 0
},
{
- "name": "scene valid",
+ "name": "SceneValid",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -507,7 +491,7 @@
"reportableChange": 0
},
{
- "name": "name support",
+ "name": "NameSupport",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -599,7 +583,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -642,7 +625,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -669,7 +651,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "switch type",
@@ -820,10 +801,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -863,7 +843,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -890,7 +869,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -997,7 +975,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1024,7 +1001,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ACL",
@@ -1115,7 +1091,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1142,7 +1117,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -1151,7 +1125,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "10",
@@ -1653,7 +1627,6 @@
"define": "OTA_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DefaultOtaProviders",
@@ -1775,9 +1748,7 @@
"mfgCode": null,
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Localization Configuration",
@@ -1786,27 +1757,10 @@
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
- "name": "ActiveLocale",
- "code": 1,
- "mfgCode": null,
- "side": "server",
- "type": "char_string",
- "included": 1,
- "storageOption": "NVM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "en-US",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "SupportedLocales",
- "code": 2,
+ "code": 1,
"mfgCode": null,
"side": "server",
"type": "array",
@@ -1814,7 +1768,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": "en-US",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -1860,9 +1814,7 @@
"mfgCode": null,
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Time Format Localization",
@@ -1871,7 +1823,6 @@
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "HourFormat",
@@ -1961,9 +1912,7 @@
"mfgCode": null,
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Unit Localization",
@@ -1972,7 +1921,6 @@
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "TemperatureUnit",
@@ -2149,7 +2097,7 @@
"side": "server",
"type": "RegulatoryLocationType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2165,7 +2113,7 @@
"side": "server",
"type": "RegulatoryLocationType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2539,7 +2487,6 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -2600,7 +2547,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -2616,7 +2563,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2632,7 +2579,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -2648,7 +2595,7 @@
"side": "server",
"type": "enum8",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2798,7 +2745,6 @@
"define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ThreadMetrics",
@@ -2823,7 +2769,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2839,7 +2785,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2855,7 +2801,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2941,7 +2887,6 @@
"define": "THREAD_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "channel",
@@ -2950,7 +2895,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2964,9 +2909,9 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "enum8",
+ "type": "RoutingRole",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2982,7 +2927,7 @@
"side": "server",
"type": "char_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2998,7 +2943,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3014,7 +2959,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3030,7 +2975,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3046,7 +2991,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3094,7 +3039,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3110,7 +3055,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3126,7 +3071,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3142,7 +3087,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3158,7 +3103,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3174,7 +3119,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3190,7 +3135,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3206,7 +3151,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3222,7 +3167,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3238,7 +3183,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3254,7 +3199,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3270,7 +3215,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3286,7 +3231,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3302,7 +3247,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3318,7 +3263,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3334,7 +3279,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3350,7 +3295,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3366,7 +3311,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3382,7 +3327,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3398,7 +3343,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3414,7 +3359,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3430,7 +3375,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3446,7 +3391,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3462,7 +3407,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3478,7 +3423,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3494,7 +3439,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3510,7 +3455,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3526,7 +3471,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3542,7 +3487,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3558,7 +3503,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3574,7 +3519,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3590,7 +3535,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3606,7 +3551,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3622,7 +3567,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3638,7 +3583,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3654,7 +3599,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3670,7 +3615,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3686,7 +3631,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3702,7 +3647,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3718,7 +3663,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3734,7 +3679,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3750,7 +3695,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3766,7 +3711,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3782,7 +3727,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3798,7 +3743,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3814,7 +3759,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3830,7 +3775,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3846,7 +3791,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3862,7 +3807,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3878,7 +3823,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3892,7 +3837,7 @@
"code": 59,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "SecurityPolicy",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -3910,7 +3855,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3924,7 +3869,7 @@
"code": 61,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "OperationalDatasetComponents",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -4028,7 +3973,6 @@
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "bssid",
@@ -4037,7 +3981,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4053,7 +3997,7 @@
"side": "server",
"type": "SecurityType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4069,7 +4013,7 @@
"side": "server",
"type": "WiFiVersionType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4085,7 +4029,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -4101,7 +4045,7 @@
"side": "server",
"type": "int8s",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -4117,7 +4061,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4133,7 +4077,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4149,7 +4093,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4165,7 +4109,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4181,7 +4125,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4197,7 +4141,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4213,7 +4157,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4229,7 +4173,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4315,7 +4259,6 @@
"define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "PHYRate",
@@ -4324,7 +4267,7 @@
"side": "server",
"type": "PHYRateType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4340,7 +4283,7 @@
"side": "server",
"type": "boolean",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -4356,7 +4299,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4372,7 +4315,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4388,7 +4331,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4404,7 +4347,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4420,7 +4363,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4436,7 +4379,7 @@
"side": "server",
"type": "boolean",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -4452,7 +4395,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4501,9 +4444,7 @@
"mfgCode": null,
"define": "SWITCH_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Switch",
@@ -4512,7 +4453,6 @@
"define": "SWITCH_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -4607,7 +4547,6 @@
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "WindowStatus",
@@ -4762,14 +4701,6 @@
"source": "client",
"incoming": 1,
"outgoing": 1
- },
- {
- "name": "RemoveTrustedRootCertificate",
- "code": 12,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -4872,7 +4803,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4888,7 +4819,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4918,7 +4849,7 @@
"code": 5,
"mfgCode": null,
"side": "server",
- "type": "fabric_idx",
+ "type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -5003,8 +4934,7 @@
"incoming": 1,
"outgoing": 0
}
- ],
- "attributes": []
+ ]
},
{
"name": "Group Key Management",
@@ -5136,9 +5066,7 @@
"mfgCode": null,
"define": "FIXED_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Fixed Label",
@@ -5147,7 +5075,6 @@
"define": "FIXED_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5205,9 +5132,7 @@
"mfgCode": null,
"define": "USER_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "User Label",
@@ -5216,7 +5141,6 @@
"define": "USER_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5291,14 +5215,6 @@
"source": "client",
"incoming": 1,
"outgoing": 0
- },
- {
- "name": "IdentifyQuery",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -5343,16 +5259,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [
- {
- "name": "IdentifyQueryResponse",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
"attributes": [
{
"name": "identify time",
@@ -5707,7 +5613,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -5750,7 +5655,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -5905,7 +5809,6 @@
"define": "BINDING_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -5948,7 +5851,6 @@
"define": "BINDING_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "Binding",
@@ -6055,7 +5957,6 @@
"define": "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -6098,7 +5999,6 @@
"define": "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "measured value",
@@ -6268,6 +6168,5 @@
"endpointVersion": 1,
"deviceIdentifier": 775
}
- ],
- "log": []
-}
+ ]
+}
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap
index 2411805..2654887 100644
--- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap
+++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 70,
+ "featureLevel": 77,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,14 +19,16 @@
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/zcl/zcl.json",
- "version": "ZCL Test Data",
- "type": "zcl-properties"
+ "type": "zcl-properties",
+ "category": "matter",
+ "version": 1,
+ "description": "Matter SDK ZCL data"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
- "version": "chip-v1",
- "type": "gen-templates-json"
+ "type": "gen-templates-json",
+ "version": "chip-v1"
}
],
"endpointTypes": [
@@ -51,14 +53,6 @@
"source": "client",
"incoming": 1,
"outgoing": 0
- },
- {
- "name": "IdentifyQuery",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -87,16 +81,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [
- {
- "name": "IdentifyQueryResponse",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
"attributes": [
{
"name": "identify time",
@@ -443,7 +427,7 @@
],
"attributes": [
{
- "name": "scene count",
+ "name": "SceneCount",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -459,7 +443,7 @@
"reportableChange": 0
},
{
- "name": "current scene",
+ "name": "CurrentScene",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -475,11 +459,11 @@
"reportableChange": 0
},
{
- "name": "current group",
+ "name": "CurrentGroup",
"code": 2,
"mfgCode": null,
"side": "server",
- "type": "int16u",
+ "type": "group_id",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -491,7 +475,7 @@
"reportableChange": 0
},
{
- "name": "scene valid",
+ "name": "SceneValid",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -507,7 +491,7 @@
"reportableChange": 0
},
{
- "name": "name support",
+ "name": "NameSupport",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -599,7 +583,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -642,7 +625,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -669,7 +651,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "switch type",
@@ -820,10 +801,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -863,7 +843,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -890,7 +869,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -997,7 +975,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1024,7 +1001,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ACL",
@@ -1115,7 +1091,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1142,7 +1117,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -1151,7 +1125,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "10",
@@ -1653,7 +1627,6 @@
"define": "OTA_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DefaultOtaProviders",
@@ -1775,9 +1748,7 @@
"mfgCode": null,
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Localization Configuration",
@@ -1786,27 +1757,10 @@
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
- "name": "ActiveLocale",
- "code": 1,
- "mfgCode": null,
- "side": "server",
- "type": "char_string",
- "included": 1,
- "storageOption": "NVM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "en-US",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "SupportedLocales",
- "code": 2,
+ "code": 1,
"mfgCode": null,
"side": "server",
"type": "array",
@@ -1814,7 +1768,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": "en-US",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -1860,9 +1814,7 @@
"mfgCode": null,
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Time Format Localization",
@@ -1871,7 +1823,6 @@
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "HourFormat",
@@ -1961,9 +1912,7 @@
"mfgCode": null,
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Unit Localization",
@@ -1972,7 +1921,6 @@
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "TemperatureUnit",
@@ -2149,7 +2097,7 @@
"side": "server",
"type": "RegulatoryLocationType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2165,7 +2113,7 @@
"side": "server",
"type": "RegulatoryLocationType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2539,7 +2487,6 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -2600,7 +2547,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -2616,7 +2563,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2632,7 +2579,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -2648,7 +2595,7 @@
"side": "server",
"type": "enum8",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2798,7 +2745,6 @@
"define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ThreadMetrics",
@@ -2823,7 +2769,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2839,7 +2785,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2855,7 +2801,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2941,7 +2887,6 @@
"define": "THREAD_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "channel",
@@ -2950,7 +2895,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2964,9 +2909,9 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "enum8",
+ "type": "RoutingRole",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2982,7 +2927,7 @@
"side": "server",
"type": "char_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2998,7 +2943,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3014,7 +2959,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3030,7 +2975,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3046,7 +2991,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3094,7 +3039,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3110,7 +3055,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3126,7 +3071,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3142,7 +3087,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3158,7 +3103,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3174,7 +3119,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3190,7 +3135,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3206,7 +3151,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3222,7 +3167,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3238,7 +3183,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3254,7 +3199,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3270,7 +3215,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3286,7 +3231,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3302,7 +3247,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3318,7 +3263,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3334,7 +3279,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3350,7 +3295,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3366,7 +3311,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3382,7 +3327,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3398,7 +3343,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3414,7 +3359,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3430,7 +3375,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3446,7 +3391,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3462,7 +3407,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3478,7 +3423,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3494,7 +3439,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3510,7 +3455,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3526,7 +3471,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3542,7 +3487,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3558,7 +3503,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3574,7 +3519,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3590,7 +3535,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3606,7 +3551,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3622,7 +3567,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3638,7 +3583,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3654,7 +3599,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3670,7 +3615,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3686,7 +3631,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3702,7 +3647,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3718,7 +3663,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3734,7 +3679,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3750,7 +3695,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3766,7 +3711,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3782,7 +3727,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3798,7 +3743,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3814,7 +3759,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3830,7 +3775,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3846,7 +3791,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3862,7 +3807,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3878,7 +3823,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3892,7 +3837,7 @@
"code": 59,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "SecurityPolicy",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -3910,7 +3855,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3924,7 +3869,7 @@
"code": 61,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "OperationalDatasetComponents",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -4028,7 +3973,6 @@
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "bssid",
@@ -4037,7 +3981,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4053,7 +3997,7 @@
"side": "server",
"type": "SecurityType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4069,7 +4013,7 @@
"side": "server",
"type": "WiFiVersionType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4085,7 +4029,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -4101,7 +4045,7 @@
"side": "server",
"type": "int8s",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -4117,7 +4061,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4133,7 +4077,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4149,7 +4093,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4165,7 +4109,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4181,7 +4125,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4197,7 +4141,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4213,7 +4157,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4229,7 +4173,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4315,7 +4259,6 @@
"define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "PHYRate",
@@ -4324,7 +4267,7 @@
"side": "server",
"type": "PHYRateType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4340,7 +4283,7 @@
"side": "server",
"type": "boolean",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -4356,7 +4299,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4372,7 +4315,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4388,7 +4331,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4404,7 +4347,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4420,7 +4363,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4436,7 +4379,7 @@
"side": "server",
"type": "boolean",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -4452,7 +4395,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4501,9 +4444,7 @@
"mfgCode": null,
"define": "SWITCH_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Switch",
@@ -4512,7 +4453,6 @@
"define": "SWITCH_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -4607,7 +4547,6 @@
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "WindowStatus",
@@ -4762,14 +4701,6 @@
"source": "client",
"incoming": 1,
"outgoing": 1
- },
- {
- "name": "RemoveTrustedRootCertificate",
- "code": 12,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -4872,7 +4803,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4888,7 +4819,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4918,7 +4849,7 @@
"code": 5,
"mfgCode": null,
"side": "server",
- "type": "fabric_idx",
+ "type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -5003,8 +4934,7 @@
"incoming": 1,
"outgoing": 0
}
- ],
- "attributes": []
+ ]
},
{
"name": "Group Key Management",
@@ -5136,9 +5066,7 @@
"mfgCode": null,
"define": "FIXED_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Fixed Label",
@@ -5147,7 +5075,6 @@
"define": "FIXED_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5205,9 +5132,7 @@
"mfgCode": null,
"define": "USER_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "User Label",
@@ -5216,7 +5141,6 @@
"define": "USER_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5291,14 +5215,6 @@
"source": "client",
"incoming": 1,
"outgoing": 0
- },
- {
- "name": "IdentifyQuery",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -5343,16 +5259,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [
- {
- "name": "IdentifyQueryResponse",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
"attributes": [
{
"name": "identify time",
@@ -5707,7 +5613,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -5750,7 +5655,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -5905,7 +5809,6 @@
"define": "BINDING_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -5948,7 +5851,6 @@
"define": "BINDING_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "Binding",
@@ -6055,7 +5957,6 @@
"define": "ILLUMINANCE_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -6098,7 +5999,6 @@
"define": "ILLUMINANCE_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "MeasuredValue",
@@ -6284,6 +6184,5 @@
"endpointVersion": 1,
"deviceIdentifier": 262
}
- ],
- "log": []
+ ]
}
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap
index ff8bd09..062d239 100644
--- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap
+++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 70,
+ "featureLevel": 77,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,14 +19,16 @@
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/zcl/zcl.json",
- "version": "ZCL Test Data",
- "type": "zcl-properties"
+ "type": "zcl-properties",
+ "category": "matter",
+ "version": 1,
+ "description": "Matter SDK ZCL data"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
- "version": "chip-v1",
- "type": "gen-templates-json"
+ "type": "gen-templates-json",
+ "version": "chip-v1"
}
],
"endpointTypes": [
@@ -51,14 +53,6 @@
"source": "client",
"incoming": 1,
"outgoing": 0
- },
- {
- "name": "IdentifyQuery",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -87,16 +81,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [
- {
- "name": "IdentifyQueryResponse",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
"attributes": [
{
"name": "identify time",
@@ -443,7 +427,7 @@
],
"attributes": [
{
- "name": "scene count",
+ "name": "SceneCount",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -459,7 +443,7 @@
"reportableChange": 0
},
{
- "name": "current scene",
+ "name": "CurrentScene",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -475,11 +459,11 @@
"reportableChange": 0
},
{
- "name": "current group",
+ "name": "CurrentGroup",
"code": 2,
"mfgCode": null,
"side": "server",
- "type": "int16u",
+ "type": "group_id",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -491,7 +475,7 @@
"reportableChange": 0
},
{
- "name": "scene valid",
+ "name": "SceneValid",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -507,7 +491,7 @@
"reportableChange": 0
},
{
- "name": "name support",
+ "name": "NameSupport",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -599,7 +583,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -642,7 +625,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -669,7 +651,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "switch type",
@@ -820,10 +801,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -863,7 +843,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -890,7 +869,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -997,7 +975,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1024,7 +1001,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ACL",
@@ -1115,7 +1091,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1142,7 +1117,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -1151,7 +1125,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "10",
@@ -1653,7 +1627,6 @@
"define": "OTA_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DefaultOtaProviders",
@@ -1775,9 +1748,7 @@
"mfgCode": null,
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Localization Configuration",
@@ -1786,27 +1757,10 @@
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
- "name": "ActiveLocale",
- "code": 1,
- "mfgCode": null,
- "side": "server",
- "type": "char_string",
- "included": 1,
- "storageOption": "NVM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "en-US",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "SupportedLocales",
- "code": 2,
+ "code": 1,
"mfgCode": null,
"side": "server",
"type": "array",
@@ -1814,7 +1768,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": "en-US",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -1860,9 +1814,7 @@
"mfgCode": null,
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Time Format Localization",
@@ -1871,7 +1823,6 @@
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "HourFormat",
@@ -1961,9 +1912,7 @@
"mfgCode": null,
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Unit Localization",
@@ -1972,7 +1921,6 @@
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "TemperatureUnit",
@@ -2149,7 +2097,7 @@
"side": "server",
"type": "RegulatoryLocationType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2165,7 +2113,7 @@
"side": "server",
"type": "RegulatoryLocationType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2539,7 +2487,6 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -2600,7 +2547,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -2616,7 +2563,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2632,7 +2579,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -2648,7 +2595,7 @@
"side": "server",
"type": "enum8",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2798,7 +2745,6 @@
"define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ThreadMetrics",
@@ -2823,7 +2769,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2839,7 +2785,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2855,7 +2801,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2941,7 +2887,6 @@
"define": "THREAD_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "channel",
@@ -2950,7 +2895,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2964,9 +2909,9 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "enum8",
+ "type": "RoutingRole",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2982,7 +2927,7 @@
"side": "server",
"type": "char_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2998,7 +2943,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3014,7 +2959,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3030,7 +2975,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3046,7 +2991,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3094,7 +3039,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3110,7 +3055,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3126,7 +3071,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3142,7 +3087,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3158,7 +3103,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3174,7 +3119,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3190,7 +3135,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3206,7 +3151,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3222,7 +3167,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3238,7 +3183,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3254,7 +3199,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3270,7 +3215,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3286,7 +3231,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3302,7 +3247,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3318,7 +3263,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3334,7 +3279,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3350,7 +3295,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3366,7 +3311,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3382,7 +3327,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3398,7 +3343,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3414,7 +3359,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3430,7 +3375,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3446,7 +3391,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3462,7 +3407,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3478,7 +3423,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3494,7 +3439,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3510,7 +3455,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3526,7 +3471,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3542,7 +3487,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3558,7 +3503,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3574,7 +3519,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3590,7 +3535,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3606,7 +3551,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3622,7 +3567,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3638,7 +3583,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3654,7 +3599,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3670,7 +3615,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3686,7 +3631,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3702,7 +3647,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3718,7 +3663,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3734,7 +3679,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3750,7 +3695,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3766,7 +3711,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3782,7 +3727,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3798,7 +3743,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3814,7 +3759,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3830,7 +3775,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3846,7 +3791,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3862,7 +3807,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3878,7 +3823,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3892,7 +3837,7 @@
"code": 59,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "SecurityPolicy",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -3910,7 +3855,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3924,7 +3869,7 @@
"code": 61,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "OperationalDatasetComponents",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -4028,7 +3973,6 @@
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "bssid",
@@ -4037,7 +3981,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4053,7 +3997,7 @@
"side": "server",
"type": "SecurityType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4069,7 +4013,7 @@
"side": "server",
"type": "WiFiVersionType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4085,7 +4029,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -4101,7 +4045,7 @@
"side": "server",
"type": "int8s",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -4117,7 +4061,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4133,7 +4077,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4149,7 +4093,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4165,7 +4109,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4181,7 +4125,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4197,7 +4141,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4213,7 +4157,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4229,7 +4173,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4315,7 +4259,6 @@
"define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "PHYRate",
@@ -4324,7 +4267,7 @@
"side": "server",
"type": "PHYRateType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4340,7 +4283,7 @@
"side": "server",
"type": "boolean",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -4356,7 +4299,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4372,7 +4315,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4388,7 +4331,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4404,7 +4347,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4420,7 +4363,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4436,7 +4379,7 @@
"side": "server",
"type": "boolean",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -4452,7 +4395,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4501,9 +4444,7 @@
"mfgCode": null,
"define": "SWITCH_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Switch",
@@ -4512,7 +4453,6 @@
"define": "SWITCH_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -4607,7 +4547,6 @@
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "WindowStatus",
@@ -4762,14 +4701,6 @@
"source": "client",
"incoming": 1,
"outgoing": 1
- },
- {
- "name": "RemoveTrustedRootCertificate",
- "code": 12,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -4872,7 +4803,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4888,7 +4819,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4918,7 +4849,7 @@
"code": 5,
"mfgCode": null,
"side": "server",
- "type": "fabric_idx",
+ "type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -5003,8 +4934,7 @@
"incoming": 1,
"outgoing": 0
}
- ],
- "attributes": []
+ ]
},
{
"name": "Group Key Management",
@@ -5136,9 +5066,7 @@
"mfgCode": null,
"define": "FIXED_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Fixed Label",
@@ -5147,7 +5075,6 @@
"define": "FIXED_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5205,9 +5132,7 @@
"mfgCode": null,
"define": "USER_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "User Label",
@@ -5216,7 +5141,6 @@
"define": "USER_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5291,14 +5215,6 @@
"source": "client",
"incoming": 1,
"outgoing": 0
- },
- {
- "name": "IdentifyQuery",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -5343,16 +5259,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [
- {
- "name": "IdentifyQueryResponse",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
"attributes": [
{
"name": "identify time",
@@ -5707,7 +5613,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -5750,7 +5655,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -5905,7 +5809,6 @@
"define": "BINDING_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -5948,7 +5851,6 @@
"define": "BINDING_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "Binding",
@@ -6055,7 +5957,6 @@
"define": "OCCUPANCY_SENSING_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -6098,7 +5999,6 @@
"define": "OCCUPANCY_SENSING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "occupancy",
@@ -6396,6 +6296,5 @@
"endpointVersion": 1,
"deviceIdentifier": 263
}
- ],
- "log": []
-}
+ ]
+}
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap
index a67de04..a5e6d76 100644
--- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap
+++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 70,
+ "featureLevel": 77,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,14 +19,16 @@
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/zcl/zcl.json",
- "version": "ZCL Test Data",
- "type": "zcl-properties"
+ "type": "zcl-properties",
+ "category": "matter",
+ "version": 1,
+ "description": "Matter SDK ZCL data"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
- "version": "chip-v1",
- "type": "gen-templates-json"
+ "type": "gen-templates-json",
+ "version": "chip-v1"
}
],
"endpointTypes": [
@@ -51,14 +53,6 @@
"source": "client",
"incoming": 1,
"outgoing": 0
- },
- {
- "name": "IdentifyQuery",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -87,16 +81,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [
- {
- "name": "IdentifyQueryResponse",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
"attributes": [
{
"name": "identify time",
@@ -443,7 +427,7 @@
],
"attributes": [
{
- "name": "scene count",
+ "name": "SceneCount",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -459,7 +443,7 @@
"reportableChange": 0
},
{
- "name": "current scene",
+ "name": "CurrentScene",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -475,11 +459,11 @@
"reportableChange": 0
},
{
- "name": "current group",
+ "name": "CurrentGroup",
"code": 2,
"mfgCode": null,
"side": "server",
- "type": "int16u",
+ "type": "group_id",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -491,7 +475,7 @@
"reportableChange": 0
},
{
- "name": "scene valid",
+ "name": "SceneValid",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -507,7 +491,7 @@
"reportableChange": 0
},
{
- "name": "name support",
+ "name": "NameSupport",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -599,7 +583,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -642,7 +625,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -669,7 +651,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "switch type",
@@ -820,10 +801,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -863,7 +843,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -890,7 +869,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -997,7 +975,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1024,7 +1001,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ACL",
@@ -1115,7 +1091,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1142,7 +1117,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -1151,7 +1125,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "10",
@@ -1653,7 +1627,6 @@
"define": "OTA_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DefaultOtaProviders",
@@ -1775,9 +1748,7 @@
"mfgCode": null,
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Localization Configuration",
@@ -1786,27 +1757,10 @@
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
- "name": "ActiveLocale",
- "code": 1,
- "mfgCode": null,
- "side": "server",
- "type": "char_string",
- "included": 1,
- "storageOption": "NVM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "en-US",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "SupportedLocales",
- "code": 2,
+ "code": 1,
"mfgCode": null,
"side": "server",
"type": "array",
@@ -1814,7 +1768,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": "en-US",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -1860,9 +1814,7 @@
"mfgCode": null,
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Time Format Localization",
@@ -1871,7 +1823,6 @@
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "HourFormat",
@@ -1961,9 +1912,7 @@
"mfgCode": null,
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Unit Localization",
@@ -1972,7 +1921,6 @@
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "TemperatureUnit",
@@ -2149,7 +2097,7 @@
"side": "server",
"type": "RegulatoryLocationType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2165,7 +2113,7 @@
"side": "server",
"type": "RegulatoryLocationType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2539,7 +2487,6 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -2600,7 +2547,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -2616,7 +2563,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2632,7 +2579,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -2648,7 +2595,7 @@
"side": "server",
"type": "enum8",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2798,7 +2745,6 @@
"define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ThreadMetrics",
@@ -2823,7 +2769,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2839,7 +2785,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2855,7 +2801,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2941,7 +2887,6 @@
"define": "THREAD_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "channel",
@@ -2950,7 +2895,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2964,9 +2909,9 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "enum8",
+ "type": "RoutingRole",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2982,7 +2927,7 @@
"side": "server",
"type": "char_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2998,7 +2943,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3014,7 +2959,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3030,7 +2975,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3046,7 +2991,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3094,7 +3039,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3110,7 +3055,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3126,7 +3071,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3142,7 +3087,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3158,7 +3103,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3174,7 +3119,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3190,7 +3135,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3206,7 +3151,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3222,7 +3167,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3238,7 +3183,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3254,7 +3199,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3270,7 +3215,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3286,7 +3231,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3302,7 +3247,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3318,7 +3263,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3334,7 +3279,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3350,7 +3295,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3366,7 +3311,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3382,7 +3327,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3398,7 +3343,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3414,7 +3359,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3430,7 +3375,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3446,7 +3391,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3462,7 +3407,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3478,7 +3423,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3494,7 +3439,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3510,7 +3455,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3526,7 +3471,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3542,7 +3487,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3558,7 +3503,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3574,7 +3519,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3590,7 +3535,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3606,7 +3551,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3622,7 +3567,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3638,7 +3583,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3654,7 +3599,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3670,7 +3615,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3686,7 +3631,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3702,7 +3647,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3718,7 +3663,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3734,7 +3679,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3750,7 +3695,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3766,7 +3711,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3782,7 +3727,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3798,7 +3743,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3814,7 +3759,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3830,7 +3775,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3846,7 +3791,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3862,7 +3807,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3878,7 +3823,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3892,7 +3837,7 @@
"code": 59,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "SecurityPolicy",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -3910,7 +3855,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3924,7 +3869,7 @@
"code": 61,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "OperationalDatasetComponents",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -4028,7 +3973,6 @@
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "bssid",
@@ -4037,7 +3981,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4053,7 +3997,7 @@
"side": "server",
"type": "SecurityType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4069,7 +4013,7 @@
"side": "server",
"type": "WiFiVersionType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4085,7 +4029,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -4101,7 +4045,7 @@
"side": "server",
"type": "int8s",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -4117,7 +4061,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4133,7 +4077,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4149,7 +4093,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4165,7 +4109,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4181,7 +4125,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4197,7 +4141,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4213,7 +4157,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4229,7 +4173,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4315,7 +4259,6 @@
"define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "PHYRate",
@@ -4324,7 +4267,7 @@
"side": "server",
"type": "PHYRateType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4340,7 +4283,7 @@
"side": "server",
"type": "boolean",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -4356,7 +4299,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4372,7 +4315,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4388,7 +4331,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4404,7 +4347,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4420,7 +4363,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4436,7 +4379,7 @@
"side": "server",
"type": "boolean",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -4452,7 +4395,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4501,9 +4444,7 @@
"mfgCode": null,
"define": "SWITCH_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Switch",
@@ -4512,7 +4453,6 @@
"define": "SWITCH_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -4607,7 +4547,6 @@
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "WindowStatus",
@@ -4762,14 +4701,6 @@
"source": "client",
"incoming": 1,
"outgoing": 1
- },
- {
- "name": "RemoveTrustedRootCertificate",
- "code": 12,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -4872,7 +4803,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4888,7 +4819,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4918,7 +4849,7 @@
"code": 5,
"mfgCode": null,
"side": "server",
- "type": "fabric_idx",
+ "type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -5003,8 +4934,7 @@
"incoming": 1,
"outgoing": 0
}
- ],
- "attributes": []
+ ]
},
{
"name": "Group Key Management",
@@ -5136,9 +5066,7 @@
"mfgCode": null,
"define": "FIXED_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Fixed Label",
@@ -5147,7 +5075,6 @@
"define": "FIXED_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5205,9 +5132,7 @@
"mfgCode": null,
"define": "USER_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "User Label",
@@ -5216,7 +5141,6 @@
"define": "USER_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5291,14 +5215,6 @@
"source": "client",
"incoming": 1,
"outgoing": 0
- },
- {
- "name": "IdentifyQuery",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -5343,16 +5259,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [
- {
- "name": "IdentifyQueryResponse",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
"attributes": [
{
"name": "identify time",
@@ -5859,7 +5765,7 @@
],
"attributes": [
{
- "name": "scene count",
+ "name": "SceneCount",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -5875,7 +5781,7 @@
"reportableChange": 0
},
{
- "name": "current scene",
+ "name": "CurrentScene",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -5891,11 +5797,11 @@
"reportableChange": 0
},
{
- "name": "current group",
+ "name": "CurrentGroup",
"code": 2,
"mfgCode": null,
"side": "server",
- "type": "int16u",
+ "type": "group_id",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -5907,7 +5813,7 @@
"reportableChange": 0
},
{
- "name": "scene valid",
+ "name": "SceneValid",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -5923,7 +5829,7 @@
"reportableChange": 0
},
{
- "name": "name support",
+ "name": "NameSupport",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -5939,7 +5845,7 @@
"reportableChange": 0
},
{
- "name": "last configured by",
+ "name": "LastConfiguredBy",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -6111,7 +6017,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -6390,10 +6295,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -6409,7 +6313,7 @@
"reportableChange": 0
},
{
- "name": "remaining time",
+ "name": "RemainingTime",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -6425,7 +6329,7 @@
"reportableChange": 0
},
{
- "name": "min level",
+ "name": "MinLevel",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -6441,7 +6345,7 @@
"reportableChange": 0
},
{
- "name": "max level",
+ "name": "MaxLevel",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -6457,7 +6361,7 @@
"reportableChange": 0
},
{
- "name": "current frequency",
+ "name": "CurrentFrequency",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -6473,7 +6377,7 @@
"reportableChange": 0
},
{
- "name": "min frequency",
+ "name": "MinFrequency",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -6489,7 +6393,7 @@
"reportableChange": 0
},
{
- "name": "max frequency",
+ "name": "MaxFrequency",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -6505,7 +6409,7 @@
"reportableChange": 0
},
{
- "name": "options",
+ "name": "Options",
"code": 15,
"mfgCode": null,
"side": "server",
@@ -6521,7 +6425,7 @@
"reportableChange": 0
},
{
- "name": "on off transition time",
+ "name": "OnOffTransitionTime",
"code": 16,
"mfgCode": null,
"side": "server",
@@ -6537,7 +6441,7 @@
"reportableChange": 0
},
{
- "name": "on level",
+ "name": "OnLevel",
"code": 17,
"mfgCode": null,
"side": "server",
@@ -6553,7 +6457,7 @@
"reportableChange": 0
},
{
- "name": "on transition time",
+ "name": "OnTransitionTime",
"code": 18,
"mfgCode": null,
"side": "server",
@@ -6569,7 +6473,7 @@
"reportableChange": 0
},
{
- "name": "off transition time",
+ "name": "OffTransitionTime",
"code": 19,
"mfgCode": null,
"side": "server",
@@ -6585,7 +6489,7 @@
"reportableChange": 0
},
{
- "name": "default move rate",
+ "name": "DefaultMoveRate",
"code": 20,
"mfgCode": null,
"side": "server",
@@ -6601,7 +6505,7 @@
"reportableChange": 0
},
{
- "name": "start up current level",
+ "name": "StartUpCurrentLevel",
"code": 16384,
"mfgCode": null,
"side": "server",
@@ -6705,7 +6609,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -6748,7 +6651,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -6903,7 +6805,6 @@
"define": "BINDING_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -6946,7 +6847,6 @@
"define": "BINDING_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "Binding",
@@ -7053,7 +6953,6 @@
"define": "OCCUPANCY_SENSING_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -7096,7 +6995,6 @@
"define": "OCCUPANCY_SENSING_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "occupancy",
@@ -7394,6 +7292,5 @@
"endpointVersion": 1,
"deviceIdentifier": 256
}
- ],
- "log": []
+ ]
}
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap
index dc5b43b..5da6d0e 100644
--- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap
+++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 70,
+ "featureLevel": 77,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,14 +19,16 @@
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/zcl/zcl.json",
- "version": "ZCL Test Data",
- "type": "zcl-properties"
+ "type": "zcl-properties",
+ "category": "matter",
+ "version": 1,
+ "description": "Matter SDK ZCL data"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
- "version": "chip-v1",
- "type": "gen-templates-json"
+ "type": "gen-templates-json",
+ "version": "chip-v1"
}
],
"endpointTypes": [
@@ -51,14 +53,6 @@
"source": "client",
"incoming": 1,
"outgoing": 0
- },
- {
- "name": "IdentifyQuery",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -87,16 +81,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [
- {
- "name": "IdentifyQueryResponse",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
"attributes": [
{
"name": "identify time",
@@ -443,7 +427,7 @@
],
"attributes": [
{
- "name": "scene count",
+ "name": "SceneCount",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -459,7 +443,7 @@
"reportableChange": 0
},
{
- "name": "current scene",
+ "name": "CurrentScene",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -475,11 +459,11 @@
"reportableChange": 0
},
{
- "name": "current group",
+ "name": "CurrentGroup",
"code": 2,
"mfgCode": null,
"side": "server",
- "type": "int16u",
+ "type": "group_id",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -491,7 +475,7 @@
"reportableChange": 0
},
{
- "name": "scene valid",
+ "name": "SceneValid",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -507,7 +491,7 @@
"reportableChange": 0
},
{
- "name": "name support",
+ "name": "NameSupport",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -599,7 +583,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -642,7 +625,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -669,7 +651,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "switch type",
@@ -820,10 +801,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -863,7 +843,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -890,7 +869,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -997,7 +975,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1024,7 +1001,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ACL",
@@ -1115,7 +1091,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1142,7 +1117,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -1653,7 +1627,6 @@
"define": "OTA_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DefaultOtaProviders",
@@ -1775,9 +1748,7 @@
"mfgCode": null,
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Localization Configuration",
@@ -1786,27 +1757,10 @@
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
- "name": "ActiveLocale",
- "code": 1,
- "mfgCode": null,
- "side": "server",
- "type": "char_string",
- "included": 1,
- "storageOption": "NVM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "en-US",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "SupportedLocales",
- "code": 2,
+ "code": 1,
"mfgCode": null,
"side": "server",
"type": "array",
@@ -1814,7 +1768,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": "en-US",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -1860,9 +1814,7 @@
"mfgCode": null,
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Time Format Localization",
@@ -1871,7 +1823,6 @@
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "HourFormat",
@@ -1961,9 +1912,7 @@
"mfgCode": null,
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Unit Localization",
@@ -1972,7 +1921,6 @@
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "TemperatureUnit",
@@ -2149,7 +2097,7 @@
"side": "server",
"type": "RegulatoryLocationType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2165,7 +2113,7 @@
"side": "server",
"type": "RegulatoryLocationType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2539,7 +2487,6 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -2600,7 +2547,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -2616,7 +2563,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2632,7 +2579,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -2648,7 +2595,7 @@
"side": "server",
"type": "enum8",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2798,7 +2745,6 @@
"define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ThreadMetrics",
@@ -2823,7 +2769,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2839,7 +2785,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2855,7 +2801,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2941,7 +2887,6 @@
"define": "THREAD_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "channel",
@@ -2950,7 +2895,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2964,9 +2909,9 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "enum8",
+ "type": "RoutingRole",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2982,7 +2927,7 @@
"side": "server",
"type": "char_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2998,7 +2943,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3014,7 +2959,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3030,7 +2975,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3046,7 +2991,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3094,7 +3039,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3110,7 +3055,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3126,7 +3071,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3142,7 +3087,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3158,7 +3103,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3174,7 +3119,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3190,7 +3135,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3206,7 +3151,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3222,7 +3167,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3238,7 +3183,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3254,7 +3199,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3270,7 +3215,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3286,7 +3231,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3302,7 +3247,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3318,7 +3263,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3334,7 +3279,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3350,7 +3295,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3366,7 +3311,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3382,7 +3327,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3398,7 +3343,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3414,7 +3359,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3430,7 +3375,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3446,7 +3391,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3462,7 +3407,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3478,7 +3423,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3494,7 +3439,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3510,7 +3455,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3526,7 +3471,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3542,7 +3487,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3558,7 +3503,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3574,7 +3519,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3590,7 +3535,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3606,7 +3551,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3622,7 +3567,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3638,7 +3583,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3654,7 +3599,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3670,7 +3615,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3686,7 +3631,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3702,7 +3647,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3718,7 +3663,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3734,7 +3679,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3750,7 +3695,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3766,7 +3711,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3782,7 +3727,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3798,7 +3743,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3814,7 +3759,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3830,7 +3775,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3846,7 +3791,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3862,7 +3807,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3878,7 +3823,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3892,7 +3837,7 @@
"code": 59,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "SecurityPolicy",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -3910,7 +3855,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3924,7 +3869,7 @@
"code": 61,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "OperationalDatasetComponents",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -4028,7 +3973,6 @@
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "bssid",
@@ -4037,7 +3981,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4053,7 +3997,7 @@
"side": "server",
"type": "SecurityType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4069,7 +4013,7 @@
"side": "server",
"type": "WiFiVersionType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4085,7 +4029,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -4101,7 +4045,7 @@
"side": "server",
"type": "int8s",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -4117,7 +4061,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4133,7 +4077,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4149,7 +4093,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4165,7 +4109,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4181,7 +4125,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4197,7 +4141,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4213,7 +4157,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4229,7 +4173,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4315,7 +4259,6 @@
"define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "PHYRate",
@@ -4501,9 +4444,7 @@
"mfgCode": null,
"define": "SWITCH_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Switch",
@@ -4512,7 +4453,6 @@
"define": "SWITCH_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -4607,7 +4547,6 @@
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "WindowStatus",
@@ -4762,14 +4701,6 @@
"source": "client",
"incoming": 1,
"outgoing": 1
- },
- {
- "name": "RemoveTrustedRootCertificate",
- "code": 12,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -4872,7 +4803,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4888,7 +4819,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4918,7 +4849,7 @@
"code": 5,
"mfgCode": null,
"side": "server",
- "type": "fabric_idx",
+ "type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -5003,8 +4934,7 @@
"incoming": 1,
"outgoing": 0
}
- ],
- "attributes": []
+ ]
},
{
"name": "Group Key Management",
@@ -5136,9 +5066,7 @@
"mfgCode": null,
"define": "FIXED_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Fixed Label",
@@ -5147,7 +5075,6 @@
"define": "FIXED_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5205,9 +5132,7 @@
"mfgCode": null,
"define": "USER_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "User Label",
@@ -5216,7 +5141,6 @@
"define": "USER_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5291,14 +5215,6 @@
"source": "client",
"incoming": 1,
"outgoing": 0
- },
- {
- "name": "IdentifyQuery",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -5343,16 +5259,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [
- {
- "name": "IdentifyQueryResponse",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
"attributes": [
{
"name": "identify time",
@@ -5859,7 +5765,7 @@
],
"attributes": [
{
- "name": "scene count",
+ "name": "SceneCount",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -5875,7 +5781,7 @@
"reportableChange": 0
},
{
- "name": "current scene",
+ "name": "CurrentScene",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -5891,11 +5797,11 @@
"reportableChange": 0
},
{
- "name": "current group",
+ "name": "CurrentGroup",
"code": 2,
"mfgCode": null,
"side": "server",
- "type": "int16u",
+ "type": "group_id",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -5907,7 +5813,7 @@
"reportableChange": 0
},
{
- "name": "scene valid",
+ "name": "SceneValid",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -5923,7 +5829,7 @@
"reportableChange": 0
},
{
- "name": "name support",
+ "name": "NameSupport",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -5939,7 +5845,7 @@
"reportableChange": 0
},
{
- "name": "last configured by",
+ "name": "LastConfiguredBy",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -6111,7 +6017,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -6390,10 +6295,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -6409,7 +6313,7 @@
"reportableChange": 0
},
{
- "name": "remaining time",
+ "name": "RemainingTime",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -6425,7 +6329,7 @@
"reportableChange": 0
},
{
- "name": "min level",
+ "name": "MinLevel",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -6441,7 +6345,7 @@
"reportableChange": 0
},
{
- "name": "max level",
+ "name": "MaxLevel",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -6457,7 +6361,7 @@
"reportableChange": 0
},
{
- "name": "current frequency",
+ "name": "CurrentFrequency",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -6473,7 +6377,7 @@
"reportableChange": 0
},
{
- "name": "min frequency",
+ "name": "MinFrequency",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -6489,7 +6393,7 @@
"reportableChange": 0
},
{
- "name": "max frequency",
+ "name": "MaxFrequency",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -6505,7 +6409,7 @@
"reportableChange": 0
},
{
- "name": "options",
+ "name": "Options",
"code": 15,
"mfgCode": null,
"side": "server",
@@ -6521,7 +6425,7 @@
"reportableChange": 0
},
{
- "name": "on off transition time",
+ "name": "OnOffTransitionTime",
"code": 16,
"mfgCode": null,
"side": "server",
@@ -6537,7 +6441,7 @@
"reportableChange": 0
},
{
- "name": "on level",
+ "name": "OnLevel",
"code": 17,
"mfgCode": null,
"side": "server",
@@ -6553,7 +6457,7 @@
"reportableChange": 0
},
{
- "name": "on transition time",
+ "name": "OnTransitionTime",
"code": 18,
"mfgCode": null,
"side": "server",
@@ -6569,7 +6473,7 @@
"reportableChange": 0
},
{
- "name": "off transition time",
+ "name": "OffTransitionTime",
"code": 19,
"mfgCode": null,
"side": "server",
@@ -6585,7 +6489,7 @@
"reportableChange": 0
},
{
- "name": "default move rate",
+ "name": "DefaultMoveRate",
"code": 20,
"mfgCode": null,
"side": "server",
@@ -6601,7 +6505,7 @@
"reportableChange": 0
},
{
- "name": "start up current level",
+ "name": "StartUpCurrentLevel",
"code": 16384,
"mfgCode": null,
"side": "server",
@@ -6705,7 +6609,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -6748,7 +6651,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -6903,7 +6805,6 @@
"define": "BINDING_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -6946,7 +6847,6 @@
"define": "BINDING_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "Binding",
@@ -7053,7 +6953,6 @@
"define": "OCCUPANCY_SENSING_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -7096,7 +6995,6 @@
"define": "OCCUPANCY_SENSING_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "occupancy",
@@ -7394,6 +7292,5 @@
"endpointVersion": 1,
"deviceIdentifier": 259
}
- ],
- "log": []
-}
+ ]
+}
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap
index 50c517d..2a54b33 100644
--- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap
+++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 70,
+ "featureLevel": 77,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,14 +19,16 @@
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/zcl/zcl.json",
- "version": "ZCL Test Data",
- "type": "zcl-properties"
+ "type": "zcl-properties",
+ "category": "matter",
+ "version": 1,
+ "description": "Matter SDK ZCL data"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
- "version": "chip-v1",
- "type": "gen-templates-json"
+ "type": "gen-templates-json",
+ "version": "chip-v1"
}
],
"endpointTypes": [
@@ -51,14 +53,6 @@
"source": "client",
"incoming": 1,
"outgoing": 0
- },
- {
- "name": "IdentifyQuery",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -87,16 +81,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [
- {
- "name": "IdentifyQueryResponse",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
"attributes": [
{
"name": "identify time",
@@ -443,7 +427,7 @@
],
"attributes": [
{
- "name": "scene count",
+ "name": "SceneCount",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -459,7 +443,7 @@
"reportableChange": 0
},
{
- "name": "current scene",
+ "name": "CurrentScene",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -475,11 +459,11 @@
"reportableChange": 0
},
{
- "name": "current group",
+ "name": "CurrentGroup",
"code": 2,
"mfgCode": null,
"side": "server",
- "type": "int16u",
+ "type": "group_id",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -491,7 +475,7 @@
"reportableChange": 0
},
{
- "name": "scene valid",
+ "name": "SceneValid",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -507,7 +491,7 @@
"reportableChange": 0
},
{
- "name": "name support",
+ "name": "NameSupport",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -599,7 +583,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -642,7 +625,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -669,7 +651,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "switch type",
@@ -820,10 +801,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -863,7 +843,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -890,7 +869,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -997,7 +975,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1024,7 +1001,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ACL",
@@ -1115,7 +1091,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1142,7 +1117,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -1151,7 +1125,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "10",
@@ -1653,7 +1627,6 @@
"define": "OTA_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DefaultOtaProviders",
@@ -1775,9 +1748,7 @@
"mfgCode": null,
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Localization Configuration",
@@ -1786,27 +1757,10 @@
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
- "name": "ActiveLocale",
- "code": 1,
- "mfgCode": null,
- "side": "server",
- "type": "char_string",
- "included": 1,
- "storageOption": "NVM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "en-US",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "SupportedLocales",
- "code": 2,
+ "code": 1,
"mfgCode": null,
"side": "server",
"type": "array",
@@ -1814,7 +1768,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": "en-US",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -1860,9 +1814,7 @@
"mfgCode": null,
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Time Format Localization",
@@ -1871,7 +1823,6 @@
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "HourFormat",
@@ -1961,9 +1912,7 @@
"mfgCode": null,
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Unit Localization",
@@ -1972,7 +1921,6 @@
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "TemperatureUnit",
@@ -2149,7 +2097,7 @@
"side": "server",
"type": "RegulatoryLocationType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2165,7 +2113,7 @@
"side": "server",
"type": "RegulatoryLocationType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2539,7 +2487,6 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -2600,7 +2547,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -2616,7 +2563,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2632,7 +2579,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -2648,7 +2595,7 @@
"side": "server",
"type": "enum8",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2798,7 +2745,6 @@
"define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ThreadMetrics",
@@ -2823,7 +2769,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2839,7 +2785,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2855,7 +2801,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2941,7 +2887,6 @@
"define": "THREAD_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "channel",
@@ -2950,7 +2895,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2964,9 +2909,9 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "enum8",
+ "type": "RoutingRole",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2982,7 +2927,7 @@
"side": "server",
"type": "char_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2998,7 +2943,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3014,7 +2959,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3030,7 +2975,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3046,7 +2991,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3094,7 +3039,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3110,7 +3055,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3126,7 +3071,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3142,7 +3087,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3158,7 +3103,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3174,7 +3119,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3190,7 +3135,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3206,7 +3151,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3222,7 +3167,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3238,7 +3183,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3254,7 +3199,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3270,7 +3215,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3286,7 +3231,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3302,7 +3247,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3318,7 +3263,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3334,7 +3279,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3350,7 +3295,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3366,7 +3311,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3382,7 +3327,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3398,7 +3343,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3414,7 +3359,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3430,7 +3375,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3446,7 +3391,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3462,7 +3407,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3478,7 +3423,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3494,7 +3439,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3510,7 +3455,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3526,7 +3471,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3542,7 +3487,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3558,7 +3503,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3574,7 +3519,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3590,7 +3535,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3606,7 +3551,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3622,7 +3567,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3638,7 +3583,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3654,7 +3599,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3670,7 +3615,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3686,7 +3631,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3702,7 +3647,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3718,7 +3663,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3734,7 +3679,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3750,7 +3695,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3766,7 +3711,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3782,7 +3727,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3798,7 +3743,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3814,7 +3759,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3830,7 +3775,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3846,7 +3791,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3862,7 +3807,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3878,7 +3823,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3892,7 +3837,7 @@
"code": 59,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "SecurityPolicy",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -3910,7 +3855,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3924,7 +3869,7 @@
"code": 61,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "OperationalDatasetComponents",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -4028,7 +3973,6 @@
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "bssid",
@@ -4037,7 +3981,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4053,7 +3997,7 @@
"side": "server",
"type": "SecurityType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4069,7 +4013,7 @@
"side": "server",
"type": "WiFiVersionType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4085,7 +4029,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -4101,7 +4045,7 @@
"side": "server",
"type": "int8s",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -4117,7 +4061,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4133,7 +4077,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4149,7 +4093,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4165,7 +4109,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4181,7 +4125,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4197,7 +4141,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4213,7 +4157,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4229,7 +4173,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4315,7 +4259,6 @@
"define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "PHYRate",
@@ -4324,7 +4267,7 @@
"side": "server",
"type": "PHYRateType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4340,7 +4283,7 @@
"side": "server",
"type": "boolean",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -4356,7 +4299,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4372,7 +4315,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4388,7 +4331,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4404,7 +4347,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4420,7 +4363,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4436,7 +4379,7 @@
"side": "server",
"type": "boolean",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -4452,7 +4395,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4501,9 +4444,7 @@
"mfgCode": null,
"define": "SWITCH_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Switch",
@@ -4512,7 +4453,6 @@
"define": "SWITCH_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -4607,7 +4547,6 @@
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "WindowStatus",
@@ -4762,14 +4701,6 @@
"source": "client",
"incoming": 1,
"outgoing": 1
- },
- {
- "name": "RemoveTrustedRootCertificate",
- "code": 12,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -4872,7 +4803,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4888,7 +4819,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4918,7 +4849,7 @@
"code": 5,
"mfgCode": null,
"side": "server",
- "type": "fabric_idx",
+ "type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -5003,8 +4934,7 @@
"incoming": 1,
"outgoing": 0
}
- ],
- "attributes": []
+ ]
},
{
"name": "Group Key Management",
@@ -5136,9 +5066,7 @@
"mfgCode": null,
"define": "FIXED_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Fixed Label",
@@ -5147,7 +5075,6 @@
"define": "FIXED_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5205,9 +5132,7 @@
"mfgCode": null,
"define": "USER_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "User Label",
@@ -5216,7 +5141,6 @@
"define": "USER_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5291,14 +5215,6 @@
"source": "client",
"incoming": 1,
"outgoing": 0
- },
- {
- "name": "IdentifyQuery",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -5343,16 +5259,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [
- {
- "name": "IdentifyQueryResponse",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
"attributes": [
{
"name": "identify time",
@@ -5859,7 +5765,7 @@
],
"attributes": [
{
- "name": "scene count",
+ "name": "SceneCount",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -5875,7 +5781,7 @@
"reportableChange": 0
},
{
- "name": "current scene",
+ "name": "CurrentScene",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -5891,11 +5797,11 @@
"reportableChange": 0
},
{
- "name": "current group",
+ "name": "CurrentGroup",
"code": 2,
"mfgCode": null,
"side": "server",
- "type": "int16u",
+ "type": "group_id",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -5907,7 +5813,7 @@
"reportableChange": 0
},
{
- "name": "scene valid",
+ "name": "SceneValid",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -5923,7 +5829,7 @@
"reportableChange": 0
},
{
- "name": "name support",
+ "name": "NameSupport",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -5939,7 +5845,7 @@
"reportableChange": 0
},
{
- "name": "last configured by",
+ "name": "LastConfiguredBy",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -6111,7 +6017,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -6390,10 +6295,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -6409,7 +6313,7 @@
"reportableChange": 0
},
{
- "name": "remaining time",
+ "name": "RemainingTime",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -6425,7 +6329,7 @@
"reportableChange": 0
},
{
- "name": "min level",
+ "name": "MinLevel",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -6441,7 +6345,7 @@
"reportableChange": 0
},
{
- "name": "max level",
+ "name": "MaxLevel",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -6457,7 +6361,7 @@
"reportableChange": 0
},
{
- "name": "current frequency",
+ "name": "CurrentFrequency",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -6473,7 +6377,7 @@
"reportableChange": 0
},
{
- "name": "min frequency",
+ "name": "MinFrequency",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -6489,7 +6393,7 @@
"reportableChange": 0
},
{
- "name": "max frequency",
+ "name": "MaxFrequency",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -6505,7 +6409,7 @@
"reportableChange": 0
},
{
- "name": "options",
+ "name": "Options",
"code": 15,
"mfgCode": null,
"side": "server",
@@ -6521,7 +6425,7 @@
"reportableChange": 0
},
{
- "name": "on off transition time",
+ "name": "OnOffTransitionTime",
"code": 16,
"mfgCode": null,
"side": "server",
@@ -6537,7 +6441,7 @@
"reportableChange": 0
},
{
- "name": "on level",
+ "name": "OnLevel",
"code": 17,
"mfgCode": null,
"side": "server",
@@ -6553,7 +6457,7 @@
"reportableChange": 0
},
{
- "name": "on transition time",
+ "name": "OnTransitionTime",
"code": 18,
"mfgCode": null,
"side": "server",
@@ -6569,7 +6473,7 @@
"reportableChange": 0
},
{
- "name": "off transition time",
+ "name": "OffTransitionTime",
"code": 19,
"mfgCode": null,
"side": "server",
@@ -6585,7 +6489,7 @@
"reportableChange": 0
},
{
- "name": "default move rate",
+ "name": "DefaultMoveRate",
"code": 20,
"mfgCode": null,
"side": "server",
@@ -6601,7 +6505,7 @@
"reportableChange": 0
},
{
- "name": "start up current level",
+ "name": "StartUpCurrentLevel",
"code": 16384,
"mfgCode": null,
"side": "server",
@@ -6705,7 +6609,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -6748,7 +6651,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -6903,7 +6805,6 @@
"define": "BINDING_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -6946,7 +6847,6 @@
"define": "BINDING_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "Binding",
@@ -7068,6 +6968,5 @@
"endpointVersion": 1,
"deviceIdentifier": 266
}
- ],
- "log": []
-}
+ ]
+}
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap
index 67b77f7..14b27d8 100644
--- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap
+++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 67,
+ "featureLevel": 77,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,14 +19,16 @@
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/zcl/zcl.json",
- "version": "ZCL Test Data",
- "type": "zcl-properties"
+ "type": "zcl-properties",
+ "category": "matter",
+ "version": 1,
+ "description": "Matter SDK ZCL data"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
- "version": "chip-v1",
- "type": "gen-templates-json"
+ "type": "gen-templates-json",
+ "version": "chip-v1"
}
],
"endpointTypes": [
@@ -51,14 +53,6 @@
"source": "client",
"incoming": 1,
"outgoing": 0
- },
- {
- "name": "IdentifyQuery",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -67,6 +61,7 @@
"code": 65533,
"mfgCode": null,
"side": "client",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -86,22 +81,13 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [
- {
- "name": "IdentifyQueryResponse",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
"attributes": [
{
"name": "identify time",
"code": 0,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -117,6 +103,7 @@
"code": 65533,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -192,6 +179,7 @@
"code": 65533,
"mfgCode": null,
"side": "client",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -251,6 +239,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
+ "type": "bitmap8",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -282,6 +271,7 @@
"code": 65533,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -365,6 +355,7 @@
"code": 65533,
"mfgCode": null,
"side": "client",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -436,10 +427,11 @@
],
"attributes": [
{
- "name": "scene count",
+ "name": "SceneCount",
"code": 0,
"mfgCode": null,
"side": "server",
+ "type": "int8u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -451,10 +443,11 @@
"reportableChange": 0
},
{
- "name": "current scene",
+ "name": "CurrentScene",
"code": 1,
"mfgCode": null,
"side": "server",
+ "type": "int8u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -466,10 +459,11 @@
"reportableChange": 0
},
{
- "name": "current group",
+ "name": "CurrentGroup",
"code": 2,
"mfgCode": null,
"side": "server",
+ "type": "group_id",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -481,10 +475,11 @@
"reportableChange": 0
},
{
- "name": "scene valid",
+ "name": "SceneValid",
"code": 3,
"mfgCode": null,
"side": "server",
+ "type": "boolean",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -496,10 +491,11 @@
"reportableChange": 0
},
{
- "name": "name support",
+ "name": "NameSupport",
"code": 4,
"mfgCode": null,
"side": "server",
+ "type": "bitmap8",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -515,6 +511,7 @@
"code": 65533,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -566,6 +563,7 @@
"code": 65533,
"mfgCode": null,
"side": "client",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -585,13 +583,13 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "OnOff",
"code": 0,
"mfgCode": null,
"side": "server",
+ "type": "boolean",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -607,6 +605,7 @@
"code": 65533,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -626,13 +625,13 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "client",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -652,13 +651,13 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "switch type",
"code": 0,
"mfgCode": null,
"side": "server",
+ "type": "enum8",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -674,6 +673,7 @@
"code": 16,
"mfgCode": null,
"side": "server",
+ "type": "enum8",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -689,6 +689,7 @@
"code": 65533,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -780,6 +781,7 @@
"code": 65533,
"mfgCode": null,
"side": "client",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -799,13 +801,13 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
+ "type": "int8u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -821,6 +823,7 @@
"code": 65533,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -840,13 +843,13 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "client",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -866,13 +869,13 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
"code": 0,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -888,6 +891,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -903,6 +907,7 @@
"code": 2,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -918,6 +923,7 @@
"code": 3,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -949,6 +955,7 @@
"code": 65533,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -968,13 +975,13 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "client",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -994,13 +1001,13 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ACL",
"code": 0,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -1016,6 +1023,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -1031,6 +1039,7 @@
"code": 65531,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -1062,6 +1071,7 @@
"code": 65533,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -1081,13 +1091,13 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "client",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 1,
@@ -1107,15 +1117,15 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
"code": 0,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "10",
@@ -1129,6 +1139,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
+ "type": "char_string",
"included": 1,
"storageOption": "External",
"singleton": 1,
@@ -1144,6 +1155,7 @@
"code": 2,
"mfgCode": null,
"side": "server",
+ "type": "vendor_id",
"included": 1,
"storageOption": "External",
"singleton": 1,
@@ -1159,6 +1171,7 @@
"code": 3,
"mfgCode": null,
"side": "server",
+ "type": "char_string",
"included": 1,
"storageOption": "External",
"singleton": 1,
@@ -1174,6 +1187,7 @@
"code": 4,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
"storageOption": "External",
"singleton": 1,
@@ -1189,6 +1203,7 @@
"code": 5,
"mfgCode": null,
"side": "server",
+ "type": "char_string",
"included": 1,
"storageOption": "NVM",
"singleton": 1,
@@ -1204,6 +1219,7 @@
"code": 6,
"mfgCode": null,
"side": "server",
+ "type": "char_string",
"included": 1,
"storageOption": "External",
"singleton": 1,
@@ -1219,6 +1235,7 @@
"code": 7,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
"storageOption": "External",
"singleton": 1,
@@ -1234,6 +1251,7 @@
"code": 8,
"mfgCode": null,
"side": "server",
+ "type": "char_string",
"included": 1,
"storageOption": "External",
"singleton": 1,
@@ -1249,6 +1267,7 @@
"code": 9,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
"storageOption": "External",
"singleton": 1,
@@ -1264,6 +1283,7 @@
"code": 10,
"mfgCode": null,
"side": "server",
+ "type": "char_string",
"included": 1,
"storageOption": "External",
"singleton": 1,
@@ -1279,6 +1299,7 @@
"code": 11,
"mfgCode": null,
"side": "server",
+ "type": "char_string",
"included": 1,
"storageOption": "External",
"singleton": 1,
@@ -1294,6 +1315,7 @@
"code": 12,
"mfgCode": null,
"side": "server",
+ "type": "char_string",
"included": 1,
"storageOption": "External",
"singleton": 1,
@@ -1309,6 +1331,7 @@
"code": 13,
"mfgCode": null,
"side": "server",
+ "type": "long_char_string",
"included": 1,
"storageOption": "External",
"singleton": 1,
@@ -1324,6 +1347,7 @@
"code": 14,
"mfgCode": null,
"side": "server",
+ "type": "char_string",
"included": 1,
"storageOption": "External",
"singleton": 1,
@@ -1339,6 +1363,7 @@
"code": 15,
"mfgCode": null,
"side": "server",
+ "type": "char_string",
"included": 1,
"storageOption": "External",
"singleton": 1,
@@ -1354,6 +1379,7 @@
"code": 16,
"mfgCode": null,
"side": "server",
+ "type": "boolean",
"included": 1,
"storageOption": "NVM",
"singleton": 1,
@@ -1369,6 +1395,7 @@
"code": 17,
"mfgCode": null,
"side": "server",
+ "type": "boolean",
"included": 1,
"storageOption": "RAM",
"singleton": 1,
@@ -1384,6 +1411,7 @@
"code": 18,
"mfgCode": null,
"side": "server",
+ "type": "char_string",
"included": 1,
"storageOption": "External",
"singleton": 1,
@@ -1415,6 +1443,7 @@
"code": 65533,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 1,
@@ -1466,6 +1495,7 @@
"code": 65533,
"mfgCode": null,
"side": "client",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -1509,6 +1539,7 @@
"code": 65531,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 0,
"storageOption": "External",
"singleton": 0,
@@ -1524,6 +1555,7 @@
"code": 65532,
"mfgCode": null,
"side": "server",
+ "type": "bitmap32",
"included": 0,
"storageOption": "RAM",
"singleton": 0,
@@ -1539,6 +1571,7 @@
"code": 65533,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -1574,6 +1607,7 @@
"code": 65533,
"mfgCode": null,
"side": "client",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -1593,13 +1627,13 @@
"define": "OTA_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DefaultOtaProviders",
"code": 0,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -1615,6 +1649,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
+ "type": "boolean",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -1630,6 +1665,7 @@
"code": 2,
"mfgCode": null,
"side": "server",
+ "type": "OTAUpdateStateEnum",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -1645,6 +1681,7 @@
"code": 3,
"mfgCode": null,
"side": "server",
+ "type": "int8u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -1660,6 +1697,7 @@
"code": 65531,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 0,
"storageOption": "External",
"singleton": 0,
@@ -1675,6 +1713,7 @@
"code": 65532,
"mfgCode": null,
"side": "server",
+ "type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -1690,6 +1729,7 @@
"code": 65533,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -1708,9 +1748,7 @@
"mfgCode": null,
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Localization Configuration",
@@ -1719,33 +1757,18 @@
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
- "name": "ActiveLocale",
+ "name": "SupportedLocales",
"code": 1,
"mfgCode": null,
"side": "server",
- "included": 1,
- "storageOption": "NVM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "en-US",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "SupportedLocales",
- "code": 2,
- "mfgCode": null,
- "side": "server",
+ "type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": "en-US",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -1772,6 +1795,7 @@
"code": 65533,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -1790,9 +1814,7 @@
"mfgCode": null,
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Time Format Localization",
@@ -1801,13 +1823,13 @@
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "HourFormat",
"code": 0,
"mfgCode": null,
"side": "server",
+ "type": "HourFormat",
"included": 1,
"storageOption": "NVM",
"singleton": 0,
@@ -1823,6 +1845,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
+ "type": "CalendarType",
"included": 1,
"storageOption": "NVM",
"singleton": 0,
@@ -1838,6 +1861,7 @@
"code": 2,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -1869,6 +1893,7 @@
"code": 65533,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -1887,9 +1912,7 @@
"mfgCode": null,
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Unit Localization",
@@ -1898,13 +1921,13 @@
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "TemperatureUnit",
"code": 0,
"mfgCode": null,
"side": "server",
+ "type": "TempUnit",
"included": 0,
"storageOption": "NVM",
"singleton": 0,
@@ -1920,6 +1943,7 @@
"code": 65532,
"mfgCode": null,
"side": "server",
+ "type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -1935,6 +1959,7 @@
"code": 65533,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -1986,6 +2011,7 @@
"code": 65533,
"mfgCode": null,
"side": "client",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -2037,6 +2063,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
+ "type": "int64u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -2052,6 +2079,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
+ "type": "BasicCommissioningInfo",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -2067,8 +2095,9 @@
"code": 2,
"mfgCode": null,
"side": "server",
+ "type": "RegulatoryLocationType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2082,8 +2111,9 @@
"code": 3,
"mfgCode": null,
"side": "server",
+ "type": "RegulatoryLocationType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2097,6 +2127,7 @@
"code": 65532,
"mfgCode": null,
"side": "server",
+ "type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -2112,6 +2143,7 @@
"code": 65533,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -2187,6 +2219,7 @@
"code": 65533,
"mfgCode": null,
"side": "client",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -2238,6 +2271,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
+ "type": "int8u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -2253,6 +2287,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -2268,6 +2303,7 @@
"code": 2,
"mfgCode": null,
"side": "server",
+ "type": "int8u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -2283,6 +2319,7 @@
"code": 3,
"mfgCode": null,
"side": "server",
+ "type": "int8u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -2298,6 +2335,7 @@
"code": 4,
"mfgCode": null,
"side": "server",
+ "type": "boolean",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -2313,6 +2351,7 @@
"code": 5,
"mfgCode": null,
"side": "server",
+ "type": "NetworkCommissioningStatus",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -2328,6 +2367,7 @@
"code": 6,
"mfgCode": null,
"side": "server",
+ "type": "octet_string",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -2343,6 +2383,7 @@
"code": 7,
"mfgCode": null,
"side": "server",
+ "type": "int32s",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -2358,6 +2399,7 @@
"code": 65532,
"mfgCode": null,
"side": "server",
+ "type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -2373,6 +2415,7 @@
"code": 65533,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -2444,13 +2487,13 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "client",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -2486,6 +2529,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -2501,8 +2545,9 @@
"code": 1,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -2516,8 +2561,9 @@
"code": 2,
"mfgCode": null,
"side": "server",
+ "type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2531,8 +2577,9 @@
"code": 3,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -2546,8 +2593,9 @@
"code": 4,
"mfgCode": null,
"side": "server",
+ "type": "enum8",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2561,6 +2609,7 @@
"code": 5,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -2576,6 +2625,7 @@
"code": 6,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -2591,6 +2641,7 @@
"code": 7,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -2638,6 +2689,7 @@
"code": 65533,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -2673,6 +2725,7 @@
"code": 65533,
"mfgCode": null,
"side": "client",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -2692,13 +2745,13 @@
"define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ThreadMetrics",
"code": 0,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -2714,8 +2767,9 @@
"code": 1,
"mfgCode": null,
"side": "server",
+ "type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2729,8 +2783,9 @@
"code": 2,
"mfgCode": null,
"side": "server",
+ "type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2744,8 +2799,9 @@
"code": 3,
"mfgCode": null,
"side": "server",
+ "type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2759,6 +2815,7 @@
"code": 65532,
"mfgCode": null,
"side": "server",
+ "type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -2774,6 +2831,7 @@
"code": 65533,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -2809,6 +2867,7 @@
"code": 65533,
"mfgCode": null,
"side": "client",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -2828,15 +2887,15 @@
"define": "THREAD_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "channel",
"code": 0,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2850,8 +2909,9 @@
"code": 1,
"mfgCode": null,
"side": "server",
+ "type": "RoutingRole",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2865,8 +2925,9 @@
"code": 2,
"mfgCode": null,
"side": "server",
+ "type": "char_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2880,8 +2941,9 @@
"code": 3,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -2895,8 +2957,9 @@
"code": 4,
"mfgCode": null,
"side": "server",
+ "type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2910,8 +2973,9 @@
"code": 5,
"mfgCode": null,
"side": "server",
+ "type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2925,8 +2989,9 @@
"code": 6,
"mfgCode": null,
"side": "server",
+ "type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2940,6 +3005,7 @@
"code": 7,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -2955,6 +3021,7 @@
"code": 8,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -2970,8 +3037,9 @@
"code": 9,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2985,8 +3053,9 @@
"code": 10,
"mfgCode": null,
"side": "server",
+ "type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3000,8 +3069,9 @@
"code": 11,
"mfgCode": null,
"side": "server",
+ "type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3015,8 +3085,9 @@
"code": 12,
"mfgCode": null,
"side": "server",
+ "type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3030,8 +3101,9 @@
"code": 13,
"mfgCode": null,
"side": "server",
+ "type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3045,8 +3117,9 @@
"code": 14,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3060,8 +3133,9 @@
"code": 15,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3075,8 +3149,9 @@
"code": 16,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3090,8 +3165,9 @@
"code": 17,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3105,8 +3181,9 @@
"code": 18,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3120,8 +3197,9 @@
"code": 19,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3135,8 +3213,9 @@
"code": 20,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3150,8 +3229,9 @@
"code": 21,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3165,8 +3245,9 @@
"code": 22,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3180,8 +3261,9 @@
"code": 23,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3195,8 +3277,9 @@
"code": 24,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3210,8 +3293,9 @@
"code": 25,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3225,8 +3309,9 @@
"code": 26,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3240,8 +3325,9 @@
"code": 27,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3255,8 +3341,9 @@
"code": 28,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3270,8 +3357,9 @@
"code": 29,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3285,8 +3373,9 @@
"code": 30,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3300,8 +3389,9 @@
"code": 31,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3315,8 +3405,9 @@
"code": 32,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3330,8 +3421,9 @@
"code": 33,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3345,8 +3437,9 @@
"code": 34,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3360,8 +3453,9 @@
"code": 35,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3375,8 +3469,9 @@
"code": 36,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3390,8 +3485,9 @@
"code": 37,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3405,8 +3501,9 @@
"code": 38,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3420,8 +3517,9 @@
"code": 39,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3435,8 +3533,9 @@
"code": 40,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3450,8 +3549,9 @@
"code": 41,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3465,8 +3565,9 @@
"code": 42,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3480,8 +3581,9 @@
"code": 43,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3495,8 +3597,9 @@
"code": 44,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3510,8 +3613,9 @@
"code": 45,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3525,8 +3629,9 @@
"code": 46,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3540,8 +3645,9 @@
"code": 47,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3555,8 +3661,9 @@
"code": 48,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3570,8 +3677,9 @@
"code": 49,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3585,8 +3693,9 @@
"code": 50,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3600,8 +3709,9 @@
"code": 51,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3615,8 +3725,9 @@
"code": 52,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3630,8 +3741,9 @@
"code": 53,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3645,8 +3757,9 @@
"code": 54,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3660,8 +3773,9 @@
"code": 55,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3675,8 +3789,9 @@
"code": 56,
"mfgCode": null,
"side": "server",
+ "type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3690,8 +3805,9 @@
"code": 57,
"mfgCode": null,
"side": "server",
+ "type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3705,8 +3821,9 @@
"code": 58,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3720,6 +3837,7 @@
"code": 59,
"mfgCode": null,
"side": "server",
+ "type": "SecurityPolicy",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -3735,8 +3853,9 @@
"code": 60,
"mfgCode": null,
"side": "server",
+ "type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3750,6 +3869,7 @@
"code": 61,
"mfgCode": null,
"side": "server",
+ "type": "OperationalDatasetComponents",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -3765,6 +3885,7 @@
"code": 62,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -3780,6 +3901,7 @@
"code": 65532,
"mfgCode": null,
"side": "server",
+ "type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -3795,6 +3917,7 @@
"code": 65533,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -3830,6 +3953,7 @@
"code": 65533,
"mfgCode": null,
"side": "client",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -3849,15 +3973,15 @@
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "bssid",
"code": 0,
"mfgCode": null,
"side": "server",
+ "type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3871,8 +3995,9 @@
"code": 1,
"mfgCode": null,
"side": "server",
+ "type": "SecurityType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3886,8 +4011,9 @@
"code": 2,
"mfgCode": null,
"side": "server",
+ "type": "WiFiVersionType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3901,8 +4027,9 @@
"code": 3,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3916,8 +4043,9 @@
"code": 4,
"mfgCode": null,
"side": "server",
+ "type": "int8s",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -3931,8 +4059,9 @@
"code": 5,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -3946,8 +4075,9 @@
"code": 6,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -3961,8 +4091,9 @@
"code": 7,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -3976,8 +4107,9 @@
"code": 8,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -3991,8 +4123,9 @@
"code": 9,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4006,8 +4139,9 @@
"code": 10,
"mfgCode": null,
"side": "server",
+ "type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4021,8 +4155,9 @@
"code": 11,
"mfgCode": null,
"side": "server",
+ "type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4036,8 +4171,9 @@
"code": 12,
"mfgCode": null,
"side": "server",
+ "type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4051,6 +4187,7 @@
"code": 65532,
"mfgCode": null,
"side": "server",
+ "type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -4066,6 +4203,7 @@
"code": 65533,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -4101,6 +4239,7 @@
"code": 65533,
"mfgCode": null,
"side": "client",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -4120,15 +4259,15 @@
"define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "PHYRate",
"code": 0,
"mfgCode": null,
"side": "server",
+ "type": "PHYRateType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4142,8 +4281,9 @@
"code": 1,
"mfgCode": null,
"side": "server",
+ "type": "boolean",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -4157,8 +4297,9 @@
"code": 2,
"mfgCode": null,
"side": "server",
+ "type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4172,8 +4313,9 @@
"code": 3,
"mfgCode": null,
"side": "server",
+ "type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4187,8 +4329,9 @@
"code": 4,
"mfgCode": null,
"side": "server",
+ "type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4202,8 +4345,9 @@
"code": 5,
"mfgCode": null,
"side": "server",
+ "type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4217,8 +4361,9 @@
"code": 6,
"mfgCode": null,
"side": "server",
+ "type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4232,8 +4377,9 @@
"code": 7,
"mfgCode": null,
"side": "server",
+ "type": "boolean",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -4247,8 +4393,9 @@
"code": 8,
"mfgCode": null,
"side": "server",
+ "type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4262,6 +4409,7 @@
"code": 65532,
"mfgCode": null,
"side": "server",
+ "type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -4277,6 +4425,7 @@
"code": 65533,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -4295,9 +4444,7 @@
"mfgCode": null,
"define": "SWITCH_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Switch",
@@ -4306,7 +4453,6 @@
"define": "SWITCH_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -4381,6 +4527,7 @@
"code": 65533,
"mfgCode": null,
"side": "client",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -4400,13 +4547,13 @@
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "WindowStatus",
"code": 0,
"mfgCode": null,
"side": "server",
+ "type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -4422,6 +4569,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
+ "type": "fabric_idx",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -4437,6 +4585,7 @@
"code": 2,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -4468,6 +4617,7 @@
"code": 65533,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -4551,14 +4701,6 @@
"source": "client",
"incoming": 1,
"outgoing": 1
- },
- {
- "name": "RemoveTrustedRootCertificate",
- "code": 12,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -4567,6 +4709,7 @@
"code": 65533,
"mfgCode": null,
"side": "client",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -4626,6 +4769,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -4641,6 +4785,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -4656,8 +4801,9 @@
"code": 2,
"mfgCode": null,
"side": "server",
+ "type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4671,8 +4817,9 @@
"code": 3,
"mfgCode": null,
"side": "server",
+ "type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4686,6 +4833,7 @@
"code": 4,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -4701,6 +4849,7 @@
"code": 5,
"mfgCode": null,
"side": "server",
+ "type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -4732,6 +4881,7 @@
"code": 65533,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -4784,8 +4934,7 @@
"incoming": 1,
"outgoing": 0
}
- ],
- "attributes": []
+ ]
},
{
"name": "Group Key Management",
@@ -4818,6 +4967,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -4833,6 +4983,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -4848,6 +4999,7 @@
"code": 2,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -4863,6 +5015,7 @@
"code": 3,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -4894,6 +5047,7 @@
"code": 65533,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -4912,9 +5066,7 @@
"mfgCode": null,
"define": "FIXED_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Fixed Label",
@@ -4923,13 +5075,13 @@
"define": "FIXED_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
"code": 0,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -4961,6 +5113,7 @@
"code": 65533,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -4979,9 +5132,7 @@
"mfgCode": null,
"define": "USER_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "User Label",
@@ -4990,13 +5141,13 @@
"define": "USER_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
"code": 0,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -5028,6 +5179,7 @@
"code": 65533,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -5063,14 +5215,6 @@
"source": "client",
"incoming": 1,
"outgoing": 0
- },
- {
- "name": "IdentifyQuery",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -5079,6 +5223,7 @@
"code": 65532,
"mfgCode": null,
"side": "client",
+ "type": "bitmap32",
"included": 0,
"storageOption": "RAM",
"singleton": 0,
@@ -5094,6 +5239,7 @@
"code": 65533,
"mfgCode": null,
"side": "client",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -5113,22 +5259,13 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [
- {
- "name": "IdentifyQueryResponse",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
"attributes": [
{
"name": "identify time",
"code": 0,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -5144,6 +5281,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
+ "type": "enum8",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -5159,8 +5297,9 @@
"code": 65528,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -5174,8 +5313,9 @@
"code": 65529,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -5189,8 +5329,9 @@
"code": 65531,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -5204,6 +5345,7 @@
"code": 65532,
"mfgCode": null,
"side": "server",
+ "type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -5219,6 +5361,7 @@
"code": 65533,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -5294,6 +5437,7 @@
"code": 65532,
"mfgCode": null,
"side": "client",
+ "type": "bitmap32",
"included": 0,
"storageOption": "RAM",
"singleton": 0,
@@ -5309,6 +5453,7 @@
"code": 65533,
"mfgCode": null,
"side": "client",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -5368,6 +5513,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
+ "type": "bitmap8",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -5383,8 +5529,9 @@
"code": 65528,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -5398,8 +5545,9 @@
"code": 65529,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -5413,8 +5561,9 @@
"code": 65531,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -5428,6 +5577,7 @@
"code": 65532,
"mfgCode": null,
"side": "server",
+ "type": "bitmap32",
"included": 0,
"storageOption": "RAM",
"singleton": 0,
@@ -5443,6 +5593,7 @@
"code": 65533,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -5462,13 +5613,13 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
"side": "client",
+ "type": "bitmap32",
"included": 0,
"storageOption": "RAM",
"singleton": 0,
@@ -5484,6 +5635,7 @@
"code": 65533,
"mfgCode": null,
"side": "client",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -5503,15 +5655,15 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
"code": 0,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -5525,8 +5677,9 @@
"code": 1,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -5540,8 +5693,9 @@
"code": 2,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -5555,8 +5709,9 @@
"code": 3,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -5570,8 +5725,9 @@
"code": 65528,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -5585,8 +5741,9 @@
"code": 65529,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -5600,8 +5757,9 @@
"code": 65531,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -5615,6 +5773,7 @@
"code": 65532,
"mfgCode": null,
"side": "server",
+ "type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -5630,6 +5789,7 @@
"code": 65533,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -5649,13 +5809,13 @@
"define": "BINDING_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
"side": "client",
+ "type": "bitmap32",
"included": 0,
"storageOption": "RAM",
"singleton": 0,
@@ -5671,6 +5831,7 @@
"code": 65533,
"mfgCode": null,
"side": "client",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -5690,15 +5851,15 @@
"define": "BINDING_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "Binding",
"code": 0,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -5712,8 +5873,9 @@
"code": 65528,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -5727,8 +5889,9 @@
"code": 65529,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -5742,8 +5905,9 @@
"code": 65531,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -5757,6 +5921,7 @@
"code": 65532,
"mfgCode": null,
"side": "server",
+ "type": "bitmap32",
"included": 0,
"storageOption": "RAM",
"singleton": 0,
@@ -5772,6 +5937,7 @@
"code": 65533,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -5791,13 +5957,13 @@
"define": "PRESSURE_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
"side": "client",
+ "type": "bitmap32",
"included": 0,
"storageOption": "RAM",
"singleton": 0,
@@ -5813,6 +5979,7 @@
"code": 65533,
"mfgCode": null,
"side": "client",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -5832,13 +5999,13 @@
"define": "PRESSURE_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "MeasuredValue",
"code": 0,
"mfgCode": null,
"side": "server",
+ "type": "int16s",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -5854,6 +6021,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
+ "type": "int16s",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -5869,6 +6037,7 @@
"code": 2,
"mfgCode": null,
"side": "server",
+ "type": "int16s",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -5884,6 +6053,7 @@
"code": 3,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 0,
"storageOption": "RAM",
"singleton": 0,
@@ -5899,6 +6069,7 @@
"code": 16,
"mfgCode": null,
"side": "server",
+ "type": "int16s",
"included": 0,
"storageOption": "RAM",
"singleton": 0,
@@ -5914,6 +6085,7 @@
"code": 17,
"mfgCode": null,
"side": "server",
+ "type": "int16s",
"included": 0,
"storageOption": "RAM",
"singleton": 0,
@@ -5929,6 +6101,7 @@
"code": 18,
"mfgCode": null,
"side": "server",
+ "type": "int16s",
"included": 0,
"storageOption": "RAM",
"singleton": 0,
@@ -5944,6 +6117,7 @@
"code": 19,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 0,
"storageOption": "RAM",
"singleton": 0,
@@ -5959,6 +6133,7 @@
"code": 20,
"mfgCode": null,
"side": "server",
+ "type": "int8s",
"included": 0,
"storageOption": "RAM",
"singleton": 0,
@@ -5974,8 +6149,9 @@
"code": 65528,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -5989,8 +6165,9 @@
"code": 65529,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -6004,8 +6181,9 @@
"code": 65531,
"mfgCode": null,
"side": "server",
+ "type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -6019,6 +6197,7 @@
"code": 65532,
"mfgCode": null,
"side": "server",
+ "type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -6034,6 +6213,7 @@
"code": 65533,
"mfgCode": null,
"side": "server",
+ "type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -6068,6 +6248,5 @@
"endpointVersion": 1,
"deviceIdentifier": 773
}
- ],
- "log": []
-}
+ ]
+}
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap
index 1ff4665..16ef5a7 100644
--- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap
+++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 70,
+ "featureLevel": 77,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,14 +19,16 @@
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/zcl/zcl.json",
- "version": "ZCL Test Data",
- "type": "zcl-properties"
+ "type": "zcl-properties",
+ "category": "matter",
+ "version": 1,
+ "description": "Matter SDK ZCL data"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
- "version": "chip-v1",
- "type": "gen-templates-json"
+ "type": "gen-templates-json",
+ "version": "chip-v1"
}
],
"endpointTypes": [
@@ -51,14 +53,6 @@
"source": "client",
"incoming": 1,
"outgoing": 0
- },
- {
- "name": "IdentifyQuery",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -87,16 +81,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [
- {
- "name": "IdentifyQueryResponse",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
"attributes": [
{
"name": "identify time",
@@ -443,7 +427,7 @@
],
"attributes": [
{
- "name": "scene count",
+ "name": "SceneCount",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -459,7 +443,7 @@
"reportableChange": 0
},
{
- "name": "current scene",
+ "name": "CurrentScene",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -475,11 +459,11 @@
"reportableChange": 0
},
{
- "name": "current group",
+ "name": "CurrentGroup",
"code": 2,
"mfgCode": null,
"side": "server",
- "type": "int16u",
+ "type": "group_id",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -491,7 +475,7 @@
"reportableChange": 0
},
{
- "name": "scene valid",
+ "name": "SceneValid",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -507,7 +491,7 @@
"reportableChange": 0
},
{
- "name": "name support",
+ "name": "NameSupport",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -599,7 +583,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -642,7 +625,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -669,7 +651,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "switch type",
@@ -820,10 +801,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -863,7 +843,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -890,7 +869,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -997,7 +975,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1024,7 +1001,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ACL",
@@ -1115,7 +1091,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1142,7 +1117,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -1653,7 +1627,6 @@
"define": "OTA_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DefaultOtaProviders",
@@ -1775,9 +1748,7 @@
"mfgCode": null,
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Localization Configuration",
@@ -1786,27 +1757,10 @@
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
- "name": "ActiveLocale",
- "code": 1,
- "mfgCode": null,
- "side": "server",
- "type": "char_string",
- "included": 1,
- "storageOption": "NVM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "en-US",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "SupportedLocales",
- "code": 2,
+ "code": 1,
"mfgCode": null,
"side": "server",
"type": "array",
@@ -1814,7 +1768,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": "en-US",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -1860,9 +1814,7 @@
"mfgCode": null,
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Time Format Localization",
@@ -1871,7 +1823,6 @@
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "HourFormat",
@@ -1961,9 +1912,7 @@
"mfgCode": null,
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Unit Localization",
@@ -1972,7 +1921,6 @@
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "TemperatureUnit",
@@ -2149,7 +2097,7 @@
"side": "server",
"type": "RegulatoryLocationType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2165,7 +2113,7 @@
"side": "server",
"type": "RegulatoryLocationType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2539,7 +2487,6 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -2600,7 +2547,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -2616,7 +2563,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2632,7 +2579,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -2648,7 +2595,7 @@
"side": "server",
"type": "enum8",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2798,7 +2745,6 @@
"define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ThreadMetrics",
@@ -2823,7 +2769,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2839,7 +2785,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2855,7 +2801,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2941,7 +2887,6 @@
"define": "THREAD_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "channel",
@@ -2950,7 +2895,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2964,9 +2909,9 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "enum8",
+ "type": "RoutingRole",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2982,7 +2927,7 @@
"side": "server",
"type": "char_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2998,7 +2943,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3014,7 +2959,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3030,7 +2975,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3046,7 +2991,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3094,7 +3039,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3110,7 +3055,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3126,7 +3071,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3142,7 +3087,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3158,7 +3103,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3174,7 +3119,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3190,7 +3135,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3206,7 +3151,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3222,7 +3167,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3238,7 +3183,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3254,7 +3199,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3270,7 +3215,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3286,7 +3231,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3302,7 +3247,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3318,7 +3263,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3334,7 +3279,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3350,7 +3295,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3366,7 +3311,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3382,7 +3327,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3398,7 +3343,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3414,7 +3359,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3430,7 +3375,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3446,7 +3391,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3462,7 +3407,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3478,7 +3423,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3494,7 +3439,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3510,7 +3455,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3526,7 +3471,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3542,7 +3487,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3558,7 +3503,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3574,7 +3519,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3590,7 +3535,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3606,7 +3551,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3622,7 +3567,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3638,7 +3583,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3654,7 +3599,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3670,7 +3615,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3686,7 +3631,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3702,7 +3647,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3718,7 +3663,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3734,7 +3679,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3750,7 +3695,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3766,7 +3711,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3782,7 +3727,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3798,7 +3743,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3814,7 +3759,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3830,7 +3775,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3846,7 +3791,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3862,7 +3807,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3878,7 +3823,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3892,7 +3837,7 @@
"code": 59,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "SecurityPolicy",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -3910,7 +3855,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3924,7 +3869,7 @@
"code": 61,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "OperationalDatasetComponents",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -4028,7 +3973,6 @@
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "bssid",
@@ -4037,7 +3981,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4053,7 +3997,7 @@
"side": "server",
"type": "SecurityType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4069,7 +4013,7 @@
"side": "server",
"type": "WiFiVersionType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4085,7 +4029,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -4101,7 +4045,7 @@
"side": "server",
"type": "int8s",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -4117,7 +4061,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4133,7 +4077,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4149,7 +4093,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4165,7 +4109,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4181,7 +4125,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4197,7 +4141,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4213,7 +4157,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4229,7 +4173,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4315,7 +4259,6 @@
"define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "PHYRate",
@@ -4501,9 +4444,7 @@
"mfgCode": null,
"define": "SWITCH_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Switch",
@@ -4512,7 +4453,6 @@
"define": "SWITCH_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -4607,7 +4547,6 @@
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "WindowStatus",
@@ -4762,14 +4701,6 @@
"source": "client",
"incoming": 1,
"outgoing": 1
- },
- {
- "name": "RemoveTrustedRootCertificate",
- "code": 12,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -4872,7 +4803,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4888,7 +4819,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4918,7 +4849,7 @@
"code": 5,
"mfgCode": null,
"side": "server",
- "type": "fabric_idx",
+ "type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -5003,8 +4934,7 @@
"incoming": 1,
"outgoing": 0
}
- ],
- "attributes": []
+ ]
},
{
"name": "Group Key Management",
@@ -5136,9 +5066,7 @@
"mfgCode": null,
"define": "FIXED_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Fixed Label",
@@ -5147,7 +5075,6 @@
"define": "FIXED_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5205,9 +5132,7 @@
"mfgCode": null,
"define": "USER_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "User Label",
@@ -5216,7 +5141,6 @@
"define": "USER_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5291,14 +5215,6 @@
"source": "client",
"incoming": 1,
"outgoing": 0
- },
- {
- "name": "IdentifyQuery",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -5343,16 +5259,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [
- {
- "name": "IdentifyQueryResponse",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
"attributes": [
{
"name": "identify time",
@@ -5543,7 +5449,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -5822,10 +5727,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -5841,7 +5745,7 @@
"reportableChange": 0
},
{
- "name": "remaining time",
+ "name": "RemainingTime",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -5857,7 +5761,7 @@
"reportableChange": 0
},
{
- "name": "min level",
+ "name": "MinLevel",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -5873,7 +5777,7 @@
"reportableChange": 0
},
{
- "name": "max level",
+ "name": "MaxLevel",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -5889,7 +5793,7 @@
"reportableChange": 0
},
{
- "name": "current frequency",
+ "name": "CurrentFrequency",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -5905,7 +5809,7 @@
"reportableChange": 0
},
{
- "name": "min frequency",
+ "name": "MinFrequency",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -5921,7 +5825,7 @@
"reportableChange": 0
},
{
- "name": "max frequency",
+ "name": "MaxFrequency",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -5937,7 +5841,7 @@
"reportableChange": 0
},
{
- "name": "options",
+ "name": "Options",
"code": 15,
"mfgCode": null,
"side": "server",
@@ -5953,7 +5857,7 @@
"reportableChange": 0
},
{
- "name": "on off transition time",
+ "name": "OnOffTransitionTime",
"code": 16,
"mfgCode": null,
"side": "server",
@@ -5969,7 +5873,7 @@
"reportableChange": 0
},
{
- "name": "on level",
+ "name": "OnLevel",
"code": 17,
"mfgCode": null,
"side": "server",
@@ -5985,7 +5889,7 @@
"reportableChange": 0
},
{
- "name": "on transition time",
+ "name": "OnTransitionTime",
"code": 18,
"mfgCode": null,
"side": "server",
@@ -6001,7 +5905,7 @@
"reportableChange": 0
},
{
- "name": "off transition time",
+ "name": "OffTransitionTime",
"code": 19,
"mfgCode": null,
"side": "server",
@@ -6017,7 +5921,7 @@
"reportableChange": 0
},
{
- "name": "default move rate",
+ "name": "DefaultMoveRate",
"code": 20,
"mfgCode": null,
"side": "server",
@@ -6033,7 +5937,7 @@
"reportableChange": 0
},
{
- "name": "start up current level",
+ "name": "StartUpCurrentLevel",
"code": 16384,
"mfgCode": null,
"side": "server",
@@ -6137,7 +6041,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -6180,7 +6083,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -6335,7 +6237,6 @@
"define": "BINDING_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -6378,7 +6279,6 @@
"define": "BINDING_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "Binding",
@@ -6500,6 +6400,5 @@
"endpointVersion": 1,
"deviceIdentifier": 34
}
- ],
- "log": []
-}
+ ]
+}
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap
index 19ed536..58cea90 100644
--- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap
+++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 70,
+ "featureLevel": 77,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,14 +19,16 @@
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/zcl/zcl.json",
- "version": "ZCL Test Data",
- "type": "zcl-properties"
+ "type": "zcl-properties",
+ "category": "matter",
+ "version": 1,
+ "description": "Matter SDK ZCL data"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
- "version": "chip-v1",
- "type": "gen-templates-json"
+ "type": "gen-templates-json",
+ "version": "chip-v1"
}
],
"endpointTypes": [
@@ -51,14 +53,6 @@
"source": "client",
"incoming": 1,
"outgoing": 0
- },
- {
- "name": "IdentifyQuery",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -87,16 +81,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [
- {
- "name": "IdentifyQueryResponse",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
"attributes": [
{
"name": "identify time",
@@ -443,7 +427,7 @@
],
"attributes": [
{
- "name": "scene count",
+ "name": "SceneCount",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -459,7 +443,7 @@
"reportableChange": 0
},
{
- "name": "current scene",
+ "name": "CurrentScene",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -475,11 +459,11 @@
"reportableChange": 0
},
{
- "name": "current group",
+ "name": "CurrentGroup",
"code": 2,
"mfgCode": null,
"side": "server",
- "type": "int16u",
+ "type": "group_id",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -491,7 +475,7 @@
"reportableChange": 0
},
{
- "name": "scene valid",
+ "name": "SceneValid",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -507,7 +491,7 @@
"reportableChange": 0
},
{
- "name": "name support",
+ "name": "NameSupport",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -599,7 +583,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -642,7 +625,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -669,7 +651,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "switch type",
@@ -820,10 +801,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -863,7 +843,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -890,7 +869,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -997,7 +975,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1024,7 +1001,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ACL",
@@ -1115,7 +1091,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1142,7 +1117,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -1151,7 +1125,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "10",
@@ -1653,7 +1627,6 @@
"define": "OTA_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DefaultOtaProviders",
@@ -1775,9 +1748,7 @@
"mfgCode": null,
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Localization Configuration",
@@ -1786,27 +1757,10 @@
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
- "name": "ActiveLocale",
- "code": 1,
- "mfgCode": null,
- "side": "server",
- "type": "char_string",
- "included": 1,
- "storageOption": "NVM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "en-US",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "SupportedLocales",
- "code": 2,
+ "code": 1,
"mfgCode": null,
"side": "server",
"type": "array",
@@ -1814,7 +1768,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": "en-US",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -1860,9 +1814,7 @@
"mfgCode": null,
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Time Format Localization",
@@ -1871,7 +1823,6 @@
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "HourFormat",
@@ -1961,9 +1912,7 @@
"mfgCode": null,
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Unit Localization",
@@ -1972,7 +1921,6 @@
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "TemperatureUnit",
@@ -2149,7 +2097,7 @@
"side": "server",
"type": "RegulatoryLocationType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2165,7 +2113,7 @@
"side": "server",
"type": "RegulatoryLocationType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2539,7 +2487,6 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -2600,7 +2547,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -2616,7 +2563,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2632,7 +2579,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -2648,7 +2595,7 @@
"side": "server",
"type": "enum8",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2798,7 +2745,6 @@
"define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ThreadMetrics",
@@ -2823,7 +2769,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2839,7 +2785,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2855,7 +2801,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2941,7 +2887,6 @@
"define": "THREAD_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "channel",
@@ -2950,7 +2895,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2964,9 +2909,9 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "enum8",
+ "type": "RoutingRole",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2982,7 +2927,7 @@
"side": "server",
"type": "char_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2998,7 +2943,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3014,7 +2959,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3030,7 +2975,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3046,7 +2991,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3094,7 +3039,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3110,7 +3055,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3126,7 +3071,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3142,7 +3087,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3158,7 +3103,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3174,7 +3119,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3190,7 +3135,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3206,7 +3151,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3222,7 +3167,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3238,7 +3183,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3254,7 +3199,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3270,7 +3215,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3286,7 +3231,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3302,7 +3247,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3318,7 +3263,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3334,7 +3279,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3350,7 +3295,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3366,7 +3311,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3382,7 +3327,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3398,7 +3343,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3414,7 +3359,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3430,7 +3375,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3446,7 +3391,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3462,7 +3407,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3478,7 +3423,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3494,7 +3439,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3510,7 +3455,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3526,7 +3471,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3542,7 +3487,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3558,7 +3503,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3574,7 +3519,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3590,7 +3535,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3606,7 +3551,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3622,7 +3567,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3638,7 +3583,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3654,7 +3599,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3670,7 +3615,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3686,7 +3631,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3702,7 +3647,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3718,7 +3663,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3734,7 +3679,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3750,7 +3695,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3766,7 +3711,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3782,7 +3727,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3798,7 +3743,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3814,7 +3759,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3830,7 +3775,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3846,7 +3791,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3862,7 +3807,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3878,7 +3823,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3892,7 +3837,7 @@
"code": 59,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "SecurityPolicy",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -3910,7 +3855,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3924,7 +3869,7 @@
"code": 61,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "OperationalDatasetComponents",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -4028,7 +3973,6 @@
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "bssid",
@@ -4037,7 +3981,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4053,7 +3997,7 @@
"side": "server",
"type": "SecurityType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4069,7 +4013,7 @@
"side": "server",
"type": "WiFiVersionType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4085,7 +4029,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -4101,7 +4045,7 @@
"side": "server",
"type": "int8s",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -4117,7 +4061,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4133,7 +4077,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4149,7 +4093,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4165,7 +4109,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4181,7 +4125,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4197,7 +4141,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4213,7 +4157,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4229,7 +4173,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4315,7 +4259,6 @@
"define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "PHYRate",
@@ -4324,7 +4267,7 @@
"side": "server",
"type": "PHYRateType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4340,7 +4283,7 @@
"side": "server",
"type": "boolean",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -4356,7 +4299,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4372,7 +4315,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4388,7 +4331,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4404,7 +4347,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4420,7 +4363,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4436,7 +4379,7 @@
"side": "server",
"type": "boolean",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -4452,7 +4395,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4501,9 +4444,7 @@
"mfgCode": null,
"define": "SWITCH_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Switch",
@@ -4512,7 +4453,6 @@
"define": "SWITCH_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -4607,7 +4547,6 @@
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "WindowStatus",
@@ -4762,14 +4701,6 @@
"source": "client",
"incoming": 1,
"outgoing": 1
- },
- {
- "name": "RemoveTrustedRootCertificate",
- "code": 12,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -4872,7 +4803,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4888,7 +4819,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4918,7 +4849,7 @@
"code": 5,
"mfgCode": null,
"side": "server",
- "type": "fabric_idx",
+ "type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -5003,8 +4934,7 @@
"incoming": 1,
"outgoing": 0
}
- ],
- "attributes": []
+ ]
},
{
"name": "Group Key Management",
@@ -5136,9 +5066,7 @@
"mfgCode": null,
"define": "FIXED_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Fixed Label",
@@ -5147,7 +5075,6 @@
"define": "FIXED_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5205,9 +5132,7 @@
"mfgCode": null,
"define": "USER_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "User Label",
@@ -5216,7 +5141,6 @@
"define": "USER_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5291,14 +5215,6 @@
"source": "client",
"incoming": 1,
"outgoing": 0
- },
- {
- "name": "IdentifyQuery",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -5343,16 +5259,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [
- {
- "name": "IdentifyQueryResponse",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
"attributes": [
{
"name": "identify time",
@@ -5707,7 +5613,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -5750,7 +5655,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -5905,7 +5809,6 @@
"define": "BINDING_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -5948,7 +5851,6 @@
"define": "BINDING_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "Binding",
@@ -6055,7 +5957,6 @@
"define": "TEMP_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -6098,7 +5999,6 @@
"define": "TEMP_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "MeasuredValue",
@@ -6268,6 +6168,5 @@
"endpointVersion": 1,
"deviceIdentifier": 770
}
- ],
- "log": []
-}
+ ]
+}
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap
index a8f4cdc..dc8cdf8 100644
--- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap
+++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 70,
+ "featureLevel": 77,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,14 +19,16 @@
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/zcl/zcl.json",
- "version": "ZCL Test Data",
- "type": "zcl-properties"
+ "type": "zcl-properties",
+ "category": "matter",
+ "version": 1,
+ "description": "Matter SDK ZCL data"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
- "version": "chip-v1",
- "type": "gen-templates-json"
+ "type": "gen-templates-json",
+ "version": "chip-v1"
}
],
"endpointTypes": [
@@ -51,14 +53,6 @@
"source": "client",
"incoming": 1,
"outgoing": 0
- },
- {
- "name": "IdentifyQuery",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -87,16 +81,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [
- {
- "name": "IdentifyQueryResponse",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
"attributes": [
{
"name": "identify time",
@@ -443,7 +427,7 @@
],
"attributes": [
{
- "name": "scene count",
+ "name": "SceneCount",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -459,7 +443,7 @@
"reportableChange": 0
},
{
- "name": "current scene",
+ "name": "CurrentScene",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -475,11 +459,11 @@
"reportableChange": 0
},
{
- "name": "current group",
+ "name": "CurrentGroup",
"code": 2,
"mfgCode": null,
"side": "server",
- "type": "int16u",
+ "type": "group_id",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -491,7 +475,7 @@
"reportableChange": 0
},
{
- "name": "scene valid",
+ "name": "SceneValid",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -507,7 +491,7 @@
"reportableChange": 0
},
{
- "name": "name support",
+ "name": "NameSupport",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -599,7 +583,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -642,7 +625,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -669,7 +651,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "switch type",
@@ -820,10 +801,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -863,7 +843,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -890,7 +869,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -997,7 +975,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1024,7 +1001,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ACL",
@@ -1115,7 +1091,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1142,7 +1117,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -1151,7 +1125,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "10",
@@ -1653,7 +1627,6 @@
"define": "OTA_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DefaultOtaProviders",
@@ -1775,9 +1748,7 @@
"mfgCode": null,
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Localization Configuration",
@@ -1786,27 +1757,10 @@
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
- "name": "ActiveLocale",
- "code": 1,
- "mfgCode": null,
- "side": "server",
- "type": "char_string",
- "included": 1,
- "storageOption": "NVM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "en-US",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "SupportedLocales",
- "code": 2,
+ "code": 1,
"mfgCode": null,
"side": "server",
"type": "array",
@@ -1814,7 +1768,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": "en-US",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -1860,9 +1814,7 @@
"mfgCode": null,
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Time Format Localization",
@@ -1871,7 +1823,6 @@
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "HourFormat",
@@ -1961,9 +1912,7 @@
"mfgCode": null,
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Unit Localization",
@@ -1972,7 +1921,6 @@
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "TemperatureUnit",
@@ -2149,7 +2097,7 @@
"side": "server",
"type": "RegulatoryLocationType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2165,7 +2113,7 @@
"side": "server",
"type": "RegulatoryLocationType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2587,7 +2535,6 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -2648,7 +2595,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -2664,7 +2611,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2680,7 +2627,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -2696,7 +2643,7 @@
"side": "server",
"type": "enum8",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2846,7 +2793,6 @@
"define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ThreadMetrics",
@@ -2871,7 +2817,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2887,7 +2833,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2903,7 +2849,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2989,7 +2935,6 @@
"define": "THREAD_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "channel",
@@ -2998,7 +2943,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3012,9 +2957,9 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "enum8",
+ "type": "RoutingRole",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3030,7 +2975,7 @@
"side": "server",
"type": "char_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -3046,7 +2991,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3062,7 +3007,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3078,7 +3023,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3094,7 +3039,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3142,7 +3087,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3158,7 +3103,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3174,7 +3119,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3190,7 +3135,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3206,7 +3151,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3222,7 +3167,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3238,7 +3183,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3254,7 +3199,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3270,7 +3215,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3286,7 +3231,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3302,7 +3247,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3318,7 +3263,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3334,7 +3279,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3350,7 +3295,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3366,7 +3311,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3382,7 +3327,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3398,7 +3343,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3414,7 +3359,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3430,7 +3375,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3446,7 +3391,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3462,7 +3407,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3478,7 +3423,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3494,7 +3439,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3510,7 +3455,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3526,7 +3471,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3542,7 +3487,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3558,7 +3503,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3574,7 +3519,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3590,7 +3535,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3606,7 +3551,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3622,7 +3567,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3638,7 +3583,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3654,7 +3599,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3670,7 +3615,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3686,7 +3631,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3702,7 +3647,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3718,7 +3663,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3734,7 +3679,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3750,7 +3695,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3766,7 +3711,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3782,7 +3727,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3798,7 +3743,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3814,7 +3759,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3830,7 +3775,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3846,7 +3791,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3862,7 +3807,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3878,7 +3823,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3894,7 +3839,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3910,7 +3855,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3926,7 +3871,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3940,7 +3885,7 @@
"code": 59,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "SecurityPolicy",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -3958,7 +3903,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3972,7 +3917,7 @@
"code": 61,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "OperationalDatasetComponents",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -4076,7 +4021,6 @@
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "bssid",
@@ -4085,7 +4029,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4101,7 +4045,7 @@
"side": "server",
"type": "SecurityType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4117,7 +4061,7 @@
"side": "server",
"type": "WiFiVersionType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4133,7 +4077,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -4149,7 +4093,7 @@
"side": "server",
"type": "int8s",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -4165,7 +4109,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4181,7 +4125,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4197,7 +4141,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4213,7 +4157,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4229,7 +4173,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4245,7 +4189,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4261,7 +4205,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4277,7 +4221,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4363,7 +4307,6 @@
"define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "PHYRate",
@@ -4372,7 +4315,7 @@
"side": "server",
"type": "PHYRateType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4388,7 +4331,7 @@
"side": "server",
"type": "boolean",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -4404,7 +4347,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4420,7 +4363,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4436,7 +4379,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4452,7 +4395,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4468,7 +4411,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4484,7 +4427,7 @@
"side": "server",
"type": "boolean",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -4500,7 +4443,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4549,9 +4492,7 @@
"mfgCode": null,
"define": "SWITCH_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Switch",
@@ -4560,7 +4501,6 @@
"define": "SWITCH_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -4655,7 +4595,6 @@
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "WindowStatus",
@@ -4810,14 +4749,6 @@
"source": "client",
"incoming": 1,
"outgoing": 1
- },
- {
- "name": "RemoveTrustedRootCertificate",
- "code": 12,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -4920,7 +4851,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4936,7 +4867,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4966,7 +4897,7 @@
"code": 5,
"mfgCode": null,
"side": "server",
- "type": "fabric_idx",
+ "type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -5051,8 +4982,7 @@
"incoming": 1,
"outgoing": 0
}
- ],
- "attributes": []
+ ]
},
{
"name": "Group Key Management",
@@ -5184,9 +5114,7 @@
"mfgCode": null,
"define": "FIXED_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Fixed Label",
@@ -5195,7 +5123,6 @@
"define": "FIXED_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5253,9 +5180,7 @@
"mfgCode": null,
"define": "USER_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "User Label",
@@ -5264,7 +5189,6 @@
"define": "USER_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5339,14 +5263,6 @@
"source": "client",
"incoming": 1,
"outgoing": 0
- },
- {
- "name": "IdentifyQuery",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -5391,16 +5307,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [
- {
- "name": "IdentifyQueryResponse",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
"attributes": [
{
"name": "identify time",
@@ -5907,7 +5813,7 @@
],
"attributes": [
{
- "name": "scene count",
+ "name": "SceneCount",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -5923,7 +5829,7 @@
"reportableChange": 0
},
{
- "name": "current scene",
+ "name": "CurrentScene",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -5939,11 +5845,11 @@
"reportableChange": 0
},
{
- "name": "current group",
+ "name": "CurrentGroup",
"code": 2,
"mfgCode": null,
"side": "server",
- "type": "int16u",
+ "type": "group_id",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -5955,7 +5861,7 @@
"reportableChange": 0
},
{
- "name": "scene valid",
+ "name": "SceneValid",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -5971,7 +5877,7 @@
"reportableChange": 0
},
{
- "name": "name support",
+ "name": "NameSupport",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -5987,7 +5893,7 @@
"reportableChange": 0
},
{
- "name": "last configured by",
+ "name": "LastConfiguredBy",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -6085,183 +5991,12 @@
]
},
{
- "name": "Alarms",
- "code": 9,
- "mfgCode": null,
- "define": "ALARM_CLUSTER",
- "side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
- },
- {
- "name": "Alarms",
- "code": 9,
- "mfgCode": null,
- "define": "ALARM_CLUSTER",
- "side": "server",
- "enabled": 1,
- "commands": [],
- "attributes": [
- {
- "name": "alarm count",
- "code": 0,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 0,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0x00",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "GeneratedCommandList",
- "code": 65528,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "AcceptedCommandList",
- "code": 65529,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "AttributeList",
- "code": 65531,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "FeatureMap",
- "code": 65532,
- "mfgCode": null,
- "side": "server",
- "type": "bitmap32",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- }
- ]
- },
- {
- "name": "Time",
- "code": 10,
- "mfgCode": null,
- "define": "TIME_CLUSTER",
- "side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": [
- {
- "name": "FeatureMap",
- "code": 65532,
- "mfgCode": null,
- "side": "client",
- "type": "bitmap32",
- "included": 0,
- "storageOption": "RAM",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": "0",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "client",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": "2",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- }
- ]
- },
- {
- "name": "Time",
- "code": 10,
- "mfgCode": null,
- "define": "TIME_CLUSTER",
- "side": "server",
- "enabled": 0,
- "commands": [],
- "attributes": []
- },
- {
"name": "Descriptor",
"code": 29,
"mfgCode": null,
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -6304,7 +6039,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -6459,7 +6193,6 @@
"define": "BINDING_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -6502,7 +6235,6 @@
"define": "BINDING_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "Binding",
@@ -6609,7 +6341,6 @@
"define": "TIME_SYNCHRONIZATION_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -6652,7 +6383,6 @@
"define": "TIME_SYNCHRONIZATION_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "GeneratedCommandList",
@@ -6795,10 +6525,9 @@
"define": "THERMOSTAT_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
- "name": "local temperature",
+ "name": "LocalTemperature",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -6814,7 +6543,7 @@
"reportableChange": 0
},
{
- "name": "outdoor temperature",
+ "name": "OutdoorTemperature",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -6830,7 +6559,7 @@
"reportableChange": 0
},
{
- "name": "occupancy",
+ "name": "Occupancy",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -6846,7 +6575,7 @@
"reportableChange": 0
},
{
- "name": "abs min heat setpoint limit",
+ "name": "AbsMinHeatSetpointLimit",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -6862,7 +6591,7 @@
"reportableChange": 0
},
{
- "name": "abs max heat setpoint limit",
+ "name": "AbsMaxHeatSetpointLimit",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -6878,7 +6607,7 @@
"reportableChange": 0
},
{
- "name": "abs min cool setpoint limit",
+ "name": "AbsMinCoolSetpointLimit",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -6894,7 +6623,7 @@
"reportableChange": 0
},
{
- "name": "abs max cool setpoint limit",
+ "name": "AbsMaxCoolSetpointLimit",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -6910,7 +6639,7 @@
"reportableChange": 0
},
{
- "name": "pi cooling demand",
+ "name": "PICoolingDemand",
"code": 7,
"mfgCode": null,
"side": "server",
@@ -6926,7 +6655,7 @@
"reportableChange": 0
},
{
- "name": "pi heating demand",
+ "name": "PIHeatingDemand",
"code": 8,
"mfgCode": null,
"side": "server",
@@ -6942,7 +6671,7 @@
"reportableChange": 0
},
{
- "name": "HVAC system type configuration",
+ "name": "HVACSystemTypeConfiguration",
"code": 9,
"mfgCode": null,
"side": "server",
@@ -6958,7 +6687,7 @@
"reportableChange": 0
},
{
- "name": "local temperature calibration",
+ "name": "LocalTemperatureCalibration",
"code": 16,
"mfgCode": null,
"side": "server",
@@ -6974,7 +6703,7 @@
"reportableChange": 0
},
{
- "name": "occupied cooling setpoint",
+ "name": "OccupiedCoolingSetpoint",
"code": 17,
"mfgCode": null,
"side": "server",
@@ -6990,7 +6719,7 @@
"reportableChange": 0
},
{
- "name": "occupied heating setpoint",
+ "name": "OccupiedHeatingSetpoint",
"code": 18,
"mfgCode": null,
"side": "server",
@@ -7006,7 +6735,7 @@
"reportableChange": 0
},
{
- "name": "unoccupied cooling setpoint",
+ "name": "UnoccupiedCoolingSetpoint",
"code": 19,
"mfgCode": null,
"side": "server",
@@ -7022,7 +6751,7 @@
"reportableChange": 0
},
{
- "name": "unoccupied heating setpoint",
+ "name": "UnoccupiedHeatingSetpoint",
"code": 20,
"mfgCode": null,
"side": "server",
@@ -7038,7 +6767,7 @@
"reportableChange": 0
},
{
- "name": "min heat setpoint limit",
+ "name": "MinHeatSetpointLimit",
"code": 21,
"mfgCode": null,
"side": "server",
@@ -7054,7 +6783,7 @@
"reportableChange": 0
},
{
- "name": "max heat setpoint limit",
+ "name": "MaxHeatSetpointLimit",
"code": 22,
"mfgCode": null,
"side": "server",
@@ -7070,7 +6799,7 @@
"reportableChange": 0
},
{
- "name": "min cool setpoint limit",
+ "name": "MinCoolSetpointLimit",
"code": 23,
"mfgCode": null,
"side": "server",
@@ -7086,7 +6815,7 @@
"reportableChange": 0
},
{
- "name": "max cool setpoint limit",
+ "name": "MaxCoolSetpointLimit",
"code": 24,
"mfgCode": null,
"side": "server",
@@ -7102,7 +6831,7 @@
"reportableChange": 0
},
{
- "name": "min setpoint dead band",
+ "name": "MinSetpointDeadBand",
"code": 25,
"mfgCode": null,
"side": "server",
@@ -7118,7 +6847,7 @@
"reportableChange": 0
},
{
- "name": "remote sensing",
+ "name": "RemoteSensing",
"code": 26,
"mfgCode": null,
"side": "server",
@@ -7134,7 +6863,7 @@
"reportableChange": 0
},
{
- "name": "control sequence of operation",
+ "name": "ControlSequenceOfOperation",
"code": 27,
"mfgCode": null,
"side": "server",
@@ -7150,7 +6879,7 @@
"reportableChange": 0
},
{
- "name": "system mode",
+ "name": "SystemMode",
"code": 28,
"mfgCode": null,
"side": "server",
@@ -7166,23 +6895,7 @@
"reportableChange": 0
},
{
- "name": "alarm mask",
- "code": 29,
- "mfgCode": null,
- "side": "server",
- "type": "bitmap8",
- "included": 0,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0x00",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "thermostat running mode",
+ "name": "ThermostatRunningMode",
"code": 30,
"mfgCode": null,
"side": "server",
@@ -7198,7 +6911,7 @@
"reportableChange": 0
},
{
- "name": "start of week",
+ "name": "StartOfWeek",
"code": 32,
"mfgCode": null,
"side": "server",
@@ -7214,7 +6927,7 @@
"reportableChange": 0
},
{
- "name": "number of weekly transitions",
+ "name": "NumberOfWeeklyTransitions",
"code": 33,
"mfgCode": null,
"side": "server",
@@ -7230,7 +6943,7 @@
"reportableChange": 0
},
{
- "name": "number of daily transitions",
+ "name": "NumberOfDailyTransitions",
"code": 34,
"mfgCode": null,
"side": "server",
@@ -7246,7 +6959,7 @@
"reportableChange": 0
},
{
- "name": "temperature setpoint hold",
+ "name": "TemperatureSetpointHold",
"code": 35,
"mfgCode": null,
"side": "server",
@@ -7262,7 +6975,7 @@
"reportableChange": 0
},
{
- "name": "temperature setpoint hold duration",
+ "name": "TemperatureSetpointHoldDuration",
"code": 36,
"mfgCode": null,
"side": "server",
@@ -7278,7 +6991,7 @@
"reportableChange": 0
},
{
- "name": "thermostat programming operation mode",
+ "name": "ThermostatProgrammingOperationMode",
"code": 37,
"mfgCode": null,
"side": "server",
@@ -7294,7 +7007,7 @@
"reportableChange": 0
},
{
- "name": "thermostat running state",
+ "name": "ThermostatRunningState",
"code": 41,
"mfgCode": null,
"side": "server",
@@ -7310,7 +7023,7 @@
"reportableChange": 0
},
{
- "name": "setpoint change source",
+ "name": "SetpointChangeSource",
"code": 48,
"mfgCode": null,
"side": "server",
@@ -7326,7 +7039,7 @@
"reportableChange": 0
},
{
- "name": "setpoint change amount",
+ "name": "SetpointChangeAmount",
"code": 49,
"mfgCode": null,
"side": "server",
@@ -7342,11 +7055,11 @@
"reportableChange": 0
},
{
- "name": "setpoint change source timestamp",
+ "name": "SetpointChangeSourceTimestamp",
"code": 50,
"mfgCode": null,
"side": "server",
- "type": "epoch_s",
+ "type": "utc",
"included": 0,
"storageOption": "RAM",
"singleton": 0,
@@ -7358,7 +7071,7 @@
"reportableChange": 0
},
{
- "name": "ac type",
+ "name": "ACType",
"code": 64,
"mfgCode": null,
"side": "server",
@@ -7374,7 +7087,7 @@
"reportableChange": 0
},
{
- "name": "ac capacity",
+ "name": "ACCapacity",
"code": 65,
"mfgCode": null,
"side": "server",
@@ -7390,7 +7103,7 @@
"reportableChange": 0
},
{
- "name": "ac refrigerant type",
+ "name": "ACRefrigerantType",
"code": 66,
"mfgCode": null,
"side": "server",
@@ -7406,7 +7119,7 @@
"reportableChange": 0
},
{
- "name": "ac compressor type",
+ "name": "ACCompressorType",
"code": 67,
"mfgCode": null,
"side": "server",
@@ -7422,7 +7135,7 @@
"reportableChange": 0
},
{
- "name": "ac error code",
+ "name": "ACErrorCode",
"code": 68,
"mfgCode": null,
"side": "server",
@@ -7438,7 +7151,7 @@
"reportableChange": 0
},
{
- "name": "ac louver position",
+ "name": "ACLouverPosition",
"code": 69,
"mfgCode": null,
"side": "server",
@@ -7454,7 +7167,7 @@
"reportableChange": 0
},
{
- "name": "ac coil temperature",
+ "name": "ACCoilTemperature",
"code": 70,
"mfgCode": null,
"side": "server",
@@ -7470,7 +7183,7 @@
"reportableChange": 0
},
{
- "name": "ac capacity format",
+ "name": "ACCapacityformat",
"code": 71,
"mfgCode": null,
"side": "server",
@@ -7574,7 +7287,6 @@
"define": "FAN_CONTROL_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -7616,9 +7328,7 @@
"mfgCode": null,
"define": "FAN_CONTROL_CLUSTER",
"side": "server",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Thermostat User Interface Configuration",
@@ -7626,9 +7336,7 @@
"mfgCode": null,
"define": "THERMOSTAT_UI_CONFIG_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Thermostat User Interface Configuration",
@@ -7637,7 +7345,6 @@
"define": "THERMOSTAT_UI_CONFIG_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "temperature display mode",
@@ -7776,7 +7483,6 @@
"define": "TEMP_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -7818,9 +7524,7 @@
"mfgCode": null,
"define": "TEMP_MEASUREMENT_CLUSTER",
"side": "server",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Relative Humidity Measurement",
@@ -7829,7 +7533,6 @@
"define": "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -7871,9 +7574,7 @@
"mfgCode": null,
"define": "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER",
"side": "server",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Occupancy Sensing",
@@ -7882,7 +7583,6 @@
"define": "OCCUPANCY_SENSING_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -7924,9 +7624,7 @@
"mfgCode": null,
"define": "OCCUPANCY_SENSING_CLUSTER",
"side": "server",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
}
]
}
@@ -7950,6 +7648,5 @@
"endpointVersion": 1,
"deviceIdentifier": 769
}
- ],
- "log": []
-}
+ ]
+}
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap
index 3a61e0d..cf438a3 100644
--- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap
+++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 70,
+ "featureLevel": 77,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,14 +19,16 @@
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/zcl/zcl.json",
- "version": "ZCL Test Data",
- "type": "zcl-properties"
+ "type": "zcl-properties",
+ "category": "matter",
+ "version": 1,
+ "description": "Matter SDK ZCL data"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
- "version": "chip-v1",
- "type": "gen-templates-json"
+ "type": "gen-templates-json",
+ "version": "chip-v1"
}
],
"endpointTypes": [
@@ -51,14 +53,6 @@
"source": "client",
"incoming": 1,
"outgoing": 0
- },
- {
- "name": "IdentifyQuery",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -87,16 +81,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [
- {
- "name": "IdentifyQueryResponse",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
"attributes": [
{
"name": "identify time",
@@ -443,7 +427,7 @@
],
"attributes": [
{
- "name": "scene count",
+ "name": "SceneCount",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -459,7 +443,7 @@
"reportableChange": 0
},
{
- "name": "current scene",
+ "name": "CurrentScene",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -475,11 +459,11 @@
"reportableChange": 0
},
{
- "name": "current group",
+ "name": "CurrentGroup",
"code": 2,
"mfgCode": null,
"side": "server",
- "type": "int16u",
+ "type": "group_id",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -491,7 +475,7 @@
"reportableChange": 0
},
{
- "name": "scene valid",
+ "name": "SceneValid",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -507,7 +491,7 @@
"reportableChange": 0
},
{
- "name": "name support",
+ "name": "NameSupport",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -599,7 +583,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -642,7 +625,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -669,7 +651,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "switch type",
@@ -820,10 +801,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -863,7 +843,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -890,7 +869,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -997,7 +975,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1024,7 +1001,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ACL",
@@ -1115,7 +1091,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1142,7 +1117,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -1151,7 +1125,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "10",
@@ -1653,7 +1627,6 @@
"define": "OTA_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DefaultOtaProviders",
@@ -1775,9 +1748,7 @@
"mfgCode": null,
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Localization Configuration",
@@ -1786,27 +1757,10 @@
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
- "name": "ActiveLocale",
- "code": 1,
- "mfgCode": null,
- "side": "server",
- "type": "char_string",
- "included": 1,
- "storageOption": "NVM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "en-US",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
"name": "SupportedLocales",
- "code": 2,
+ "code": 1,
"mfgCode": null,
"side": "server",
"type": "array",
@@ -1814,7 +1768,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
- "defaultValue": "",
+ "defaultValue": "en-US",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -1860,9 +1814,7 @@
"mfgCode": null,
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Time Format Localization",
@@ -1871,7 +1823,6 @@
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "HourFormat",
@@ -1961,9 +1912,7 @@
"mfgCode": null,
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Unit Localization",
@@ -1972,7 +1921,6 @@
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "TemperatureUnit",
@@ -2149,7 +2097,7 @@
"side": "server",
"type": "RegulatoryLocationType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2165,7 +2113,7 @@
"side": "server",
"type": "RegulatoryLocationType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2539,7 +2487,6 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -2600,7 +2547,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -2616,7 +2563,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2632,7 +2579,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -2648,7 +2595,7 @@
"side": "server",
"type": "enum8",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2798,7 +2745,6 @@
"define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ThreadMetrics",
@@ -2823,7 +2769,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2839,7 +2785,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2855,7 +2801,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -2941,7 +2887,6 @@
"define": "THREAD_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "channel",
@@ -2950,7 +2895,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2964,9 +2909,9 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "enum8",
+ "type": "RoutingRole",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2982,7 +2927,7 @@
"side": "server",
"type": "char_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -2998,7 +2943,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3014,7 +2959,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3030,7 +2975,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3046,7 +2991,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3094,7 +3039,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3110,7 +3055,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3126,7 +3071,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3142,7 +3087,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3158,7 +3103,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3174,7 +3119,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3190,7 +3135,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3206,7 +3151,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3222,7 +3167,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3238,7 +3183,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3254,7 +3199,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3270,7 +3215,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3286,7 +3231,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3302,7 +3247,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3318,7 +3263,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3334,7 +3279,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3350,7 +3295,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3366,7 +3311,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3382,7 +3327,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3398,7 +3343,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3414,7 +3359,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3430,7 +3375,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3446,7 +3391,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3462,7 +3407,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3478,7 +3423,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3494,7 +3439,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3510,7 +3455,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3526,7 +3471,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3542,7 +3487,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3558,7 +3503,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3574,7 +3519,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3590,7 +3535,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3606,7 +3551,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3622,7 +3567,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3638,7 +3583,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3654,7 +3599,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3670,7 +3615,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3686,7 +3631,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3702,7 +3647,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3718,7 +3663,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3734,7 +3679,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3750,7 +3695,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3766,7 +3711,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3782,7 +3727,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3798,7 +3743,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3814,7 +3759,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3830,7 +3775,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3846,7 +3791,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3862,7 +3807,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -3878,7 +3823,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3892,7 +3837,7 @@
"code": 59,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "SecurityPolicy",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -3910,7 +3855,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -3924,7 +3869,7 @@
"code": 61,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "OperationalDatasetComponents",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -4028,7 +3973,6 @@
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "bssid",
@@ -4037,7 +3981,7 @@
"side": "server",
"type": "octet_string",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4053,7 +3997,7 @@
"side": "server",
"type": "SecurityType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4069,7 +4013,7 @@
"side": "server",
"type": "WiFiVersionType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4085,7 +4029,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
@@ -4101,7 +4045,7 @@
"side": "server",
"type": "int8s",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -4117,7 +4061,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4133,7 +4077,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4149,7 +4093,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4165,7 +4109,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4181,7 +4125,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4197,7 +4141,7 @@
"side": "server",
"type": "int32u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00000000",
@@ -4213,7 +4157,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4229,7 +4173,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4315,7 +4259,6 @@
"define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "PHYRate",
@@ -4324,7 +4267,7 @@
"side": "server",
"type": "PHYRateType",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4340,7 +4283,7 @@
"side": "server",
"type": "boolean",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -4356,7 +4299,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4372,7 +4315,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4388,7 +4331,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4404,7 +4347,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4420,7 +4363,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4436,7 +4379,7 @@
"side": "server",
"type": "boolean",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
@@ -4452,7 +4395,7 @@
"side": "server",
"type": "int64u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000000000000000",
@@ -4501,9 +4444,7 @@
"mfgCode": null,
"define": "SWITCH_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Switch",
@@ -4512,7 +4453,6 @@
"define": "SWITCH_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -4607,7 +4547,6 @@
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "WindowStatus",
@@ -4762,14 +4701,6 @@
"source": "client",
"incoming": 1,
"outgoing": 1
- },
- {
- "name": "RemoveTrustedRootCertificate",
- "code": 12,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -4872,7 +4803,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4888,7 +4819,7 @@
"side": "server",
"type": "int8u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4918,7 +4849,7 @@
"code": 5,
"mfgCode": null,
"side": "server",
- "type": "fabric_idx",
+ "type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -5003,8 +4934,7 @@
"incoming": 1,
"outgoing": 0
}
- ],
- "attributes": []
+ ]
},
{
"name": "Group Key Management",
@@ -5136,9 +5066,7 @@
"mfgCode": null,
"define": "FIXED_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Fixed Label",
@@ -5147,7 +5075,6 @@
"define": "FIXED_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5205,9 +5132,7 @@
"mfgCode": null,
"define": "USER_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "User Label",
@@ -5216,7 +5141,6 @@
"define": "USER_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5291,14 +5215,6 @@
"source": "client",
"incoming": 1,
"outgoing": 0
- },
- {
- "name": "IdentifyQuery",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
}
],
"attributes": [
@@ -5343,16 +5259,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [
- {
- "name": "IdentifyQueryResponse",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
"attributes": [
{
"name": "identify time",
@@ -5859,7 +5765,7 @@
],
"attributes": [
{
- "name": "scene count",
+ "name": "SceneCount",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -5875,7 +5781,7 @@
"reportableChange": 0
},
{
- "name": "current scene",
+ "name": "CurrentScene",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -5891,11 +5797,11 @@
"reportableChange": 0
},
{
- "name": "current group",
+ "name": "CurrentGroup",
"code": 2,
"mfgCode": null,
"side": "server",
- "type": "int16u",
+ "type": "group_id",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -5907,7 +5813,7 @@
"reportableChange": 0
},
{
- "name": "scene valid",
+ "name": "SceneValid",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -5923,7 +5829,7 @@
"reportableChange": 0
},
{
- "name": "name support",
+ "name": "NameSupport",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -5939,7 +5845,7 @@
"reportableChange": 0
},
{
- "name": "last configured by",
+ "name": "LastConfiguredBy",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -6043,7 +5949,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -6086,7 +5991,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -6241,7 +6145,6 @@
"define": "BINDING_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -6284,7 +6187,6 @@
"define": "BINDING_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "Binding",
@@ -6491,7 +6393,6 @@
"define": "WINDOW_COVERING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "Type",
@@ -6658,7 +6559,7 @@
"code": 10,
"mfgCode": null,
"side": "server",
- "type": "bitmap8",
+ "type": "OperationalStatus",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -6834,7 +6735,7 @@
"code": 26,
"mfgCode": null,
"side": "server",
- "type": "bitmap16",
+ "type": "SafetyStatus",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -6949,6 +6850,5 @@
"endpointVersion": 1,
"deviceIdentifier": 514
}
- ],
- "log": []
-}
+ ]
+}
\ No newline at end of file
diff --git a/examples/common/pigweed/protos/attributes_service.proto b/examples/common/pigweed/protos/attributes_service.proto
index 6e2d93b..8eff6cb 100644
--- a/examples/common/pigweed/protos/attributes_service.proto
+++ b/examples/common/pigweed/protos/attributes_service.proto
@@ -87,7 +87,7 @@
ZCL_APPLIANCE_CONTROL_CLUSTER_ID = 0x001B;
ZCL_DESCRIPTOR_CLUSTER_ID = 0x001D;
ZCL_POLL_CONTROL_CLUSTER_ID = 0x0020;
- ZCL_BRIDGED_ACTIONS_CLUSTER_ID = 0x0025;
+ ZCL_ACTIONS_CLUSTER_ID = 0x0025;
ZCL_BASIC_CLUSTER_ID = 0x0028;
ZCL_OTA_PROVIDER_CLUSTER_ID = 0x0029;
ZCL_OTA_REQUESTOR_CLUSTER_ID = 0x002A;
diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.zap b/examples/light-switch-app/light-switch-common/light-switch-app.zap
index 321038e..b545561 100644
--- a/examples/light-switch-app/light-switch-common/light-switch-app.zap
+++ b/examples/light-switch-app/light-switch-common/light-switch-app.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 71,
+ "featureLevel": 77,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,14 +19,16 @@
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/zcl/zcl.json",
- "version": "ZCL Test Data",
- "type": "zcl-properties"
+ "type": "zcl-properties",
+ "category": "matter",
+ "version": 1,
+ "description": "Matter SDK ZCL data"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
- "version": "chip-v1",
- "type": "gen-templates-json"
+ "type": "gen-templates-json",
+ "version": "chip-v1"
}
],
"endpointTypes": [
@@ -79,7 +81,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "identify time",
@@ -566,7 +567,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -609,7 +609,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -636,7 +635,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "switch type",
@@ -787,10 +785,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -830,7 +827,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -857,7 +853,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -963,9 +958,7 @@
"mfgCode": null,
"define": "BINDING_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Binding",
@@ -974,7 +967,6 @@
"define": "BINDING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "Binding",
@@ -1048,9 +1040,7 @@
"mfgCode": null,
"define": "ACCESS_CONTROL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Access Control",
@@ -1059,7 +1049,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ACL",
@@ -1198,7 +1187,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1225,7 +1213,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -1752,7 +1739,6 @@
"define": "OTA_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DefaultOtaProviders",
@@ -1874,9 +1860,7 @@
"mfgCode": null,
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Localization Configuration",
@@ -1885,7 +1869,6 @@
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ActiveLocale",
@@ -1959,9 +1942,7 @@
"mfgCode": null,
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Time Format Localization",
@@ -1970,7 +1951,6 @@
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "HourFormat",
@@ -2585,7 +2565,6 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -2844,7 +2823,6 @@
"define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ThreadMetrics",
@@ -2987,7 +2965,6 @@
"define": "THREAD_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "channel",
@@ -4074,7 +4051,6 @@
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "bssid",
@@ -4361,7 +4337,6 @@
"define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "PHYRate",
@@ -4547,9 +4522,7 @@
"mfgCode": null,
"define": "SWITCH_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Switch",
@@ -4558,7 +4531,6 @@
"define": "SWITCH_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -4653,7 +4625,6 @@
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "WindowStatus",
@@ -4956,7 +4927,7 @@
"code": 5,
"mfgCode": null,
"side": "server",
- "type": "fabric_idx",
+ "type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -5041,8 +5012,7 @@
"incoming": 1,
"outgoing": 0
}
- ],
- "attributes": []
+ ]
},
{
"name": "Group Key Management",
@@ -5174,9 +5144,7 @@
"mfgCode": null,
"define": "FIXED_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Fixed Label",
@@ -5185,7 +5153,6 @@
"define": "FIXED_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5243,9 +5210,7 @@
"mfgCode": null,
"define": "USER_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "User Label",
@@ -5254,7 +5219,6 @@
"define": "USER_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5381,7 +5345,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "identify time",
@@ -6124,7 +6087,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -6355,10 +6317,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -6374,7 +6335,7 @@
"reportableChange": 0
},
{
- "name": "remaining time",
+ "name": "RemainingTime",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -6390,7 +6351,7 @@
"reportableChange": 0
},
{
- "name": "min level",
+ "name": "MinLevel",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -6406,7 +6367,7 @@
"reportableChange": 0
},
{
- "name": "max level",
+ "name": "MaxLevel",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -6422,7 +6383,7 @@
"reportableChange": 0
},
{
- "name": "current frequency",
+ "name": "CurrentFrequency",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -6438,7 +6399,7 @@
"reportableChange": 0
},
{
- "name": "min frequency",
+ "name": "MinFrequency",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -6454,7 +6415,7 @@
"reportableChange": 0
},
{
- "name": "max frequency",
+ "name": "MaxFrequency",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -6470,7 +6431,7 @@
"reportableChange": 0
},
{
- "name": "options",
+ "name": "Options",
"code": 15,
"mfgCode": null,
"side": "server",
@@ -6486,7 +6447,7 @@
"reportableChange": 0
},
{
- "name": "on off transition time",
+ "name": "OnOffTransitionTime",
"code": 16,
"mfgCode": null,
"side": "server",
@@ -6502,7 +6463,7 @@
"reportableChange": 0
},
{
- "name": "on level",
+ "name": "OnLevel",
"code": 17,
"mfgCode": null,
"side": "server",
@@ -6518,7 +6479,7 @@
"reportableChange": 0
},
{
- "name": "on transition time",
+ "name": "OnTransitionTime",
"code": 18,
"mfgCode": null,
"side": "server",
@@ -6534,7 +6495,7 @@
"reportableChange": 0
},
{
- "name": "off transition time",
+ "name": "OffTransitionTime",
"code": 19,
"mfgCode": null,
"side": "server",
@@ -6550,7 +6511,7 @@
"reportableChange": 0
},
{
- "name": "default move rate",
+ "name": "DefaultMoveRate",
"code": 20,
"mfgCode": null,
"side": "server",
@@ -6566,7 +6527,7 @@
"reportableChange": 0
},
{
- "name": "start up current level",
+ "name": "StartUpCurrentLevel",
"code": 16384,
"mfgCode": null,
"side": "server",
@@ -6622,7 +6583,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -6665,7 +6625,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -6788,7 +6747,6 @@
"define": "BINDING_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -6831,7 +6789,6 @@
"define": "BINDING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "Binding",
@@ -6906,7 +6863,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -6933,7 +6889,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -7476,7 +7431,6 @@
"define": "COLOR_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "CurrentHue",
@@ -7871,7 +7825,6 @@
"define": "OCCUPANCY_SENSING_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -7898,7 +7851,6 @@
"define": "OCCUPANCY_SENSING_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "occupancy",
@@ -8041,7 +7993,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "identify time",
@@ -8732,7 +8683,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -8775,7 +8725,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -8930,7 +8879,6 @@
"define": "BINDING_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -8973,7 +8921,6 @@
"define": "BINDING_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "Binding",
@@ -9080,7 +9027,6 @@
"define": "SWITCH_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -9123,7 +9069,6 @@
"define": "SWITCH_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "number of positions",
@@ -9286,6 +9231,5 @@
"endpointVersion": 1,
"deviceIdentifier": 15
}
- ],
- "log": []
+ ]
}
\ No newline at end of file
diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap
index 94a78ac..a80993b 100644
--- a/examples/lighting-app/lighting-common/lighting-app.zap
+++ b/examples/lighting-app/lighting-common/lighting-app.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 71,
+ "featureLevel": 77,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,14 +19,16 @@
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/zcl/zcl.json",
- "version": "ZCL Test Data",
- "type": "zcl-properties"
+ "type": "zcl-properties",
+ "category": "matter",
+ "version": 1,
+ "description": "Matter SDK ZCL data"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
- "version": "chip-v1",
- "type": "gen-templates-json"
+ "type": "gen-templates-json",
+ "version": "chip-v1"
}
],
"endpointTypes": [
@@ -79,7 +81,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "identify time",
@@ -582,7 +583,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -625,7 +625,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -652,7 +651,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "switch type",
@@ -803,10 +801,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -846,7 +843,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -873,7 +869,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -980,7 +975,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1007,7 +1001,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ACL",
@@ -1146,7 +1139,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1173,7 +1165,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -1700,7 +1691,6 @@
"define": "OTA_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DefaultOtaProviders",
@@ -1822,9 +1812,7 @@
"mfgCode": null,
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Localization Configuration",
@@ -1833,7 +1821,6 @@
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ActiveLocale",
@@ -1907,9 +1894,7 @@
"mfgCode": null,
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Time Format Localization",
@@ -1918,7 +1903,6 @@
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "HourFormat",
@@ -2008,9 +1992,7 @@
"mfgCode": null,
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Unit Localization",
@@ -2019,7 +2001,6 @@
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "TemperatureUnit",
@@ -2602,7 +2583,6 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -2861,7 +2841,6 @@
"define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ThreadMetrics",
@@ -3004,7 +2983,6 @@
"define": "THREAD_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "channel",
@@ -4091,7 +4069,6 @@
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "bssid",
@@ -4378,7 +4355,6 @@
"define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "PHYRate",
@@ -4564,9 +4540,7 @@
"mfgCode": null,
"define": "SWITCH_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Switch",
@@ -4575,7 +4549,6 @@
"define": "SWITCH_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -4670,7 +4643,6 @@
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "WindowStatus",
@@ -4973,7 +4945,7 @@
"code": 5,
"mfgCode": null,
"side": "server",
- "type": "fabric_idx",
+ "type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -5058,8 +5030,7 @@
"incoming": 1,
"outgoing": 0
}
- ],
- "attributes": []
+ ]
},
{
"name": "Group Key Management",
@@ -5191,9 +5162,7 @@
"mfgCode": null,
"define": "FIXED_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Fixed Label",
@@ -5202,7 +5171,6 @@
"define": "FIXED_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5260,9 +5228,7 @@
"mfgCode": null,
"define": "USER_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "User Label",
@@ -5271,7 +5237,6 @@
"define": "USER_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5382,7 +5347,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "identify time",
@@ -5965,7 +5929,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -6180,10 +6143,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -6199,7 +6161,7 @@
"reportableChange": 0
},
{
- "name": "remaining time",
+ "name": "RemainingTime",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -6215,7 +6177,7 @@
"reportableChange": 0
},
{
- "name": "min level",
+ "name": "MinLevel",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -6231,7 +6193,7 @@
"reportableChange": 0
},
{
- "name": "max level",
+ "name": "MaxLevel",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -6247,7 +6209,7 @@
"reportableChange": 0
},
{
- "name": "current frequency",
+ "name": "CurrentFrequency",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -6263,7 +6225,7 @@
"reportableChange": 0
},
{
- "name": "min frequency",
+ "name": "MinFrequency",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -6279,7 +6241,7 @@
"reportableChange": 0
},
{
- "name": "max frequency",
+ "name": "MaxFrequency",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -6295,7 +6257,7 @@
"reportableChange": 0
},
{
- "name": "options",
+ "name": "Options",
"code": 15,
"mfgCode": null,
"side": "server",
@@ -6311,7 +6273,7 @@
"reportableChange": 0
},
{
- "name": "on off transition time",
+ "name": "OnOffTransitionTime",
"code": 16,
"mfgCode": null,
"side": "server",
@@ -6327,7 +6289,7 @@
"reportableChange": 0
},
{
- "name": "on level",
+ "name": "OnLevel",
"code": 17,
"mfgCode": null,
"side": "server",
@@ -6343,7 +6305,7 @@
"reportableChange": 0
},
{
- "name": "on transition time",
+ "name": "OnTransitionTime",
"code": 18,
"mfgCode": null,
"side": "server",
@@ -6359,7 +6321,7 @@
"reportableChange": 0
},
{
- "name": "off transition time",
+ "name": "OffTransitionTime",
"code": 19,
"mfgCode": null,
"side": "server",
@@ -6375,7 +6337,7 @@
"reportableChange": 0
},
{
- "name": "default move rate",
+ "name": "DefaultMoveRate",
"code": 20,
"mfgCode": null,
"side": "server",
@@ -6391,7 +6353,7 @@
"reportableChange": 0
},
{
- "name": "start up current level",
+ "name": "StartUpCurrentLevel",
"code": 16384,
"mfgCode": null,
"side": "server",
@@ -6495,7 +6457,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -6522,7 +6483,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -6629,7 +6589,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -6656,7 +6615,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -7183,7 +7141,6 @@
"define": "COLOR_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "CurrentHue",
@@ -8106,7 +8063,6 @@
"define": "OCCUPANCY_SENSING_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -8133,7 +8089,6 @@
"define": "OCCUPANCY_SENSING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "occupancy",
diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap
index 1cebbee..a4fcb00 100755
--- a/examples/lock-app/lock-common/lock-app.zap
+++ b/examples/lock-app/lock-common/lock-app.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 75,
+ "featureLevel": 77,
"creator": "zap",
"keyValuePairs": [
{
@@ -20,7 +20,9 @@
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/zcl/zcl.json",
"type": "zcl-properties",
- "version": "ZCL Test Data"
+ "category": "matter",
+ "version": 1,
+ "description": "Matter SDK ZCL data"
},
{
"pathRelativity": "relativeToZap",
@@ -37,162 +39,6 @@
"deviceTypeProfileId": 259,
"clusters": [
{
- "name": "Power Configuration",
- "code": 1,
- "mfgCode": null,
- "define": "POWER_CONFIG_CLUSTER",
- "side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": [
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "client",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "2",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ]
- },
- {
- "name": "Power Configuration",
- "code": 1,
- "mfgCode": null,
- "define": "POWER_CONFIG_CLUSTER",
- "side": "server",
- "enabled": 0,
- "commands": [],
- "attributes": [
- {
- "name": "battery percentage remaining",
- "code": 33,
- "mfgCode": null,
- "side": "server",
- "type": "int8u",
- "included": 0,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0x00",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "battery alarm state",
- "code": 62,
- "mfgCode": null,
- "side": "server",
- "type": "bitmap32",
- "included": 0,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0x00000000",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "2",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ]
- },
- {
- "name": "Device Temperature Configuration",
- "code": 2,
- "mfgCode": null,
- "define": "DEVICE_TEMP_CLUSTER",
- "side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": [
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "client",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ]
- },
- {
- "name": "Device Temperature Configuration",
- "code": 2,
- "mfgCode": null,
- "define": "DEVICE_TEMP_CLUSTER",
- "side": "server",
- "enabled": 0,
- "commands": [],
- "attributes": [
- {
- "name": "current temperature",
- "code": 0,
- "mfgCode": null,
- "side": "server",
- "type": "int16s",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ]
- },
- {
"name": "Identify",
"code": 3,
"mfgCode": null,
@@ -235,7 +81,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "identify time",
@@ -722,7 +567,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -759,93 +603,12 @@
]
},
{
- "name": "Alarms",
- "code": 9,
- "mfgCode": null,
- "define": "ALARM_CLUSTER",
- "side": "client",
- "enabled": 0,
- "commands": [
- {
- "name": "ResetAlarm",
- "code": 0,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- },
- {
- "name": "ResetAllAlarms",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- }
- ],
- "attributes": [
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "client",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ]
- },
- {
- "name": "Alarms",
- "code": 9,
- "mfgCode": null,
- "define": "ALARM_CLUSTER",
- "side": "server",
- "enabled": 0,
- "commands": [
- {
- "name": "Alarm",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
- "attributes": [
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ]
- },
- {
"name": "Descriptor",
"code": 29,
"mfgCode": null,
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -872,7 +635,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -978,9 +740,7 @@
"mfgCode": null,
"define": "ACCESS_CONTROL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Access Control",
@@ -989,7 +749,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ACL",
@@ -1128,7 +887,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1155,7 +913,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -1682,7 +1439,6 @@
"define": "OTA_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DefaultOtaProviders",
@@ -1804,9 +1560,7 @@
"mfgCode": null,
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Localization Configuration",
@@ -1815,7 +1569,6 @@
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ActiveLocale",
@@ -1889,9 +1642,7 @@
"mfgCode": null,
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Time Format Localization",
@@ -1900,7 +1651,6 @@
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "HourFormat",
@@ -1990,9 +1740,7 @@
"mfgCode": null,
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Unit Localization",
@@ -2001,7 +1749,6 @@
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "TemperatureUnit",
@@ -2059,9 +1806,7 @@
"mfgCode": null,
"define": "POWER_SOURCE_CONFIGURATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Power Source Configuration",
@@ -2070,7 +1815,6 @@
"define": "POWER_SOURCE_CONFIGURATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "Sources",
@@ -2128,9 +1872,7 @@
"mfgCode": null,
"define": "POWER_SOURCE_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Power Source",
@@ -2139,7 +1881,6 @@
"define": "POWER_SOURCE_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "Status",
@@ -2770,7 +2511,6 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -3029,7 +2769,6 @@
"define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ThreadMetrics",
@@ -3172,7 +2911,6 @@
"define": "THREAD_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "channel",
@@ -4259,7 +3997,6 @@
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "bssid",
@@ -4546,7 +4283,6 @@
"define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "PHYRate",
@@ -4785,7 +4521,6 @@
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "WindowStatus",
@@ -5088,7 +4823,7 @@
"code": 5,
"mfgCode": null,
"side": "server",
- "type": "fabric_idx",
+ "type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -5173,8 +4908,7 @@
"incoming": 1,
"outgoing": 0
}
- ],
- "attributes": []
+ ]
},
{
"name": "Group Key Management",
@@ -5322,9 +5056,7 @@
"mfgCode": null,
"define": "FIXED_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Fixed Label",
@@ -5333,7 +5065,6 @@
"define": "FIXED_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5391,9 +5122,7 @@
"mfgCode": null,
"define": "USER_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "User Label",
@@ -5402,7 +5131,6 @@
"define": "USER_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5461,7 +5189,6 @@
"define": "OCCUPANCY_SENSING_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -5488,7 +5215,6 @@
"define": "OCCUPANCY_SENSING_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "occupancy",
@@ -5565,162 +5291,6 @@
"deviceTypeProfileId": 259,
"clusters": [
{
- "name": "Power Configuration",
- "code": 1,
- "mfgCode": null,
- "define": "POWER_CONFIG_CLUSTER",
- "side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": [
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "client",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": "2",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ]
- },
- {
- "name": "Power Configuration",
- "code": 1,
- "mfgCode": null,
- "define": "POWER_CONFIG_CLUSTER",
- "side": "server",
- "enabled": 0,
- "commands": [],
- "attributes": [
- {
- "name": "battery percentage remaining",
- "code": 33,
- "mfgCode": null,
- "side": "server",
- "type": "int8u",
- "included": 0,
- "storageOption": "RAM",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": "0x00",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "battery alarm state",
- "code": 62,
- "mfgCode": null,
- "side": "server",
- "type": "bitmap32",
- "included": 0,
- "storageOption": "RAM",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": "0x00000000",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": "2",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ]
- },
- {
- "name": "Device Temperature Configuration",
- "code": 2,
- "mfgCode": null,
- "define": "DEVICE_TEMP_CLUSTER",
- "side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": [
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "client",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ]
- },
- {
- "name": "Device Temperature Configuration",
- "code": 2,
- "mfgCode": null,
- "define": "DEVICE_TEMP_CLUSTER",
- "side": "server",
- "enabled": 0,
- "commands": [],
- "attributes": [
- {
- "name": "current temperature",
- "code": 0,
- "mfgCode": null,
- "side": "server",
- "type": "int16s",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ]
- },
- {
"name": "Identify",
"code": 3,
"mfgCode": null,
@@ -5763,7 +5333,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "identify time",
@@ -6298,7 +5867,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -6421,7 +5989,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -6448,7 +6015,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "switch type",
@@ -6501,93 +6067,12 @@
]
},
{
- "name": "Alarms",
- "code": 9,
- "mfgCode": null,
- "define": "ALARM_CLUSTER",
- "side": "client",
- "enabled": 0,
- "commands": [
- {
- "name": "ResetAlarm",
- "code": 0,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- },
- {
- "name": "ResetAllAlarms",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- }
- ],
- "attributes": [
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "client",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ]
- },
- {
- "name": "Alarms",
- "code": 9,
- "mfgCode": null,
- "define": "ALARM_CLUSTER",
- "side": "server",
- "enabled": 0,
- "commands": [
- {
- "name": "Alarm",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
- "attributes": [
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ]
- },
- {
"name": "Descriptor",
"code": 29,
"mfgCode": null,
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -6614,7 +6099,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -6721,7 +6205,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -6748,7 +6231,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -7094,9 +6576,7 @@
"mfgCode": null,
"define": "POWER_SOURCE_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Power Source",
@@ -7105,7 +6585,6 @@
"define": "POWER_SOURCE_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "Status",
@@ -8164,7 +7643,6 @@
"define": "OCCUPANCY_SENSING_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -8191,7 +7669,6 @@
"define": "OCCUPANCY_SENSING_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "occupancy",
@@ -8281,6 +7758,5 @@
"endpointVersion": 1,
"deviceIdentifier": 10
}
- ],
- "log": []
+ ]
}
\ No newline at end of file
diff --git a/examples/log-source-app/log-source-common/log-source-app.zap b/examples/log-source-app/log-source-common/log-source-app.zap
index 4da01a3..09bfbe0 100644
--- a/examples/log-source-app/log-source-common/log-source-app.zap
+++ b/examples/log-source-app/log-source-common/log-source-app.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 71,
+ "featureLevel": 77,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,14 +19,16 @@
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/zcl/zcl.json",
- "version": "ZCL Test Data",
- "type": "zcl-properties"
+ "type": "zcl-properties",
+ "category": "matter",
+ "version": 1,
+ "description": "Matter SDK ZCL data"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
- "version": "chip-v1",
- "type": "gen-templates-json"
+ "type": "gen-templates-json",
+ "version": "chip-v1"
}
],
"endpointTypes": [
@@ -79,7 +81,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "identify time",
@@ -566,7 +567,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -701,10 +701,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -743,9 +742,7 @@
"mfgCode": null,
"define": "ACCESS_CONTROL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Access Control",
@@ -754,7 +751,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ACL",
@@ -893,7 +889,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -920,7 +915,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -1588,8 +1582,7 @@
"incoming": 0,
"outgoing": 1
}
- ],
- "attributes": []
+ ]
},
{
"name": "Diagnostic Logs",
@@ -1998,7 +1991,6 @@
"define": "DOOR_LOCK_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "LockState",
@@ -2357,7 +2349,6 @@
"define": "BARRIER_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "barrier moving state",
@@ -2588,7 +2579,6 @@
"define": "COLOR_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "CurrentHue",
@@ -3415,7 +3405,6 @@
"define": "TEMP_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -3442,7 +3431,6 @@
"define": "TEMP_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "MeasuredValue",
@@ -3509,166 +3497,6 @@
"reportableChange": 0
}
]
- },
- {
- "name": "IAS Zone",
- "code": 1280,
- "mfgCode": null,
- "define": "IAS_ZONE_CLUSTER",
- "side": "client",
- "enabled": 0,
- "commands": [
- {
- "name": "ZoneEnrollResponse",
- "code": 0,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- }
- ],
- "attributes": [
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "client",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "2",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ]
- },
- {
- "name": "IAS Zone",
- "code": 1280,
- "mfgCode": null,
- "define": "IAS_ZONE_CLUSTER",
- "side": "server",
- "enabled": 0,
- "commands": [
- {
- "name": "ZoneStatusChangeNotification",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- },
- {
- "name": "ZoneEnrollRequest",
- "code": 1,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
- "attributes": [
- {
- "name": "zone state",
- "code": 0,
- "mfgCode": null,
- "side": "server",
- "type": "enum8",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0x00",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "zone type",
- "code": 1,
- "mfgCode": null,
- "side": "server",
- "type": "enum16",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "zone status",
- "code": 2,
- "mfgCode": null,
- "side": "server",
- "type": "bitmap16",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0x0000",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "IAS CIE address",
- "code": 16,
- "mfgCode": null,
- "side": "server",
- "type": "node_id",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "Zone ID",
- "code": 17,
- "mfgCode": null,
- "side": "server",
- "type": "int8u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0xff",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "2",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ]
}
]
}
diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap
index d84c220..764a129 100644
--- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap
+++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 71,
+ "featureLevel": 77,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,14 +19,16 @@
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/zcl/zcl.json",
- "version": "ZCL Test Data",
- "type": "zcl-properties"
+ "type": "zcl-properties",
+ "category": "matter",
+ "version": 1,
+ "description": "Matter SDK ZCL data"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
- "version": "chip-v1",
- "type": "gen-templates-json"
+ "type": "gen-templates-json",
+ "version": "chip-v1"
}
],
"endpointTypes": [
@@ -79,7 +81,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "identify time",
@@ -268,539 +269,6 @@
]
},
{
- "name": "Group Key Management",
- "code": 63,
- "mfgCode": null,
- "define": "GROUP_KEY_MANAGEMENT_CLUSTER",
- "side": "client",
- "enabled": 0,
- "commands": [
- {
- "name": "KeySetWrite",
- "code": 0,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- },
- {
- "name": "KeySetRead",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- },
- {
- "name": "KeySetRemove",
- "code": 3,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- },
- {
- "name": "KeySetReadAllIndices",
- "code": 4,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- }
- ],
- "attributes": [
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "client",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ]
- },
- {
- "name": "Group Key Management",
- "code": 63,
- "mfgCode": null,
- "define": "GROUP_KEY_MANAGEMENT_CLUSTER",
- "side": "server",
- "enabled": 1,
- "commands": [
- {
- "name": "KeySetReadResponse",
- "code": 2,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- },
- {
- "name": "KeySetReadAllIndicesResponse",
- "code": 5,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
- "attributes": [
- {
- "name": "GroupKeyMap",
- "code": 0,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "GroupTable",
- "code": 1,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "MaxGroupsPerFabric",
- "code": 2,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "MaxGroupKeysPerFabric",
- "code": 3,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "FeatureMap",
- "code": 65532,
- "mfgCode": null,
- "side": "server",
- "type": "bitmap32",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ]
- },
- {
- "name": "General Diagnostics",
- "code": 51,
- "mfgCode": null,
- "define": "GENERAL_DIAGNOSTICS_CLUSTER",
- "side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": [
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "client",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ]
- },
- {
- "name": "General Diagnostics",
- "code": 51,
- "mfgCode": null,
- "define": "GENERAL_DIAGNOSTICS_CLUSTER",
- "side": "server",
- "enabled": 1,
- "commands": [
- {
- "name": "TestEventTrigger",
- "code": 0,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- }
- ],
- "attributes": [
- {
- "name": "NetworkInterfaces",
- "code": 0,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "RebootCount",
- "code": 1,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0x0000",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "UpTime",
- "code": 2,
- "mfgCode": null,
- "side": "server",
- "type": "int64u",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0x0000000000000000",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "TotalOperationalHours",
- "code": 3,
- "mfgCode": null,
- "side": "server",
- "type": "int32u",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0x00000000",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "BootReasons",
- "code": 4,
- "mfgCode": null,
- "side": "server",
- "type": "enum8",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ActiveHardwareFaults",
- "code": 5,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ActiveRadioFaults",
- "code": 6,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ActiveNetworkFaults",
- "code": 7,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "TestEventTriggersEnabled",
- "code": 8,
- "mfgCode": null,
- "side": "server",
- "type": "boolean",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "false",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "FeatureMap",
- "code": 65532,
- "mfgCode": null,
- "side": "server",
- "type": "bitmap32",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ]
- },
- {
- "name": "AdministratorCommissioning",
- "code": 60,
- "mfgCode": null,
- "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
- "side": "client",
- "enabled": 0,
- "commands": [
- {
- "name": "OpenCommissioningWindow",
- "code": 0,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- },
- {
- "name": "OpenBasicCommissioningWindow",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- },
- {
- "name": "RevokeCommissioning",
- "code": 2,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- }
- ],
- "attributes": []
- },
- {
- "name": "AdministratorCommissioning",
- "code": 60,
- "mfgCode": null,
- "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
- "side": "server",
- "enabled": 1,
- "commands": [],
- "attributes": [
- {
- "name": "WindowStatus",
- "code": 0,
- "mfgCode": null,
- "side": "server",
- "type": "int8u",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "AdminFabricIndex",
- "code": 1,
- "mfgCode": null,
- "side": "server",
- "type": "fabric_idx",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "AdminVendorId",
- "code": 2,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "FeatureMap",
- "code": 65532,
- "mfgCode": null,
- "side": "server",
- "type": "bitmap32",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- }
- ]
- },
- {
"name": "Scenes",
"code": 5,
"mfgCode": null,
@@ -1099,7 +567,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -1234,10 +701,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -1277,7 +743,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1304,7 +769,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ACL",
@@ -1443,7 +907,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1470,7 +933,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -1945,7 +1407,6 @@
"define": "OTA_REQUESTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1972,7 +1433,6 @@
"define": "OTA_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1998,9 +1458,7 @@
"mfgCode": null,
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Localization Configuration",
@@ -2009,7 +1467,6 @@
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ActiveLocale",
@@ -2083,9 +1540,7 @@
"mfgCode": null,
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Time Format Localization",
@@ -2094,7 +1549,6 @@
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "HourFormat",
@@ -2184,9 +1638,7 @@
"mfgCode": null,
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Unit Localization",
@@ -2195,7 +1647,6 @@
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "TemperatureUnit",
@@ -2720,6 +2171,352 @@
]
},
{
+ "name": "General Diagnostics",
+ "code": 51,
+ "mfgCode": null,
+ "define": "GENERAL_DIAGNOSTICS_CLUSTER",
+ "side": "client",
+ "enabled": 0,
+ "attributes": [
+ {
+ "name": "ClusterRevision",
+ "code": 65533,
+ "mfgCode": null,
+ "side": "client",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "1",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ }
+ ]
+ },
+ {
+ "name": "General Diagnostics",
+ "code": 51,
+ "mfgCode": null,
+ "define": "GENERAL_DIAGNOSTICS_CLUSTER",
+ "side": "server",
+ "enabled": 1,
+ "commands": [
+ {
+ "name": "TestEventTrigger",
+ "code": 0,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ }
+ ],
+ "attributes": [
+ {
+ "name": "NetworkInterfaces",
+ "code": 0,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ },
+ {
+ "name": "RebootCount",
+ "code": 1,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0x0000",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ },
+ {
+ "name": "UpTime",
+ "code": 2,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int64u",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0x0000000000000000",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "TotalOperationalHours",
+ "code": 3,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int32u",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0x00000000",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "BootReasons",
+ "code": 4,
+ "mfgCode": null,
+ "side": "server",
+ "type": "enum8",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "ActiveHardwareFaults",
+ "code": 5,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "ActiveRadioFaults",
+ "code": 6,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "ActiveNetworkFaults",
+ "code": 7,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "TestEventTriggersEnabled",
+ "code": 8,
+ "mfgCode": null,
+ "side": "server",
+ "type": "boolean",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "false",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "FeatureMap",
+ "code": 65532,
+ "mfgCode": null,
+ "side": "server",
+ "type": "bitmap32",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "ClusterRevision",
+ "code": 65533,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "1",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ }
+ ]
+ },
+ {
+ "name": "AdministratorCommissioning",
+ "code": 60,
+ "mfgCode": null,
+ "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
+ "side": "client",
+ "enabled": 0,
+ "commands": [
+ {
+ "name": "OpenCommissioningWindow",
+ "code": 0,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ },
+ {
+ "name": "OpenBasicCommissioningWindow",
+ "code": 1,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ },
+ {
+ "name": "RevokeCommissioning",
+ "code": 2,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ }
+ ]
+ },
+ {
+ "name": "AdministratorCommissioning",
+ "code": 60,
+ "mfgCode": null,
+ "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
+ "side": "server",
+ "enabled": 1,
+ "attributes": [
+ {
+ "name": "WindowStatus",
+ "code": 0,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int8u",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AdminFabricIndex",
+ "code": 1,
+ "mfgCode": null,
+ "side": "server",
+ "type": "fabric_idx",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "AdminVendorId",
+ "code": 2,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "FeatureMap",
+ "code": 65532,
+ "mfgCode": null,
+ "side": "server",
+ "type": "bitmap32",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "ClusterRevision",
+ "code": 65533,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "1",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ }
+ ]
+ },
+ {
"name": "Operational Credentials",
"code": 62,
"mfgCode": null,
@@ -2938,7 +2735,191 @@
"code": 5,
"mfgCode": null,
"side": "server",
- "type": "fabric_idx",
+ "type": "int8u",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "FeatureMap",
+ "code": 65532,
+ "mfgCode": null,
+ "side": "server",
+ "type": "bitmap32",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "0",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "ClusterRevision",
+ "code": 65533,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "1",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ }
+ ]
+ },
+ {
+ "name": "Group Key Management",
+ "code": 63,
+ "mfgCode": null,
+ "define": "GROUP_KEY_MANAGEMENT_CLUSTER",
+ "side": "client",
+ "enabled": 0,
+ "commands": [
+ {
+ "name": "KeySetWrite",
+ "code": 0,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ },
+ {
+ "name": "KeySetRead",
+ "code": 1,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ },
+ {
+ "name": "KeySetRemove",
+ "code": 3,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ },
+ {
+ "name": "KeySetReadAllIndices",
+ "code": 4,
+ "mfgCode": null,
+ "source": "client",
+ "incoming": 1,
+ "outgoing": 0
+ }
+ ],
+ "attributes": [
+ {
+ "name": "ClusterRevision",
+ "code": 65533,
+ "mfgCode": null,
+ "side": "client",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "RAM",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "1",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ }
+ ]
+ },
+ {
+ "name": "Group Key Management",
+ "code": 63,
+ "mfgCode": null,
+ "define": "GROUP_KEY_MANAGEMENT_CLUSTER",
+ "side": "server",
+ "enabled": 1,
+ "commands": [
+ {
+ "name": "KeySetReadResponse",
+ "code": 2,
+ "mfgCode": null,
+ "source": "server",
+ "incoming": 0,
+ "outgoing": 1
+ },
+ {
+ "name": "KeySetReadAllIndicesResponse",
+ "code": 5,
+ "mfgCode": null,
+ "source": "server",
+ "incoming": 0,
+ "outgoing": 1
+ }
+ ],
+ "attributes": [
+ {
+ "name": "GroupKeyMap",
+ "code": 0,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ },
+ {
+ "name": "GroupTable",
+ "code": 1,
+ "mfgCode": null,
+ "side": "server",
+ "type": "array",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 0,
+ "maxInterval": 65344,
+ "reportableChange": 0
+ },
+ {
+ "name": "MaxGroupsPerFabric",
+ "code": 2,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int16u",
+ "included": 1,
+ "storageOption": "External",
+ "singleton": 0,
+ "bounded": 0,
+ "defaultValue": "",
+ "reportable": 1,
+ "minInterval": 1,
+ "maxInterval": 65534,
+ "reportableChange": 0
+ },
+ {
+ "name": "MaxGroupKeysPerFabric",
+ "code": 3,
+ "mfgCode": null,
+ "side": "server",
+ "type": "int16u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -2989,9 +2970,7 @@
"mfgCode": null,
"define": "FIXED_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Fixed Label",
@@ -3000,7 +2979,6 @@
"define": "FIXED_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -3058,9 +3036,7 @@
"mfgCode": null,
"define": "USER_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "User Label",
@@ -3069,7 +3045,6 @@
"define": "USER_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -3252,7 +3227,6 @@
"define": "DOOR_LOCK_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "LockState",
@@ -3611,7 +3585,6 @@
"define": "BARRIER_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "barrier moving state",
@@ -3842,7 +3815,6 @@
"define": "COLOR_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "CurrentHue",
@@ -4669,7 +4641,6 @@
"define": "TEMP_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -4696,7 +4667,6 @@
"define": "TEMP_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "MeasuredValue",
@@ -4763,166 +4733,6 @@
"reportableChange": 0
}
]
- },
- {
- "name": "IAS Zone",
- "code": 1280,
- "mfgCode": null,
- "define": "IAS_ZONE_CLUSTER",
- "side": "client",
- "enabled": 0,
- "commands": [
- {
- "name": "ZoneEnrollResponse",
- "code": 0,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- }
- ],
- "attributes": [
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "client",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "2",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ]
- },
- {
- "name": "IAS Zone",
- "code": 1280,
- "mfgCode": null,
- "define": "IAS_ZONE_CLUSTER",
- "side": "server",
- "enabled": 0,
- "commands": [
- {
- "name": "ZoneStatusChangeNotification",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- },
- {
- "name": "ZoneEnrollRequest",
- "code": 1,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
- "attributes": [
- {
- "name": "zone state",
- "code": 0,
- "mfgCode": null,
- "side": "server",
- "type": "enum8",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0x00",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "zone type",
- "code": 1,
- "mfgCode": null,
- "side": "server",
- "type": "enum16",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "zone status",
- "code": 2,
- "mfgCode": null,
- "side": "server",
- "type": "bitmap16",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0x0000",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "IAS CIE address",
- "code": 16,
- "mfgCode": null,
- "side": "server",
- "type": "node_id",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "Zone ID",
- "code": 17,
- "mfgCode": null,
- "side": "server",
- "type": "int8u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0xff",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "2",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ]
}
]
}
@@ -4938,4 +4748,4 @@
"deviceIdentifier": 22
}
]
-}
+}
\ No newline at end of file
diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap
index 18fdc9c..36c4c75 100644
--- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap
+++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 76,
+ "featureLevel": 77,
"creator": "zap",
"keyValuePairs": [
{
@@ -703,7 +703,7 @@
"enabled": 0,
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -2985,7 +2985,7 @@
"code": 5,
"mfgCode": null,
"side": "server",
- "type": "fabric_idx",
+ "type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -5113,7 +5113,7 @@
"side": "server",
"type": "array",
"included": 0,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -5129,7 +5129,7 @@
"side": "server",
"type": "array",
"included": 0,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -5145,7 +5145,7 @@
"side": "server",
"type": "array",
"included": 0,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -5546,6 +5546,5 @@
"endpointVersion": 1,
"deviceIdentifier": 61442
}
- ],
- "log": []
+ ]
}
\ No newline at end of file
diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
index 62a7d08..44aaab1 100644
--- a/examples/placeholder/linux/apps/app1/config.matter
+++ b/examples/placeholder/linux/apps/app1/config.matter
@@ -425,7 +425,7 @@
readonly attribute int16u clusterRevision = 65533;
}
-server cluster BridgedActions = 37 {
+server cluster Actions = 37 {
enum ActionErrorEnum : ENUM8 {
kUnknown = 0;
kInterrupted = 1;
@@ -474,8 +474,8 @@
char_string<32> name = 1;
ActionTypeEnum type = 2;
int16u endpointListID = 3;
- int16u supportedCommands = 4;
- ActionStateEnum status = 5;
+ CommandBits supportedCommands = 4;
+ ActionStateEnum state = 5;
}
struct EndpointListStruct {
@@ -499,8 +499,8 @@
}
readonly attribute ActionStruct actionList[] = 0;
- readonly attribute EndpointListStruct endpointList[] = 1;
- readonly attribute long_char_string<512> setupUrl = 2;
+ readonly attribute EndpointListStruct endpointLists[] = 1;
+ readonly attribute long_char_string<512> setupURL = 2;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
}
@@ -2630,10 +2630,10 @@
callback attribute clusterRevision default = 1;
}
- server cluster BridgedActions {
+ server cluster Actions {
callback attribute actionList;
- callback attribute endpointList;
- callback attribute setupUrl;
+ callback attribute endpointLists;
+ callback attribute setupURL;
ram attribute featureMap;
callback attribute clusterRevision default = 1;
}
diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap
index 6dbef1d..c4791e2 100644
--- a/examples/placeholder/linux/apps/app1/config.zap
+++ b/examples/placeholder/linux/apps/app1/config.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 72,
+ "featureLevel": 77,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,14 +19,16 @@
{
"pathRelativity": "relativeToZap",
"path": "../../../../../src/app/zap-templates/zcl/zcl.json",
- "version": "ZCL Test Data",
- "type": "zcl-properties"
+ "type": "zcl-properties",
+ "category": "matter",
+ "version": 1,
+ "description": "Matter SDK ZCL data"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../../../src/app/zap-templates/app-templates.json",
- "version": "chip-v1",
- "type": "gen-templates-json"
+ "type": "gen-templates-json",
+ "version": "chip-v1"
}
],
"endpointTypes": [
@@ -119,7 +121,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -242,7 +243,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -269,7 +269,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -370,13 +369,12 @@
]
},
{
- "name": "Bridged Actions",
+ "name": "Actions",
"code": 37,
"mfgCode": null,
- "define": "BRIDGED_ACTIONS_CLUSTER",
+ "define": "ACTIONS_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -397,16 +395,15 @@
]
},
{
- "name": "Bridged Actions",
+ "name": "Actions",
"code": 37,
"mfgCode": null,
- "define": "BRIDGED_ACTIONS_CLUSTER",
+ "define": "ACTIONS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
- "name": "action list",
+ "name": "ActionList",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -422,7 +419,7 @@
"reportableChange": 0
},
{
- "name": "endpoint list",
+ "name": "EndpointLists",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -438,7 +435,7 @@
"reportableChange": 0
},
{
- "name": "setup url",
+ "name": "SetupURL",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -542,7 +539,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -569,7 +565,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -931,9 +926,7 @@
"mfgCode": null,
"define": "POWER_SOURCE_CONFIGURATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Power Source Configuration",
@@ -942,7 +935,6 @@
"define": "POWER_SOURCE_CONFIGURATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "Sources",
@@ -1001,7 +993,6 @@
"define": "POWER_SOURCE_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1028,7 +1019,6 @@
"define": "POWER_SOURCE_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "Status",
@@ -2103,7 +2093,6 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -2362,7 +2351,6 @@
"define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ThreadMetrics",
@@ -2505,7 +2493,6 @@
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "bssid",
@@ -2792,7 +2779,6 @@
"define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "PHYRate",
@@ -2979,7 +2965,6 @@
"define": "SWITCH_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -3022,7 +3007,6 @@
"define": "SWITCH_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "number of positions",
@@ -3213,7 +3197,6 @@
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "WindowStatus",
@@ -3500,7 +3483,7 @@
"code": 5,
"mfgCode": null,
"side": "server",
- "type": "fabric_idx",
+ "type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -3552,7 +3535,6 @@
"define": "BOOLEAN_STATE_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -3579,7 +3561,6 @@
"define": "BOOLEAN_STATE_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "StateValue",
@@ -3690,7 +3671,6 @@
"define": "MODE_SELECT_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "Description",
@@ -3945,7 +3925,6 @@
"define": "WINDOW_COVERING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "Type",
@@ -4276,7 +4255,6 @@
"define": "PUMP_CONFIG_CONTROL_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -4303,7 +4281,6 @@
"define": "PUMP_CONFIG_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "MaxPressure",
@@ -5130,7 +5107,6 @@
"define": "THERMOSTAT_UI_CONFIG_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -5173,7 +5149,6 @@
"define": "THERMOSTAT_UI_CONFIG_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "temperature display mode",
@@ -5312,7 +5287,6 @@
"define": "ILLUMINANCE_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -5339,7 +5313,6 @@
"define": "ILLUMINANCE_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "MeasuredValue",
@@ -5462,7 +5435,6 @@
"define": "TEMP_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -5489,7 +5461,6 @@
"define": "TEMP_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "MeasuredValue",
@@ -5596,7 +5567,6 @@
"define": "PRESSURE_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -5623,7 +5593,6 @@
"define": "PRESSURE_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "MeasuredValue",
@@ -5810,7 +5779,6 @@
"define": "FLOW_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -5837,7 +5805,6 @@
"define": "FLOW_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "MeasuredValue",
@@ -5944,7 +5911,6 @@
"define": "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -5987,7 +5953,6 @@
"define": "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "measured value",
@@ -6622,7 +6587,6 @@
"define": "APPLICATION_BASIC_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -6649,7 +6613,6 @@
"define": "APPLICATION_BASIC_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "VendorName",
@@ -6672,7 +6635,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "int16u",
+ "type": "vendor_id",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -6912,7 +6875,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "identify time",
@@ -7463,7 +7425,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -7614,10 +7575,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -7673,7 +7633,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -7700,7 +7659,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -8115,7 +8073,6 @@
"define": "COLOR_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "CurrentHue",
diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
index 62a7d08..44aaab1 100644
--- a/examples/placeholder/linux/apps/app2/config.matter
+++ b/examples/placeholder/linux/apps/app2/config.matter
@@ -425,7 +425,7 @@
readonly attribute int16u clusterRevision = 65533;
}
-server cluster BridgedActions = 37 {
+server cluster Actions = 37 {
enum ActionErrorEnum : ENUM8 {
kUnknown = 0;
kInterrupted = 1;
@@ -474,8 +474,8 @@
char_string<32> name = 1;
ActionTypeEnum type = 2;
int16u endpointListID = 3;
- int16u supportedCommands = 4;
- ActionStateEnum status = 5;
+ CommandBits supportedCommands = 4;
+ ActionStateEnum state = 5;
}
struct EndpointListStruct {
@@ -499,8 +499,8 @@
}
readonly attribute ActionStruct actionList[] = 0;
- readonly attribute EndpointListStruct endpointList[] = 1;
- readonly attribute long_char_string<512> setupUrl = 2;
+ readonly attribute EndpointListStruct endpointLists[] = 1;
+ readonly attribute long_char_string<512> setupURL = 2;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
}
@@ -2630,10 +2630,10 @@
callback attribute clusterRevision default = 1;
}
- server cluster BridgedActions {
+ server cluster Actions {
callback attribute actionList;
- callback attribute endpointList;
- callback attribute setupUrl;
+ callback attribute endpointLists;
+ callback attribute setupURL;
ram attribute featureMap;
callback attribute clusterRevision default = 1;
}
diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap
index 6dbef1d..c4791e2 100644
--- a/examples/placeholder/linux/apps/app2/config.zap
+++ b/examples/placeholder/linux/apps/app2/config.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 72,
+ "featureLevel": 77,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,14 +19,16 @@
{
"pathRelativity": "relativeToZap",
"path": "../../../../../src/app/zap-templates/zcl/zcl.json",
- "version": "ZCL Test Data",
- "type": "zcl-properties"
+ "type": "zcl-properties",
+ "category": "matter",
+ "version": 1,
+ "description": "Matter SDK ZCL data"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../../../src/app/zap-templates/app-templates.json",
- "version": "chip-v1",
- "type": "gen-templates-json"
+ "type": "gen-templates-json",
+ "version": "chip-v1"
}
],
"endpointTypes": [
@@ -119,7 +121,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -242,7 +243,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -269,7 +269,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -370,13 +369,12 @@
]
},
{
- "name": "Bridged Actions",
+ "name": "Actions",
"code": 37,
"mfgCode": null,
- "define": "BRIDGED_ACTIONS_CLUSTER",
+ "define": "ACTIONS_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -397,16 +395,15 @@
]
},
{
- "name": "Bridged Actions",
+ "name": "Actions",
"code": 37,
"mfgCode": null,
- "define": "BRIDGED_ACTIONS_CLUSTER",
+ "define": "ACTIONS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
- "name": "action list",
+ "name": "ActionList",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -422,7 +419,7 @@
"reportableChange": 0
},
{
- "name": "endpoint list",
+ "name": "EndpointLists",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -438,7 +435,7 @@
"reportableChange": 0
},
{
- "name": "setup url",
+ "name": "SetupURL",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -542,7 +539,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -569,7 +565,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -931,9 +926,7 @@
"mfgCode": null,
"define": "POWER_SOURCE_CONFIGURATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Power Source Configuration",
@@ -942,7 +935,6 @@
"define": "POWER_SOURCE_CONFIGURATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "Sources",
@@ -1001,7 +993,6 @@
"define": "POWER_SOURCE_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1028,7 +1019,6 @@
"define": "POWER_SOURCE_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "Status",
@@ -2103,7 +2093,6 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -2362,7 +2351,6 @@
"define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ThreadMetrics",
@@ -2505,7 +2493,6 @@
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "bssid",
@@ -2792,7 +2779,6 @@
"define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "PHYRate",
@@ -2979,7 +2965,6 @@
"define": "SWITCH_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -3022,7 +3007,6 @@
"define": "SWITCH_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "number of positions",
@@ -3213,7 +3197,6 @@
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "WindowStatus",
@@ -3500,7 +3483,7 @@
"code": 5,
"mfgCode": null,
"side": "server",
- "type": "fabric_idx",
+ "type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -3552,7 +3535,6 @@
"define": "BOOLEAN_STATE_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -3579,7 +3561,6 @@
"define": "BOOLEAN_STATE_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "StateValue",
@@ -3690,7 +3671,6 @@
"define": "MODE_SELECT_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "Description",
@@ -3945,7 +3925,6 @@
"define": "WINDOW_COVERING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "Type",
@@ -4276,7 +4255,6 @@
"define": "PUMP_CONFIG_CONTROL_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -4303,7 +4281,6 @@
"define": "PUMP_CONFIG_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "MaxPressure",
@@ -5130,7 +5107,6 @@
"define": "THERMOSTAT_UI_CONFIG_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -5173,7 +5149,6 @@
"define": "THERMOSTAT_UI_CONFIG_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "temperature display mode",
@@ -5312,7 +5287,6 @@
"define": "ILLUMINANCE_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -5339,7 +5313,6 @@
"define": "ILLUMINANCE_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "MeasuredValue",
@@ -5462,7 +5435,6 @@
"define": "TEMP_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -5489,7 +5461,6 @@
"define": "TEMP_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "MeasuredValue",
@@ -5596,7 +5567,6 @@
"define": "PRESSURE_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -5623,7 +5593,6 @@
"define": "PRESSURE_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "MeasuredValue",
@@ -5810,7 +5779,6 @@
"define": "FLOW_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -5837,7 +5805,6 @@
"define": "FLOW_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "MeasuredValue",
@@ -5944,7 +5911,6 @@
"define": "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -5987,7 +5953,6 @@
"define": "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "measured value",
@@ -6622,7 +6587,6 @@
"define": "APPLICATION_BASIC_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -6649,7 +6613,6 @@
"define": "APPLICATION_BASIC_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "VendorName",
@@ -6672,7 +6635,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "int16u",
+ "type": "vendor_id",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -6912,7 +6875,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "identify time",
@@ -7463,7 +7425,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -7614,10 +7575,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -7673,7 +7633,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -7700,7 +7659,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -8115,7 +8073,6 @@
"define": "COLOR_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "CurrentHue",
diff --git a/examples/placeholder/linux/src/bridged-actions-stub.cpp b/examples/placeholder/linux/src/bridged-actions-stub.cpp
index af3b476..ff5a7a7 100644
--- a/examples/placeholder/linux/src/bridged-actions-stub.cpp
+++ b/examples/placeholder/linux/src/bridged-actions-stub.cpp
@@ -27,15 +27,15 @@
using namespace chip;
using namespace chip::app;
using namespace chip::app::Clusters;
-using namespace chip::app::Clusters::BridgedActions::Attributes;
+using namespace chip::app::Clusters::Actions::Attributes;
namespace {
-class BridgedActionsAttrAccess : public AttributeAccessInterface
+class ActionsAttrAccess : public AttributeAccessInterface
{
public:
- // Register for the Bridged Actions cluster on all endpoints.
- BridgedActionsAttrAccess() : AttributeAccessInterface(Optional<EndpointId>::Missing(), BridgedActions::Id) {}
+ // Register for the Actions cluster on all endpoints.
+ ActionsAttrAccess() : AttributeAccessInterface(Optional<EndpointId>::Missing(), Actions::Id) {}
CHIP_ERROR Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder) override;
@@ -48,44 +48,44 @@
CHIP_ERROR ReadClusterRevision(EndpointId endpoint, AttributeValueEncoder & aEncoder);
};
-constexpr uint16_t BridgedActionsAttrAccess::ClusterRevision;
+constexpr uint16_t ActionsAttrAccess::ClusterRevision;
-CHIP_ERROR BridgedActionsAttrAccess::ReadActionListAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder)
+CHIP_ERROR ActionsAttrAccess::ReadActionListAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder)
{
// Just return an empty list
return aEncoder.EncodeEmptyList();
}
-CHIP_ERROR BridgedActionsAttrAccess::ReadEndpointListAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder)
+CHIP_ERROR ActionsAttrAccess::ReadEndpointListAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder)
{
// Just return an empty list
return aEncoder.EncodeEmptyList();
}
-CHIP_ERROR BridgedActionsAttrAccess::ReadSetupUrlAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder)
+CHIP_ERROR ActionsAttrAccess::ReadSetupUrlAttribute(EndpointId endpoint, AttributeValueEncoder & aEncoder)
{
const char SetupUrl[] = "https://example.com";
return aEncoder.Encode(chip::Span<const char>(SetupUrl, strlen(SetupUrl)));
}
-CHIP_ERROR BridgedActionsAttrAccess::ReadClusterRevision(EndpointId endpoint, AttributeValueEncoder & aEncoder)
+CHIP_ERROR ActionsAttrAccess::ReadClusterRevision(EndpointId endpoint, AttributeValueEncoder & aEncoder)
{
return aEncoder.Encode(ClusterRevision);
}
-BridgedActionsAttrAccess gAttrAccess;
+ActionsAttrAccess gAttrAccess;
-CHIP_ERROR BridgedActionsAttrAccess::Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder)
+CHIP_ERROR ActionsAttrAccess::Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder)
{
- VerifyOrDie(aPath.mClusterId == BridgedActions::Id);
+ VerifyOrDie(aPath.mClusterId == Actions::Id);
switch (aPath.mAttributeId)
{
case ActionList::Id:
return ReadActionListAttribute(aPath.mEndpointId, aEncoder);
- case EndpointList::Id:
+ case EndpointLists::Id:
return ReadEndpointListAttribute(aPath.mEndpointId, aEncoder);
- case SetupUrl::Id:
+ case SetupURL::Id:
return ReadSetupUrlAttribute(aPath.mEndpointId, aEncoder);
case ClusterRevision::Id:
return ReadClusterRevision(aPath.mEndpointId, aEncoder);
@@ -96,7 +96,7 @@
}
} // anonymous namespace
-void MatterBridgedActionsPluginServerInitCallback(void)
+void MatterActionsPluginServerInitCallback(void)
{
registerAttributeAccessOverride(&gAttrAccess);
}
diff --git a/examples/pump-app/pump-common/pump-app.zap b/examples/pump-app/pump-common/pump-app.zap
index 418e7b4..c6370d5 100644
--- a/examples/pump-app/pump-common/pump-app.zap
+++ b/examples/pump-app/pump-common/pump-app.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 71,
+ "featureLevel": 77,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,14 +19,16 @@
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/zcl/zcl.json",
- "version": "ZCL Test Data",
- "type": "zcl-properties"
+ "type": "zcl-properties",
+ "category": "matter",
+ "version": 1,
+ "description": "Matter SDK ZCL data"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
- "version": "chip-v1",
- "type": "gen-templates-json"
+ "type": "gen-templates-json",
+ "version": "chip-v1"
}
],
"endpointTypes": [
@@ -60,8 +62,7 @@
"incoming": 1,
"outgoing": 0
}
- ],
- "attributes": []
+ ]
},
{
"name": "Identify",
@@ -70,7 +71,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "identify time",
@@ -242,8 +242,7 @@
"incoming": 1,
"outgoing": 0
}
- ],
- "attributes": []
+ ]
},
{
"name": "Groups",
@@ -473,8 +472,7 @@
"incoming": 0,
"outgoing": 0
}
- ],
- "attributes": []
+ ]
},
{
"name": "Scenes",
@@ -743,7 +741,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -786,7 +783,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -941,7 +937,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -984,7 +979,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ACL",
@@ -1207,7 +1201,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -1703,8 +1696,7 @@
"incoming": 1,
"outgoing": 0
}
- ],
- "attributes": []
+ ]
},
{
"name": "OTA Software Update Requestor",
@@ -1722,8 +1714,7 @@
"incoming": 1,
"outgoing": 0
}
- ],
- "attributes": []
+ ]
},
{
"name": "OTA Software Update Requestor",
@@ -1732,7 +1723,6 @@
"define": "OTA_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DefaultOtaProviders",
@@ -1886,9 +1876,7 @@
"mfgCode": null,
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Localization Configuration",
@@ -1897,7 +1885,6 @@
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ActiveLocale",
@@ -2019,9 +2006,7 @@
"mfgCode": null,
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Time Format Localization",
@@ -2030,7 +2015,6 @@
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "HourFormat",
@@ -2168,9 +2152,7 @@
"mfgCode": null,
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Unit Localization",
@@ -2179,7 +2161,6 @@
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "TemperatureUnit",
@@ -2885,9 +2866,7 @@
"mfgCode": null,
"define": "DIAGNOSTIC_LOGS_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Diagnostic Logs",
@@ -3004,7 +2983,6 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -3327,7 +3305,6 @@
"define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ThreadMetrics",
@@ -3518,7 +3495,6 @@
"define": "THREAD_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "channel",
@@ -4685,7 +4661,6 @@
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "WindowStatus",
@@ -5052,7 +5027,7 @@
"code": 5,
"mfgCode": null,
"side": "server",
- "type": "fabric_idx",
+ "type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -5399,9 +5374,7 @@
"mfgCode": null,
"define": "FIXED_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Fixed Label",
@@ -5410,7 +5383,6 @@
"define": "FIXED_LABEL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5516,9 +5488,7 @@
"mfgCode": null,
"define": "USER_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "User Label",
@@ -5527,7 +5497,6 @@
"define": "USER_LABEL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5651,8 +5620,7 @@
"incoming": 1,
"outgoing": 0
}
- ],
- "attributes": []
+ ]
},
{
"name": "Identify",
@@ -5661,7 +5629,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "identify time",
@@ -5860,7 +5827,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -6123,10 +6089,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -6142,7 +6107,7 @@
"reportableChange": 0
},
{
- "name": "remaining time",
+ "name": "RemainingTime",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -6158,7 +6123,7 @@
"reportableChange": 0
},
{
- "name": "min level",
+ "name": "MinLevel",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -6174,7 +6139,7 @@
"reportableChange": 0
},
{
- "name": "max level",
+ "name": "MaxLevel",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -6190,7 +6155,7 @@
"reportableChange": 0
},
{
- "name": "current frequency",
+ "name": "CurrentFrequency",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -6206,7 +6171,7 @@
"reportableChange": 0
},
{
- "name": "min frequency",
+ "name": "MinFrequency",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -6222,7 +6187,7 @@
"reportableChange": 0
},
{
- "name": "max frequency",
+ "name": "MaxFrequency",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -6238,7 +6203,7 @@
"reportableChange": 0
},
{
- "name": "options",
+ "name": "Options",
"code": 15,
"mfgCode": null,
"side": "server",
@@ -6254,7 +6219,7 @@
"reportableChange": 0
},
{
- "name": "on off transition time",
+ "name": "OnOffTransitionTime",
"code": 16,
"mfgCode": null,
"side": "server",
@@ -6270,7 +6235,7 @@
"reportableChange": 0
},
{
- "name": "on level",
+ "name": "OnLevel",
"code": 17,
"mfgCode": null,
"side": "server",
@@ -6286,7 +6251,7 @@
"reportableChange": 0
},
{
- "name": "on transition time",
+ "name": "OnTransitionTime",
"code": 18,
"mfgCode": null,
"side": "server",
@@ -6302,7 +6267,7 @@
"reportableChange": 0
},
{
- "name": "off transition time",
+ "name": "OffTransitionTime",
"code": 19,
"mfgCode": null,
"side": "server",
@@ -6318,7 +6283,7 @@
"reportableChange": 0
},
{
- "name": "default move rate",
+ "name": "DefaultMoveRate",
"code": 20,
"mfgCode": null,
"side": "server",
@@ -6334,7 +6299,7 @@
"reportableChange": 0
},
{
- "name": "start up current level",
+ "name": "StartUpCurrentLevel",
"code": 16384,
"mfgCode": null,
"side": "server",
@@ -6438,7 +6403,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -6465,7 +6429,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -6619,9 +6582,7 @@
"mfgCode": null,
"define": "BINDING_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Binding",
@@ -6630,7 +6591,6 @@
"define": "BINDING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "Binding",
@@ -6737,7 +6697,6 @@
"define": "PUMP_CONFIG_CONTROL_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -6764,7 +6723,6 @@
"define": "PUMP_CONFIG_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "MaxPressure",
@@ -7223,7 +7181,6 @@
"define": "TEMP_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -7266,7 +7223,6 @@
"define": "TEMP_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "MeasuredValue",
@@ -7421,7 +7377,6 @@
"define": "PRESSURE_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -7464,7 +7419,6 @@
"define": "PRESSURE_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "MeasuredValue",
@@ -7699,7 +7653,6 @@
"define": "FLOW_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -7742,7 +7695,6 @@
"define": "FLOW_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "MeasuredValue",
@@ -7897,7 +7849,6 @@
"define": "OCCUPANCY_SENSING_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -7939,9 +7890,7 @@
"mfgCode": null,
"define": "OCCUPANCY_SENSING_CLUSTER",
"side": "server",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
}
]
}
diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap
index ba54ac0..65416ac 100644
--- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap
+++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 71,
+ "featureLevel": 77,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,14 +19,16 @@
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/zcl/zcl.json",
- "version": "ZCL Test Data",
- "type": "zcl-properties"
+ "type": "zcl-properties",
+ "category": "matter",
+ "version": 1,
+ "description": "Matter SDK ZCL data"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
- "version": "chip-v1",
- "type": "gen-templates-json"
+ "type": "gen-templates-json",
+ "version": "chip-v1"
}
],
"endpointTypes": [
@@ -87,7 +89,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "identify time",
@@ -698,7 +699,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -741,7 +741,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -896,7 +895,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -939,7 +937,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ACL",
@@ -1110,7 +1107,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -1153,7 +1149,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -1649,8 +1644,7 @@
"incoming": 1,
"outgoing": 0
}
- ],
- "attributes": []
+ ]
},
{
"name": "OTA Software Update Requestor",
@@ -1668,8 +1662,7 @@
"incoming": 1,
"outgoing": 0
}
- ],
- "attributes": []
+ ]
},
{
"name": "OTA Software Update Requestor",
@@ -1678,7 +1671,6 @@
"define": "OTA_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DefaultOtaProviders",
@@ -1832,9 +1824,7 @@
"mfgCode": null,
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Localization Configuration",
@@ -1843,7 +1833,6 @@
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ActiveLocale",
@@ -1965,9 +1954,7 @@
"mfgCode": null,
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Time Format Localization",
@@ -1976,7 +1963,6 @@
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "HourFormat",
@@ -2114,9 +2100,7 @@
"mfgCode": null,
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Unit Localization",
@@ -2125,7 +2109,6 @@
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "TemperatureUnit",
@@ -2831,9 +2814,7 @@
"mfgCode": null,
"define": "DIAGNOSTIC_LOGS_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Diagnostic Logs",
@@ -2950,7 +2931,6 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -3273,7 +3253,6 @@
"define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ThreadMetrics",
@@ -3464,7 +3443,6 @@
"define": "THREAD_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "channel",
@@ -4631,7 +4609,6 @@
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "WindowStatus",
@@ -4998,7 +4975,7 @@
"code": 5,
"mfgCode": null,
"side": "server",
- "type": "fabric_idx",
+ "type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -5345,9 +5322,7 @@
"mfgCode": null,
"define": "FIXED_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Fixed Label",
@@ -5356,7 +5331,6 @@
"define": "FIXED_LABEL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5462,9 +5436,7 @@
"mfgCode": null,
"define": "USER_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "User Label",
@@ -5473,7 +5445,6 @@
"define": "USER_LABEL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5597,8 +5568,7 @@
"incoming": 1,
"outgoing": 0
}
- ],
- "attributes": []
+ ]
},
{
"name": "Identify",
@@ -5607,7 +5577,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "identify time",
@@ -5648,7 +5617,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -5664,7 +5633,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -5680,7 +5649,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -5798,7 +5767,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -5841,7 +5809,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -5868,7 +5835,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -6022,9 +5988,7 @@
"mfgCode": null,
"define": "BINDING_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Binding",
@@ -6033,7 +5997,6 @@
"define": "BINDING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "Binding",
@@ -6042,7 +6005,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6058,7 +6021,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6074,7 +6037,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6090,7 +6053,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6140,7 +6103,6 @@
"define": "PUMP_CONFIG_CONTROL_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -6183,7 +6145,6 @@
"define": "PUMP_CONFIG_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "MaxPressure",
@@ -6338,7 +6299,6 @@
"define": "TEMP_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -6381,7 +6341,6 @@
"define": "TEMP_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "MeasuredValue",
@@ -6472,7 +6431,6 @@
"define": "PRESSURE_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -6515,7 +6473,6 @@
"define": "PRESSURE_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "MeasuredValue",
@@ -6638,7 +6595,6 @@
"define": "FLOW_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -6681,7 +6637,6 @@
"define": "FLOW_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "MeasuredValue",
@@ -6787,6 +6742,5 @@
"endpointVersion": 1,
"deviceIdentifier": 772
}
- ],
- "log": []
+ ]
}
\ No newline at end of file
diff --git a/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap b/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap
index eb56cfb..56e02d9 100644
--- a/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap
+++ b/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 71,
+ "featureLevel": 77,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,14 +19,16 @@
{
"pathRelativity": "relativeToZap",
"path": "../../../../src/app/zap-templates/zcl/zcl.json",
- "version": "ZCL Test Data",
- "type": "zcl-properties"
+ "type": "zcl-properties",
+ "category": "matter",
+ "version": 1,
+ "description": "Matter SDK ZCL data"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../../src/app/zap-templates/app-templates.json",
- "version": "chip-v1",
- "type": "gen-templates-json"
+ "type": "gen-templates-json",
+ "version": "chip-v1"
}
],
"endpointTypes": [
@@ -37,92 +39,6 @@
"deviceTypeProfileId": 259,
"clusters": [
{
- "name": "Power Configuration",
- "code": 1,
- "mfgCode": null,
- "define": "POWER_CONFIG_CLUSTER",
- "side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": [
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "client",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "2",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ]
- },
- {
- "name": "Power Configuration",
- "code": 1,
- "mfgCode": null,
- "define": "POWER_CONFIG_CLUSTER",
- "side": "server",
- "enabled": 0,
- "commands": [],
- "attributes": [
- {
- "name": "battery percentage remaining",
- "code": 33,
- "mfgCode": null,
- "side": "server",
- "type": "int8u",
- "included": 0,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0x00",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "battery alarm state",
- "code": 62,
- "mfgCode": null,
- "side": "server",
- "type": "bitmap32",
- "included": 0,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0x00000000",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "2",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ]
- },
- {
"name": "Identify",
"code": 3,
"mfgCode": null,
@@ -165,7 +81,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "identify time",
@@ -354,93 +269,12 @@
]
},
{
- "name": "Alarms",
- "code": 9,
- "mfgCode": null,
- "define": "ALARM_CLUSTER",
- "side": "client",
- "enabled": 0,
- "commands": [
- {
- "name": "ResetAlarm",
- "code": 0,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- },
- {
- "name": "ResetAllAlarms",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- }
- ],
- "attributes": [
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "client",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ]
- },
- {
- "name": "Alarms",
- "code": 9,
- "mfgCode": null,
- "define": "ALARM_CLUSTER",
- "side": "server",
- "enabled": 0,
- "commands": [
- {
- "name": "Alarm",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
- "attributes": [
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ]
- },
- {
"name": "Descriptor",
"code": 29,
"mfgCode": null,
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -467,7 +301,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -573,9 +406,7 @@
"mfgCode": null,
"define": "ACCESS_CONTROL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Access Control",
@@ -584,7 +415,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ACL",
@@ -723,7 +553,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -750,7 +579,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -1112,9 +940,7 @@
"mfgCode": null,
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Localization Configuration",
@@ -1123,7 +949,6 @@
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ActiveLocale",
@@ -1197,9 +1022,7 @@
"mfgCode": null,
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Time Format Localization",
@@ -1208,7 +1031,6 @@
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "HourFormat",
@@ -1298,9 +1120,7 @@
"mfgCode": null,
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Unit Localization",
@@ -1309,7 +1129,6 @@
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "TemperatureUnit",
@@ -1892,7 +1711,6 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -2151,7 +1969,6 @@
"define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "CurrentHeapHighWatermark",
@@ -2210,7 +2027,6 @@
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -2237,7 +2053,6 @@
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "bssid",
@@ -2524,7 +2339,6 @@
"define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "PHYRate",
@@ -2763,7 +2577,6 @@
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "WindowStatus",
@@ -3066,7 +2879,7 @@
"code": 5,
"mfgCode": null,
"side": "server",
- "type": "fabric_idx",
+ "type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -3301,9 +3114,7 @@
"mfgCode": null,
"define": "FIXED_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Fixed Label",
@@ -3312,7 +3123,6 @@
"define": "FIXED_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -3370,9 +3180,7 @@
"mfgCode": null,
"define": "USER_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "User Label",
@@ -3381,7 +3189,6 @@
"define": "USER_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -3442,162 +3249,6 @@
"deviceTypeProfileId": null,
"clusters": [
{
- "name": "Power Configuration",
- "code": 1,
- "mfgCode": null,
- "define": "POWER_CONFIG_CLUSTER",
- "side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": [
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "client",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": "2",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ]
- },
- {
- "name": "Power Configuration",
- "code": 1,
- "mfgCode": null,
- "define": "POWER_CONFIG_CLUSTER",
- "side": "server",
- "enabled": 0,
- "commands": [],
- "attributes": [
- {
- "name": "battery percentage remaining",
- "code": 33,
- "mfgCode": null,
- "side": "server",
- "type": "int8u",
- "included": 0,
- "storageOption": "RAM",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": "0x00",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "battery alarm state",
- "code": 62,
- "mfgCode": null,
- "side": "server",
- "type": "bitmap32",
- "included": 0,
- "storageOption": "RAM",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": "0x00000000",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 1,
- "bounded": 0,
- "defaultValue": "2",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ]
- },
- {
- "name": "Device Temperature Configuration",
- "code": 2,
- "mfgCode": null,
- "define": "DEVICE_TEMP_CLUSTER",
- "side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": [
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "client",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ]
- },
- {
- "name": "Device Temperature Configuration",
- "code": 2,
- "mfgCode": null,
- "define": "DEVICE_TEMP_CLUSTER",
- "side": "server",
- "enabled": 0,
- "commands": [],
- "attributes": [
- {
- "name": "current temperature",
- "code": 0,
- "mfgCode": null,
- "side": "server",
- "type": "int16s",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- },
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ]
- },
- {
"name": "Identify",
"code": 3,
"mfgCode": null,
@@ -3640,7 +3291,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "identify time",
@@ -3829,93 +3479,12 @@
]
},
{
- "name": "Alarms",
- "code": 9,
- "mfgCode": null,
- "define": "ALARM_CLUSTER",
- "side": "client",
- "enabled": 0,
- "commands": [
- {
- "name": "ResetAlarm",
- "code": 0,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- },
- {
- "name": "ResetAllAlarms",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 0
- }
- ],
- "attributes": [
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "client",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ]
- },
- {
- "name": "Alarms",
- "code": 9,
- "mfgCode": null,
- "define": "ALARM_CLUSTER",
- "side": "server",
- "enabled": 0,
- "commands": [
- {
- "name": "Alarm",
- "code": 0,
- "mfgCode": null,
- "source": "server",
- "incoming": 0,
- "outgoing": 1
- }
- ],
- "attributes": [
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 0,
- "maxInterval": 65344,
- "reportableChange": 0
- }
- ]
- },
- {
"name": "Descriptor",
"code": 29,
"mfgCode": null,
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -3942,7 +3511,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -4049,7 +3617,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -4076,7 +3643,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -4423,7 +3989,6 @@
"define": "TEMP_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -4450,7 +4015,6 @@
"define": "TEMP_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "MeasuredValue",
@@ -4573,4 +4137,4 @@
"deviceIdentifier": 770
}
]
-}
+}
\ No newline at end of file
diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap
index 024b609..3ed706b 100644
--- a/examples/thermostat/thermostat-common/thermostat.zap
+++ b/examples/thermostat/thermostat-common/thermostat.zap
@@ -719,7 +719,7 @@
"enabled": 0,
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -8219,7 +8219,7 @@
"enabled": 0,
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -8235,7 +8235,7 @@
"reportableChange": 0
},
{
- "name": "remaining time",
+ "name": "RemainingTime",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -8251,7 +8251,7 @@
"reportableChange": 0
},
{
- "name": "min level",
+ "name": "MinLevel",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -8267,7 +8267,7 @@
"reportableChange": 0
},
{
- "name": "max level",
+ "name": "MaxLevel",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -8283,7 +8283,7 @@
"reportableChange": 0
},
{
- "name": "current frequency",
+ "name": "CurrentFrequency",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -8299,7 +8299,7 @@
"reportableChange": 0
},
{
- "name": "min frequency",
+ "name": "MinFrequency",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -8315,7 +8315,7 @@
"reportableChange": 0
},
{
- "name": "max frequency",
+ "name": "MaxFrequency",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -8331,7 +8331,7 @@
"reportableChange": 0
},
{
- "name": "options",
+ "name": "Options",
"code": 15,
"mfgCode": null,
"side": "server",
@@ -8347,7 +8347,7 @@
"reportableChange": 0
},
{
- "name": "on off transition time",
+ "name": "OnOffTransitionTime",
"code": 16,
"mfgCode": null,
"side": "server",
@@ -8363,7 +8363,7 @@
"reportableChange": 0
},
{
- "name": "on level",
+ "name": "OnLevel",
"code": 17,
"mfgCode": null,
"side": "server",
@@ -8379,7 +8379,7 @@
"reportableChange": 0
},
{
- "name": "on transition time",
+ "name": "OnTransitionTime",
"code": 18,
"mfgCode": null,
"side": "server",
@@ -8395,7 +8395,7 @@
"reportableChange": 0
},
{
- "name": "off transition time",
+ "name": "OffTransitionTime",
"code": 19,
"mfgCode": null,
"side": "server",
@@ -8411,7 +8411,7 @@
"reportableChange": 0
},
{
- "name": "default move rate",
+ "name": "DefaultMoveRate",
"code": 20,
"mfgCode": null,
"side": "server",
@@ -8427,7 +8427,7 @@
"reportableChange": 0
},
{
- "name": "start up current level",
+ "name": "StartUpCurrentLevel",
"code": 16384,
"mfgCode": null,
"side": "server",
@@ -11311,7 +11311,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -11327,7 +11327,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -11343,7 +11343,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -14354,6 +14354,5 @@
"endpointVersion": 1,
"deviceIdentifier": 769
}
- ],
- "log": []
+ ]
}
\ No newline at end of file
diff --git a/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/Clusters.java b/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/Clusters.java
index 22e1e1f..7d7761a 100644
--- a/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/Clusters.java
+++ b/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/Clusters.java
@@ -36,7 +36,7 @@
public static final int ClusterId_Binding = 0x0000001E;
public static final int ClusterId_AccessControl = 0x0000001F;
public static final int ClusterId_PollControl = 0x00000020;
- public static final int ClusterId_BridgedActions = 0x00000025;
+ public static final int ClusterId_Actions = 0x00000025;
public static final int ClusterId_Basic = 0x00000028;
public static final int ClusterId_OtaSoftwareUpdateProvider = 0x00000029;
public static final int ClusterId_OtaSoftwareUpdateRequestor = 0x0000002A;
diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap
index de91964..08f76bc 100644
--- a/examples/tv-app/tv-common/tv-app.zap
+++ b/examples/tv-app/tv-common/tv-app.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 75,
+ "featureLevel": 77,
"creator": "zap",
"keyValuePairs": [
{
@@ -81,7 +81,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "identify time",
@@ -568,7 +567,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -703,10 +701,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -746,7 +743,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -773,7 +769,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -880,7 +875,6 @@
"define": "BINDING_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -907,7 +901,6 @@
"define": "BINDING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "Binding",
@@ -965,9 +958,7 @@
"mfgCode": null,
"define": "ACCESS_CONTROL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Access Control",
@@ -976,7 +967,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ACL",
@@ -1115,7 +1105,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1142,7 +1131,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -1616,9 +1604,7 @@
"mfgCode": null,
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Localization Configuration",
@@ -1627,7 +1613,6 @@
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ActiveLocale",
@@ -1701,9 +1686,7 @@
"mfgCode": null,
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Time Format Localization",
@@ -1712,7 +1695,6 @@
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "HourFormat",
@@ -1802,9 +1784,7 @@
"mfgCode": null,
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Unit Localization",
@@ -1813,7 +1793,6 @@
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "TemperatureUnit",
@@ -2428,7 +2407,6 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -2687,7 +2665,6 @@
"define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ThreadMetrics",
@@ -2794,7 +2771,6 @@
"define": "THREAD_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "channel",
@@ -3845,7 +3821,6 @@
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -3872,7 +3847,6 @@
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "bssid",
@@ -4159,7 +4133,6 @@
"define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "PHYRate",
@@ -4346,7 +4319,6 @@
"define": "SWITCH_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -4373,7 +4345,6 @@
"define": "SWITCH_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "number of positions",
@@ -4500,7 +4471,6 @@
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "WindowStatus",
@@ -4803,7 +4773,7 @@
"code": 5,
"mfgCode": null,
"side": "server",
- "type": "fabric_idx",
+ "type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -5038,9 +5008,7 @@
"mfgCode": null,
"define": "FIXED_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Fixed Label",
@@ -5049,7 +5017,6 @@
"define": "FIXED_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5107,9 +5074,7 @@
"mfgCode": null,
"define": "USER_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "User Label",
@@ -5118,7 +5083,6 @@
"define": "USER_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5301,7 +5265,6 @@
"define": "DOOR_LOCK_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "LockState",
@@ -5660,7 +5623,6 @@
"define": "BARRIER_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "barrier moving state",
@@ -5891,7 +5853,6 @@
"define": "COLOR_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "CurrentHue",
@@ -6718,7 +6679,6 @@
"define": "TEMP_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -6745,7 +6705,6 @@
"define": "TEMP_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "MeasuredValue",
@@ -6836,7 +6795,6 @@
"define": "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -6863,7 +6821,6 @@
"define": "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "measured value",
@@ -7422,7 +7379,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -7481,7 +7437,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -7508,7 +7463,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -7615,7 +7569,6 @@
"define": "WAKE_ON_LAN_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -7642,7 +7595,6 @@
"define": "WAKE_ON_LAN_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "MACAddress",
@@ -8158,8 +8110,7 @@
"incoming": 1,
"outgoing": 0
}
- ],
- "attributes": []
+ ]
},
{
"name": "Media Playback",
@@ -8440,7 +8391,6 @@
"define": "MEDIA_INPUT_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "InputList",
@@ -8599,7 +8549,6 @@
"define": "LOW_POWER_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -8678,7 +8627,6 @@
"define": "KEYPAD_INPUT_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "GeneratedCommandList",
@@ -8962,8 +8910,7 @@
"incoming": 1,
"outgoing": 0
}
- ],
- "attributes": []
+ ]
},
{
"name": "Audio Output",
@@ -8972,7 +8919,6 @@
"define": "AUDIO_OUTPUT_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "OutputList",
@@ -9763,7 +9709,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -9914,10 +9859,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -9933,7 +9877,7 @@
"reportableChange": 0
},
{
- "name": "remaining time",
+ "name": "RemainingTime",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -9949,7 +9893,7 @@
"reportableChange": 0
},
{
- "name": "min level",
+ "name": "MinLevel",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -9965,7 +9909,7 @@
"reportableChange": 0
},
{
- "name": "max level",
+ "name": "MaxLevel",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -9981,7 +9925,7 @@
"reportableChange": 0
},
{
- "name": "current frequency",
+ "name": "CurrentFrequency",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -9997,7 +9941,7 @@
"reportableChange": 0
},
{
- "name": "min frequency",
+ "name": "MinFrequency",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -10013,7 +9957,7 @@
"reportableChange": 0
},
{
- "name": "max frequency",
+ "name": "MaxFrequency",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -10029,7 +9973,7 @@
"reportableChange": 0
},
{
- "name": "options",
+ "name": "Options",
"code": 15,
"mfgCode": null,
"side": "server",
@@ -10045,7 +9989,7 @@
"reportableChange": 0
},
{
- "name": "on off transition time",
+ "name": "OnOffTransitionTime",
"code": 16,
"mfgCode": null,
"side": "server",
@@ -10061,7 +10005,7 @@
"reportableChange": 0
},
{
- "name": "on level",
+ "name": "OnLevel",
"code": 17,
"mfgCode": null,
"side": "server",
@@ -10077,7 +10021,7 @@
"reportableChange": 0
},
{
- "name": "on transition time",
+ "name": "OnTransitionTime",
"code": 18,
"mfgCode": null,
"side": "server",
@@ -10093,7 +10037,7 @@
"reportableChange": 0
},
{
- "name": "off transition time",
+ "name": "OffTransitionTime",
"code": 19,
"mfgCode": null,
"side": "server",
@@ -10109,7 +10053,7 @@
"reportableChange": 0
},
{
- "name": "default move rate",
+ "name": "DefaultMoveRate",
"code": 20,
"mfgCode": null,
"side": "server",
@@ -10125,7 +10069,7 @@
"reportableChange": 0
},
{
- "name": "start up current level",
+ "name": "StartUpCurrentLevel",
"code": 16384,
"mfgCode": null,
"side": "server",
@@ -10181,7 +10125,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -10208,7 +10151,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -10359,7 +10301,6 @@
"define": "AUDIO_OUTPUT_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "OutputList",
@@ -10490,7 +10431,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -10517,7 +10457,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -10624,7 +10563,6 @@
"define": "BINDING_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -10667,7 +10605,6 @@
"define": "BINDING_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "Binding",
@@ -12030,7 +11967,6 @@
"define": "APPLICATION_BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -12057,7 +11993,6 @@
"define": "APPLICATION_BASIC_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "VendorName",
@@ -12080,7 +12015,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "int16u",
+ "type": "vendor_id",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -12429,6 +12364,5 @@
"endpointVersion": 1,
"deviceIdentifier": 36
}
- ],
- "log": []
+ ]
}
\ No newline at end of file
diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap
index 126fbc1..127ce0f 100644
--- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap
+++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 71,
+ "featureLevel": 77,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,14 +19,16 @@
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/zcl/zcl.json",
- "version": "ZCL Test Data",
- "type": "zcl-properties"
+ "type": "zcl-properties",
+ "category": "matter",
+ "version": 1,
+ "description": "Matter SDK ZCL data"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
- "version": "chip-v1",
- "type": "gen-templates-json"
+ "type": "gen-templates-json",
+ "version": "chip-v1"
}
],
"endpointTypes": [
@@ -79,7 +81,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "identify time",
@@ -566,7 +567,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -701,10 +701,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -744,7 +743,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -771,7 +769,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -877,9 +874,7 @@
"mfgCode": null,
"define": "BINDING_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Binding",
@@ -888,7 +883,6 @@
"define": "BINDING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "Binding",
@@ -946,9 +940,7 @@
"mfgCode": null,
"define": "ACCESS_CONTROL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Access Control",
@@ -957,7 +949,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ACL",
@@ -1096,7 +1087,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1123,7 +1113,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -1597,9 +1586,7 @@
"mfgCode": null,
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Localization Configuration",
@@ -1608,7 +1595,6 @@
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ActiveLocale",
@@ -1682,9 +1668,7 @@
"mfgCode": null,
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Time Format Localization",
@@ -1693,7 +1677,6 @@
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "HourFormat",
@@ -1783,9 +1766,7 @@
"mfgCode": null,
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Unit Localization",
@@ -1794,7 +1775,6 @@
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "TemperatureUnit",
@@ -2377,7 +2357,6 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -2636,7 +2615,6 @@
"define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ThreadMetrics",
@@ -2743,7 +2721,6 @@
"define": "THREAD_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "channel",
@@ -3794,7 +3771,6 @@
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -3821,7 +3797,6 @@
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "bssid",
@@ -4108,7 +4083,6 @@
"define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "PHYRate",
@@ -4295,7 +4269,6 @@
"define": "SWITCH_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -4322,7 +4295,6 @@
"define": "SWITCH_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "number of positions",
@@ -4449,7 +4421,6 @@
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "WindowStatus",
@@ -4752,7 +4723,7 @@
"code": 5,
"mfgCode": null,
"side": "server",
- "type": "fabric_idx",
+ "type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -4864,7 +4835,6 @@
"define": "GROUP_KEY_MANAGEMENT_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "GroupKeyMap",
@@ -4905,7 +4875,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4921,7 +4891,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -4970,9 +4940,7 @@
"mfgCode": null,
"define": "FIXED_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Fixed Label",
@@ -4981,7 +4949,6 @@
"define": "FIXED_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5039,9 +5006,7 @@
"mfgCode": null,
"define": "USER_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "User Label",
@@ -5050,7 +5015,6 @@
"define": "USER_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -5153,7 +5117,6 @@
"define": "DOOR_LOCK_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "LockState",
@@ -5512,7 +5475,6 @@
"define": "BARRIER_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "barrier moving state",
@@ -5743,7 +5705,6 @@
"define": "COLOR_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "CurrentHue",
@@ -6570,7 +6531,6 @@
"define": "TEMP_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -6597,7 +6557,6 @@
"define": "TEMP_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "MeasuredValue",
@@ -6688,7 +6647,6 @@
"define": "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -6715,7 +6673,6 @@
"define": "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "measured value",
@@ -6803,7 +6760,7 @@
},
{
"name": "MA-videoplayer",
- "deviceTypeName": "MA-videoplayer",
+ "deviceTypeName": "MA-casting-videoplayer",
"deviceTypeCode": 35,
"deviceTypeProfileId": 259,
"clusters": [
@@ -6850,7 +6807,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "identify time",
@@ -7401,7 +7357,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -7616,10 +7571,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -7635,7 +7589,7 @@
"reportableChange": 0
},
{
- "name": "remaining time",
+ "name": "RemainingTime",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -7651,7 +7605,7 @@
"reportableChange": 0
},
{
- "name": "min level",
+ "name": "MinLevel",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -7667,7 +7621,7 @@
"reportableChange": 0
},
{
- "name": "max level",
+ "name": "MaxLevel",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -7683,7 +7637,7 @@
"reportableChange": 0
},
{
- "name": "current frequency",
+ "name": "CurrentFrequency",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -7699,7 +7653,7 @@
"reportableChange": 0
},
{
- "name": "min frequency",
+ "name": "MinFrequency",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -7715,7 +7669,7 @@
"reportableChange": 0
},
{
- "name": "max frequency",
+ "name": "MaxFrequency",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -7731,7 +7685,7 @@
"reportableChange": 0
},
{
- "name": "options",
+ "name": "Options",
"code": 15,
"mfgCode": null,
"side": "server",
@@ -7747,7 +7701,7 @@
"reportableChange": 0
},
{
- "name": "on off transition time",
+ "name": "OnOffTransitionTime",
"code": 16,
"mfgCode": null,
"side": "server",
@@ -7763,7 +7717,7 @@
"reportableChange": 0
},
{
- "name": "on level",
+ "name": "OnLevel",
"code": 17,
"mfgCode": null,
"side": "server",
@@ -7779,7 +7733,7 @@
"reportableChange": 0
},
{
- "name": "on transition time",
+ "name": "OnTransitionTime",
"code": 18,
"mfgCode": null,
"side": "server",
@@ -7795,7 +7749,7 @@
"reportableChange": 0
},
{
- "name": "off transition time",
+ "name": "OffTransitionTime",
"code": 19,
"mfgCode": null,
"side": "server",
@@ -7811,7 +7765,7 @@
"reportableChange": 0
},
{
- "name": "default move rate",
+ "name": "DefaultMoveRate",
"code": 20,
"mfgCode": null,
"side": "server",
@@ -7827,7 +7781,7 @@
"reportableChange": 0
},
{
- "name": "start up current level",
+ "name": "StartUpCurrentLevel",
"code": 16384,
"mfgCode": null,
"side": "server",
@@ -7883,7 +7837,6 @@
"define": "BINARY_INPUT_BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -7910,7 +7863,6 @@
"define": "BINARY_INPUT_BASIC_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "out of service",
@@ -8001,7 +7953,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -8028,7 +7979,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -8135,7 +8085,6 @@
"define": "BINDING_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -8162,7 +8111,6 @@
"define": "BINDING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "Binding",
@@ -8221,7 +8169,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -8248,7 +8195,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -8675,7 +8621,6 @@
"define": "OTA_REQUESTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -8702,7 +8647,6 @@
"define": "OTA_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -8985,7 +8929,6 @@
"define": "SWITCH_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -9012,7 +8955,6 @@
"define": "SWITCH_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "number of positions",
@@ -9103,7 +9045,6 @@
"define": "GROUP_KEY_MANAGEMENT_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -9130,7 +9071,6 @@
"define": "GROUP_KEY_MANAGEMENT_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "GroupKeyMap",
@@ -9189,7 +9129,6 @@
"define": "FIXED_LABEL_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -9216,7 +9155,6 @@
"define": "FIXED_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -9935,7 +9873,6 @@
"define": "WINDOW_COVERING_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "Type",
@@ -10038,7 +9975,7 @@
"code": 10,
"mfgCode": null,
"side": "server",
- "type": "bitmap8",
+ "type": "OperationalStatus",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -10214,7 +10151,7 @@
"code": 26,
"mfgCode": null,
"side": "server",
- "type": "bitmap16",
+ "type": "SafetyStatus",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -10294,7 +10231,6 @@
"define": "BARRIER_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "barrier moving state",
@@ -10401,7 +10337,6 @@
"define": "PUMP_CONFIG_CONTROL_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -10428,7 +10363,6 @@
"define": "PUMP_CONFIG_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "MaxPressure",
@@ -10995,7 +10929,6 @@
"define": "COLOR_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "CurrentHue",
@@ -11822,7 +11755,6 @@
"define": "TEMP_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -11849,7 +11781,6 @@
"define": "TEMP_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "MeasuredValue",
@@ -11940,7 +11871,6 @@
"define": "PRESSURE_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -11967,7 +11897,6 @@
"define": "PRESSURE_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "MeasuredValue",
@@ -12090,7 +12019,6 @@
"define": "FLOW_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -12117,7 +12045,6 @@
"define": "FLOW_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "MeasuredValue",
@@ -12192,7 +12119,6 @@
"define": "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -12219,7 +12145,6 @@
"define": "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "measured value",
@@ -12310,7 +12235,6 @@
"define": "WAKE_ON_LAN_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -12337,7 +12261,6 @@
"define": "WAKE_ON_LAN_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "MACAddress",
@@ -12464,7 +12387,6 @@
"define": "CHANNEL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ChannelList",
@@ -12591,7 +12513,6 @@
"define": "TARGET_NAVIGATOR_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "TargetList",
@@ -12766,7 +12687,6 @@
"define": "MEDIA_PLAYBACK_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -12869,7 +12789,6 @@
"define": "MEDIA_INPUT_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "InputList",
@@ -12964,7 +12883,6 @@
"define": "KEYPAD_INPUT_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -13051,7 +12969,6 @@
"define": "CONTENT_LAUNCH_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "AcceptHeader",
@@ -13170,7 +13087,6 @@
"define": "AUDIO_OUTPUT_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "OutputList",
@@ -13281,7 +13197,6 @@
"define": "APPLICATION_LAUNCHER_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "CatalogList",
@@ -13324,7 +13239,6 @@
"define": "APPLICATION_BASIC_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -13367,7 +13281,6 @@
"define": "APPLICATION_BASIC_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "VendorName",
@@ -13390,7 +13303,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "int16u",
+ "type": "vendor_id",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -13558,7 +13471,6 @@
"define": "ACCOUNT_LOGIN_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -13629,7 +13541,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "identify time",
@@ -14116,7 +14027,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -14267,10 +14177,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -14310,7 +14219,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -14337,7 +14245,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -14444,7 +14351,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -14471,7 +14377,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -14862,7 +14767,6 @@
"define": "DOOR_LOCK_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "LockState",
@@ -15221,7 +15125,6 @@
"define": "BARRIER_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "barrier moving state",
@@ -15452,7 +15355,6 @@
"define": "COLOR_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "CurrentHue",
@@ -16279,7 +16181,6 @@
"define": "TEMP_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -16306,7 +16207,6 @@
"define": "TEMP_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "MeasuredValue",
@@ -16397,7 +16297,6 @@
"define": "OCCUPANCY_SENSING_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -16424,7 +16323,6 @@
"define": "OCCUPANCY_SENSING_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "occupancy",
@@ -16523,6 +16421,5 @@
"endpointVersion": 1,
"deviceIdentifier": 263
}
- ],
- "log": []
+ ]
}
\ No newline at end of file
diff --git a/examples/window-app/common/window-app.zap b/examples/window-app/common/window-app.zap
index 3a85ea5..db3d57c 100644
--- a/examples/window-app/common/window-app.zap
+++ b/examples/window-app/common/window-app.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 72,
+ "featureLevel": 77,
"creator": "zap",
"keyValuePairs": [
{
@@ -19,14 +19,16 @@
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/zcl/zcl.json",
- "version": "ZCL Test Data",
- "type": "zcl-properties"
+ "type": "zcl-properties",
+ "category": "matter",
+ "version": 1,
+ "description": "Matter SDK ZCL data"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
- "version": "chip-v1",
- "type": "gen-templates-json"
+ "type": "gen-templates-json",
+ "version": "chip-v1"
}
],
"endpointTypes": [
@@ -87,7 +89,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "identify time",
@@ -746,7 +747,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -789,7 +789,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -944,7 +943,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -987,7 +985,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ACL",
@@ -1158,7 +1155,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -1201,7 +1197,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -1776,7 +1771,6 @@
"define": "OTA_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "DefaultOtaProviders",
@@ -1899,7 +1893,6 @@
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -1942,7 +1935,6 @@
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ActiveLocale",
@@ -2065,7 +2057,6 @@
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -2108,7 +2099,6 @@
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "HourFormat",
@@ -2247,7 +2237,6 @@
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -2290,7 +2279,6 @@
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "TemperatureUnit",
@@ -2397,7 +2385,6 @@
"define": "POWER_SOURCE_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "Status",
@@ -3184,7 +3171,6 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -3507,7 +3493,6 @@
"define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ThreadMetrics",
@@ -3650,7 +3635,6 @@
"define": "THREAD_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "channel",
@@ -4749,7 +4733,6 @@
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -4776,7 +4759,6 @@
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "bssid",
@@ -5063,7 +5045,6 @@
"define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "PHYRate",
@@ -5318,7 +5299,6 @@
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "WindowStatus",
@@ -5685,7 +5665,7 @@
"code": 5,
"mfgCode": null,
"side": "server",
- "type": "fabric_idx",
+ "type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -6032,9 +6012,7 @@
"mfgCode": null,
"define": "FIXED_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Fixed Label",
@@ -6043,7 +6021,6 @@
"define": "FIXED_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -6101,9 +6078,7 @@
"mfgCode": null,
"define": "USER_LABEL_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "User Label",
@@ -6112,7 +6087,6 @@
"define": "USER_LABEL_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -6196,8 +6170,7 @@
"incoming": 1,
"outgoing": 1
}
- ],
- "attributes": []
+ ]
},
{
"name": "Identify",
@@ -6206,7 +6179,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "identify time",
@@ -6889,7 +6861,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -6916,7 +6887,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -7070,9 +7040,7 @@
"mfgCode": null,
"define": "BINDING_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Binding",
@@ -7081,7 +7049,6 @@
"define": "BINDING_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "Binding",
@@ -7272,7 +7239,6 @@
"define": "WINDOW_COVERING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "Type",
@@ -7740,8 +7706,7 @@
"incoming": 0,
"outgoing": 0
}
- ],
- "attributes": []
+ ]
},
{
"name": "Identify",
@@ -7750,7 +7715,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "identify time",
@@ -8433,7 +8397,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -8460,7 +8423,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -8614,9 +8576,7 @@
"mfgCode": null,
"define": "BINDING_CLUSTER",
"side": "client",
- "enabled": 0,
- "commands": [],
- "attributes": []
+ "enabled": 0
},
{
"name": "Binding",
@@ -8625,7 +8585,6 @@
"define": "BINDING_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "Binding",
@@ -8816,7 +8775,6 @@
"define": "WINDOW_COVERING_CLUSTER",
"side": "server",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "Type",
diff --git a/scripts/rules.matterlint b/scripts/rules.matterlint
index 3c93551..1e48cd8 100644
--- a/scripts/rules.matterlint
+++ b/scripts/rules.matterlint
@@ -11,7 +11,7 @@
load "../src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/boolean-state-cluster.xml";
-load "../src/app/zap-templates/zcl/data-model/chip/bridged-actions-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/actions-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/bridged-device-basic.xml";
load "../src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/chip-ota.xml";
diff --git a/scripts/tools/zap_convert_all.py b/scripts/tools/zap_convert_all.py
index 86677d0..d32b3fa 100755
--- a/scripts/tools/zap_convert_all.py
+++ b/scripts/tools/zap_convert_all.py
@@ -31,14 +31,25 @@
exit(1)
+zapFilesToSkip = [
+ # examples/chef/sample_app_util/test_files/sample_zap_file.zap is
+ # not a real .zap file; it's input to generating .zap files. So
+ # the path to zcl.json in it is just wrong, and we should skip it.
+ "examples/chef/sample_app_util/test_files/sample_zap_file.zap",
+]
+
+
def getTargets():
targets = []
targets.extend([[str(filepath)]
- for filepath in Path('./examples').rglob('*.zap')])
+ for filepath in Path('./examples').rglob('*.zap')
+ if str(filepath) not in zapFilesToSkip])
targets.extend([[str(filepath)]
- for filepath in Path('./src/darwin').rglob('*.zap')])
+ for filepath in Path('./src/darwin').rglob('*.zap')
+ if str(filepath) not in zapFilesToSkip])
targets.extend([[str(filepath)] for filepath in Path(
- './src/controller/data_model').rglob('*.zap')])
+ './src/controller/data_model').rglob('*.zap')
+ if str(filepath) not in zapFilesToSkip])
return targets
diff --git a/src/app/tests/suites/README.md b/src/app/tests/suites/README.md
index 2f2808d..74e18fb 100644
--- a/src/app/tests/suites/README.md
+++ b/src/app/tests/suites/README.md
@@ -399,7 +399,7 @@
| Binding | Thermostat | BromoformConcentrationMeasurement |
| AccessControl | FanControl | ChlorodibromomethaneConcentrationMeasurement |
| PollControl | DehumidificationControl | ChloroformConcentrationMeasurement |
-| BridgedActions | ThermostatUserInterfaceConfiguration | SodiumConcentrationMeasurement |
+| Actions | ThermostatUserInterfaceConfiguration | SodiumConcentrationMeasurement |
| Basic | ColorControl | IasZone |
| OtaSoftwareUpdateProvider | BallastConfiguration | IasAce |
| OtaSoftwareUpdateRequestor | IlluminanceMeasurement | IasWd |
diff --git a/src/app/tests/suites/certification/Test_TC_ACT_1_1.yaml b/src/app/tests/suites/certification/Test_TC_ACT_1_1.yaml
index 7edc277..59194cd 100644
--- a/src/app/tests/suites/certification/Test_TC_ACT_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ACT_1_1.yaml
@@ -19,7 +19,7 @@
config:
nodeId: 0x12344321
- cluster: "Bridged Actions"
+ cluster: "Actions"
endpoint: 1
tests:
diff --git a/src/app/zap-templates/zcl/data-model/all.xml b/src/app/zap-templates/zcl/data-model/all.xml
index 2b65111..ac3fe6e 100644
--- a/src/app/zap-templates/zcl/data-model/all.xml
+++ b/src/app/zap-templates/zcl/data-model/all.xml
@@ -9,7 +9,7 @@
<xi:include href="chip/basic-information-cluster.xml" />
<xi:include href="chip/binding-cluster.xml" />
<xi:include href="chip/boolean-state-cluster.xml" />
- <xi:include href="chip/bridged-actions-cluster.xml" />
+ <xi:include href="chip/actions-cluster.xml" />
<xi:include href="chip/bridged-device-basic.xml" />
<xi:include href="chip/chip-ota.xml" />
<xi:include href="chip/chip-types.xml" />
diff --git a/src/app/zap-templates/zcl/data-model/chip/bridged-actions-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/actions-cluster.xml
similarity index 96%
rename from src/app/zap-templates/zcl/data-model/chip/bridged-actions-cluster.xml
rename to src/app/zap-templates/zcl/data-model/chip/actions-cluster.xml
index 1d61edf..821db4d 100644
--- a/src/app/zap-templates/zcl/data-model/chip/bridged-actions-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/actions-cluster.xml
@@ -71,8 +71,8 @@
<item name="Name" type="CHAR_STRING" length="32"/>
<item name="Type" type="ActionTypeEnum"/>
<item name="EndpointListID" type="INT16U"/>
- <item name="SupportedCommands" type="INT16U"/>
- <item name="Status" type="ActionStateEnum"/>
+ <item name="SupportedCommands" type="CommandBits"/>
+ <item name="State" type="ActionStateEnum"/>
</struct>
<struct name="EndpointListStruct">
@@ -85,14 +85,14 @@
<cluster>
<domain>General</domain>
- <name>Bridged Actions</name>
+ <name>Actions</name>
<code>0x0025</code>
- <define>BRIDGED_ACTIONS_CLUSTER</define>
+ <define>ACTIONS_CLUSTER</define>
<description>This cluster provides a standardized way for a Node (typically a Bridge, but could be any Node) to expose action information.</description>
- <attribute side="server" code="0x0000" define="ACTION_LIST" type="ARRAY" entryType="ActionStruct" length="256" writable="false" optional="false">action list</attribute>
- <attribute side="server" code="0x0001" define="ENDPOINT_LIST" type="ARRAY" entryType="EndpointListStruct" length="256" writable="false" optional="false">endpoint list</attribute>
- <attribute side="server" code="0x0002" define="SETUP_URL" type="LONG_CHAR_STRING" length="512" writable="false" optional="true">setup url</attribute>
+ <attribute side="server" code="0x0000" define="ACTION_LIST" type="ARRAY" entryType="ActionStruct" length="256" writable="false" optional="false">ActionList</attribute>
+ <attribute side="server" code="0x0001" define="ENDPOINT_LIST" type="ARRAY" entryType="EndpointListStruct" length="256" writable="false" optional="false">EndpointLists</attribute>
+ <attribute side="server" code="0x0002" define="SETUP_URL" type="LONG_CHAR_STRING" length="512" writable="false" optional="true">SetupURL</attribute>
<command source="client" code="0x00" name="InstantAction" optional="true">
<description>This command triggers an action (state change) on the involved endpoints.</description>
diff --git a/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml b/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
index c0152a2..a29ade6 100644
--- a/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
@@ -187,7 +187,7 @@
<include cluster="Binding" client="true" server="false" clientLocked="false" serverLocked="true">
<requireAttribute>BINDING</requireAttribute>
</include>
- <include cluster="Bridged Actions" client="false" server="true" clientLocked="true" serverLocked="true"></include>
+ <include cluster="Actions" client="false" server="true" clientLocked="true" serverLocked="true"></include>
</clusters>
</deviceType>
<deviceType>
diff --git a/src/app/zap-templates/zcl/zcl-with-test-extensions.json b/src/app/zap-templates/zcl/zcl-with-test-extensions.json
index f717d05..ef85071 100644
--- a/src/app/zap-templates/zcl/zcl-with-test-extensions.json
+++ b/src/app/zap-templates/zcl/zcl-with-test-extensions.json
@@ -20,7 +20,7 @@
"basic-information-cluster.xml",
"binding-cluster.xml",
"boolean-state-cluster.xml",
- "bridged-actions-cluster.xml",
+ "actions-cluster.xml",
"bridged-device-basic.xml",
"chip-ota.xml",
"chip-types.xml",
diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json
index c9ff659..a5478bf 100644
--- a/src/app/zap-templates/zcl/zcl.json
+++ b/src/app/zap-templates/zcl/zcl.json
@@ -15,7 +15,7 @@
"basic-information-cluster.xml",
"binding-cluster.xml",
"boolean-state-cluster.xml",
- "bridged-actions-cluster.xml",
+ "actions-cluster.xml",
"bridged-device-basic.xml",
"chip-ota.xml",
"chip-types.xml",
diff --git a/src/app/zap_cluster_list.py b/src/app/zap_cluster_list.py
index ce89b6f..9dd6cf3 100755
--- a/src/app/zap_cluster_list.py
+++ b/src/app/zap_cluster_list.py
@@ -22,7 +22,7 @@
'BINARY_INPUT_BASIC_CLUSTER': [],
'BINDING_CLUSTER': ['bindings'],
'BOOLEAN_STATE_CLUSTER': [],
- 'BRIDGED_ACTIONS_CLUSTER': [],
+ 'ACTIONS_CLUSTER': [],
'BRIDGED_DEVICE_BASIC_CLUSTER': ['bridged-device-basic-information-server'],
'CHANNEL_CLUSTER': ['channel-server'],
'COLOR_CONTROL_CLUSTER': ['color-control-server'],
@@ -106,7 +106,7 @@
'BINARY_INPUT_BASIC_CLUSTER': [],
'BINDING_CLUSTER': [],
'BOOLEAN_STATE_CLUSTER': [],
- 'BRIDGED_ACTIONS_CLUSTER': [],
+ 'ACTIONS_CLUSTER': [],
'BRIDGED_DEVICE_BASIC_CLUSTER': [],
'CHANNEL_CLUSTER': [],
'COLOR_CONTROL_CLUSTER': [],
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
index 7e48829..300cede 100644
--- a/src/controller/data_model/controller-clusters.matter
+++ b/src/controller/data_model/controller-clusters.matter
@@ -512,7 +512,7 @@
readonly attribute int16u clusterRevision = 65533;
}
-client cluster BridgedActions = 37 {
+client cluster Actions = 37 {
enum ActionErrorEnum : ENUM8 {
kUnknown = 0;
kInterrupted = 1;
@@ -561,8 +561,8 @@
char_string<32> name = 1;
ActionTypeEnum type = 2;
int16u endpointListID = 3;
- int16u supportedCommands = 4;
- ActionStateEnum status = 5;
+ CommandBits supportedCommands = 4;
+ ActionStateEnum state = 5;
}
struct EndpointListStruct {
@@ -586,8 +586,8 @@
}
readonly attribute ActionStruct actionList[] = 0;
- readonly attribute EndpointListStruct endpointList[] = 1;
- readonly attribute long_char_string<512> setupUrl = 2;
+ readonly attribute EndpointListStruct endpointLists[] = 1;
+ readonly attribute long_char_string<512> setupURL = 2;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
@@ -4399,7 +4399,7 @@
binding cluster Descriptor;
binding cluster Binding;
binding cluster AccessControl;
- binding cluster BridgedActions;
+ binding cluster Actions;
binding cluster Basic;
binding cluster OtaSoftwareUpdateProvider;
binding cluster OtaSoftwareUpdateRequestor;
diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap
index 6439260..584ca51 100644
--- a/src/controller/data_model/controller-clusters.zap
+++ b/src/controller/data_model/controller-clusters.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 75,
+ "featureLevel": 77,
"creator": "zap",
"keyValuePairs": [
{
@@ -20,7 +20,9 @@
"pathRelativity": "relativeToZap",
"path": "../../app/zap-templates/zcl/zcl.json",
"type": "zcl-properties",
- "version": "ZCL Test Data"
+ "category": "matter",
+ "version": 1,
+ "description": "Matter SDK ZCL data"
},
{
"pathRelativity": "relativeToZap",
@@ -87,7 +89,6 @@
"define": "IDENTIFY_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "identify time",
@@ -838,7 +839,6 @@
"define": "ON_OFF_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "OnOff",
@@ -1009,7 +1009,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1036,7 +1035,6 @@
"define": "ON_OFF_SWITCH_CONFIG_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "switch type",
@@ -1267,10 +1265,9 @@
"define": "LEVEL_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
- "name": "current level",
+ "name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -1286,7 +1283,7 @@
"reportableChange": 0
},
{
- "name": "remaining time",
+ "name": "RemainingTime",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -1302,7 +1299,7 @@
"reportableChange": 0
},
{
- "name": "min level",
+ "name": "MinLevel",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -1318,7 +1315,7 @@
"reportableChange": 0
},
{
- "name": "max level",
+ "name": "MaxLevel",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -1334,7 +1331,7 @@
"reportableChange": 0
},
{
- "name": "current frequency",
+ "name": "CurrentFrequency",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -1350,7 +1347,7 @@
"reportableChange": 0
},
{
- "name": "min frequency",
+ "name": "MinFrequency",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -1366,7 +1363,7 @@
"reportableChange": 0
},
{
- "name": "max frequency",
+ "name": "MaxFrequency",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -1382,7 +1379,7 @@
"reportableChange": 0
},
{
- "name": "options",
+ "name": "Options",
"code": 15,
"mfgCode": null,
"side": "server",
@@ -1398,7 +1395,7 @@
"reportableChange": 0
},
{
- "name": "on off transition time",
+ "name": "OnOffTransitionTime",
"code": 16,
"mfgCode": null,
"side": "server",
@@ -1414,7 +1411,7 @@
"reportableChange": 0
},
{
- "name": "on level",
+ "name": "OnLevel",
"code": 17,
"mfgCode": null,
"side": "server",
@@ -1430,7 +1427,7 @@
"reportableChange": 0
},
{
- "name": "on transition time",
+ "name": "OnTransitionTime",
"code": 18,
"mfgCode": null,
"side": "server",
@@ -1446,7 +1443,7 @@
"reportableChange": 0
},
{
- "name": "off transition time",
+ "name": "OffTransitionTime",
"code": 19,
"mfgCode": null,
"side": "server",
@@ -1462,7 +1459,7 @@
"reportableChange": 0
},
{
- "name": "default move rate",
+ "name": "DefaultMoveRate",
"code": 20,
"mfgCode": null,
"side": "server",
@@ -1478,7 +1475,7 @@
"reportableChange": 0
},
{
- "name": "start up current level",
+ "name": "StartUpCurrentLevel",
"code": 16384,
"mfgCode": null,
"side": "server",
@@ -1582,7 +1579,6 @@
"define": "BINARY_INPUT_BASIC_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1609,7 +1605,6 @@
"define": "BINARY_INPUT_BASIC_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "active text",
@@ -1844,7 +1839,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -1871,7 +1865,6 @@
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "device list",
@@ -2026,7 +2019,6 @@
"define": "BINDING_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -2053,7 +2045,6 @@
"define": "BINDING_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "Binding",
@@ -2160,7 +2151,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -2187,7 +2177,6 @@
"define": "ACCESS_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ACL",
@@ -2352,10 +2341,10 @@
]
},
{
- "name": "Bridged Actions",
+ "name": "Actions",
"code": 37,
"mfgCode": null,
- "define": "BRIDGED_ACTIONS_CLUSTER",
+ "define": "ACTIONS_CLUSTER",
"side": "client",
"enabled": 1,
"commands": [
@@ -2476,16 +2465,15 @@
]
},
{
- "name": "Bridged Actions",
+ "name": "Actions",
"code": 37,
"mfgCode": null,
- "define": "BRIDGED_ACTIONS_CLUSTER",
+ "define": "ACTIONS_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
- "name": "action list",
+ "name": "ActionList",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -2501,7 +2489,7 @@
"reportableChange": 0
},
{
- "name": "endpoint list",
+ "name": "EndpointLists",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -2517,7 +2505,7 @@
"reportableChange": 0
},
{
- "name": "setup url",
+ "name": "SetupURL",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -2621,7 +2609,6 @@
"define": "BASIC_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -2648,7 +2635,6 @@
"define": "BASIC_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "DataModelRevision",
@@ -3255,7 +3241,6 @@
"define": "OTA_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "DefaultOtaProviders",
@@ -3377,9 +3362,7 @@
"mfgCode": null,
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "client",
- "enabled": 1,
- "commands": [],
- "attributes": []
+ "enabled": 1
},
{
"name": "Localization Configuration",
@@ -3388,7 +3371,6 @@
"define": "LOCALIZATION_CONFIGURATION_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ActiveLocale",
@@ -3510,9 +3492,7 @@
"mfgCode": null,
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 1,
- "commands": [],
- "attributes": []
+ "enabled": 1
},
{
"name": "Time Format Localization",
@@ -3521,7 +3501,6 @@
"define": "TIME_FORMAT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "HourFormat",
@@ -3659,9 +3638,7 @@
"mfgCode": null,
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "client",
- "enabled": 1,
- "commands": [],
- "attributes": []
+ "enabled": 1
},
{
"name": "Unit Localization",
@@ -3670,7 +3647,6 @@
"define": "UNIT_LOCALIZATION_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "TemperatureUnit",
@@ -3745,7 +3721,6 @@
"define": "POWER_SOURCE_CONFIGURATION_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -3772,7 +3747,6 @@
"define": "POWER_SOURCE_CONFIGURATION_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "Sources",
@@ -3879,7 +3853,6 @@
"define": "POWER_SOURCE_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -3906,7 +3879,6 @@
"define": "POWER_SOURCE_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "Status",
@@ -5102,8 +5074,7 @@
"incoming": 0,
"outgoing": 1
}
- ],
- "attributes": []
+ ]
},
{
"name": "Diagnostic Logs",
@@ -5248,7 +5219,6 @@
"define": "GENERAL_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "NetworkInterfaces",
@@ -5535,7 +5505,6 @@
"define": "SOFTWARE_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "ThreadMetrics",
@@ -5742,7 +5711,6 @@
"define": "THREAD_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "channel",
@@ -6893,7 +6861,6 @@
"define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "bssid",
@@ -7244,7 +7211,6 @@
"define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "PHYRate",
@@ -7479,7 +7445,6 @@
"define": "BRIDGED_DEVICE_BASIC_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -7506,7 +7471,6 @@
"define": "BRIDGED_DEVICE_BASIC_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "VendorName",
@@ -7837,7 +7801,6 @@
"define": "SWITCH_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -7864,7 +7827,6 @@
"define": "SWITCH_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "number of positions",
@@ -8055,7 +8017,6 @@
"define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "WindowStatus",
@@ -8406,7 +8367,7 @@
"code": 5,
"mfgCode": null,
"side": "server",
- "type": "fabric_idx",
+ "type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
@@ -8738,7 +8699,6 @@
"define": "FIXED_LABEL_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -8765,7 +8725,6 @@
"define": "FIXED_LABEL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -8871,9 +8830,7 @@
"mfgCode": null,
"define": "USER_LABEL_CLUSTER",
"side": "client",
- "enabled": 1,
- "commands": [],
- "attributes": []
+ "enabled": 1
},
{
"name": "User Label",
@@ -8882,7 +8839,6 @@
"define": "USER_LABEL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "label list",
@@ -8989,7 +8945,6 @@
"define": "BOOLEAN_STATE_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -9016,7 +8971,6 @@
"define": "BOOLEAN_STATE_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "StateValue",
@@ -9175,7 +9129,6 @@
"define": "MODE_SELECT_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "Description",
@@ -10350,7 +10303,6 @@
"define": "WINDOW_COVERING_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "Type",
@@ -10837,7 +10789,6 @@
"define": "BARRIER_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "barrier moving state",
@@ -11088,7 +11039,6 @@
"define": "PUMP_CONFIG_CONTROL_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -11131,7 +11081,6 @@
"define": "PUMP_CONFIG_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "MaxPressure",
@@ -12021,9 +11970,7 @@
"mfgCode": null,
"define": "FAN_CONTROL_CLUSTER",
"side": "client",
- "enabled": 1,
- "commands": [],
- "attributes": []
+ "enabled": 1
},
{
"name": "Fan Control",
@@ -12032,7 +11979,6 @@
"define": "FAN_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "fan mode",
@@ -12299,7 +12245,6 @@
"define": "THERMOSTAT_UI_CONFIG_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -12326,7 +12271,6 @@
"define": "THERMOSTAT_UI_CONFIG_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "temperature display mode",
@@ -12645,7 +12589,6 @@
"define": "COLOR_CONTROL_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "CurrentHue",
@@ -13568,7 +13511,6 @@
"define": "BALLAST_CONFIGURATION_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -13611,7 +13553,6 @@
"define": "BALLAST_CONFIGURATION_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "PhysicalMinLevel",
@@ -13926,7 +13867,6 @@
"define": "ILLUMINANCE_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -13953,7 +13893,6 @@
"define": "ILLUMINANCE_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "MeasuredValue",
@@ -14124,7 +14063,6 @@
"define": "TEMP_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -14151,7 +14089,6 @@
"define": "TEMP_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "MeasuredValue",
@@ -14274,7 +14211,6 @@
"define": "PRESSURE_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -14301,7 +14237,6 @@
"define": "PRESSURE_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "MeasuredValue",
@@ -14504,7 +14439,6 @@
"define": "FLOW_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -14531,7 +14465,6 @@
"define": "FLOW_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "MeasuredValue",
@@ -14686,7 +14619,6 @@
"define": "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -14713,7 +14645,6 @@
"define": "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "measured value",
@@ -14868,7 +14799,6 @@
"define": "OCCUPANCY_SENSING_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -14895,7 +14825,6 @@
"define": "OCCUPANCY_SENSING_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "occupancy",
@@ -15178,7 +15107,6 @@
"define": "WAKE_ON_LAN_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -15221,7 +15149,6 @@
"define": "WAKE_ON_LAN_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "MACAddress",
@@ -16132,7 +16059,6 @@
"define": "MEDIA_INPUT_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "InputList",
@@ -16307,7 +16233,6 @@
"define": "LOW_POWER_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "GeneratedCommandList",
@@ -16802,7 +16727,6 @@
"define": "AUDIO_OUTPUT_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "OutputList",
@@ -17125,7 +17049,6 @@
"define": "APPLICATION_BASIC_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "FeatureMap",
@@ -17168,7 +17091,6 @@
"define": "APPLICATION_BASIC_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "VendorName",
@@ -17191,7 +17113,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
- "type": "int16u",
+ "type": "vendor_id",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
@@ -17555,7 +17477,6 @@
"define": "ELECTRICAL_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 1,
- "commands": [],
"attributes": [
{
"name": "ClusterRevision",
@@ -17582,7 +17503,6 @@
"define": "ELECTRICAL_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 0,
- "commands": [],
"attributes": [
{
"name": "measurement type",
@@ -19495,6 +19415,5 @@
"endpointVersion": 1,
"deviceIdentifier": 22
}
- ],
- "log": []
+ ]
}
\ No newline at end of file
diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
index be8458b..af6ff83 100644
--- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
+++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
@@ -2168,8 +2168,8 @@
}
break;
}
- case app::Clusters::BridgedActions::Id: {
- using namespace app::Clusters::BridgedActions;
+ case app::Clusters::Actions::Id: {
+ using namespace app::Clusters::Actions;
switch (aPath.mAttributeId)
{
case Attributes::ActionList::Id: {
@@ -2213,20 +2213,20 @@
std::string newElement_0_supportedCommandsCtorSignature = "(I)V";
chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
newElement_0_supportedCommandsClassName.c_str(), newElement_0_supportedCommandsCtorSignature.c_str(),
- entry_0.supportedCommands, newElement_0_supportedCommands);
- jobject newElement_0_status;
- std::string newElement_0_statusClassName = "java/lang/Integer";
- std::string newElement_0_statusCtorSignature = "(I)V";
+ entry_0.supportedCommands.Raw(), newElement_0_supportedCommands);
+ jobject newElement_0_state;
+ std::string newElement_0_stateClassName = "java/lang/Integer";
+ std::string newElement_0_stateCtorSignature = "(I)V";
chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
- newElement_0_statusClassName.c_str(), newElement_0_statusCtorSignature.c_str(),
- static_cast<uint8_t>(entry_0.status), newElement_0_status);
+ newElement_0_stateClassName.c_str(), newElement_0_stateCtorSignature.c_str(),
+ static_cast<uint8_t>(entry_0.state), newElement_0_state);
jclass actionStructStructClass_1;
err = chip::JniReferences::GetInstance().GetClassRef(
- env, "chip/devicecontroller/ChipStructs$BridgedActionsClusterActionStruct", actionStructStructClass_1);
+ env, "chip/devicecontroller/ChipStructs$ActionsClusterActionStruct", actionStructStructClass_1);
if (err != CHIP_NO_ERROR)
{
- ChipLogError(Zcl, "Could not find class ChipStructs$BridgedActionsClusterActionStruct");
+ ChipLogError(Zcl, "Could not find class ChipStructs$ActionsClusterActionStruct");
return nullptr;
}
jmethodID actionStructStructCtor_1 =
@@ -2235,19 +2235,19 @@
"Integer;Ljava/lang/Integer;)V");
if (actionStructStructCtor_1 == nullptr)
{
- ChipLogError(Zcl, "Could not find ChipStructs$BridgedActionsClusterActionStruct constructor");
+ ChipLogError(Zcl, "Could not find ChipStructs$ActionsClusterActionStruct constructor");
return nullptr;
}
newElement_0 = env->NewObject(actionStructStructClass_1, actionStructStructCtor_1, newElement_0_actionID,
newElement_0_name, newElement_0_type, newElement_0_endpointListID,
- newElement_0_supportedCommands, newElement_0_status);
+ newElement_0_supportedCommands, newElement_0_state);
chip::JniReferences::GetInstance().AddToList(value, newElement_0);
}
return value;
}
- case Attributes::EndpointList::Id: {
- using TypeInfo = Attributes::EndpointList::TypeInfo;
+ case Attributes::EndpointLists::Id: {
+ using TypeInfo = Attributes::EndpointLists::TypeInfo;
TypeInfo::DecodableType cppValue;
*aError = app::DataModel::Decode(aReader, cppValue);
if (*aError != CHIP_NO_ERROR)
@@ -2293,11 +2293,10 @@
jclass endpointListStructStructClass_1;
err = chip::JniReferences::GetInstance().GetClassRef(
- env, "chip/devicecontroller/ChipStructs$BridgedActionsClusterEndpointListStruct",
- endpointListStructStructClass_1);
+ env, "chip/devicecontroller/ChipStructs$ActionsClusterEndpointListStruct", endpointListStructStructClass_1);
if (err != CHIP_NO_ERROR)
{
- ChipLogError(Zcl, "Could not find class ChipStructs$BridgedActionsClusterEndpointListStruct");
+ ChipLogError(Zcl, "Could not find class ChipStructs$ActionsClusterEndpointListStruct");
return nullptr;
}
jmethodID endpointListStructStructCtor_1 =
@@ -2305,7 +2304,7 @@
"(Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Integer;Ljava/util/ArrayList;)V");
if (endpointListStructStructCtor_1 == nullptr)
{
- ChipLogError(Zcl, "Could not find ChipStructs$BridgedActionsClusterEndpointListStruct constructor");
+ ChipLogError(Zcl, "Could not find ChipStructs$ActionsClusterEndpointListStruct constructor");
return nullptr;
}
@@ -2316,8 +2315,8 @@
}
return value;
}
- case Attributes::SetupUrl::Id: {
- using TypeInfo = Attributes::SetupUrl::TypeInfo;
+ case Attributes::SetupURL::Id: {
+ using TypeInfo = Attributes::SetupURL::TypeInfo;
TypeInfo::DecodableType cppValue;
*aError = app::DataModel::Decode(aReader, cppValue);
if (*aError != CHIP_NO_ERROR)
diff --git a/src/controller/java/zap-generated/CHIPCallbackTypes.h b/src/controller/java/zap-generated/CHIPCallbackTypes.h
index 3ec74ab..be01149 100644
--- a/src/controller/java/zap-generated/CHIPCallbackTypes.h
+++ b/src/controller/java/zap-generated/CHIPCallbackTypes.h
@@ -237,22 +237,22 @@
typedef void (*CHIPAccessControlClusterClusterRevisionAttributeCallbackType)(
void *, chip::app::Clusters::AccessControl::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
-typedef void (*CHIPBridgedActionsClusterActionListAttributeCallbackType)(
- void *, const chip::app::Clusters::BridgedActions::Attributes::ActionList::TypeInfo::DecodableType &);
-typedef void (*CHIPBridgedActionsClusterEndpointListAttributeCallbackType)(
- void *, const chip::app::Clusters::BridgedActions::Attributes::EndpointList::TypeInfo::DecodableType &);
-typedef void (*CHIPBridgedActionsClusterSetupUrlAttributeCallbackType)(
- void *, chip::app::Clusters::BridgedActions::Attributes::SetupUrl::TypeInfo::DecodableArgType);
-typedef void (*CHIPBridgedActionsClusterGeneratedCommandListAttributeCallbackType)(
- void *, const chip::app::Clusters::BridgedActions::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPBridgedActionsClusterAcceptedCommandListAttributeCallbackType)(
- void *, const chip::app::Clusters::BridgedActions::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
-typedef void (*CHIPBridgedActionsClusterAttributeListAttributeCallbackType)(
- void *, const chip::app::Clusters::BridgedActions::Attributes::AttributeList::TypeInfo::DecodableType &);
-typedef void (*CHIPBridgedActionsClusterFeatureMapAttributeCallbackType)(
- void *, chip::app::Clusters::BridgedActions::Attributes::FeatureMap::TypeInfo::DecodableArgType);
-typedef void (*CHIPBridgedActionsClusterClusterRevisionAttributeCallbackType)(
- void *, chip::app::Clusters::BridgedActions::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
+typedef void (*CHIPActionsClusterActionListAttributeCallbackType)(
+ void *, const chip::app::Clusters::Actions::Attributes::ActionList::TypeInfo::DecodableType &);
+typedef void (*CHIPActionsClusterEndpointListsAttributeCallbackType)(
+ void *, const chip::app::Clusters::Actions::Attributes::EndpointLists::TypeInfo::DecodableType &);
+typedef void (*CHIPActionsClusterSetupURLAttributeCallbackType)(
+ void *, chip::app::Clusters::Actions::Attributes::SetupURL::TypeInfo::DecodableArgType);
+typedef void (*CHIPActionsClusterGeneratedCommandListAttributeCallbackType)(
+ void *, const chip::app::Clusters::Actions::Attributes::GeneratedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPActionsClusterAcceptedCommandListAttributeCallbackType)(
+ void *, const chip::app::Clusters::Actions::Attributes::AcceptedCommandList::TypeInfo::DecodableType &);
+typedef void (*CHIPActionsClusterAttributeListAttributeCallbackType)(
+ void *, const chip::app::Clusters::Actions::Attributes::AttributeList::TypeInfo::DecodableType &);
+typedef void (*CHIPActionsClusterFeatureMapAttributeCallbackType)(
+ void *, chip::app::Clusters::Actions::Attributes::FeatureMap::TypeInfo::DecodableArgType);
+typedef void (*CHIPActionsClusterClusterRevisionAttributeCallbackType)(
+ void *, chip::app::Clusters::Actions::Attributes::ClusterRevision::TypeInfo::DecodableArgType);
typedef void (*CHIPBasicClusterDataModelRevisionAttributeCallbackType)(
void *, chip::app::Clusters::Basic::Attributes::DataModelRevision::TypeInfo::DecodableArgType);
diff --git a/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp
index 8427859..fcdb5b5 100644
--- a/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp
+++ b/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp
@@ -473,8 +473,8 @@
}
break;
}
- case app::Clusters::BridgedActions::Id: {
- using namespace app::Clusters::BridgedActions;
+ case app::Clusters::Actions::Id: {
+ using namespace app::Clusters::Actions;
switch (aPath.mEventId)
{
case Events::StateChanged::Id: {
@@ -505,17 +505,17 @@
jclass stateChangedStructClass;
err = chip::JniReferences::GetInstance().GetClassRef(
- env, "chip/devicecontroller/ChipEventStructs$BridgedActionsClusterStateChangedEvent", stateChangedStructClass);
+ env, "chip/devicecontroller/ChipEventStructs$ActionsClusterStateChangedEvent", stateChangedStructClass);
if (err != CHIP_NO_ERROR)
{
- ChipLogError(Zcl, "Could not find class ChipEventStructs$BridgedActionsClusterStateChangedEvent");
+ ChipLogError(Zcl, "Could not find class ChipEventStructs$ActionsClusterStateChangedEvent");
return nullptr;
}
jmethodID stateChangedStructCtor =
env->GetMethodID(stateChangedStructClass, "<init>", "(Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Integer;)V");
if (stateChangedStructCtor == nullptr)
{
- ChipLogError(Zcl, "Could not find ChipEventStructs$BridgedActionsClusterStateChangedEvent constructor");
+ ChipLogError(Zcl, "Could not find ChipEventStructs$ActionsClusterStateChangedEvent constructor");
return nullptr;
}
@@ -558,17 +558,17 @@
jclass actionFailedStructClass;
err = chip::JniReferences::GetInstance().GetClassRef(
- env, "chip/devicecontroller/ChipEventStructs$BridgedActionsClusterActionFailedEvent", actionFailedStructClass);
+ env, "chip/devicecontroller/ChipEventStructs$ActionsClusterActionFailedEvent", actionFailedStructClass);
if (err != CHIP_NO_ERROR)
{
- ChipLogError(Zcl, "Could not find class ChipEventStructs$BridgedActionsClusterActionFailedEvent");
+ ChipLogError(Zcl, "Could not find class ChipEventStructs$ActionsClusterActionFailedEvent");
return nullptr;
}
jmethodID actionFailedStructCtor = env->GetMethodID(
actionFailedStructClass, "<init>", "(Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Integer;)V");
if (actionFailedStructCtor == nullptr)
{
- ChipLogError(Zcl, "Could not find ChipEventStructs$BridgedActionsClusterActionFailedEvent constructor");
+ ChipLogError(Zcl, "Could not find ChipEventStructs$ActionsClusterActionFailedEvent constructor");
return nullptr;
}
diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
index 647f9bf..68e371f 100644
--- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
+++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
@@ -4059,8 +4059,8 @@
env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
}
-CHIPBridgedActionsActionListAttributeCallback::CHIPBridgedActionsActionListAttributeCallback(jobject javaCallback, bool keepAlive) :
- chip::Callback::Callback<CHIPBridgedActionsClusterActionListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPActionsActionListAttributeCallback::CHIPActionsActionListAttributeCallback(jobject javaCallback, bool keepAlive) :
+ chip::Callback::Callback<CHIPActionsClusterActionListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
{
JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
if (env == nullptr)
@@ -4076,7 +4076,7 @@
}
}
-CHIPBridgedActionsActionListAttributeCallback::~CHIPBridgedActionsActionListAttributeCallback()
+CHIPActionsActionListAttributeCallback::~CHIPActionsActionListAttributeCallback()
{
JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
if (env == nullptr)
@@ -4087,9 +4087,9 @@
env->DeleteGlobalRef(javaCallbackRef);
}
-void CHIPBridgedActionsActionListAttributeCallback::CallbackFn(
+void CHIPActionsActionListAttributeCallback::CallbackFn(
void * context,
- const chip::app::DataModel::DecodableList<chip::app::Clusters::BridgedActions::Structs::ActionStruct::DecodableType> & list)
+ const chip::app::DataModel::DecodableList<chip::app::Clusters::Actions::Structs::ActionStruct::DecodableType> & list)
{
chip::DeviceLayer::StackUnlock unlock;
CHIP_ERROR err = CHIP_NO_ERROR;
@@ -4098,8 +4098,8 @@
VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
- std::unique_ptr<CHIPBridgedActionsActionListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
- reinterpret_cast<CHIPBridgedActionsActionListAttributeCallback *>(context), maybeDestroy);
+ std::unique_ptr<CHIPActionsActionListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+ reinterpret_cast<CHIPActionsActionListAttributeCallback *>(context), maybeDestroy);
// It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -4141,22 +4141,22 @@
jobject newElement_0_supportedCommands;
std::string newElement_0_supportedCommandsClassName = "java/lang/Integer";
std::string newElement_0_supportedCommandsCtorSignature = "(I)V";
- chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(newElement_0_supportedCommandsClassName.c_str(),
- newElement_0_supportedCommandsCtorSignature.c_str(),
- entry_0.supportedCommands, newElement_0_supportedCommands);
- jobject newElement_0_status;
- std::string newElement_0_statusClassName = "java/lang/Integer";
- std::string newElement_0_statusCtorSignature = "(I)V";
- chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_statusClassName.c_str(),
- newElement_0_statusCtorSignature.c_str(),
- static_cast<uint8_t>(entry_0.status), newElement_0_status);
+ chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
+ newElement_0_supportedCommandsClassName.c_str(), newElement_0_supportedCommandsCtorSignature.c_str(),
+ entry_0.supportedCommands.Raw(), newElement_0_supportedCommands);
+ jobject newElement_0_state;
+ std::string newElement_0_stateClassName = "java/lang/Integer";
+ std::string newElement_0_stateCtorSignature = "(I)V";
+ chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(newElement_0_stateClassName.c_str(),
+ newElement_0_stateCtorSignature.c_str(),
+ static_cast<uint8_t>(entry_0.state), newElement_0_state);
jclass actionStructStructClass_1;
- err = chip::JniReferences::GetInstance().GetClassRef(
- env, "chip/devicecontroller/ChipStructs$BridgedActionsClusterActionStruct", actionStructStructClass_1);
+ err = chip::JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipStructs$ActionsClusterActionStruct",
+ actionStructStructClass_1);
if (err != CHIP_NO_ERROR)
{
- ChipLogError(Zcl, "Could not find class ChipStructs$BridgedActionsClusterActionStruct");
+ ChipLogError(Zcl, "Could not find class ChipStructs$ActionsClusterActionStruct");
return;
}
jmethodID actionStructStructCtor_1 = env->GetMethodID(
@@ -4164,13 +4164,13 @@
"(Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V");
if (actionStructStructCtor_1 == nullptr)
{
- ChipLogError(Zcl, "Could not find ChipStructs$BridgedActionsClusterActionStruct constructor");
+ ChipLogError(Zcl, "Could not find ChipStructs$ActionsClusterActionStruct constructor");
return;
}
newElement_0 =
env->NewObject(actionStructStructClass_1, actionStructStructCtor_1, newElement_0_actionID, newElement_0_name,
- newElement_0_type, newElement_0_endpointListID, newElement_0_supportedCommands, newElement_0_status);
+ newElement_0_type, newElement_0_endpointListID, newElement_0_supportedCommands, newElement_0_state);
chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
}
@@ -4178,10 +4178,8 @@
env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
}
-CHIPBridgedActionsEndpointListAttributeCallback::CHIPBridgedActionsEndpointListAttributeCallback(jobject javaCallback,
- bool keepAlive) :
- chip::Callback::Callback<CHIPBridgedActionsClusterEndpointListAttributeCallbackType>(CallbackFn, this),
- keepAlive(keepAlive)
+CHIPActionsEndpointListsAttributeCallback::CHIPActionsEndpointListsAttributeCallback(jobject javaCallback, bool keepAlive) :
+ chip::Callback::Callback<CHIPActionsClusterEndpointListsAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
{
JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
if (env == nullptr)
@@ -4197,7 +4195,7 @@
}
}
-CHIPBridgedActionsEndpointListAttributeCallback::~CHIPBridgedActionsEndpointListAttributeCallback()
+CHIPActionsEndpointListsAttributeCallback::~CHIPActionsEndpointListsAttributeCallback()
{
JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
if (env == nullptr)
@@ -4208,10 +4206,9 @@
env->DeleteGlobalRef(javaCallbackRef);
}
-void CHIPBridgedActionsEndpointListAttributeCallback::CallbackFn(
+void CHIPActionsEndpointListsAttributeCallback::CallbackFn(
void * context,
- const chip::app::DataModel::DecodableList<chip::app::Clusters::BridgedActions::Structs::EndpointListStruct::DecodableType> &
- list)
+ const chip::app::DataModel::DecodableList<chip::app::Clusters::Actions::Structs::EndpointListStruct::DecodableType> & list)
{
chip::DeviceLayer::StackUnlock unlock;
CHIP_ERROR err = CHIP_NO_ERROR;
@@ -4220,8 +4217,8 @@
VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
- std::unique_ptr<CHIPBridgedActionsEndpointListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
- reinterpret_cast<CHIPBridgedActionsEndpointListAttributeCallback *>(context), maybeDestroy);
+ std::unique_ptr<CHIPActionsEndpointListsAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+ reinterpret_cast<CHIPActionsEndpointListsAttributeCallback *>(context), maybeDestroy);
// It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -4271,10 +4268,10 @@
jclass endpointListStructStructClass_1;
err = chip::JniReferences::GetInstance().GetClassRef(
- env, "chip/devicecontroller/ChipStructs$BridgedActionsClusterEndpointListStruct", endpointListStructStructClass_1);
+ env, "chip/devicecontroller/ChipStructs$ActionsClusterEndpointListStruct", endpointListStructStructClass_1);
if (err != CHIP_NO_ERROR)
{
- ChipLogError(Zcl, "Could not find class ChipStructs$BridgedActionsClusterEndpointListStruct");
+ ChipLogError(Zcl, "Could not find class ChipStructs$ActionsClusterEndpointListStruct");
return;
}
jmethodID endpointListStructStructCtor_1 =
@@ -4282,7 +4279,7 @@
"(Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Integer;Ljava/util/ArrayList;)V");
if (endpointListStructStructCtor_1 == nullptr)
{
- ChipLogError(Zcl, "Could not find ChipStructs$BridgedActionsClusterEndpointListStruct constructor");
+ ChipLogError(Zcl, "Could not find ChipStructs$ActionsClusterEndpointListStruct constructor");
return;
}
@@ -4295,151 +4292,9 @@
env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
}
-CHIPBridgedActionsGeneratedCommandListAttributeCallback::CHIPBridgedActionsGeneratedCommandListAttributeCallback(
- jobject javaCallback, bool keepAlive) :
- chip::Callback::Callback<CHIPBridgedActionsClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
- keepAlive(keepAlive)
-{
- JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
- if (env == nullptr)
- {
- ChipLogError(Zcl, "Could not create global reference for Java callback");
- return;
- }
-
- javaCallbackRef = env->NewGlobalRef(javaCallback);
- if (javaCallbackRef == nullptr)
- {
- ChipLogError(Zcl, "Could not create global reference for Java callback");
- }
-}
-
-CHIPBridgedActionsGeneratedCommandListAttributeCallback::~CHIPBridgedActionsGeneratedCommandListAttributeCallback()
-{
- JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
- if (env == nullptr)
- {
- ChipLogError(Zcl, "Could not delete global reference for Java callback");
- return;
- }
- env->DeleteGlobalRef(javaCallbackRef);
-}
-
-void CHIPBridgedActionsGeneratedCommandListAttributeCallback::CallbackFn(
- void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
-{
- chip::DeviceLayer::StackUnlock unlock;
- CHIP_ERROR err = CHIP_NO_ERROR;
- JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
- jobject javaCallbackRef;
-
- VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
- std::unique_ptr<CHIPBridgedActionsGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
- reinterpret_cast<CHIPBridgedActionsGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
-
- // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
- javaCallbackRef = cppCallback.get()->javaCallbackRef;
- VerifyOrReturn(javaCallbackRef != nullptr,
- ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
- jmethodID javaMethod;
- err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
- VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
- jobject arrayListObj;
- chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
- auto iter_arrayListObj_0 = list.begin();
- while (iter_arrayListObj_0.Next())
- {
- auto & entry_0 = iter_arrayListObj_0.GetValue();
- jobject newElement_0;
- std::string newElement_0ClassName = "java/lang/Long";
- std::string newElement_0CtorSignature = "(J)V";
- chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
- newElement_0CtorSignature.c_str(), entry_0, newElement_0);
- chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
- }
-
- env->ExceptionClear();
- env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-}
-
-CHIPBridgedActionsAcceptedCommandListAttributeCallback::CHIPBridgedActionsAcceptedCommandListAttributeCallback(jobject javaCallback,
- bool keepAlive) :
- chip::Callback::Callback<CHIPBridgedActionsClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
- keepAlive(keepAlive)
-{
- JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
- if (env == nullptr)
- {
- ChipLogError(Zcl, "Could not create global reference for Java callback");
- return;
- }
-
- javaCallbackRef = env->NewGlobalRef(javaCallback);
- if (javaCallbackRef == nullptr)
- {
- ChipLogError(Zcl, "Could not create global reference for Java callback");
- }
-}
-
-CHIPBridgedActionsAcceptedCommandListAttributeCallback::~CHIPBridgedActionsAcceptedCommandListAttributeCallback()
-{
- JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
- if (env == nullptr)
- {
- ChipLogError(Zcl, "Could not delete global reference for Java callback");
- return;
- }
- env->DeleteGlobalRef(javaCallbackRef);
-}
-
-void CHIPBridgedActionsAcceptedCommandListAttributeCallback::CallbackFn(
- void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
-{
- chip::DeviceLayer::StackUnlock unlock;
- CHIP_ERROR err = CHIP_NO_ERROR;
- JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
- jobject javaCallbackRef;
-
- VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
- std::unique_ptr<CHIPBridgedActionsAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
- reinterpret_cast<CHIPBridgedActionsAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
-
- // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
- javaCallbackRef = cppCallback.get()->javaCallbackRef;
- VerifyOrReturn(javaCallbackRef != nullptr,
- ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
- jmethodID javaMethod;
- err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
- VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
- jobject arrayListObj;
- chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
-
- auto iter_arrayListObj_0 = list.begin();
- while (iter_arrayListObj_0.Next())
- {
- auto & entry_0 = iter_arrayListObj_0.GetValue();
- jobject newElement_0;
- std::string newElement_0ClassName = "java/lang/Long";
- std::string newElement_0CtorSignature = "(J)V";
- chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
- newElement_0CtorSignature.c_str(), entry_0, newElement_0);
- chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
- }
-
- env->ExceptionClear();
- env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-}
-
-CHIPBridgedActionsAttributeListAttributeCallback::CHIPBridgedActionsAttributeListAttributeCallback(jobject javaCallback,
+CHIPActionsGeneratedCommandListAttributeCallback::CHIPActionsGeneratedCommandListAttributeCallback(jobject javaCallback,
bool keepAlive) :
- chip::Callback::Callback<CHIPBridgedActionsClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+ chip::Callback::Callback<CHIPActionsClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
keepAlive(keepAlive)
{
JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -4456,7 +4311,7 @@
}
}
-CHIPBridgedActionsAttributeListAttributeCallback::~CHIPBridgedActionsAttributeListAttributeCallback()
+CHIPActionsGeneratedCommandListAttributeCallback::~CHIPActionsGeneratedCommandListAttributeCallback()
{
JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
if (env == nullptr)
@@ -4467,8 +4322,8 @@
env->DeleteGlobalRef(javaCallbackRef);
}
-void CHIPBridgedActionsAttributeListAttributeCallback::CallbackFn(
- void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPActionsGeneratedCommandListAttributeCallback::CallbackFn(void * context,
+ const chip::app::DataModel::DecodableList<chip::CommandId> & list)
{
chip::DeviceLayer::StackUnlock unlock;
CHIP_ERROR err = CHIP_NO_ERROR;
@@ -4477,8 +4332,148 @@
VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
- std::unique_ptr<CHIPBridgedActionsAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
- reinterpret_cast<CHIPBridgedActionsAttributeListAttributeCallback *>(context), maybeDestroy);
+ std::unique_ptr<CHIPActionsGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+ reinterpret_cast<CHIPActionsGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+
+ // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+ javaCallbackRef = cppCallback.get()->javaCallbackRef;
+ VerifyOrReturn(javaCallbackRef != nullptr,
+ ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+ jmethodID javaMethod;
+ err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+ VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+ jobject arrayListObj;
+ chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+ auto iter_arrayListObj_0 = list.begin();
+ while (iter_arrayListObj_0.Next())
+ {
+ auto & entry_0 = iter_arrayListObj_0.GetValue();
+ jobject newElement_0;
+ std::string newElement_0ClassName = "java/lang/Long";
+ std::string newElement_0CtorSignature = "(J)V";
+ chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+ newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+ chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+ }
+
+ env->ExceptionClear();
+ env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPActionsAcceptedCommandListAttributeCallback::CHIPActionsAcceptedCommandListAttributeCallback(jobject javaCallback,
+ bool keepAlive) :
+ chip::Callback::Callback<CHIPActionsClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+ keepAlive(keepAlive)
+{
+ JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+ if (env == nullptr)
+ {
+ ChipLogError(Zcl, "Could not create global reference for Java callback");
+ return;
+ }
+
+ javaCallbackRef = env->NewGlobalRef(javaCallback);
+ if (javaCallbackRef == nullptr)
+ {
+ ChipLogError(Zcl, "Could not create global reference for Java callback");
+ }
+}
+
+CHIPActionsAcceptedCommandListAttributeCallback::~CHIPActionsAcceptedCommandListAttributeCallback()
+{
+ JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+ if (env == nullptr)
+ {
+ ChipLogError(Zcl, "Could not delete global reference for Java callback");
+ return;
+ }
+ env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPActionsAcceptedCommandListAttributeCallback::CallbackFn(void * context,
+ const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+{
+ chip::DeviceLayer::StackUnlock unlock;
+ CHIP_ERROR err = CHIP_NO_ERROR;
+ JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+ jobject javaCallbackRef;
+
+ VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+ std::unique_ptr<CHIPActionsAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+ reinterpret_cast<CHIPActionsAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+
+ // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+ javaCallbackRef = cppCallback.get()->javaCallbackRef;
+ VerifyOrReturn(javaCallbackRef != nullptr,
+ ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+ jmethodID javaMethod;
+ err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+ VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+ jobject arrayListObj;
+ chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+
+ auto iter_arrayListObj_0 = list.begin();
+ while (iter_arrayListObj_0.Next())
+ {
+ auto & entry_0 = iter_arrayListObj_0.GetValue();
+ jobject newElement_0;
+ std::string newElement_0ClassName = "java/lang/Long";
+ std::string newElement_0CtorSignature = "(J)V";
+ chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(newElement_0ClassName.c_str(),
+ newElement_0CtorSignature.c_str(), entry_0, newElement_0);
+ chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+ }
+
+ env->ExceptionClear();
+ env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPActionsAttributeListAttributeCallback::CHIPActionsAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+ chip::Callback::Callback<CHIPActionsClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+{
+ JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+ if (env == nullptr)
+ {
+ ChipLogError(Zcl, "Could not create global reference for Java callback");
+ return;
+ }
+
+ javaCallbackRef = env->NewGlobalRef(javaCallback);
+ if (javaCallbackRef == nullptr)
+ {
+ ChipLogError(Zcl, "Could not create global reference for Java callback");
+ }
+}
+
+CHIPActionsAttributeListAttributeCallback::~CHIPActionsAttributeListAttributeCallback()
+{
+ JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+ if (env == nullptr)
+ {
+ ChipLogError(Zcl, "Could not delete global reference for Java callback");
+ return;
+ }
+ env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPActionsAttributeListAttributeCallback::CallbackFn(void * context,
+ const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+{
+ chip::DeviceLayer::StackUnlock unlock;
+ CHIP_ERROR err = CHIP_NO_ERROR;
+ JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+ jobject javaCallbackRef;
+
+ VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+ std::unique_ptr<CHIPActionsAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+ reinterpret_cast<CHIPActionsAttributeListAttributeCallback *>(context), maybeDestroy);
// It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
javaCallbackRef = cppCallback.get()->javaCallbackRef;
diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.h b/src/controller/java/zap-generated/CHIPReadCallbacks.h
index 99bbaec..b1951ce 100644
--- a/src/controller/java/zap-generated/CHIPReadCallbacks.h
+++ b/src/controller/java/zap-generated/CHIPReadCallbacks.h
@@ -1745,31 +1745,29 @@
bool keepAlive;
};
-class CHIPBridgedActionsActionListAttributeCallback
- : public chip::Callback::Callback<CHIPBridgedActionsClusterActionListAttributeCallbackType>
+class CHIPActionsActionListAttributeCallback : public chip::Callback::Callback<CHIPActionsClusterActionListAttributeCallbackType>
{
public:
- CHIPBridgedActionsActionListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+ CHIPActionsActionListAttributeCallback(jobject javaCallback, bool keepAlive = false);
- ~CHIPBridgedActionsActionListAttributeCallback();
+ ~CHIPActionsActionListAttributeCallback();
- static void maybeDestroy(CHIPBridgedActionsActionListAttributeCallback * callback)
+ static void maybeDestroy(CHIPActionsActionListAttributeCallback * callback)
{
if (!callback->keepAlive)
{
callback->Cancel();
- chip::Platform::Delete<CHIPBridgedActionsActionListAttributeCallback>(callback);
+ chip::Platform::Delete<CHIPActionsActionListAttributeCallback>(callback);
}
}
static void CallbackFn(
void * context,
- const chip::app::DataModel::DecodableList<chip::app::Clusters::BridgedActions::Structs::ActionStruct::DecodableType> &
- list);
+ const chip::app::DataModel::DecodableList<chip::app::Clusters::Actions::Structs::ActionStruct::DecodableType> & list);
static void OnSubscriptionEstablished(void * context)
{
CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
- reinterpret_cast<CHIPBridgedActionsActionListAttributeCallback *>(context)->javaCallbackRef);
+ reinterpret_cast<CHIPActionsActionListAttributeCallback *>(context)->javaCallbackRef);
VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
};
@@ -1778,31 +1776,30 @@
bool keepAlive;
};
-class CHIPBridgedActionsEndpointListAttributeCallback
- : public chip::Callback::Callback<CHIPBridgedActionsClusterEndpointListAttributeCallbackType>
+class CHIPActionsEndpointListsAttributeCallback
+ : public chip::Callback::Callback<CHIPActionsClusterEndpointListsAttributeCallbackType>
{
public:
- CHIPBridgedActionsEndpointListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+ CHIPActionsEndpointListsAttributeCallback(jobject javaCallback, bool keepAlive = false);
- ~CHIPBridgedActionsEndpointListAttributeCallback();
+ ~CHIPActionsEndpointListsAttributeCallback();
- static void maybeDestroy(CHIPBridgedActionsEndpointListAttributeCallback * callback)
+ static void maybeDestroy(CHIPActionsEndpointListsAttributeCallback * callback)
{
if (!callback->keepAlive)
{
callback->Cancel();
- chip::Platform::Delete<CHIPBridgedActionsEndpointListAttributeCallback>(callback);
+ chip::Platform::Delete<CHIPActionsEndpointListsAttributeCallback>(callback);
}
}
static void CallbackFn(
void * context,
- const chip::app::DataModel::DecodableList<chip::app::Clusters::BridgedActions::Structs::EndpointListStruct::DecodableType> &
- list);
+ const chip::app::DataModel::DecodableList<chip::app::Clusters::Actions::Structs::EndpointListStruct::DecodableType> & list);
static void OnSubscriptionEstablished(void * context)
{
CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
- reinterpret_cast<CHIPBridgedActionsEndpointListAttributeCallback *>(context)->javaCallbackRef);
+ reinterpret_cast<CHIPActionsEndpointListsAttributeCallback *>(context)->javaCallbackRef);
VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
};
@@ -1811,20 +1808,20 @@
bool keepAlive;
};
-class CHIPBridgedActionsGeneratedCommandListAttributeCallback
- : public chip::Callback::Callback<CHIPBridgedActionsClusterGeneratedCommandListAttributeCallbackType>
+class CHIPActionsGeneratedCommandListAttributeCallback
+ : public chip::Callback::Callback<CHIPActionsClusterGeneratedCommandListAttributeCallbackType>
{
public:
- CHIPBridgedActionsGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+ CHIPActionsGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
- ~CHIPBridgedActionsGeneratedCommandListAttributeCallback();
+ ~CHIPActionsGeneratedCommandListAttributeCallback();
- static void maybeDestroy(CHIPBridgedActionsGeneratedCommandListAttributeCallback * callback)
+ static void maybeDestroy(CHIPActionsGeneratedCommandListAttributeCallback * callback)
{
if (!callback->keepAlive)
{
callback->Cancel();
- chip::Platform::Delete<CHIPBridgedActionsGeneratedCommandListAttributeCallback>(callback);
+ chip::Platform::Delete<CHIPActionsGeneratedCommandListAttributeCallback>(callback);
}
}
@@ -1832,7 +1829,7 @@
static void OnSubscriptionEstablished(void * context)
{
CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
- reinterpret_cast<CHIPBridgedActionsGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
+ reinterpret_cast<CHIPActionsGeneratedCommandListAttributeCallback *>(context)->javaCallbackRef);
VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
};
@@ -1841,20 +1838,20 @@
bool keepAlive;
};
-class CHIPBridgedActionsAcceptedCommandListAttributeCallback
- : public chip::Callback::Callback<CHIPBridgedActionsClusterAcceptedCommandListAttributeCallbackType>
+class CHIPActionsAcceptedCommandListAttributeCallback
+ : public chip::Callback::Callback<CHIPActionsClusterAcceptedCommandListAttributeCallbackType>
{
public:
- CHIPBridgedActionsAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+ CHIPActionsAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive = false);
- ~CHIPBridgedActionsAcceptedCommandListAttributeCallback();
+ ~CHIPActionsAcceptedCommandListAttributeCallback();
- static void maybeDestroy(CHIPBridgedActionsAcceptedCommandListAttributeCallback * callback)
+ static void maybeDestroy(CHIPActionsAcceptedCommandListAttributeCallback * callback)
{
if (!callback->keepAlive)
{
callback->Cancel();
- chip::Platform::Delete<CHIPBridgedActionsAcceptedCommandListAttributeCallback>(callback);
+ chip::Platform::Delete<CHIPActionsAcceptedCommandListAttributeCallback>(callback);
}
}
@@ -1862,7 +1859,7 @@
static void OnSubscriptionEstablished(void * context)
{
CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
- reinterpret_cast<CHIPBridgedActionsAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
+ reinterpret_cast<CHIPActionsAcceptedCommandListAttributeCallback *>(context)->javaCallbackRef);
VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
};
@@ -1871,20 +1868,20 @@
bool keepAlive;
};
-class CHIPBridgedActionsAttributeListAttributeCallback
- : public chip::Callback::Callback<CHIPBridgedActionsClusterAttributeListAttributeCallbackType>
+class CHIPActionsAttributeListAttributeCallback
+ : public chip::Callback::Callback<CHIPActionsClusterAttributeListAttributeCallbackType>
{
public:
- CHIPBridgedActionsAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
+ CHIPActionsAttributeListAttributeCallback(jobject javaCallback, bool keepAlive = false);
- ~CHIPBridgedActionsAttributeListAttributeCallback();
+ ~CHIPActionsAttributeListAttributeCallback();
- static void maybeDestroy(CHIPBridgedActionsAttributeListAttributeCallback * callback)
+ static void maybeDestroy(CHIPActionsAttributeListAttributeCallback * callback)
{
if (!callback->keepAlive)
{
callback->Cancel();
- chip::Platform::Delete<CHIPBridgedActionsAttributeListAttributeCallback>(callback);
+ chip::Platform::Delete<CHIPActionsAttributeListAttributeCallback>(callback);
}
}
@@ -1892,7 +1889,7 @@
static void OnSubscriptionEstablished(void * context)
{
CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
- reinterpret_cast<CHIPBridgedActionsAttributeListAttributeCallback *>(context)->javaCallbackRef);
+ reinterpret_cast<CHIPActionsAttributeListAttributeCallback *>(context)->javaCallbackRef);
VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
};
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
index 9c791da..1aa9a1d 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
@@ -3093,10 +3093,10 @@
long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
}
- public static class BridgedActionsCluster extends BaseChipCluster {
+ public static class ActionsCluster extends BaseChipCluster {
public static final long CLUSTER_ID = 37L;
- public BridgedActionsCluster(long devicePtr, int endpointId) {
+ public ActionsCluster(long devicePtr, int endpointId) {
super(devicePtr, endpointId);
}
@@ -3363,15 +3363,15 @@
@Nullable Integer timedInvokeTimeoutMs);
public interface ActionListAttributeCallback {
- void onSuccess(List<ChipStructs.BridgedActionsClusterActionStruct> valueList);
+ void onSuccess(List<ChipStructs.ActionsClusterActionStruct> valueList);
void onError(Exception ex);
default void onSubscriptionEstablished() {}
}
- public interface EndpointListAttributeCallback {
- void onSuccess(List<ChipStructs.BridgedActionsClusterEndpointListStruct> valueList);
+ public interface EndpointListsAttributeCallback {
+ void onSuccess(List<ChipStructs.ActionsClusterEndpointListStruct> valueList);
void onError(Exception ex);
@@ -3411,22 +3411,22 @@
subscribeActionListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
}
- public void readEndpointListAttribute(EndpointListAttributeCallback callback) {
- readEndpointListAttribute(chipClusterPtr, callback);
+ public void readEndpointListsAttribute(EndpointListsAttributeCallback callback) {
+ readEndpointListsAttribute(chipClusterPtr, callback);
}
- public void subscribeEndpointListAttribute(
- EndpointListAttributeCallback callback, int minInterval, int maxInterval) {
- subscribeEndpointListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+ public void subscribeEndpointListsAttribute(
+ EndpointListsAttributeCallback callback, int minInterval, int maxInterval) {
+ subscribeEndpointListsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
}
- public void readSetupUrlAttribute(CharStringAttributeCallback callback) {
- readSetupUrlAttribute(chipClusterPtr, callback);
+ public void readSetupURLAttribute(CharStringAttributeCallback callback) {
+ readSetupURLAttribute(chipClusterPtr, callback);
}
- public void subscribeSetupUrlAttribute(
+ public void subscribeSetupURLAttribute(
CharStringAttributeCallback callback, int minInterval, int maxInterval) {
- subscribeSetupUrlAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+ subscribeSetupURLAttribute(chipClusterPtr, callback, minInterval, maxInterval);
}
public void readGeneratedCommandListAttribute(GeneratedCommandListAttributeCallback callback) {
@@ -3483,19 +3483,19 @@
int minInterval,
int maxInterval);
- private native void readEndpointListAttribute(
- long chipClusterPtr, EndpointListAttributeCallback callback);
+ private native void readEndpointListsAttribute(
+ long chipClusterPtr, EndpointListsAttributeCallback callback);
- private native void subscribeEndpointListAttribute(
+ private native void subscribeEndpointListsAttribute(
long chipClusterPtr,
- EndpointListAttributeCallback callback,
+ EndpointListsAttributeCallback callback,
int minInterval,
int maxInterval);
- private native void readSetupUrlAttribute(
+ private native void readSetupURLAttribute(
long chipClusterPtr, CharStringAttributeCallback callback);
- private native void subscribeSetupUrlAttribute(
+ private native void subscribeSetupURLAttribute(
long chipClusterPtr,
CharStringAttributeCallback callback,
int minInterval,
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipEventStructs.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipEventStructs.java
index 54310f7..21ebe48 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ChipEventStructs.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipEventStructs.java
@@ -112,13 +112,12 @@
}
}
- public static class BridgedActionsClusterStateChangedEvent {
+ public static class ActionsClusterStateChangedEvent {
public Integer actionID;
public Long invokeID;
public Integer newState;
- public BridgedActionsClusterStateChangedEvent(
- Integer actionID, Long invokeID, Integer newState) {
+ public ActionsClusterStateChangedEvent(Integer actionID, Long invokeID, Integer newState) {
this.actionID = actionID;
this.invokeID = invokeID;
this.newState = newState;
@@ -127,7 +126,7 @@
@Override
public String toString() {
StringBuilder output = new StringBuilder();
- output.append("BridgedActionsClusterStateChangedEvent {\n");
+ output.append("ActionsClusterStateChangedEvent {\n");
output.append("\tactionID: ");
output.append(actionID);
output.append("\n");
@@ -142,13 +141,13 @@
}
}
- public static class BridgedActionsClusterActionFailedEvent {
+ public static class ActionsClusterActionFailedEvent {
public Integer actionID;
public Long invokeID;
public Integer newState;
public Integer error;
- public BridgedActionsClusterActionFailedEvent(
+ public ActionsClusterActionFailedEvent(
Integer actionID, Long invokeID, Integer newState, Integer error) {
this.actionID = actionID;
this.invokeID = invokeID;
@@ -159,7 +158,7 @@
@Override
public String toString() {
StringBuilder output = new StringBuilder();
- output.append("BridgedActionsClusterActionFailedEvent {\n");
+ output.append("ActionsClusterActionFailedEvent {\n");
output.append("\tactionID: ");
output.append(actionID);
output.append("\n");
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java
index 9068934..fddd0ee 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java
@@ -56,7 +56,7 @@
return "AccessControl";
}
if (clusterId == 37L) {
- return "BridgedActions";
+ return "Actions";
}
if (clusterId == 40L) {
return "Basic";
@@ -539,10 +539,10 @@
return "ActionList";
}
if (attributeId == 1L) {
- return "EndpointList";
+ return "EndpointLists";
}
if (attributeId == 2L) {
- return "SetupUrl";
+ return "SetupURL";
}
if (attributeId == 65528L) {
return "GeneratedCommandList";
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java
index d495408..0e5bd9c 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java
@@ -240,33 +240,33 @@
}
}
- public static class BridgedActionsClusterActionStruct {
+ public static class ActionsClusterActionStruct {
public Integer actionID;
public String name;
public Integer type;
public Integer endpointListID;
public Integer supportedCommands;
- public Integer status;
+ public Integer state;
- public BridgedActionsClusterActionStruct(
+ public ActionsClusterActionStruct(
Integer actionID,
String name,
Integer type,
Integer endpointListID,
Integer supportedCommands,
- Integer status) {
+ Integer state) {
this.actionID = actionID;
this.name = name;
this.type = type;
this.endpointListID = endpointListID;
this.supportedCommands = supportedCommands;
- this.status = status;
+ this.state = state;
}
@Override
public String toString() {
StringBuilder output = new StringBuilder();
- output.append("BridgedActionsClusterActionStruct {\n");
+ output.append("ActionsClusterActionStruct {\n");
output.append("\tactionID: ");
output.append(actionID);
output.append("\n");
@@ -282,21 +282,21 @@
output.append("\tsupportedCommands: ");
output.append(supportedCommands);
output.append("\n");
- output.append("\tstatus: ");
- output.append(status);
+ output.append("\tstate: ");
+ output.append(state);
output.append("\n");
output.append("}\n");
return output.toString();
}
}
- public static class BridgedActionsClusterEndpointListStruct {
+ public static class ActionsClusterEndpointListStruct {
public Integer endpointListID;
public String name;
public Integer type;
public ArrayList<Object> endpoints;
- public BridgedActionsClusterEndpointListStruct(
+ public ActionsClusterEndpointListStruct(
Integer endpointListID, String name, Integer type, ArrayList<Object> endpoints) {
this.endpointListID = endpointListID;
this.name = name;
@@ -307,7 +307,7 @@
@Override
public String toString() {
StringBuilder output = new StringBuilder();
- output.append("BridgedActionsClusterEndpointListStruct {\n");
+ output.append("ActionsClusterEndpointListStruct {\n");
output.append("\tendpointListID: ");
output.append(endpointListID);
output.append("\n");
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
index a7431df..955ae30 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
@@ -1400,9 +1400,8 @@
}
}
- public static class DelegatedBridgedActionsClusterActionListAttributeCallback
- implements ChipClusters.BridgedActionsCluster.ActionListAttributeCallback,
- DelegatedClusterCallback {
+ public static class DelegatedActionsClusterActionListAttributeCallback
+ implements ChipClusters.ActionsCluster.ActionListAttributeCallback, DelegatedClusterCallback {
private ClusterCommandCallback callback;
@Override
@@ -1411,11 +1410,10 @@
}
@Override
- public void onSuccess(List<ChipStructs.BridgedActionsClusterActionStruct> valueList) {
+ public void onSuccess(List<ChipStructs.ActionsClusterActionStruct> valueList) {
Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
CommandResponseInfo commandResponseInfo =
- new CommandResponseInfo(
- "valueList", "List<ChipStructs.BridgedActionsClusterActionStruct>");
+ new CommandResponseInfo("valueList", "List<ChipStructs.ActionsClusterActionStruct>");
responseValues.put(commandResponseInfo, valueList);
callback.onSuccess(responseValues);
}
@@ -1426,8 +1424,8 @@
}
}
- public static class DelegatedBridgedActionsClusterEndpointListAttributeCallback
- implements ChipClusters.BridgedActionsCluster.EndpointListAttributeCallback,
+ public static class DelegatedActionsClusterEndpointListsAttributeCallback
+ implements ChipClusters.ActionsCluster.EndpointListsAttributeCallback,
DelegatedClusterCallback {
private ClusterCommandCallback callback;
@@ -1437,11 +1435,11 @@
}
@Override
- public void onSuccess(List<ChipStructs.BridgedActionsClusterEndpointListStruct> valueList) {
+ public void onSuccess(List<ChipStructs.ActionsClusterEndpointListStruct> valueList) {
Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
CommandResponseInfo commandResponseInfo =
new CommandResponseInfo(
- "valueList", "List<ChipStructs.BridgedActionsClusterEndpointListStruct>");
+ "valueList", "List<ChipStructs.ActionsClusterEndpointListStruct>");
responseValues.put(commandResponseInfo, valueList);
callback.onSuccess(responseValues);
}
@@ -1452,8 +1450,8 @@
}
}
- public static class DelegatedBridgedActionsClusterGeneratedCommandListAttributeCallback
- implements ChipClusters.BridgedActionsCluster.GeneratedCommandListAttributeCallback,
+ public static class DelegatedActionsClusterGeneratedCommandListAttributeCallback
+ implements ChipClusters.ActionsCluster.GeneratedCommandListAttributeCallback,
DelegatedClusterCallback {
private ClusterCommandCallback callback;
@@ -1476,8 +1474,8 @@
}
}
- public static class DelegatedBridgedActionsClusterAcceptedCommandListAttributeCallback
- implements ChipClusters.BridgedActionsCluster.AcceptedCommandListAttributeCallback,
+ public static class DelegatedActionsClusterAcceptedCommandListAttributeCallback
+ implements ChipClusters.ActionsCluster.AcceptedCommandListAttributeCallback,
DelegatedClusterCallback {
private ClusterCommandCallback callback;
@@ -1500,8 +1498,8 @@
}
}
- public static class DelegatedBridgedActionsClusterAttributeListAttributeCallback
- implements ChipClusters.BridgedActionsCluster.AttributeListAttributeCallback,
+ public static class DelegatedActionsClusterAttributeListAttributeCallback
+ implements ChipClusters.ActionsCluster.AttributeListAttributeCallback,
DelegatedClusterCallback {
private ClusterCommandCallback callback;
@@ -7194,11 +7192,10 @@
(ptr, endpointId) -> new ChipClusters.AccessControlCluster(ptr, endpointId),
new HashMap<>());
clusterMap.put("accessControl", accessControlClusterInfo);
- ClusterInfo bridgedActionsClusterInfo =
+ ClusterInfo actionsClusterInfo =
new ClusterInfo(
- (ptr, endpointId) -> new ChipClusters.BridgedActionsCluster(ptr, endpointId),
- new HashMap<>());
- clusterMap.put("bridgedActions", bridgedActionsClusterInfo);
+ (ptr, endpointId) -> new ChipClusters.ActionsCluster(ptr, endpointId), new HashMap<>());
+ clusterMap.put("actions", actionsClusterInfo);
ClusterInfo basicClusterInfo =
new ClusterInfo(
(ptr, endpointId) -> new ChipClusters.BasicCluster(ptr, endpointId), new HashMap<>());
@@ -7490,7 +7487,7 @@
destination.get("descriptor").combineCommands(source.get("descriptor"));
destination.get("binding").combineCommands(source.get("binding"));
destination.get("accessControl").combineCommands(source.get("accessControl"));
- destination.get("bridgedActions").combineCommands(source.get("bridgedActions"));
+ destination.get("actions").combineCommands(source.get("actions"));
destination.get("basic").combineCommands(source.get("basic"));
destination
.get("otaSoftwareUpdateProvider")
@@ -8281,55 +8278,52 @@
commandMap.put("binding", bindingClusterInteractionInfoMap);
Map<String, InteractionInfo> accessControlClusterInteractionInfoMap = new LinkedHashMap<>();
commandMap.put("accessControl", accessControlClusterInteractionInfoMap);
- Map<String, InteractionInfo> bridgedActionsClusterInteractionInfoMap = new LinkedHashMap<>();
- Map<String, CommandParameterInfo> bridgedActionsinstantActionCommandParams =
+ Map<String, InteractionInfo> actionsClusterInteractionInfoMap = new LinkedHashMap<>();
+ Map<String, CommandParameterInfo> actionsinstantActionCommandParams =
new LinkedHashMap<String, CommandParameterInfo>();
- CommandParameterInfo bridgedActionsinstantActionactionIDCommandParameterInfo =
+ CommandParameterInfo actionsinstantActionactionIDCommandParameterInfo =
new CommandParameterInfo("actionID", Integer.class, Integer.class);
- bridgedActionsinstantActionCommandParams.put(
- "actionID", bridgedActionsinstantActionactionIDCommandParameterInfo);
+ actionsinstantActionCommandParams.put(
+ "actionID", actionsinstantActionactionIDCommandParameterInfo);
- CommandParameterInfo bridgedActionsinstantActioninvokeIDCommandParameterInfo =
+ CommandParameterInfo actionsinstantActioninvokeIDCommandParameterInfo =
new CommandParameterInfo("invokeID", Optional.class, Long.class);
- bridgedActionsinstantActionCommandParams.put(
- "invokeID", bridgedActionsinstantActioninvokeIDCommandParameterInfo);
+ actionsinstantActionCommandParams.put(
+ "invokeID", actionsinstantActioninvokeIDCommandParameterInfo);
- InteractionInfo bridgedActionsinstantActionInteractionInfo =
+ InteractionInfo actionsinstantActionInteractionInfo =
new InteractionInfo(
(cluster, callback, commandArguments) -> {
- ((ChipClusters.BridgedActionsCluster) cluster)
+ ((ChipClusters.ActionsCluster) cluster)
.instantAction(
(DefaultClusterCallback) callback,
(Integer) commandArguments.get("actionID"),
(Optional<Long>) commandArguments.get("invokeID"));
},
() -> new DelegatedDefaultClusterCallback(),
- bridgedActionsinstantActionCommandParams);
- bridgedActionsClusterInteractionInfoMap.put(
- "instantAction", bridgedActionsinstantActionInteractionInfo);
- Map<String, CommandParameterInfo> bridgedActionsinstantActionWithTransitionCommandParams =
+ actionsinstantActionCommandParams);
+ actionsClusterInteractionInfoMap.put("instantAction", actionsinstantActionInteractionInfo);
+ Map<String, CommandParameterInfo> actionsinstantActionWithTransitionCommandParams =
new LinkedHashMap<String, CommandParameterInfo>();
- CommandParameterInfo bridgedActionsinstantActionWithTransitionactionIDCommandParameterInfo =
+ CommandParameterInfo actionsinstantActionWithTransitionactionIDCommandParameterInfo =
new CommandParameterInfo("actionID", Integer.class, Integer.class);
- bridgedActionsinstantActionWithTransitionCommandParams.put(
- "actionID", bridgedActionsinstantActionWithTransitionactionIDCommandParameterInfo);
+ actionsinstantActionWithTransitionCommandParams.put(
+ "actionID", actionsinstantActionWithTransitionactionIDCommandParameterInfo);
- CommandParameterInfo bridgedActionsinstantActionWithTransitioninvokeIDCommandParameterInfo =
+ CommandParameterInfo actionsinstantActionWithTransitioninvokeIDCommandParameterInfo =
new CommandParameterInfo("invokeID", Optional.class, Long.class);
- bridgedActionsinstantActionWithTransitionCommandParams.put(
- "invokeID", bridgedActionsinstantActionWithTransitioninvokeIDCommandParameterInfo);
+ actionsinstantActionWithTransitionCommandParams.put(
+ "invokeID", actionsinstantActionWithTransitioninvokeIDCommandParameterInfo);
- CommandParameterInfo
- bridgedActionsinstantActionWithTransitiontransitionTimeCommandParameterInfo =
- new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
- bridgedActionsinstantActionWithTransitionCommandParams.put(
- "transitionTime",
- bridgedActionsinstantActionWithTransitiontransitionTimeCommandParameterInfo);
+ CommandParameterInfo actionsinstantActionWithTransitiontransitionTimeCommandParameterInfo =
+ new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
+ actionsinstantActionWithTransitionCommandParams.put(
+ "transitionTime", actionsinstantActionWithTransitiontransitionTimeCommandParameterInfo);
- InteractionInfo bridgedActionsinstantActionWithTransitionInteractionInfo =
+ InteractionInfo actionsinstantActionWithTransitionInteractionInfo =
new InteractionInfo(
(cluster, callback, commandArguments) -> {
- ((ChipClusters.BridgedActionsCluster) cluster)
+ ((ChipClusters.ActionsCluster) cluster)
.instantActionWithTransition(
(DefaultClusterCallback) callback,
(Integer) commandArguments.get("actionID"),
@@ -8337,55 +8331,52 @@
(Integer) commandArguments.get("transitionTime"));
},
() -> new DelegatedDefaultClusterCallback(),
- bridgedActionsinstantActionWithTransitionCommandParams);
- bridgedActionsClusterInteractionInfoMap.put(
- "instantActionWithTransition", bridgedActionsinstantActionWithTransitionInteractionInfo);
- Map<String, CommandParameterInfo> bridgedActionsstartActionCommandParams =
+ actionsinstantActionWithTransitionCommandParams);
+ actionsClusterInteractionInfoMap.put(
+ "instantActionWithTransition", actionsinstantActionWithTransitionInteractionInfo);
+ Map<String, CommandParameterInfo> actionsstartActionCommandParams =
new LinkedHashMap<String, CommandParameterInfo>();
- CommandParameterInfo bridgedActionsstartActionactionIDCommandParameterInfo =
+ CommandParameterInfo actionsstartActionactionIDCommandParameterInfo =
new CommandParameterInfo("actionID", Integer.class, Integer.class);
- bridgedActionsstartActionCommandParams.put(
- "actionID", bridgedActionsstartActionactionIDCommandParameterInfo);
+ actionsstartActionCommandParams.put("actionID", actionsstartActionactionIDCommandParameterInfo);
- CommandParameterInfo bridgedActionsstartActioninvokeIDCommandParameterInfo =
+ CommandParameterInfo actionsstartActioninvokeIDCommandParameterInfo =
new CommandParameterInfo("invokeID", Optional.class, Long.class);
- bridgedActionsstartActionCommandParams.put(
- "invokeID", bridgedActionsstartActioninvokeIDCommandParameterInfo);
+ actionsstartActionCommandParams.put("invokeID", actionsstartActioninvokeIDCommandParameterInfo);
- InteractionInfo bridgedActionsstartActionInteractionInfo =
+ InteractionInfo actionsstartActionInteractionInfo =
new InteractionInfo(
(cluster, callback, commandArguments) -> {
- ((ChipClusters.BridgedActionsCluster) cluster)
+ ((ChipClusters.ActionsCluster) cluster)
.startAction(
(DefaultClusterCallback) callback,
(Integer) commandArguments.get("actionID"),
(Optional<Long>) commandArguments.get("invokeID"));
},
() -> new DelegatedDefaultClusterCallback(),
- bridgedActionsstartActionCommandParams);
- bridgedActionsClusterInteractionInfoMap.put(
- "startAction", bridgedActionsstartActionInteractionInfo);
- Map<String, CommandParameterInfo> bridgedActionsstartActionWithDurationCommandParams =
+ actionsstartActionCommandParams);
+ actionsClusterInteractionInfoMap.put("startAction", actionsstartActionInteractionInfo);
+ Map<String, CommandParameterInfo> actionsstartActionWithDurationCommandParams =
new LinkedHashMap<String, CommandParameterInfo>();
- CommandParameterInfo bridgedActionsstartActionWithDurationactionIDCommandParameterInfo =
+ CommandParameterInfo actionsstartActionWithDurationactionIDCommandParameterInfo =
new CommandParameterInfo("actionID", Integer.class, Integer.class);
- bridgedActionsstartActionWithDurationCommandParams.put(
- "actionID", bridgedActionsstartActionWithDurationactionIDCommandParameterInfo);
+ actionsstartActionWithDurationCommandParams.put(
+ "actionID", actionsstartActionWithDurationactionIDCommandParameterInfo);
- CommandParameterInfo bridgedActionsstartActionWithDurationinvokeIDCommandParameterInfo =
+ CommandParameterInfo actionsstartActionWithDurationinvokeIDCommandParameterInfo =
new CommandParameterInfo("invokeID", Optional.class, Long.class);
- bridgedActionsstartActionWithDurationCommandParams.put(
- "invokeID", bridgedActionsstartActionWithDurationinvokeIDCommandParameterInfo);
+ actionsstartActionWithDurationCommandParams.put(
+ "invokeID", actionsstartActionWithDurationinvokeIDCommandParameterInfo);
- CommandParameterInfo bridgedActionsstartActionWithDurationdurationCommandParameterInfo =
+ CommandParameterInfo actionsstartActionWithDurationdurationCommandParameterInfo =
new CommandParameterInfo("duration", Long.class, Long.class);
- bridgedActionsstartActionWithDurationCommandParams.put(
- "duration", bridgedActionsstartActionWithDurationdurationCommandParameterInfo);
+ actionsstartActionWithDurationCommandParams.put(
+ "duration", actionsstartActionWithDurationdurationCommandParameterInfo);
- InteractionInfo bridgedActionsstartActionWithDurationInteractionInfo =
+ InteractionInfo actionsstartActionWithDurationInteractionInfo =
new InteractionInfo(
(cluster, callback, commandArguments) -> {
- ((ChipClusters.BridgedActionsCluster) cluster)
+ ((ChipClusters.ActionsCluster) cluster)
.startActionWithDuration(
(DefaultClusterCallback) callback,
(Integer) commandArguments.get("actionID"),
@@ -8393,80 +8384,74 @@
(Long) commandArguments.get("duration"));
},
() -> new DelegatedDefaultClusterCallback(),
- bridgedActionsstartActionWithDurationCommandParams);
- bridgedActionsClusterInteractionInfoMap.put(
- "startActionWithDuration", bridgedActionsstartActionWithDurationInteractionInfo);
- Map<String, CommandParameterInfo> bridgedActionsstopActionCommandParams =
+ actionsstartActionWithDurationCommandParams);
+ actionsClusterInteractionInfoMap.put(
+ "startActionWithDuration", actionsstartActionWithDurationInteractionInfo);
+ Map<String, CommandParameterInfo> actionsstopActionCommandParams =
new LinkedHashMap<String, CommandParameterInfo>();
- CommandParameterInfo bridgedActionsstopActionactionIDCommandParameterInfo =
+ CommandParameterInfo actionsstopActionactionIDCommandParameterInfo =
new CommandParameterInfo("actionID", Integer.class, Integer.class);
- bridgedActionsstopActionCommandParams.put(
- "actionID", bridgedActionsstopActionactionIDCommandParameterInfo);
+ actionsstopActionCommandParams.put("actionID", actionsstopActionactionIDCommandParameterInfo);
- CommandParameterInfo bridgedActionsstopActioninvokeIDCommandParameterInfo =
+ CommandParameterInfo actionsstopActioninvokeIDCommandParameterInfo =
new CommandParameterInfo("invokeID", Optional.class, Long.class);
- bridgedActionsstopActionCommandParams.put(
- "invokeID", bridgedActionsstopActioninvokeIDCommandParameterInfo);
+ actionsstopActionCommandParams.put("invokeID", actionsstopActioninvokeIDCommandParameterInfo);
- InteractionInfo bridgedActionsstopActionInteractionInfo =
+ InteractionInfo actionsstopActionInteractionInfo =
new InteractionInfo(
(cluster, callback, commandArguments) -> {
- ((ChipClusters.BridgedActionsCluster) cluster)
+ ((ChipClusters.ActionsCluster) cluster)
.stopAction(
(DefaultClusterCallback) callback,
(Integer) commandArguments.get("actionID"),
(Optional<Long>) commandArguments.get("invokeID"));
},
() -> new DelegatedDefaultClusterCallback(),
- bridgedActionsstopActionCommandParams);
- bridgedActionsClusterInteractionInfoMap.put(
- "stopAction", bridgedActionsstopActionInteractionInfo);
- Map<String, CommandParameterInfo> bridgedActionspauseActionCommandParams =
+ actionsstopActionCommandParams);
+ actionsClusterInteractionInfoMap.put("stopAction", actionsstopActionInteractionInfo);
+ Map<String, CommandParameterInfo> actionspauseActionCommandParams =
new LinkedHashMap<String, CommandParameterInfo>();
- CommandParameterInfo bridgedActionspauseActionactionIDCommandParameterInfo =
+ CommandParameterInfo actionspauseActionactionIDCommandParameterInfo =
new CommandParameterInfo("actionID", Integer.class, Integer.class);
- bridgedActionspauseActionCommandParams.put(
- "actionID", bridgedActionspauseActionactionIDCommandParameterInfo);
+ actionspauseActionCommandParams.put("actionID", actionspauseActionactionIDCommandParameterInfo);
- CommandParameterInfo bridgedActionspauseActioninvokeIDCommandParameterInfo =
+ CommandParameterInfo actionspauseActioninvokeIDCommandParameterInfo =
new CommandParameterInfo("invokeID", Optional.class, Long.class);
- bridgedActionspauseActionCommandParams.put(
- "invokeID", bridgedActionspauseActioninvokeIDCommandParameterInfo);
+ actionspauseActionCommandParams.put("invokeID", actionspauseActioninvokeIDCommandParameterInfo);
- InteractionInfo bridgedActionspauseActionInteractionInfo =
+ InteractionInfo actionspauseActionInteractionInfo =
new InteractionInfo(
(cluster, callback, commandArguments) -> {
- ((ChipClusters.BridgedActionsCluster) cluster)
+ ((ChipClusters.ActionsCluster) cluster)
.pauseAction(
(DefaultClusterCallback) callback,
(Integer) commandArguments.get("actionID"),
(Optional<Long>) commandArguments.get("invokeID"));
},
() -> new DelegatedDefaultClusterCallback(),
- bridgedActionspauseActionCommandParams);
- bridgedActionsClusterInteractionInfoMap.put(
- "pauseAction", bridgedActionspauseActionInteractionInfo);
- Map<String, CommandParameterInfo> bridgedActionspauseActionWithDurationCommandParams =
+ actionspauseActionCommandParams);
+ actionsClusterInteractionInfoMap.put("pauseAction", actionspauseActionInteractionInfo);
+ Map<String, CommandParameterInfo> actionspauseActionWithDurationCommandParams =
new LinkedHashMap<String, CommandParameterInfo>();
- CommandParameterInfo bridgedActionspauseActionWithDurationactionIDCommandParameterInfo =
+ CommandParameterInfo actionspauseActionWithDurationactionIDCommandParameterInfo =
new CommandParameterInfo("actionID", Integer.class, Integer.class);
- bridgedActionspauseActionWithDurationCommandParams.put(
- "actionID", bridgedActionspauseActionWithDurationactionIDCommandParameterInfo);
+ actionspauseActionWithDurationCommandParams.put(
+ "actionID", actionspauseActionWithDurationactionIDCommandParameterInfo);
- CommandParameterInfo bridgedActionspauseActionWithDurationinvokeIDCommandParameterInfo =
+ CommandParameterInfo actionspauseActionWithDurationinvokeIDCommandParameterInfo =
new CommandParameterInfo("invokeID", Optional.class, Long.class);
- bridgedActionspauseActionWithDurationCommandParams.put(
- "invokeID", bridgedActionspauseActionWithDurationinvokeIDCommandParameterInfo);
+ actionspauseActionWithDurationCommandParams.put(
+ "invokeID", actionspauseActionWithDurationinvokeIDCommandParameterInfo);
- CommandParameterInfo bridgedActionspauseActionWithDurationdurationCommandParameterInfo =
+ CommandParameterInfo actionspauseActionWithDurationdurationCommandParameterInfo =
new CommandParameterInfo("duration", Long.class, Long.class);
- bridgedActionspauseActionWithDurationCommandParams.put(
- "duration", bridgedActionspauseActionWithDurationdurationCommandParameterInfo);
+ actionspauseActionWithDurationCommandParams.put(
+ "duration", actionspauseActionWithDurationdurationCommandParameterInfo);
- InteractionInfo bridgedActionspauseActionWithDurationInteractionInfo =
+ InteractionInfo actionspauseActionWithDurationInteractionInfo =
new InteractionInfo(
(cluster, callback, commandArguments) -> {
- ((ChipClusters.BridgedActionsCluster) cluster)
+ ((ChipClusters.ActionsCluster) cluster)
.pauseActionWithDuration(
(DefaultClusterCallback) callback,
(Integer) commandArguments.get("actionID"),
@@ -8474,80 +8459,78 @@
(Long) commandArguments.get("duration"));
},
() -> new DelegatedDefaultClusterCallback(),
- bridgedActionspauseActionWithDurationCommandParams);
- bridgedActionsClusterInteractionInfoMap.put(
- "pauseActionWithDuration", bridgedActionspauseActionWithDurationInteractionInfo);
- Map<String, CommandParameterInfo> bridgedActionsresumeActionCommandParams =
+ actionspauseActionWithDurationCommandParams);
+ actionsClusterInteractionInfoMap.put(
+ "pauseActionWithDuration", actionspauseActionWithDurationInteractionInfo);
+ Map<String, CommandParameterInfo> actionsresumeActionCommandParams =
new LinkedHashMap<String, CommandParameterInfo>();
- CommandParameterInfo bridgedActionsresumeActionactionIDCommandParameterInfo =
+ CommandParameterInfo actionsresumeActionactionIDCommandParameterInfo =
new CommandParameterInfo("actionID", Integer.class, Integer.class);
- bridgedActionsresumeActionCommandParams.put(
- "actionID", bridgedActionsresumeActionactionIDCommandParameterInfo);
+ actionsresumeActionCommandParams.put(
+ "actionID", actionsresumeActionactionIDCommandParameterInfo);
- CommandParameterInfo bridgedActionsresumeActioninvokeIDCommandParameterInfo =
+ CommandParameterInfo actionsresumeActioninvokeIDCommandParameterInfo =
new CommandParameterInfo("invokeID", Optional.class, Long.class);
- bridgedActionsresumeActionCommandParams.put(
- "invokeID", bridgedActionsresumeActioninvokeIDCommandParameterInfo);
+ actionsresumeActionCommandParams.put(
+ "invokeID", actionsresumeActioninvokeIDCommandParameterInfo);
- InteractionInfo bridgedActionsresumeActionInteractionInfo =
+ InteractionInfo actionsresumeActionInteractionInfo =
new InteractionInfo(
(cluster, callback, commandArguments) -> {
- ((ChipClusters.BridgedActionsCluster) cluster)
+ ((ChipClusters.ActionsCluster) cluster)
.resumeAction(
(DefaultClusterCallback) callback,
(Integer) commandArguments.get("actionID"),
(Optional<Long>) commandArguments.get("invokeID"));
},
() -> new DelegatedDefaultClusterCallback(),
- bridgedActionsresumeActionCommandParams);
- bridgedActionsClusterInteractionInfoMap.put(
- "resumeAction", bridgedActionsresumeActionInteractionInfo);
- Map<String, CommandParameterInfo> bridgedActionsenableActionCommandParams =
+ actionsresumeActionCommandParams);
+ actionsClusterInteractionInfoMap.put("resumeAction", actionsresumeActionInteractionInfo);
+ Map<String, CommandParameterInfo> actionsenableActionCommandParams =
new LinkedHashMap<String, CommandParameterInfo>();
- CommandParameterInfo bridgedActionsenableActionactionIDCommandParameterInfo =
+ CommandParameterInfo actionsenableActionactionIDCommandParameterInfo =
new CommandParameterInfo("actionID", Integer.class, Integer.class);
- bridgedActionsenableActionCommandParams.put(
- "actionID", bridgedActionsenableActionactionIDCommandParameterInfo);
+ actionsenableActionCommandParams.put(
+ "actionID", actionsenableActionactionIDCommandParameterInfo);
- CommandParameterInfo bridgedActionsenableActioninvokeIDCommandParameterInfo =
+ CommandParameterInfo actionsenableActioninvokeIDCommandParameterInfo =
new CommandParameterInfo("invokeID", Optional.class, Long.class);
- bridgedActionsenableActionCommandParams.put(
- "invokeID", bridgedActionsenableActioninvokeIDCommandParameterInfo);
+ actionsenableActionCommandParams.put(
+ "invokeID", actionsenableActioninvokeIDCommandParameterInfo);
- InteractionInfo bridgedActionsenableActionInteractionInfo =
+ InteractionInfo actionsenableActionInteractionInfo =
new InteractionInfo(
(cluster, callback, commandArguments) -> {
- ((ChipClusters.BridgedActionsCluster) cluster)
+ ((ChipClusters.ActionsCluster) cluster)
.enableAction(
(DefaultClusterCallback) callback,
(Integer) commandArguments.get("actionID"),
(Optional<Long>) commandArguments.get("invokeID"));
},
() -> new DelegatedDefaultClusterCallback(),
- bridgedActionsenableActionCommandParams);
- bridgedActionsClusterInteractionInfoMap.put(
- "enableAction", bridgedActionsenableActionInteractionInfo);
- Map<String, CommandParameterInfo> bridgedActionsenableActionWithDurationCommandParams =
+ actionsenableActionCommandParams);
+ actionsClusterInteractionInfoMap.put("enableAction", actionsenableActionInteractionInfo);
+ Map<String, CommandParameterInfo> actionsenableActionWithDurationCommandParams =
new LinkedHashMap<String, CommandParameterInfo>();
- CommandParameterInfo bridgedActionsenableActionWithDurationactionIDCommandParameterInfo =
+ CommandParameterInfo actionsenableActionWithDurationactionIDCommandParameterInfo =
new CommandParameterInfo("actionID", Integer.class, Integer.class);
- bridgedActionsenableActionWithDurationCommandParams.put(
- "actionID", bridgedActionsenableActionWithDurationactionIDCommandParameterInfo);
+ actionsenableActionWithDurationCommandParams.put(
+ "actionID", actionsenableActionWithDurationactionIDCommandParameterInfo);
- CommandParameterInfo bridgedActionsenableActionWithDurationinvokeIDCommandParameterInfo =
+ CommandParameterInfo actionsenableActionWithDurationinvokeIDCommandParameterInfo =
new CommandParameterInfo("invokeID", Optional.class, Long.class);
- bridgedActionsenableActionWithDurationCommandParams.put(
- "invokeID", bridgedActionsenableActionWithDurationinvokeIDCommandParameterInfo);
+ actionsenableActionWithDurationCommandParams.put(
+ "invokeID", actionsenableActionWithDurationinvokeIDCommandParameterInfo);
- CommandParameterInfo bridgedActionsenableActionWithDurationdurationCommandParameterInfo =
+ CommandParameterInfo actionsenableActionWithDurationdurationCommandParameterInfo =
new CommandParameterInfo("duration", Long.class, Long.class);
- bridgedActionsenableActionWithDurationCommandParams.put(
- "duration", bridgedActionsenableActionWithDurationdurationCommandParameterInfo);
+ actionsenableActionWithDurationCommandParams.put(
+ "duration", actionsenableActionWithDurationdurationCommandParameterInfo);
- InteractionInfo bridgedActionsenableActionWithDurationInteractionInfo =
+ InteractionInfo actionsenableActionWithDurationInteractionInfo =
new InteractionInfo(
(cluster, callback, commandArguments) -> {
- ((ChipClusters.BridgedActionsCluster) cluster)
+ ((ChipClusters.ActionsCluster) cluster)
.enableActionWithDuration(
(DefaultClusterCallback) callback,
(Integer) commandArguments.get("actionID"),
@@ -8555,55 +8538,54 @@
(Long) commandArguments.get("duration"));
},
() -> new DelegatedDefaultClusterCallback(),
- bridgedActionsenableActionWithDurationCommandParams);
- bridgedActionsClusterInteractionInfoMap.put(
- "enableActionWithDuration", bridgedActionsenableActionWithDurationInteractionInfo);
- Map<String, CommandParameterInfo> bridgedActionsdisableActionCommandParams =
+ actionsenableActionWithDurationCommandParams);
+ actionsClusterInteractionInfoMap.put(
+ "enableActionWithDuration", actionsenableActionWithDurationInteractionInfo);
+ Map<String, CommandParameterInfo> actionsdisableActionCommandParams =
new LinkedHashMap<String, CommandParameterInfo>();
- CommandParameterInfo bridgedActionsdisableActionactionIDCommandParameterInfo =
+ CommandParameterInfo actionsdisableActionactionIDCommandParameterInfo =
new CommandParameterInfo("actionID", Integer.class, Integer.class);
- bridgedActionsdisableActionCommandParams.put(
- "actionID", bridgedActionsdisableActionactionIDCommandParameterInfo);
+ actionsdisableActionCommandParams.put(
+ "actionID", actionsdisableActionactionIDCommandParameterInfo);
- CommandParameterInfo bridgedActionsdisableActioninvokeIDCommandParameterInfo =
+ CommandParameterInfo actionsdisableActioninvokeIDCommandParameterInfo =
new CommandParameterInfo("invokeID", Optional.class, Long.class);
- bridgedActionsdisableActionCommandParams.put(
- "invokeID", bridgedActionsdisableActioninvokeIDCommandParameterInfo);
+ actionsdisableActionCommandParams.put(
+ "invokeID", actionsdisableActioninvokeIDCommandParameterInfo);
- InteractionInfo bridgedActionsdisableActionInteractionInfo =
+ InteractionInfo actionsdisableActionInteractionInfo =
new InteractionInfo(
(cluster, callback, commandArguments) -> {
- ((ChipClusters.BridgedActionsCluster) cluster)
+ ((ChipClusters.ActionsCluster) cluster)
.disableAction(
(DefaultClusterCallback) callback,
(Integer) commandArguments.get("actionID"),
(Optional<Long>) commandArguments.get("invokeID"));
},
() -> new DelegatedDefaultClusterCallback(),
- bridgedActionsdisableActionCommandParams);
- bridgedActionsClusterInteractionInfoMap.put(
- "disableAction", bridgedActionsdisableActionInteractionInfo);
- Map<String, CommandParameterInfo> bridgedActionsdisableActionWithDurationCommandParams =
+ actionsdisableActionCommandParams);
+ actionsClusterInteractionInfoMap.put("disableAction", actionsdisableActionInteractionInfo);
+ Map<String, CommandParameterInfo> actionsdisableActionWithDurationCommandParams =
new LinkedHashMap<String, CommandParameterInfo>();
- CommandParameterInfo bridgedActionsdisableActionWithDurationactionIDCommandParameterInfo =
+ CommandParameterInfo actionsdisableActionWithDurationactionIDCommandParameterInfo =
new CommandParameterInfo("actionID", Integer.class, Integer.class);
- bridgedActionsdisableActionWithDurationCommandParams.put(
- "actionID", bridgedActionsdisableActionWithDurationactionIDCommandParameterInfo);
+ actionsdisableActionWithDurationCommandParams.put(
+ "actionID", actionsdisableActionWithDurationactionIDCommandParameterInfo);
- CommandParameterInfo bridgedActionsdisableActionWithDurationinvokeIDCommandParameterInfo =
+ CommandParameterInfo actionsdisableActionWithDurationinvokeIDCommandParameterInfo =
new CommandParameterInfo("invokeID", Optional.class, Long.class);
- bridgedActionsdisableActionWithDurationCommandParams.put(
- "invokeID", bridgedActionsdisableActionWithDurationinvokeIDCommandParameterInfo);
+ actionsdisableActionWithDurationCommandParams.put(
+ "invokeID", actionsdisableActionWithDurationinvokeIDCommandParameterInfo);
- CommandParameterInfo bridgedActionsdisableActionWithDurationdurationCommandParameterInfo =
+ CommandParameterInfo actionsdisableActionWithDurationdurationCommandParameterInfo =
new CommandParameterInfo("duration", Long.class, Long.class);
- bridgedActionsdisableActionWithDurationCommandParams.put(
- "duration", bridgedActionsdisableActionWithDurationdurationCommandParameterInfo);
+ actionsdisableActionWithDurationCommandParams.put(
+ "duration", actionsdisableActionWithDurationdurationCommandParameterInfo);
- InteractionInfo bridgedActionsdisableActionWithDurationInteractionInfo =
+ InteractionInfo actionsdisableActionWithDurationInteractionInfo =
new InteractionInfo(
(cluster, callback, commandArguments) -> {
- ((ChipClusters.BridgedActionsCluster) cluster)
+ ((ChipClusters.ActionsCluster) cluster)
.disableActionWithDuration(
(DefaultClusterCallback) callback,
(Integer) commandArguments.get("actionID"),
@@ -8611,10 +8593,10 @@
(Long) commandArguments.get("duration"));
},
() -> new DelegatedDefaultClusterCallback(),
- bridgedActionsdisableActionWithDurationCommandParams);
- bridgedActionsClusterInteractionInfoMap.put(
- "disableActionWithDuration", bridgedActionsdisableActionWithDurationInteractionInfo);
- commandMap.put("bridgedActions", bridgedActionsClusterInteractionInfoMap);
+ actionsdisableActionWithDurationCommandParams);
+ actionsClusterInteractionInfoMap.put(
+ "disableActionWithDuration", actionsdisableActionWithDurationInteractionInfo);
+ commandMap.put("actions", actionsClusterInteractionInfoMap);
Map<String, InteractionInfo> basicClusterInteractionInfoMap = new LinkedHashMap<>();
commandMap.put("basic", basicClusterInteractionInfoMap);
Map<String, InteractionInfo> otaSoftwareUpdateProviderClusterInteractionInfoMap =
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java
index 2520d1c..b56a5d2 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java
@@ -1289,122 +1289,114 @@
readAccessControlInteractionInfo.put(
"readClusterRevisionAttribute", readAccessControlClusterRevisionAttributeInteractionInfo);
readAttributeMap.put("accessControl", readAccessControlInteractionInfo);
- Map<String, InteractionInfo> readBridgedActionsInteractionInfo = new LinkedHashMap<>();
- Map<String, CommandParameterInfo> readBridgedActionsActionListCommandParams =
+ Map<String, InteractionInfo> readActionsInteractionInfo = new LinkedHashMap<>();
+ Map<String, CommandParameterInfo> readActionsActionListCommandParams =
new LinkedHashMap<String, CommandParameterInfo>();
- InteractionInfo readBridgedActionsActionListAttributeInteractionInfo =
+ InteractionInfo readActionsActionListAttributeInteractionInfo =
new InteractionInfo(
(cluster, callback, commandArguments) -> {
- ((ChipClusters.BridgedActionsCluster) cluster)
+ ((ChipClusters.ActionsCluster) cluster)
.readActionListAttribute(
- (ChipClusters.BridgedActionsCluster.ActionListAttributeCallback) callback);
+ (ChipClusters.ActionsCluster.ActionListAttributeCallback) callback);
},
- () ->
- new ClusterInfoMapping.DelegatedBridgedActionsClusterActionListAttributeCallback(),
- readBridgedActionsActionListCommandParams);
- readBridgedActionsInteractionInfo.put(
- "readActionListAttribute", readBridgedActionsActionListAttributeInteractionInfo);
- Map<String, CommandParameterInfo> readBridgedActionsEndpointListCommandParams =
+ () -> new ClusterInfoMapping.DelegatedActionsClusterActionListAttributeCallback(),
+ readActionsActionListCommandParams);
+ readActionsInteractionInfo.put(
+ "readActionListAttribute", readActionsActionListAttributeInteractionInfo);
+ Map<String, CommandParameterInfo> readActionsEndpointListsCommandParams =
new LinkedHashMap<String, CommandParameterInfo>();
- InteractionInfo readBridgedActionsEndpointListAttributeInteractionInfo =
+ InteractionInfo readActionsEndpointListsAttributeInteractionInfo =
new InteractionInfo(
(cluster, callback, commandArguments) -> {
- ((ChipClusters.BridgedActionsCluster) cluster)
- .readEndpointListAttribute(
- (ChipClusters.BridgedActionsCluster.EndpointListAttributeCallback) callback);
+ ((ChipClusters.ActionsCluster) cluster)
+ .readEndpointListsAttribute(
+ (ChipClusters.ActionsCluster.EndpointListsAttributeCallback) callback);
},
- () ->
- new ClusterInfoMapping
- .DelegatedBridgedActionsClusterEndpointListAttributeCallback(),
- readBridgedActionsEndpointListCommandParams);
- readBridgedActionsInteractionInfo.put(
- "readEndpointListAttribute", readBridgedActionsEndpointListAttributeInteractionInfo);
- Map<String, CommandParameterInfo> readBridgedActionsSetupUrlCommandParams =
+ () -> new ClusterInfoMapping.DelegatedActionsClusterEndpointListsAttributeCallback(),
+ readActionsEndpointListsCommandParams);
+ readActionsInteractionInfo.put(
+ "readEndpointListsAttribute", readActionsEndpointListsAttributeInteractionInfo);
+ Map<String, CommandParameterInfo> readActionsSetupURLCommandParams =
new LinkedHashMap<String, CommandParameterInfo>();
- InteractionInfo readBridgedActionsSetupUrlAttributeInteractionInfo =
+ InteractionInfo readActionsSetupURLAttributeInteractionInfo =
new InteractionInfo(
(cluster, callback, commandArguments) -> {
- ((ChipClusters.BridgedActionsCluster) cluster)
- .readSetupUrlAttribute((ChipClusters.CharStringAttributeCallback) callback);
+ ((ChipClusters.ActionsCluster) cluster)
+ .readSetupURLAttribute((ChipClusters.CharStringAttributeCallback) callback);
},
() -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(),
- readBridgedActionsSetupUrlCommandParams);
- readBridgedActionsInteractionInfo.put(
- "readSetupUrlAttribute", readBridgedActionsSetupUrlAttributeInteractionInfo);
- Map<String, CommandParameterInfo> readBridgedActionsGeneratedCommandListCommandParams =
+ readActionsSetupURLCommandParams);
+ readActionsInteractionInfo.put(
+ "readSetupURLAttribute", readActionsSetupURLAttributeInteractionInfo);
+ Map<String, CommandParameterInfo> readActionsGeneratedCommandListCommandParams =
new LinkedHashMap<String, CommandParameterInfo>();
- InteractionInfo readBridgedActionsGeneratedCommandListAttributeInteractionInfo =
+ InteractionInfo readActionsGeneratedCommandListAttributeInteractionInfo =
new InteractionInfo(
(cluster, callback, commandArguments) -> {
- ((ChipClusters.BridgedActionsCluster) cluster)
+ ((ChipClusters.ActionsCluster) cluster)
.readGeneratedCommandListAttribute(
- (ChipClusters.BridgedActionsCluster.GeneratedCommandListAttributeCallback)
- callback);
+ (ChipClusters.ActionsCluster.GeneratedCommandListAttributeCallback) callback);
},
() ->
new ClusterInfoMapping
- .DelegatedBridgedActionsClusterGeneratedCommandListAttributeCallback(),
- readBridgedActionsGeneratedCommandListCommandParams);
- readBridgedActionsInteractionInfo.put(
+ .DelegatedActionsClusterGeneratedCommandListAttributeCallback(),
+ readActionsGeneratedCommandListCommandParams);
+ readActionsInteractionInfo.put(
"readGeneratedCommandListAttribute",
- readBridgedActionsGeneratedCommandListAttributeInteractionInfo);
- Map<String, CommandParameterInfo> readBridgedActionsAcceptedCommandListCommandParams =
+ readActionsGeneratedCommandListAttributeInteractionInfo);
+ Map<String, CommandParameterInfo> readActionsAcceptedCommandListCommandParams =
new LinkedHashMap<String, CommandParameterInfo>();
- InteractionInfo readBridgedActionsAcceptedCommandListAttributeInteractionInfo =
+ InteractionInfo readActionsAcceptedCommandListAttributeInteractionInfo =
new InteractionInfo(
(cluster, callback, commandArguments) -> {
- ((ChipClusters.BridgedActionsCluster) cluster)
+ ((ChipClusters.ActionsCluster) cluster)
.readAcceptedCommandListAttribute(
- (ChipClusters.BridgedActionsCluster.AcceptedCommandListAttributeCallback)
- callback);
+ (ChipClusters.ActionsCluster.AcceptedCommandListAttributeCallback) callback);
},
() ->
new ClusterInfoMapping
- .DelegatedBridgedActionsClusterAcceptedCommandListAttributeCallback(),
- readBridgedActionsAcceptedCommandListCommandParams);
- readBridgedActionsInteractionInfo.put(
- "readAcceptedCommandListAttribute",
- readBridgedActionsAcceptedCommandListAttributeInteractionInfo);
- Map<String, CommandParameterInfo> readBridgedActionsAttributeListCommandParams =
+ .DelegatedActionsClusterAcceptedCommandListAttributeCallback(),
+ readActionsAcceptedCommandListCommandParams);
+ readActionsInteractionInfo.put(
+ "readAcceptedCommandListAttribute", readActionsAcceptedCommandListAttributeInteractionInfo);
+ Map<String, CommandParameterInfo> readActionsAttributeListCommandParams =
new LinkedHashMap<String, CommandParameterInfo>();
- InteractionInfo readBridgedActionsAttributeListAttributeInteractionInfo =
+ InteractionInfo readActionsAttributeListAttributeInteractionInfo =
new InteractionInfo(
(cluster, callback, commandArguments) -> {
- ((ChipClusters.BridgedActionsCluster) cluster)
+ ((ChipClusters.ActionsCluster) cluster)
.readAttributeListAttribute(
- (ChipClusters.BridgedActionsCluster.AttributeListAttributeCallback) callback);
+ (ChipClusters.ActionsCluster.AttributeListAttributeCallback) callback);
},
- () ->
- new ClusterInfoMapping
- .DelegatedBridgedActionsClusterAttributeListAttributeCallback(),
- readBridgedActionsAttributeListCommandParams);
- readBridgedActionsInteractionInfo.put(
- "readAttributeListAttribute", readBridgedActionsAttributeListAttributeInteractionInfo);
- Map<String, CommandParameterInfo> readBridgedActionsFeatureMapCommandParams =
+ () -> new ClusterInfoMapping.DelegatedActionsClusterAttributeListAttributeCallback(),
+ readActionsAttributeListCommandParams);
+ readActionsInteractionInfo.put(
+ "readAttributeListAttribute", readActionsAttributeListAttributeInteractionInfo);
+ Map<String, CommandParameterInfo> readActionsFeatureMapCommandParams =
new LinkedHashMap<String, CommandParameterInfo>();
- InteractionInfo readBridgedActionsFeatureMapAttributeInteractionInfo =
+ InteractionInfo readActionsFeatureMapAttributeInteractionInfo =
new InteractionInfo(
(cluster, callback, commandArguments) -> {
- ((ChipClusters.BridgedActionsCluster) cluster)
+ ((ChipClusters.ActionsCluster) cluster)
.readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback);
},
() -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
- readBridgedActionsFeatureMapCommandParams);
- readBridgedActionsInteractionInfo.put(
- "readFeatureMapAttribute", readBridgedActionsFeatureMapAttributeInteractionInfo);
- Map<String, CommandParameterInfo> readBridgedActionsClusterRevisionCommandParams =
+ readActionsFeatureMapCommandParams);
+ readActionsInteractionInfo.put(
+ "readFeatureMapAttribute", readActionsFeatureMapAttributeInteractionInfo);
+ Map<String, CommandParameterInfo> readActionsClusterRevisionCommandParams =
new LinkedHashMap<String, CommandParameterInfo>();
- InteractionInfo readBridgedActionsClusterRevisionAttributeInteractionInfo =
+ InteractionInfo readActionsClusterRevisionAttributeInteractionInfo =
new InteractionInfo(
(cluster, callback, commandArguments) -> {
- ((ChipClusters.BridgedActionsCluster) cluster)
+ ((ChipClusters.ActionsCluster) cluster)
.readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback);
},
() -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
- readBridgedActionsClusterRevisionCommandParams);
- readBridgedActionsInteractionInfo.put(
- "readClusterRevisionAttribute", readBridgedActionsClusterRevisionAttributeInteractionInfo);
- readAttributeMap.put("bridgedActions", readBridgedActionsInteractionInfo);
+ readActionsClusterRevisionCommandParams);
+ readActionsInteractionInfo.put(
+ "readClusterRevisionAttribute", readActionsClusterRevisionAttributeInteractionInfo);
+ readAttributeMap.put("actions", readActionsInteractionInfo);
Map<String, InteractionInfo> readBasicInteractionInfo = new LinkedHashMap<>();
Map<String, CommandParameterInfo> readBasicDataModelRevisionCommandParams =
new LinkedHashMap<String, CommandParameterInfo>();
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterWriteMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterWriteMapping.java
index 1d69c69..95414b2 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterWriteMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterWriteMapping.java
@@ -286,8 +286,8 @@
writeAttributeMap.put("binding", writeBindingInteractionInfo);
Map<String, InteractionInfo> writeAccessControlInteractionInfo = new LinkedHashMap<>();
writeAttributeMap.put("accessControl", writeAccessControlInteractionInfo);
- Map<String, InteractionInfo> writeBridgedActionsInteractionInfo = new LinkedHashMap<>();
- writeAttributeMap.put("bridgedActions", writeBridgedActionsInteractionInfo);
+ Map<String, InteractionInfo> writeActionsInteractionInfo = new LinkedHashMap<>();
+ writeAttributeMap.put("actions", writeActionsInteractionInfo);
Map<String, InteractionInfo> writeBasicInteractionInfo = new LinkedHashMap<>();
Map<String, CommandParameterInfo> writeBasicNodeLabelCommandParams =
new LinkedHashMap<String, CommandParameterInfo>();
diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py
index 88d6317..4513a38 100644
--- a/src/controller/python/chip/clusters/CHIPClusters.py
+++ b/src/controller/python/chip/clusters/CHIPClusters.py
@@ -912,8 +912,8 @@
},
},
}
- _BRIDGED_ACTIONS_CLUSTER_INFO = {
- "clusterName": "BridgedActions",
+ _ACTIONS_CLUSTER_INFO = {
+ "clusterName": "Actions",
"clusterId": 0x00000025,
"commands": {
0x00000000: {
@@ -1026,13 +1026,13 @@
"reportable": True,
},
0x00000001: {
- "attributeName": "EndpointList",
+ "attributeName": "EndpointLists",
"attributeId": 0x00000001,
"type": "",
"reportable": True,
},
0x00000002: {
- "attributeName": "SetupUrl",
+ "attributeName": "SetupURL",
"attributeId": 0x00000002,
"type": "str",
"reportable": True,
@@ -7514,7 +7514,7 @@
0x0000001D: _DESCRIPTOR_CLUSTER_INFO,
0x0000001E: _BINDING_CLUSTER_INFO,
0x0000001F: _ACCESS_CONTROL_CLUSTER_INFO,
- 0x00000025: _BRIDGED_ACTIONS_CLUSTER_INFO,
+ 0x00000025: _ACTIONS_CLUSTER_INFO,
0x00000028: _BASIC_CLUSTER_INFO,
0x00000029: _OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_INFO,
0x0000002A: _OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_INFO,
@@ -7582,7 +7582,7 @@
"Descriptor": _DESCRIPTOR_CLUSTER_INFO,
"Binding": _BINDING_CLUSTER_INFO,
"AccessControl": _ACCESS_CONTROL_CLUSTER_INFO,
- "BridgedActions": _BRIDGED_ACTIONS_CLUSTER_INFO,
+ "Actions": _ACTIONS_CLUSTER_INFO,
"Basic": _BASIC_CLUSTER_INFO,
"OtaSoftwareUpdateProvider": _OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_INFO,
"OtaSoftwareUpdateRequestor": _OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_INFO,
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
index 9d623a4..71014e3 100644
--- a/src/controller/python/chip/clusters/Objects.py
+++ b/src/controller/python/chip/clusters/Objects.py
@@ -3160,16 +3160,16 @@
@dataclass
-class BridgedActions(Cluster):
+class Actions(Cluster):
id: typing.ClassVar[int] = 0x0025
@ChipUtility.classproperty
def descriptor(cls) -> ClusterObjectDescriptor:
return ClusterObjectDescriptor(
Fields = [
- ClusterObjectFieldDescriptor(Label="actionList", Tag=0x00000000, Type=typing.List[BridgedActions.Structs.ActionStruct]),
- ClusterObjectFieldDescriptor(Label="endpointList", Tag=0x00000001, Type=typing.List[BridgedActions.Structs.EndpointListStruct]),
- ClusterObjectFieldDescriptor(Label="setupUrl", Tag=0x00000002, Type=typing.Optional[str]),
+ ClusterObjectFieldDescriptor(Label="actionList", Tag=0x00000000, Type=typing.List[Actions.Structs.ActionStruct]),
+ ClusterObjectFieldDescriptor(Label="endpointLists", Tag=0x00000001, Type=typing.List[Actions.Structs.EndpointListStruct]),
+ ClusterObjectFieldDescriptor(Label="setupURL", Tag=0x00000002, Type=typing.Optional[str]),
ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
ClusterObjectFieldDescriptor(Label="attributeList", Tag=0x0000FFFB, Type=typing.List[uint]),
@@ -3177,9 +3177,9 @@
ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
])
- actionList: 'typing.List[BridgedActions.Structs.ActionStruct]' = None
- endpointList: 'typing.List[BridgedActions.Structs.EndpointListStruct]' = None
- setupUrl: 'typing.Optional[str]' = None
+ actionList: 'typing.List[Actions.Structs.ActionStruct]' = None
+ endpointLists: 'typing.List[Actions.Structs.EndpointListStruct]' = None
+ setupURL: 'typing.Optional[str]' = None
generatedCommandList: 'typing.List[uint]' = None
acceptedCommandList: 'typing.List[uint]' = None
attributeList: 'typing.List[uint]' = None
@@ -3221,18 +3221,18 @@
Fields = [
ClusterObjectFieldDescriptor(Label="actionID", Tag=0, Type=uint),
ClusterObjectFieldDescriptor(Label="name", Tag=1, Type=str),
- ClusterObjectFieldDescriptor(Label="type", Tag=2, Type=BridgedActions.Enums.ActionTypeEnum),
+ ClusterObjectFieldDescriptor(Label="type", Tag=2, Type=Actions.Enums.ActionTypeEnum),
ClusterObjectFieldDescriptor(Label="endpointListID", Tag=3, Type=uint),
ClusterObjectFieldDescriptor(Label="supportedCommands", Tag=4, Type=uint),
- ClusterObjectFieldDescriptor(Label="status", Tag=5, Type=BridgedActions.Enums.ActionStateEnum),
+ ClusterObjectFieldDescriptor(Label="state", Tag=5, Type=Actions.Enums.ActionStateEnum),
])
actionID: 'uint' = 0
name: 'str' = ""
- type: 'BridgedActions.Enums.ActionTypeEnum' = 0
+ type: 'Actions.Enums.ActionTypeEnum' = 0
endpointListID: 'uint' = 0
supportedCommands: 'uint' = 0
- status: 'BridgedActions.Enums.ActionStateEnum' = 0
+ state: 'Actions.Enums.ActionStateEnum' = 0
@dataclass
class EndpointListStruct(ClusterObject):
@@ -3242,13 +3242,13 @@
Fields = [
ClusterObjectFieldDescriptor(Label="endpointListID", Tag=0, Type=uint),
ClusterObjectFieldDescriptor(Label="name", Tag=1, Type=str),
- ClusterObjectFieldDescriptor(Label="type", Tag=2, Type=BridgedActions.Enums.EndpointListTypeEnum),
+ ClusterObjectFieldDescriptor(Label="type", Tag=2, Type=Actions.Enums.EndpointListTypeEnum),
ClusterObjectFieldDescriptor(Label="endpoints", Tag=3, Type=typing.List[uint]),
])
endpointListID: 'uint' = 0
name: 'str' = ""
- type: 'BridgedActions.Enums.EndpointListTypeEnum' = 0
+ type: 'Actions.Enums.EndpointListTypeEnum' = 0
endpoints: 'typing.List[uint]' = field(default_factory=lambda: [])
@@ -3482,12 +3482,12 @@
@ChipUtility.classproperty
def attribute_type(cls) -> ClusterObjectFieldDescriptor:
- return ClusterObjectFieldDescriptor(Type=typing.List[BridgedActions.Structs.ActionStruct])
+ return ClusterObjectFieldDescriptor(Type=typing.List[Actions.Structs.ActionStruct])
- value: 'typing.List[BridgedActions.Structs.ActionStruct]' = field(default_factory=lambda: [])
+ value: 'typing.List[Actions.Structs.ActionStruct]' = field(default_factory=lambda: [])
@dataclass
- class EndpointList(ClusterAttributeDescriptor):
+ class EndpointLists(ClusterAttributeDescriptor):
@ChipUtility.classproperty
def cluster_id(cls) -> int:
return 0x0025
@@ -3498,12 +3498,12 @@
@ChipUtility.classproperty
def attribute_type(cls) -> ClusterObjectFieldDescriptor:
- return ClusterObjectFieldDescriptor(Type=typing.List[BridgedActions.Structs.EndpointListStruct])
+ return ClusterObjectFieldDescriptor(Type=typing.List[Actions.Structs.EndpointListStruct])
- value: 'typing.List[BridgedActions.Structs.EndpointListStruct]' = field(default_factory=lambda: [])
+ value: 'typing.List[Actions.Structs.EndpointListStruct]' = field(default_factory=lambda: [])
@dataclass
- class SetupUrl(ClusterAttributeDescriptor):
+ class SetupURL(ClusterAttributeDescriptor):
@ChipUtility.classproperty
def cluster_id(cls) -> int:
return 0x0025
@@ -3616,12 +3616,12 @@
Fields = [
ClusterObjectFieldDescriptor(Label="actionID", Tag=0, Type=uint),
ClusterObjectFieldDescriptor(Label="invokeID", Tag=1, Type=uint),
- ClusterObjectFieldDescriptor(Label="newState", Tag=2, Type=BridgedActions.Enums.ActionStateEnum),
+ ClusterObjectFieldDescriptor(Label="newState", Tag=2, Type=Actions.Enums.ActionStateEnum),
])
actionID: 'uint' = 0
invokeID: 'uint' = 0
- newState: 'BridgedActions.Enums.ActionStateEnum' = 0
+ newState: 'Actions.Enums.ActionStateEnum' = 0
@dataclass
class ActionFailed(ClusterEvent):
@@ -3639,14 +3639,14 @@
Fields = [
ClusterObjectFieldDescriptor(Label="actionID", Tag=0, Type=uint),
ClusterObjectFieldDescriptor(Label="invokeID", Tag=1, Type=uint),
- ClusterObjectFieldDescriptor(Label="newState", Tag=2, Type=BridgedActions.Enums.ActionStateEnum),
- ClusterObjectFieldDescriptor(Label="error", Tag=3, Type=BridgedActions.Enums.ActionErrorEnum),
+ ClusterObjectFieldDescriptor(Label="newState", Tag=2, Type=Actions.Enums.ActionStateEnum),
+ ClusterObjectFieldDescriptor(Label="error", Tag=3, Type=Actions.Enums.ActionErrorEnum),
])
actionID: 'uint' = 0
invokeID: 'uint' = 0
- newState: 'BridgedActions.Enums.ActionStateEnum' = 0
- error: 'BridgedActions.Enums.ActionErrorEnum' = 0
+ newState: 'Actions.Enums.ActionStateEnum' = 0
+ error: 'Actions.Enums.ActionErrorEnum' = 0
@dataclass
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
index fa865ee..35da7e5 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
@@ -1883,8 +1883,8 @@
}
break;
}
- case Clusters::BridgedActions::Id: {
- using namespace Clusters::BridgedActions;
+ case Clusters::Actions::Id: {
+ using namespace Clusters::Actions;
switch (aPath.mAttributeId) {
case Attributes::ActionList::Id: {
using TypeInfo = Attributes::ActionList::TypeInfo;
@@ -1899,16 +1899,16 @@
auto iter_0 = cppValue.begin();
while (iter_0.Next()) {
auto & entry_0 = iter_0.GetValue();
- MTRBridgedActionsClusterActionStruct * newElement_0;
- newElement_0 = [MTRBridgedActionsClusterActionStruct new];
+ MTRActionsClusterActionStruct * newElement_0;
+ newElement_0 = [MTRActionsClusterActionStruct new];
newElement_0.actionID = [NSNumber numberWithUnsignedShort:entry_0.actionID];
newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.data()
length:entry_0.name.size()
encoding:NSUTF8StringEncoding];
newElement_0.type = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.type)];
newElement_0.endpointListID = [NSNumber numberWithUnsignedShort:entry_0.endpointListID];
- newElement_0.supportedCommands = [NSNumber numberWithUnsignedShort:entry_0.supportedCommands];
- newElement_0.status = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.status)];
+ newElement_0.supportedCommands = [NSNumber numberWithUnsignedShort:entry_0.supportedCommands.Raw()];
+ newElement_0.state = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.state)];
[array_0 addObject:newElement_0];
}
CHIP_ERROR err = iter_0.GetStatus();
@@ -1920,8 +1920,8 @@
}
return value;
}
- case Attributes::EndpointList::Id: {
- using TypeInfo = Attributes::EndpointList::TypeInfo;
+ case Attributes::EndpointLists::Id: {
+ using TypeInfo = Attributes::EndpointLists::TypeInfo;
TypeInfo::DecodableType cppValue;
*aError = DataModel::Decode(aReader, cppValue);
if (*aError != CHIP_NO_ERROR) {
@@ -1933,8 +1933,8 @@
auto iter_0 = cppValue.begin();
while (iter_0.Next()) {
auto & entry_0 = iter_0.GetValue();
- MTRBridgedActionsClusterEndpointListStruct * newElement_0;
- newElement_0 = [MTRBridgedActionsClusterEndpointListStruct new];
+ MTRActionsClusterEndpointListStruct * newElement_0;
+ newElement_0 = [MTRActionsClusterEndpointListStruct new];
newElement_0.endpointListID = [NSNumber numberWithUnsignedShort:entry_0.endpointListID];
newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.data()
length:entry_0.name.size()
@@ -1967,8 +1967,8 @@
}
return value;
}
- case Attributes::SetupUrl::Id: {
- using TypeInfo = Attributes::SetupUrl::TypeInfo;
+ case Attributes::SetupURL::Id: {
+ using TypeInfo = Attributes::SetupURL::TypeInfo;
TypeInfo::DecodableType cppValue;
*aError = DataModel::Decode(aReader, cppValue);
if (*aError != CHIP_NO_ERROR) {
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
index f15e630..5d6b998 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
@@ -2099,38 +2099,33 @@
@end
/**
- * Cluster Bridged Actions
+ * Cluster Actions
*
*/
-@interface MTRBaseClusterBridgedActions : MTRCluster
+@interface MTRBaseClusterActions : MTRCluster
- (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
endpoint:(uint16_t)endpoint
queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER;
-- (void)instantActionWithParams:(MTRBridgedActionsClusterInstantActionParams *)params
+- (void)instantActionWithParams:(MTRActionsClusterInstantActionParams *)params
completionHandler:(StatusCompletion)completionHandler;
-- (void)instantActionWithTransitionWithParams:(MTRBridgedActionsClusterInstantActionWithTransitionParams *)params
+- (void)instantActionWithTransitionWithParams:(MTRActionsClusterInstantActionWithTransitionParams *)params
completionHandler:(StatusCompletion)completionHandler;
-- (void)startActionWithParams:(MTRBridgedActionsClusterStartActionParams *)params
- completionHandler:(StatusCompletion)completionHandler;
-- (void)startActionWithDurationWithParams:(MTRBridgedActionsClusterStartActionWithDurationParams *)params
+- (void)startActionWithParams:(MTRActionsClusterStartActionParams *)params completionHandler:(StatusCompletion)completionHandler;
+- (void)startActionWithDurationWithParams:(MTRActionsClusterStartActionWithDurationParams *)params
completionHandler:(StatusCompletion)completionHandler;
-- (void)stopActionWithParams:(MTRBridgedActionsClusterStopActionParams *)params
- completionHandler:(StatusCompletion)completionHandler;
-- (void)pauseActionWithParams:(MTRBridgedActionsClusterPauseActionParams *)params
- completionHandler:(StatusCompletion)completionHandler;
-- (void)pauseActionWithDurationWithParams:(MTRBridgedActionsClusterPauseActionWithDurationParams *)params
+- (void)stopActionWithParams:(MTRActionsClusterStopActionParams *)params completionHandler:(StatusCompletion)completionHandler;
+- (void)pauseActionWithParams:(MTRActionsClusterPauseActionParams *)params completionHandler:(StatusCompletion)completionHandler;
+- (void)pauseActionWithDurationWithParams:(MTRActionsClusterPauseActionWithDurationParams *)params
completionHandler:(StatusCompletion)completionHandler;
-- (void)resumeActionWithParams:(MTRBridgedActionsClusterResumeActionParams *)params
- completionHandler:(StatusCompletion)completionHandler;
-- (void)enableActionWithParams:(MTRBridgedActionsClusterEnableActionParams *)params
- completionHandler:(StatusCompletion)completionHandler;
-- (void)enableActionWithDurationWithParams:(MTRBridgedActionsClusterEnableActionWithDurationParams *)params
+- (void)resumeActionWithParams:(MTRActionsClusterResumeActionParams *)params completionHandler:(StatusCompletion)completionHandler;
+- (void)enableActionWithParams:(MTRActionsClusterEnableActionParams *)params completionHandler:(StatusCompletion)completionHandler;
+- (void)enableActionWithDurationWithParams:(MTRActionsClusterEnableActionWithDurationParams *)params
completionHandler:(StatusCompletion)completionHandler;
-- (void)disableActionWithParams:(MTRBridgedActionsClusterDisableActionParams *)params
+- (void)disableActionWithParams:(MTRActionsClusterDisableActionParams *)params
completionHandler:(StatusCompletion)completionHandler;
-- (void)disableActionWithDurationWithParams:(MTRBridgedActionsClusterDisableActionWithDurationParams *)params
+- (void)disableActionWithDurationWithParams:(MTRActionsClusterDisableActionWithDurationParams *)params
completionHandler:(StatusCompletion)completionHandler;
- (void)readAttributeActionListWithCompletionHandler:(void (^)(
@@ -2149,35 +2144,36 @@
queue:(dispatch_queue_t)queue
completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)readAttributeEndpointListWithCompletionHandler:(void (^)(
- NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)readAttributeEndpointListsWithCompletionHandler:(void (^)(
+ NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
/**
* This API does not support setting autoResubscribe to NO in the
* MTRSubscribeParams.
*/
-- (void)subscribeAttributeEndpointListWithMinInterval:(NSNumber * _Nonnull)minInterval
- maxInterval:(NSNumber * _Nonnull)maxInterval
- params:(MTRSubscribeParams * _Nullable)params
- subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
- reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeEndpointListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer
- endpoint:(NSNumber *)endpoint
- queue:(dispatch_queue_t)queue
- completionHandler:
- (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeEndpointListsWithMinInterval:(NSNumber * _Nonnull)minInterval
+ maxInterval:(NSNumber * _Nonnull)maxInterval
+ params:(MTRSubscribeParams * _Nullable)params
+ subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+ reportHandler:
+ (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeEndpointListsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer
+ endpoint:(NSNumber *)endpoint
+ queue:(dispatch_queue_t)queue
+ completionHandler:
+ (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)readAttributeSetupUrlWithCompletionHandler:(void (^)(
+- (void)readAttributeSetupURLWithCompletionHandler:(void (^)(
NSString * _Nullable value, NSError * _Nullable error))completionHandler;
/**
* This API does not support setting autoResubscribe to NO in the
* MTRSubscribeParams.
*/
-- (void)subscribeAttributeSetupUrlWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeSetupURLWithMinInterval:(NSNumber * _Nonnull)minInterval
maxInterval:(NSNumber * _Nonnull)maxInterval
params:(MTRSubscribeParams * _Nullable)params
subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeSetupUrlWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeSetupURLWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer
endpoint:(NSNumber *)endpoint
queue:(dispatch_queue_t)queue
completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler;
@@ -22089,47 +22085,47 @@
MTRAccessControlPrivilegeAdminister = 0x05,
};
-typedef NS_ENUM(uint8_t, MTRBridgedActionsActionError) {
- MTRBridgedActionsActionErrorUnknown = 0x00,
- MTRBridgedActionsActionErrorInterrupted = 0x01,
+typedef NS_ENUM(uint8_t, MTRActionsActionError) {
+ MTRActionsActionErrorUnknown = 0x00,
+ MTRActionsActionErrorInterrupted = 0x01,
};
-typedef NS_ENUM(uint8_t, MTRBridgedActionsActionState) {
- MTRBridgedActionsActionStateInactive = 0x00,
- MTRBridgedActionsActionStateActive = 0x01,
- MTRBridgedActionsActionStatePaused = 0x02,
- MTRBridgedActionsActionStateDisabled = 0x03,
+typedef NS_ENUM(uint8_t, MTRActionsActionState) {
+ MTRActionsActionStateInactive = 0x00,
+ MTRActionsActionStateActive = 0x01,
+ MTRActionsActionStatePaused = 0x02,
+ MTRActionsActionStateDisabled = 0x03,
};
-typedef NS_ENUM(uint8_t, MTRBridgedActionsActionType) {
- MTRBridgedActionsActionTypeOther = 0x00,
- MTRBridgedActionsActionTypeScene = 0x01,
- MTRBridgedActionsActionTypeSequence = 0x02,
- MTRBridgedActionsActionTypeAutomation = 0x03,
- MTRBridgedActionsActionTypeException = 0x04,
- MTRBridgedActionsActionTypeNotification = 0x05,
- MTRBridgedActionsActionTypeAlarm = 0x06,
+typedef NS_ENUM(uint8_t, MTRActionsActionType) {
+ MTRActionsActionTypeOther = 0x00,
+ MTRActionsActionTypeScene = 0x01,
+ MTRActionsActionTypeSequence = 0x02,
+ MTRActionsActionTypeAutomation = 0x03,
+ MTRActionsActionTypeException = 0x04,
+ MTRActionsActionTypeNotification = 0x05,
+ MTRActionsActionTypeAlarm = 0x06,
};
-typedef NS_ENUM(uint8_t, MTRBridgedActionsEndpointListType) {
- MTRBridgedActionsEndpointListTypeOther = 0x00,
- MTRBridgedActionsEndpointListTypeRoom = 0x01,
- MTRBridgedActionsEndpointListTypeZone = 0x02,
+typedef NS_ENUM(uint8_t, MTRActionsEndpointListType) {
+ MTRActionsEndpointListTypeOther = 0x00,
+ MTRActionsEndpointListTypeRoom = 0x01,
+ MTRActionsEndpointListTypeZone = 0x02,
};
-typedef NS_OPTIONS(uint16_t, MTRBridgedActionsCommandBits) {
- MTRBridgedActionsCommandBitsInstantAction = 0x1,
- MTRBridgedActionsCommandBitsInstantActionWithTransition = 0x2,
- MTRBridgedActionsCommandBitsStartAction = 0x4,
- MTRBridgedActionsCommandBitsStartActionWithDuration = 0x8,
- MTRBridgedActionsCommandBitsStopAction = 0x10,
- MTRBridgedActionsCommandBitsPauseAction = 0x20,
- MTRBridgedActionsCommandBitsPauseActionWithDuration = 0x40,
- MTRBridgedActionsCommandBitsResumeAction = 0x80,
- MTRBridgedActionsCommandBitsEnableAction = 0x100,
- MTRBridgedActionsCommandBitsEnableActionWithDuration = 0x200,
- MTRBridgedActionsCommandBitsDisableAction = 0x400,
- MTRBridgedActionsCommandBitsDisableActionWithDuration = 0x800,
+typedef NS_OPTIONS(uint16_t, MTRActionsCommandBits) {
+ MTRActionsCommandBitsInstantAction = 0x1,
+ MTRActionsCommandBitsInstantActionWithTransition = 0x2,
+ MTRActionsCommandBitsStartAction = 0x4,
+ MTRActionsCommandBitsStartActionWithDuration = 0x8,
+ MTRActionsCommandBitsStopAction = 0x10,
+ MTRActionsCommandBitsPauseAction = 0x20,
+ MTRActionsCommandBitsPauseActionWithDuration = 0x40,
+ MTRActionsCommandBitsResumeAction = 0x80,
+ MTRActionsCommandBitsEnableAction = 0x100,
+ MTRActionsCommandBitsEnableActionWithDuration = 0x200,
+ MTRActionsCommandBitsDisableAction = 0x400,
+ MTRActionsCommandBitsDisableActionWithDuration = 0x800,
};
typedef NS_ENUM(uint8_t, MTROtaSoftwareUpdateProviderOTAApplyUpdateAction) {
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
index 2aecf89..345e5d9 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
@@ -9243,7 +9243,7 @@
@end
-@implementation MTRBaseClusterBridgedActions
+@implementation MTRBaseClusterActions
- (instancetype)initWithDevice:(MTRBaseDevice *)device endpoint:(uint16_t)endpoint queue:(dispatch_queue_t)queue
{
@@ -9258,8 +9258,7 @@
return self;
}
-- (void)instantActionWithParams:(MTRBridgedActionsClusterInstantActionParams *)params
- completionHandler:(StatusCompletion)completionHandler
+- (void)instantActionWithParams:(MTRActionsClusterInstantActionParams *)params completionHandler:(StatusCompletion)completionHandler
{
// Make a copy of params before we go async.
params = [params copy];
@@ -9271,7 +9270,7 @@
^(ExchangeManager & exchangeManager, const SessionHandle & session, Cancelable * success, Cancelable * failure) {
chip::Optional<uint16_t> timedInvokeTimeoutMs;
ListFreer listFreer;
- BridgedActions::Commands::InstantAction::Type request;
+ Actions::Commands::InstantAction::Type request;
if (params != nil) {
if (params.timedInvokeTimeoutMs != nil) {
timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
@@ -9285,12 +9284,12 @@
auto successFn = Callback<CommandSuccessCallbackType>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
});
}
-- (void)instantActionWithTransitionWithParams:(MTRBridgedActionsClusterInstantActionWithTransitionParams *)params
+- (void)instantActionWithTransitionWithParams:(MTRActionsClusterInstantActionWithTransitionParams *)params
completionHandler:(StatusCompletion)completionHandler
{
// Make a copy of params before we go async.
@@ -9303,7 +9302,7 @@
^(ExchangeManager & exchangeManager, const SessionHandle & session, Cancelable * success, Cancelable * failure) {
chip::Optional<uint16_t> timedInvokeTimeoutMs;
ListFreer listFreer;
- BridgedActions::Commands::InstantActionWithTransition::Type request;
+ Actions::Commands::InstantActionWithTransition::Type request;
if (params != nil) {
if (params.timedInvokeTimeoutMs != nil) {
timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
@@ -9318,13 +9317,12 @@
auto successFn = Callback<CommandSuccessCallbackType>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
});
}
-- (void)startActionWithParams:(MTRBridgedActionsClusterStartActionParams *)params
- completionHandler:(StatusCompletion)completionHandler
+- (void)startActionWithParams:(MTRActionsClusterStartActionParams *)params completionHandler:(StatusCompletion)completionHandler
{
// Make a copy of params before we go async.
params = [params copy];
@@ -9336,7 +9334,7 @@
^(ExchangeManager & exchangeManager, const SessionHandle & session, Cancelable * success, Cancelable * failure) {
chip::Optional<uint16_t> timedInvokeTimeoutMs;
ListFreer listFreer;
- BridgedActions::Commands::StartAction::Type request;
+ Actions::Commands::StartAction::Type request;
if (params != nil) {
if (params.timedInvokeTimeoutMs != nil) {
timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
@@ -9350,12 +9348,12 @@
auto successFn = Callback<CommandSuccessCallbackType>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
});
}
-- (void)startActionWithDurationWithParams:(MTRBridgedActionsClusterStartActionWithDurationParams *)params
+- (void)startActionWithDurationWithParams:(MTRActionsClusterStartActionWithDurationParams *)params
completionHandler:(StatusCompletion)completionHandler
{
// Make a copy of params before we go async.
@@ -9368,7 +9366,7 @@
^(ExchangeManager & exchangeManager, const SessionHandle & session, Cancelable * success, Cancelable * failure) {
chip::Optional<uint16_t> timedInvokeTimeoutMs;
ListFreer listFreer;
- BridgedActions::Commands::StartActionWithDuration::Type request;
+ Actions::Commands::StartActionWithDuration::Type request;
if (params != nil) {
if (params.timedInvokeTimeoutMs != nil) {
timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
@@ -9383,13 +9381,12 @@
auto successFn = Callback<CommandSuccessCallbackType>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
});
}
-- (void)stopActionWithParams:(MTRBridgedActionsClusterStopActionParams *)params
- completionHandler:(StatusCompletion)completionHandler
+- (void)stopActionWithParams:(MTRActionsClusterStopActionParams *)params completionHandler:(StatusCompletion)completionHandler
{
// Make a copy of params before we go async.
params = [params copy];
@@ -9401,7 +9398,7 @@
^(ExchangeManager & exchangeManager, const SessionHandle & session, Cancelable * success, Cancelable * failure) {
chip::Optional<uint16_t> timedInvokeTimeoutMs;
ListFreer listFreer;
- BridgedActions::Commands::StopAction::Type request;
+ Actions::Commands::StopAction::Type request;
if (params != nil) {
if (params.timedInvokeTimeoutMs != nil) {
timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
@@ -9415,13 +9412,12 @@
auto successFn = Callback<CommandSuccessCallbackType>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
});
}
-- (void)pauseActionWithParams:(MTRBridgedActionsClusterPauseActionParams *)params
- completionHandler:(StatusCompletion)completionHandler
+- (void)pauseActionWithParams:(MTRActionsClusterPauseActionParams *)params completionHandler:(StatusCompletion)completionHandler
{
// Make a copy of params before we go async.
params = [params copy];
@@ -9433,7 +9429,7 @@
^(ExchangeManager & exchangeManager, const SessionHandle & session, Cancelable * success, Cancelable * failure) {
chip::Optional<uint16_t> timedInvokeTimeoutMs;
ListFreer listFreer;
- BridgedActions::Commands::PauseAction::Type request;
+ Actions::Commands::PauseAction::Type request;
if (params != nil) {
if (params.timedInvokeTimeoutMs != nil) {
timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
@@ -9447,12 +9443,12 @@
auto successFn = Callback<CommandSuccessCallbackType>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
});
}
-- (void)pauseActionWithDurationWithParams:(MTRBridgedActionsClusterPauseActionWithDurationParams *)params
+- (void)pauseActionWithDurationWithParams:(MTRActionsClusterPauseActionWithDurationParams *)params
completionHandler:(StatusCompletion)completionHandler
{
// Make a copy of params before we go async.
@@ -9465,7 +9461,7 @@
^(ExchangeManager & exchangeManager, const SessionHandle & session, Cancelable * success, Cancelable * failure) {
chip::Optional<uint16_t> timedInvokeTimeoutMs;
ListFreer listFreer;
- BridgedActions::Commands::PauseActionWithDuration::Type request;
+ Actions::Commands::PauseActionWithDuration::Type request;
if (params != nil) {
if (params.timedInvokeTimeoutMs != nil) {
timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
@@ -9480,13 +9476,12 @@
auto successFn = Callback<CommandSuccessCallbackType>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
});
}
-- (void)resumeActionWithParams:(MTRBridgedActionsClusterResumeActionParams *)params
- completionHandler:(StatusCompletion)completionHandler
+- (void)resumeActionWithParams:(MTRActionsClusterResumeActionParams *)params completionHandler:(StatusCompletion)completionHandler
{
// Make a copy of params before we go async.
params = [params copy];
@@ -9498,7 +9493,7 @@
^(ExchangeManager & exchangeManager, const SessionHandle & session, Cancelable * success, Cancelable * failure) {
chip::Optional<uint16_t> timedInvokeTimeoutMs;
ListFreer listFreer;
- BridgedActions::Commands::ResumeAction::Type request;
+ Actions::Commands::ResumeAction::Type request;
if (params != nil) {
if (params.timedInvokeTimeoutMs != nil) {
timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
@@ -9512,13 +9507,12 @@
auto successFn = Callback<CommandSuccessCallbackType>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
});
}
-- (void)enableActionWithParams:(MTRBridgedActionsClusterEnableActionParams *)params
- completionHandler:(StatusCompletion)completionHandler
+- (void)enableActionWithParams:(MTRActionsClusterEnableActionParams *)params completionHandler:(StatusCompletion)completionHandler
{
// Make a copy of params before we go async.
params = [params copy];
@@ -9530,7 +9524,7 @@
^(ExchangeManager & exchangeManager, const SessionHandle & session, Cancelable * success, Cancelable * failure) {
chip::Optional<uint16_t> timedInvokeTimeoutMs;
ListFreer listFreer;
- BridgedActions::Commands::EnableAction::Type request;
+ Actions::Commands::EnableAction::Type request;
if (params != nil) {
if (params.timedInvokeTimeoutMs != nil) {
timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
@@ -9544,12 +9538,12 @@
auto successFn = Callback<CommandSuccessCallbackType>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
});
}
-- (void)enableActionWithDurationWithParams:(MTRBridgedActionsClusterEnableActionWithDurationParams *)params
+- (void)enableActionWithDurationWithParams:(MTRActionsClusterEnableActionWithDurationParams *)params
completionHandler:(StatusCompletion)completionHandler
{
// Make a copy of params before we go async.
@@ -9562,7 +9556,7 @@
^(ExchangeManager & exchangeManager, const SessionHandle & session, Cancelable * success, Cancelable * failure) {
chip::Optional<uint16_t> timedInvokeTimeoutMs;
ListFreer listFreer;
- BridgedActions::Commands::EnableActionWithDuration::Type request;
+ Actions::Commands::EnableActionWithDuration::Type request;
if (params != nil) {
if (params.timedInvokeTimeoutMs != nil) {
timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
@@ -9577,13 +9571,12 @@
auto successFn = Callback<CommandSuccessCallbackType>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
});
}
-- (void)disableActionWithParams:(MTRBridgedActionsClusterDisableActionParams *)params
- completionHandler:(StatusCompletion)completionHandler
+- (void)disableActionWithParams:(MTRActionsClusterDisableActionParams *)params completionHandler:(StatusCompletion)completionHandler
{
// Make a copy of params before we go async.
params = [params copy];
@@ -9595,7 +9588,7 @@
^(ExchangeManager & exchangeManager, const SessionHandle & session, Cancelable * success, Cancelable * failure) {
chip::Optional<uint16_t> timedInvokeTimeoutMs;
ListFreer listFreer;
- BridgedActions::Commands::DisableAction::Type request;
+ Actions::Commands::DisableAction::Type request;
if (params != nil) {
if (params.timedInvokeTimeoutMs != nil) {
timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
@@ -9609,12 +9602,12 @@
auto successFn = Callback<CommandSuccessCallbackType>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
});
}
-- (void)disableActionWithDurationWithParams:(MTRBridgedActionsClusterDisableActionWithDurationParams *)params
+- (void)disableActionWithDurationWithParams:(MTRActionsClusterDisableActionWithDurationParams *)params
completionHandler:(StatusCompletion)completionHandler
{
// Make a copy of params before we go async.
@@ -9627,7 +9620,7 @@
^(ExchangeManager & exchangeManager, const SessionHandle & session, Cancelable * success, Cancelable * failure) {
chip::Optional<uint16_t> timedInvokeTimeoutMs;
ListFreer listFreer;
- BridgedActions::Commands::DisableActionWithDuration::Type request;
+ Actions::Commands::DisableActionWithDuration::Type request;
if (params != nil) {
if (params.timedInvokeTimeoutMs != nil) {
timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
@@ -9642,7 +9635,7 @@
auto successFn = Callback<CommandSuccessCallbackType>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
});
}
@@ -9650,12 +9643,12 @@
- (void)readAttributeActionListWithCompletionHandler:(void (^)(
NSArray * _Nullable value, NSError * _Nullable error))completionHandler
{
- new MTRBridgedActionsActionListListAttributeCallbackBridge(self.callbackQueue, self.device, completionHandler,
+ new MTRActionsActionListListAttributeCallbackBridge(self.callbackQueue, self.device, completionHandler,
^(ExchangeManager & exchangeManager, const SessionHandle & session, Cancelable * success, Cancelable * failure) {
- using TypeInfo = BridgedActions::Attributes::ActionList::TypeInfo;
- auto successFn = Callback<BridgedActionsActionListListAttributeCallback>::FromCancelable(success);
+ using TypeInfo = Actions::Attributes::ActionList::TypeInfo;
+ auto successFn = Callback<ActionsActionListListAttributeCallback>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
});
}
@@ -9670,21 +9663,21 @@
minInterval = [minInterval copy];
maxInterval = [maxInterval copy];
params = [params copy];
- new MTRBridgedActionsActionListListAttributeCallbackSubscriptionBridge(
+ new MTRActionsActionListListAttributeCallbackSubscriptionBridge(
self.callbackQueue, self.device, reportHandler,
^(ExchangeManager & exchangeManager, const SessionHandle & session, Cancelable * success, Cancelable * failure) {
if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
// We don't support disabling auto-resubscribe.
return CHIP_ERROR_INVALID_ARGUMENT;
}
- using TypeInfo = BridgedActions::Attributes::ActionList::TypeInfo;
- auto successFn = Callback<BridgedActionsActionListListAttributeCallback>::FromCancelable(success);
+ using TypeInfo = Actions::Attributes::ActionList::TypeInfo;
+ auto successFn = Callback<ActionsActionListListAttributeCallback>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
[minInterval unsignedShortValue], [maxInterval unsignedShortValue],
- MTRBridgedActionsActionListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+ MTRActionsActionListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
},
@@ -9696,110 +9689,108 @@
queue:(dispatch_queue_t)queue
completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
{
- new MTRBridgedActionsActionListListAttributeCallbackBridge(
- queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
- if (attributeCacheContainer.cppAttributeCache) {
- chip::app::ConcreteAttributePath path;
- using TypeInfo = BridgedActions::Attributes::ActionList::TypeInfo;
- path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
- path.mClusterId = TypeInfo::GetClusterId();
- path.mAttributeId = TypeInfo::GetAttributeId();
- TypeInfo::DecodableType value;
- CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
- auto successFn = Callback<BridgedActionsActionListListAttributeCallback>::FromCancelable(success);
- if (err == CHIP_NO_ERROR) {
- successFn->mCall(successFn->mContext, value);
- }
- return err;
+ new MTRActionsActionListListAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+ if (attributeCacheContainer.cppAttributeCache) {
+ chip::app::ConcreteAttributePath path;
+ using TypeInfo = Actions::Attributes::ActionList::TypeInfo;
+ path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+ path.mClusterId = TypeInfo::GetClusterId();
+ path.mAttributeId = TypeInfo::GetAttributeId();
+ TypeInfo::DecodableType value;
+ CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+ auto successFn = Callback<ActionsActionListListAttributeCallback>::FromCancelable(success);
+ if (err == CHIP_NO_ERROR) {
+ successFn->mCall(successFn->mContext, value);
}
- return CHIP_ERROR_NOT_FOUND;
- });
+ return err;
+ }
+ return CHIP_ERROR_NOT_FOUND;
+ });
}
-- (void)readAttributeEndpointListWithCompletionHandler:(void (^)(
- NSArray * _Nullable value, NSError * _Nullable error))completionHandler
+- (void)readAttributeEndpointListsWithCompletionHandler:(void (^)(
+ NSArray * _Nullable value, NSError * _Nullable error))completionHandler
{
- new MTRBridgedActionsEndpointListListAttributeCallbackBridge(self.callbackQueue, self.device, completionHandler,
+ new MTRActionsEndpointListsListAttributeCallbackBridge(self.callbackQueue, self.device, completionHandler,
^(ExchangeManager & exchangeManager, const SessionHandle & session, Cancelable * success, Cancelable * failure) {
- using TypeInfo = BridgedActions::Attributes::EndpointList::TypeInfo;
- auto successFn = Callback<BridgedActionsEndpointListListAttributeCallback>::FromCancelable(success);
+ using TypeInfo = Actions::Attributes::EndpointLists::TypeInfo;
+ auto successFn = Callback<ActionsEndpointListsListAttributeCallback>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
});
}
-- (void)subscribeAttributeEndpointListWithMinInterval:(NSNumber * _Nonnull)minInterval
- maxInterval:(NSNumber * _Nonnull)maxInterval
- params:(MTRSubscribeParams * _Nullable)params
- subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
- reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeEndpointListsWithMinInterval:(NSNumber * _Nonnull)minInterval
+ maxInterval:(NSNumber * _Nonnull)maxInterval
+ params:(MTRSubscribeParams * _Nullable)params
+ subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+ reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
{
// Make a copy of params before we go async.
minInterval = [minInterval copy];
maxInterval = [maxInterval copy];
params = [params copy];
- new MTRBridgedActionsEndpointListListAttributeCallbackSubscriptionBridge(
+ new MTRActionsEndpointListsListAttributeCallbackSubscriptionBridge(
self.callbackQueue, self.device, reportHandler,
^(ExchangeManager & exchangeManager, const SessionHandle & session, Cancelable * success, Cancelable * failure) {
if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
// We don't support disabling auto-resubscribe.
return CHIP_ERROR_INVALID_ARGUMENT;
}
- using TypeInfo = BridgedActions::Attributes::EndpointList::TypeInfo;
- auto successFn = Callback<BridgedActionsEndpointListListAttributeCallback>::FromCancelable(success);
+ using TypeInfo = Actions::Attributes::EndpointLists::TypeInfo;
+ auto successFn = Callback<ActionsEndpointListsListAttributeCallback>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
[minInterval unsignedShortValue], [maxInterval unsignedShortValue],
- MTRBridgedActionsEndpointListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+ MTRActionsEndpointListsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
},
subscriptionEstablishedHandler);
}
-+ (void)readAttributeEndpointListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer
- endpoint:(NSNumber *)endpoint
- queue:(dispatch_queue_t)queue
- completionHandler:
- (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeEndpointListsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer
+ endpoint:(NSNumber *)endpoint
+ queue:(dispatch_queue_t)queue
+ completionHandler:
+ (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
{
- new MTRBridgedActionsEndpointListListAttributeCallbackBridge(
- queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
- if (attributeCacheContainer.cppAttributeCache) {
- chip::app::ConcreteAttributePath path;
- using TypeInfo = BridgedActions::Attributes::EndpointList::TypeInfo;
- path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
- path.mClusterId = TypeInfo::GetClusterId();
- path.mAttributeId = TypeInfo::GetAttributeId();
- TypeInfo::DecodableType value;
- CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
- auto successFn = Callback<BridgedActionsEndpointListListAttributeCallback>::FromCancelable(success);
- if (err == CHIP_NO_ERROR) {
- successFn->mCall(successFn->mContext, value);
- }
- return err;
+ new MTRActionsEndpointListsListAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+ if (attributeCacheContainer.cppAttributeCache) {
+ chip::app::ConcreteAttributePath path;
+ using TypeInfo = Actions::Attributes::EndpointLists::TypeInfo;
+ path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+ path.mClusterId = TypeInfo::GetClusterId();
+ path.mAttributeId = TypeInfo::GetAttributeId();
+ TypeInfo::DecodableType value;
+ CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+ auto successFn = Callback<ActionsEndpointListsListAttributeCallback>::FromCancelable(success);
+ if (err == CHIP_NO_ERROR) {
+ successFn->mCall(successFn->mContext, value);
}
- return CHIP_ERROR_NOT_FOUND;
- });
+ return err;
+ }
+ return CHIP_ERROR_NOT_FOUND;
+ });
}
-- (void)readAttributeSetupUrlWithCompletionHandler:(void (^)(
+- (void)readAttributeSetupURLWithCompletionHandler:(void (^)(
NSString * _Nullable value, NSError * _Nullable error))completionHandler
{
new MTRCharStringAttributeCallbackBridge(self.callbackQueue, self.device, completionHandler,
^(ExchangeManager & exchangeManager, const SessionHandle & session, Cancelable * success, Cancelable * failure) {
- using TypeInfo = BridgedActions::Attributes::SetupUrl::TypeInfo;
+ using TypeInfo = Actions::Attributes::SetupURL::TypeInfo;
auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
});
}
-- (void)subscribeAttributeSetupUrlWithMinInterval:(NSNumber * _Nonnull)minInterval
+- (void)subscribeAttributeSetupURLWithMinInterval:(NSNumber * _Nonnull)minInterval
maxInterval:(NSNumber * _Nonnull)maxInterval
params:(MTRSubscribeParams * _Nullable)params
subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
@@ -9816,11 +9807,11 @@
// We don't support disabling auto-resubscribe.
return CHIP_ERROR_INVALID_ARGUMENT;
}
- using TypeInfo = BridgedActions::Attributes::SetupUrl::TypeInfo;
+ using TypeInfo = Actions::Attributes::SetupURL::TypeInfo;
auto successFn = Callback<CharStringAttributeCallback>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
[minInterval unsignedShortValue], [maxInterval unsignedShortValue],
MTRCharStringAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
@@ -9830,7 +9821,7 @@
subscriptionEstablishedHandler);
}
-+ (void)readAttributeSetupUrlWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer
++ (void)readAttributeSetupURLWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer
endpoint:(NSNumber *)endpoint
queue:(dispatch_queue_t)queue
completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
@@ -9838,7 +9829,7 @@
new MTRCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
if (attributeCacheContainer.cppAttributeCache) {
chip::app::ConcreteAttributePath path;
- using TypeInfo = BridgedActions::Attributes::SetupUrl::TypeInfo;
+ using TypeInfo = Actions::Attributes::SetupURL::TypeInfo;
path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
path.mClusterId = TypeInfo::GetClusterId();
path.mAttributeId = TypeInfo::GetAttributeId();
@@ -9857,12 +9848,12 @@
- (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
NSError * _Nullable error))completionHandler
{
- new MTRBridgedActionsGeneratedCommandListListAttributeCallbackBridge(self.callbackQueue, self.device, completionHandler,
+ new MTRActionsGeneratedCommandListListAttributeCallbackBridge(self.callbackQueue, self.device, completionHandler,
^(ExchangeManager & exchangeManager, const SessionHandle & session, Cancelable * success, Cancelable * failure) {
- using TypeInfo = BridgedActions::Attributes::GeneratedCommandList::TypeInfo;
- auto successFn = Callback<BridgedActionsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+ using TypeInfo = Actions::Attributes::GeneratedCommandList::TypeInfo;
+ auto successFn = Callback<ActionsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
});
}
@@ -9879,21 +9870,21 @@
minInterval = [minInterval copy];
maxInterval = [maxInterval copy];
params = [params copy];
- new MTRBridgedActionsGeneratedCommandListListAttributeCallbackSubscriptionBridge(
+ new MTRActionsGeneratedCommandListListAttributeCallbackSubscriptionBridge(
self.callbackQueue, self.device, reportHandler,
^(ExchangeManager & exchangeManager, const SessionHandle & session, Cancelable * success, Cancelable * failure) {
if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
// We don't support disabling auto-resubscribe.
return CHIP_ERROR_INVALID_ARGUMENT;
}
- using TypeInfo = BridgedActions::Attributes::GeneratedCommandList::TypeInfo;
- auto successFn = Callback<BridgedActionsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+ using TypeInfo = Actions::Attributes::GeneratedCommandList::TypeInfo;
+ auto successFn = Callback<ActionsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
[minInterval unsignedShortValue], [maxInterval unsignedShortValue],
- MTRBridgedActionsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+ MTRActionsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
},
@@ -9906,17 +9897,17 @@
completionHandler:
(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
{
- new MTRBridgedActionsGeneratedCommandListListAttributeCallbackBridge(
+ new MTRActionsGeneratedCommandListListAttributeCallbackBridge(
queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
if (attributeCacheContainer.cppAttributeCache) {
chip::app::ConcreteAttributePath path;
- using TypeInfo = BridgedActions::Attributes::GeneratedCommandList::TypeInfo;
+ using TypeInfo = Actions::Attributes::GeneratedCommandList::TypeInfo;
path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
path.mClusterId = TypeInfo::GetClusterId();
path.mAttributeId = TypeInfo::GetAttributeId();
TypeInfo::DecodableType value;
CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
- auto successFn = Callback<BridgedActionsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
+ auto successFn = Callback<ActionsGeneratedCommandListListAttributeCallback>::FromCancelable(success);
if (err == CHIP_NO_ERROR) {
successFn->mCall(successFn->mContext, value);
}
@@ -9929,12 +9920,12 @@
- (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value,
NSError * _Nullable error))completionHandler
{
- new MTRBridgedActionsAcceptedCommandListListAttributeCallbackBridge(self.callbackQueue, self.device, completionHandler,
+ new MTRActionsAcceptedCommandListListAttributeCallbackBridge(self.callbackQueue, self.device, completionHandler,
^(ExchangeManager & exchangeManager, const SessionHandle & session, Cancelable * success, Cancelable * failure) {
- using TypeInfo = BridgedActions::Attributes::AcceptedCommandList::TypeInfo;
- auto successFn = Callback<BridgedActionsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+ using TypeInfo = Actions::Attributes::AcceptedCommandList::TypeInfo;
+ auto successFn = Callback<ActionsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
});
}
@@ -9951,21 +9942,21 @@
minInterval = [minInterval copy];
maxInterval = [maxInterval copy];
params = [params copy];
- new MTRBridgedActionsAcceptedCommandListListAttributeCallbackSubscriptionBridge(
+ new MTRActionsAcceptedCommandListListAttributeCallbackSubscriptionBridge(
self.callbackQueue, self.device, reportHandler,
^(ExchangeManager & exchangeManager, const SessionHandle & session, Cancelable * success, Cancelable * failure) {
if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
// We don't support disabling auto-resubscribe.
return CHIP_ERROR_INVALID_ARGUMENT;
}
- using TypeInfo = BridgedActions::Attributes::AcceptedCommandList::TypeInfo;
- auto successFn = Callback<BridgedActionsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+ using TypeInfo = Actions::Attributes::AcceptedCommandList::TypeInfo;
+ auto successFn = Callback<ActionsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
[minInterval unsignedShortValue], [maxInterval unsignedShortValue],
- MTRBridgedActionsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+ MTRActionsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
},
@@ -9978,17 +9969,17 @@
completionHandler:
(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
{
- new MTRBridgedActionsAcceptedCommandListListAttributeCallbackBridge(
+ new MTRActionsAcceptedCommandListListAttributeCallbackBridge(
queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
if (attributeCacheContainer.cppAttributeCache) {
chip::app::ConcreteAttributePath path;
- using TypeInfo = BridgedActions::Attributes::AcceptedCommandList::TypeInfo;
+ using TypeInfo = Actions::Attributes::AcceptedCommandList::TypeInfo;
path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
path.mClusterId = TypeInfo::GetClusterId();
path.mAttributeId = TypeInfo::GetAttributeId();
TypeInfo::DecodableType value;
CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
- auto successFn = Callback<BridgedActionsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
+ auto successFn = Callback<ActionsAcceptedCommandListListAttributeCallback>::FromCancelable(success);
if (err == CHIP_NO_ERROR) {
successFn->mCall(successFn->mContext, value);
}
@@ -10001,12 +9992,12 @@
- (void)readAttributeAttributeListWithCompletionHandler:(void (^)(
NSArray * _Nullable value, NSError * _Nullable error))completionHandler
{
- new MTRBridgedActionsAttributeListListAttributeCallbackBridge(self.callbackQueue, self.device, completionHandler,
+ new MTRActionsAttributeListListAttributeCallbackBridge(self.callbackQueue, self.device, completionHandler,
^(ExchangeManager & exchangeManager, const SessionHandle & session, Cancelable * success, Cancelable * failure) {
- using TypeInfo = BridgedActions::Attributes::AttributeList::TypeInfo;
- auto successFn = Callback<BridgedActionsAttributeListListAttributeCallback>::FromCancelable(success);
+ using TypeInfo = Actions::Attributes::AttributeList::TypeInfo;
+ auto successFn = Callback<ActionsAttributeListListAttributeCallback>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
});
}
@@ -10021,21 +10012,21 @@
minInterval = [minInterval copy];
maxInterval = [maxInterval copy];
params = [params copy];
- new MTRBridgedActionsAttributeListListAttributeCallbackSubscriptionBridge(
+ new MTRActionsAttributeListListAttributeCallbackSubscriptionBridge(
self.callbackQueue, self.device, reportHandler,
^(ExchangeManager & exchangeManager, const SessionHandle & session, Cancelable * success, Cancelable * failure) {
if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
// We don't support disabling auto-resubscribe.
return CHIP_ERROR_INVALID_ARGUMENT;
}
- using TypeInfo = BridgedActions::Attributes::AttributeList::TypeInfo;
- auto successFn = Callback<BridgedActionsAttributeListListAttributeCallback>::FromCancelable(success);
+ using TypeInfo = Actions::Attributes::AttributeList::TypeInfo;
+ auto successFn = Callback<ActionsAttributeListListAttributeCallback>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
[minInterval unsignedShortValue], [maxInterval unsignedShortValue],
- MTRBridgedActionsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
+ MTRActionsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
},
@@ -10048,24 +10039,23 @@
completionHandler:
(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
{
- new MTRBridgedActionsAttributeListListAttributeCallbackBridge(
- queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
- if (attributeCacheContainer.cppAttributeCache) {
- chip::app::ConcreteAttributePath path;
- using TypeInfo = BridgedActions::Attributes::AttributeList::TypeInfo;
- path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
- path.mClusterId = TypeInfo::GetClusterId();
- path.mAttributeId = TypeInfo::GetAttributeId();
- TypeInfo::DecodableType value;
- CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
- auto successFn = Callback<BridgedActionsAttributeListListAttributeCallback>::FromCancelable(success);
- if (err == CHIP_NO_ERROR) {
- successFn->mCall(successFn->mContext, value);
- }
- return err;
+ new MTRActionsAttributeListListAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+ if (attributeCacheContainer.cppAttributeCache) {
+ chip::app::ConcreteAttributePath path;
+ using TypeInfo = Actions::Attributes::AttributeList::TypeInfo;
+ path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
+ path.mClusterId = TypeInfo::GetClusterId();
+ path.mAttributeId = TypeInfo::GetAttributeId();
+ TypeInfo::DecodableType value;
+ CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get<TypeInfo>(path, value);
+ auto successFn = Callback<ActionsAttributeListListAttributeCallback>::FromCancelable(success);
+ if (err == CHIP_NO_ERROR) {
+ successFn->mCall(successFn->mContext, value);
}
- return CHIP_ERROR_NOT_FOUND;
- });
+ return err;
+ }
+ return CHIP_ERROR_NOT_FOUND;
+ });
}
- (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(
@@ -10073,10 +10063,10 @@
{
new MTRInt32uAttributeCallbackBridge(self.callbackQueue, self.device, completionHandler,
^(ExchangeManager & exchangeManager, const SessionHandle & session, Cancelable * success, Cancelable * failure) {
- using TypeInfo = BridgedActions::Attributes::FeatureMap::TypeInfo;
+ using TypeInfo = Actions::Attributes::FeatureMap::TypeInfo;
auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
});
}
@@ -10098,11 +10088,11 @@
// We don't support disabling auto-resubscribe.
return CHIP_ERROR_INVALID_ARGUMENT;
}
- using TypeInfo = BridgedActions::Attributes::FeatureMap::TypeInfo;
+ using TypeInfo = Actions::Attributes::FeatureMap::TypeInfo;
auto successFn = Callback<Int32uAttributeCallback>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
[minInterval unsignedShortValue], [maxInterval unsignedShortValue],
MTRInt32uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
@@ -10120,7 +10110,7 @@
new MTRInt32uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
if (attributeCacheContainer.cppAttributeCache) {
chip::app::ConcreteAttributePath path;
- using TypeInfo = BridgedActions::Attributes::FeatureMap::TypeInfo;
+ using TypeInfo = Actions::Attributes::FeatureMap::TypeInfo;
path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
path.mClusterId = TypeInfo::GetClusterId();
path.mAttributeId = TypeInfo::GetAttributeId();
@@ -10141,10 +10131,10 @@
{
new MTRInt16uAttributeCallbackBridge(self.callbackQueue, self.device, completionHandler,
^(ExchangeManager & exchangeManager, const SessionHandle & session, Cancelable * success, Cancelable * failure) {
- using TypeInfo = BridgedActions::Attributes::ClusterRevision::TypeInfo;
+ using TypeInfo = Actions::Attributes::ClusterRevision::TypeInfo;
auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.ReadAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall);
});
}
@@ -10167,11 +10157,11 @@
// We don't support disabling auto-resubscribe.
return CHIP_ERROR_INVALID_ARGUMENT;
}
- using TypeInfo = BridgedActions::Attributes::ClusterRevision::TypeInfo;
+ using TypeInfo = Actions::Attributes::ClusterRevision::TypeInfo;
auto successFn = Callback<Int16uAttributeCallback>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.SubscribeAttribute<TypeInfo>(successFn->mContext, successFn->mCall, failureFn->mCall,
[minInterval unsignedShortValue], [maxInterval unsignedShortValue],
MTRInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil,
@@ -10190,7 +10180,7 @@
new MTRInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
if (attributeCacheContainer.cppAttributeCache) {
chip::app::ConcreteAttributePath path;
- using TypeInfo = BridgedActions::Attributes::ClusterRevision::TypeInfo;
+ using TypeInfo = Actions::Attributes::ClusterRevision::TypeInfo;
path.mEndpointId = static_cast<chip::EndpointId>([endpoint unsignedShortValue]);
path.mClusterId = TypeInfo::GetClusterId();
path.mAttributeId = TypeInfo::GetAttributeId();
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters_internal.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters_internal.h
index 4c6be50..359f771 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters_internal.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters_internal.h
@@ -74,7 +74,7 @@
@property (nonatomic, assign, readonly) chip::EndpointId endpoint;
@end
-@interface MTRBaseClusterBridgedActions ()
+@interface MTRBaseClusterActions ()
@property (nonatomic, strong, readonly) MTRBaseDevice * device;
@property (nonatomic, assign, readonly) chip::EndpointId endpoint;
@end
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm
index f2e3515..4657924 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm
@@ -2262,8 +2262,8 @@
}
}
-void MTRBridgedActionsActionListListAttributeCallbackBridge::OnSuccessFn(void * context,
- const chip::app::DataModel::DecodableList<chip::app::Clusters::BridgedActions::Structs::ActionStruct::DecodableType> & value)
+void MTRActionsActionListListAttributeCallbackBridge::OnSuccessFn(void * context,
+ const chip::app::DataModel::DecodableList<chip::app::Clusters::Actions::Structs::ActionStruct::DecodableType> & value)
{
NSArray * _Nonnull objCValue;
{ // Scope for our temporary variables
@@ -2271,16 +2271,16 @@
auto iter_0 = value.begin();
while (iter_0.Next()) {
auto & entry_0 = iter_0.GetValue();
- MTRBridgedActionsClusterActionStruct * newElement_0;
- newElement_0 = [MTRBridgedActionsClusterActionStruct new];
+ MTRActionsClusterActionStruct * newElement_0;
+ newElement_0 = [MTRActionsClusterActionStruct new];
newElement_0.actionID = [NSNumber numberWithUnsignedShort:entry_0.actionID];
newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.data()
length:entry_0.name.size()
encoding:NSUTF8StringEncoding];
newElement_0.type = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.type)];
newElement_0.endpointListID = [NSNumber numberWithUnsignedShort:entry_0.endpointListID];
- newElement_0.supportedCommands = [NSNumber numberWithUnsignedShort:entry_0.supportedCommands];
- newElement_0.status = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.status)];
+ newElement_0.supportedCommands = [NSNumber numberWithUnsignedShort:entry_0.supportedCommands.Raw()];
+ newElement_0.state = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0.state)];
[array_0 addObject:newElement_0];
}
CHIP_ERROR err = iter_0.GetStatus();
@@ -2293,9 +2293,9 @@
DispatchSuccess(context, objCValue);
};
-void MTRBridgedActionsActionListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void MTRActionsActionListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
{
- auto * self = static_cast<MTRBridgedActionsActionListListAttributeCallbackSubscriptionBridge *>(context);
+ auto * self = static_cast<MTRActionsActionListListAttributeCallbackSubscriptionBridge *>(context);
if (!self->mQueue) {
return;
}
@@ -2309,9 +2309,8 @@
}
}
-void MTRBridgedActionsEndpointListListAttributeCallbackBridge::OnSuccessFn(void * context,
- const chip::app::DataModel::DecodableList<chip::app::Clusters::BridgedActions::Structs::EndpointListStruct::DecodableType> &
- value)
+void MTRActionsEndpointListsListAttributeCallbackBridge::OnSuccessFn(void * context,
+ const chip::app::DataModel::DecodableList<chip::app::Clusters::Actions::Structs::EndpointListStruct::DecodableType> & value)
{
NSArray * _Nonnull objCValue;
{ // Scope for our temporary variables
@@ -2319,8 +2318,8 @@
auto iter_0 = value.begin();
while (iter_0.Next()) {
auto & entry_0 = iter_0.GetValue();
- MTRBridgedActionsClusterEndpointListStruct * newElement_0;
- newElement_0 = [MTRBridgedActionsClusterEndpointListStruct new];
+ MTRActionsClusterEndpointListStruct * newElement_0;
+ newElement_0 = [MTRActionsClusterEndpointListStruct new];
newElement_0.endpointListID = [NSNumber numberWithUnsignedShort:entry_0.endpointListID];
newElement_0.name = [[NSString alloc] initWithBytes:entry_0.name.data()
length:entry_0.name.size()
@@ -2354,9 +2353,9 @@
DispatchSuccess(context, objCValue);
};
-void MTRBridgedActionsEndpointListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void MTRActionsEndpointListsListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
{
- auto * self = static_cast<MTRBridgedActionsEndpointListListAttributeCallbackSubscriptionBridge *>(context);
+ auto * self = static_cast<MTRActionsEndpointListsListAttributeCallbackSubscriptionBridge *>(context);
if (!self->mQueue) {
return;
}
@@ -2370,7 +2369,7 @@
}
}
-void MTRBridgedActionsGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void MTRActionsGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn(
void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
{
NSArray * _Nonnull objCValue;
@@ -2393,9 +2392,9 @@
DispatchSuccess(context, objCValue);
};
-void MTRBridgedActionsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void MTRActionsGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
{
- auto * self = static_cast<MTRBridgedActionsGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+ auto * self = static_cast<MTRActionsGeneratedCommandListListAttributeCallbackSubscriptionBridge *>(context);
if (!self->mQueue) {
return;
}
@@ -2409,7 +2408,7 @@
}
}
-void MTRBridgedActionsAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
+void MTRActionsAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn(
void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value)
{
NSArray * _Nonnull objCValue;
@@ -2432,9 +2431,9 @@
DispatchSuccess(context, objCValue);
};
-void MTRBridgedActionsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void MTRActionsAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
{
- auto * self = static_cast<MTRBridgedActionsAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
+ auto * self = static_cast<MTRActionsAcceptedCommandListListAttributeCallbackSubscriptionBridge *>(context);
if (!self->mQueue) {
return;
}
@@ -2448,7 +2447,7 @@
}
}
-void MTRBridgedActionsAttributeListListAttributeCallbackBridge::OnSuccessFn(
+void MTRActionsAttributeListListAttributeCallbackBridge::OnSuccessFn(
void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value)
{
NSArray * _Nonnull objCValue;
@@ -2471,9 +2470,9 @@
DispatchSuccess(context, objCValue);
};
-void MTRBridgedActionsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void MTRActionsAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
{
- auto * self = static_cast<MTRBridgedActionsAttributeListListAttributeCallbackSubscriptionBridge *>(context);
+ auto * self = static_cast<MTRActionsAttributeListListAttributeCallbackSubscriptionBridge *>(context);
if (!self->mQueue) {
return;
}
@@ -13993,17 +13992,17 @@
}
}
-void MTRBridgedActionsClusterActionErrorEnumAttributeCallbackBridge::OnSuccessFn(
- void * context, chip::app::Clusters::BridgedActions::ActionErrorEnum value)
+void MTRActionsClusterActionErrorEnumAttributeCallbackBridge::OnSuccessFn(
+ void * context, chip::app::Clusters::Actions::ActionErrorEnum value)
{
NSNumber * _Nonnull objCValue;
objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
DispatchSuccess(context, objCValue);
};
-void MTRBridgedActionsClusterActionErrorEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void MTRActionsClusterActionErrorEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
{
- auto * self = static_cast<MTRBridgedActionsClusterActionErrorEnumAttributeCallbackSubscriptionBridge *>(context);
+ auto * self = static_cast<MTRActionsClusterActionErrorEnumAttributeCallbackSubscriptionBridge *>(context);
if (!self->mQueue) {
return;
}
@@ -14017,8 +14016,8 @@
}
}
-void MTRNullableBridgedActionsClusterActionErrorEnumAttributeCallbackBridge::OnSuccessFn(
- void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::BridgedActions::ActionErrorEnum> & value)
+void MTRNullableActionsClusterActionErrorEnumAttributeCallbackBridge::OnSuccessFn(
+ void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::Actions::ActionErrorEnum> & value)
{
NSNumber * _Nullable objCValue;
if (value.IsNull()) {
@@ -14029,9 +14028,9 @@
DispatchSuccess(context, objCValue);
};
-void MTRNullableBridgedActionsClusterActionErrorEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void MTRNullableActionsClusterActionErrorEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
{
- auto * self = static_cast<MTRNullableBridgedActionsClusterActionErrorEnumAttributeCallbackSubscriptionBridge *>(context);
+ auto * self = static_cast<MTRNullableActionsClusterActionErrorEnumAttributeCallbackSubscriptionBridge *>(context);
if (!self->mQueue) {
return;
}
@@ -14045,17 +14044,17 @@
}
}
-void MTRBridgedActionsClusterActionStateEnumAttributeCallbackBridge::OnSuccessFn(
- void * context, chip::app::Clusters::BridgedActions::ActionStateEnum value)
+void MTRActionsClusterActionStateEnumAttributeCallbackBridge::OnSuccessFn(
+ void * context, chip::app::Clusters::Actions::ActionStateEnum value)
{
NSNumber * _Nonnull objCValue;
objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
DispatchSuccess(context, objCValue);
};
-void MTRBridgedActionsClusterActionStateEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void MTRActionsClusterActionStateEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
{
- auto * self = static_cast<MTRBridgedActionsClusterActionStateEnumAttributeCallbackSubscriptionBridge *>(context);
+ auto * self = static_cast<MTRActionsClusterActionStateEnumAttributeCallbackSubscriptionBridge *>(context);
if (!self->mQueue) {
return;
}
@@ -14069,8 +14068,8 @@
}
}
-void MTRNullableBridgedActionsClusterActionStateEnumAttributeCallbackBridge::OnSuccessFn(
- void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::BridgedActions::ActionStateEnum> & value)
+void MTRNullableActionsClusterActionStateEnumAttributeCallbackBridge::OnSuccessFn(
+ void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::Actions::ActionStateEnum> & value)
{
NSNumber * _Nullable objCValue;
if (value.IsNull()) {
@@ -14081,9 +14080,9 @@
DispatchSuccess(context, objCValue);
};
-void MTRNullableBridgedActionsClusterActionStateEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void MTRNullableActionsClusterActionStateEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
{
- auto * self = static_cast<MTRNullableBridgedActionsClusterActionStateEnumAttributeCallbackSubscriptionBridge *>(context);
+ auto * self = static_cast<MTRNullableActionsClusterActionStateEnumAttributeCallbackSubscriptionBridge *>(context);
if (!self->mQueue) {
return;
}
@@ -14097,17 +14096,17 @@
}
}
-void MTRBridgedActionsClusterActionTypeEnumAttributeCallbackBridge::OnSuccessFn(
- void * context, chip::app::Clusters::BridgedActions::ActionTypeEnum value)
+void MTRActionsClusterActionTypeEnumAttributeCallbackBridge::OnSuccessFn(
+ void * context, chip::app::Clusters::Actions::ActionTypeEnum value)
{
NSNumber * _Nonnull objCValue;
objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
DispatchSuccess(context, objCValue);
};
-void MTRBridgedActionsClusterActionTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void MTRActionsClusterActionTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
{
- auto * self = static_cast<MTRBridgedActionsClusterActionTypeEnumAttributeCallbackSubscriptionBridge *>(context);
+ auto * self = static_cast<MTRActionsClusterActionTypeEnumAttributeCallbackSubscriptionBridge *>(context);
if (!self->mQueue) {
return;
}
@@ -14121,8 +14120,8 @@
}
}
-void MTRNullableBridgedActionsClusterActionTypeEnumAttributeCallbackBridge::OnSuccessFn(
- void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::BridgedActions::ActionTypeEnum> & value)
+void MTRNullableActionsClusterActionTypeEnumAttributeCallbackBridge::OnSuccessFn(
+ void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::Actions::ActionTypeEnum> & value)
{
NSNumber * _Nullable objCValue;
if (value.IsNull()) {
@@ -14133,9 +14132,9 @@
DispatchSuccess(context, objCValue);
};
-void MTRNullableBridgedActionsClusterActionTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void MTRNullableActionsClusterActionTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
{
- auto * self = static_cast<MTRNullableBridgedActionsClusterActionTypeEnumAttributeCallbackSubscriptionBridge *>(context);
+ auto * self = static_cast<MTRNullableActionsClusterActionTypeEnumAttributeCallbackSubscriptionBridge *>(context);
if (!self->mQueue) {
return;
}
@@ -14149,17 +14148,17 @@
}
}
-void MTRBridgedActionsClusterEndpointListTypeEnumAttributeCallbackBridge::OnSuccessFn(
- void * context, chip::app::Clusters::BridgedActions::EndpointListTypeEnum value)
+void MTRActionsClusterEndpointListTypeEnumAttributeCallbackBridge::OnSuccessFn(
+ void * context, chip::app::Clusters::Actions::EndpointListTypeEnum value)
{
NSNumber * _Nonnull objCValue;
objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
DispatchSuccess(context, objCValue);
};
-void MTRBridgedActionsClusterEndpointListTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
+void MTRActionsClusterEndpointListTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
{
- auto * self = static_cast<MTRBridgedActionsClusterEndpointListTypeEnumAttributeCallbackSubscriptionBridge *>(context);
+ auto * self = static_cast<MTRActionsClusterEndpointListTypeEnumAttributeCallbackSubscriptionBridge *>(context);
if (!self->mQueue) {
return;
}
@@ -14173,8 +14172,8 @@
}
}
-void MTRNullableBridgedActionsClusterEndpointListTypeEnumAttributeCallbackBridge::OnSuccessFn(
- void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::BridgedActions::EndpointListTypeEnum> & value)
+void MTRNullableActionsClusterEndpointListTypeEnumAttributeCallbackBridge::OnSuccessFn(
+ void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::Actions::EndpointListTypeEnum> & value)
{
NSNumber * _Nullable objCValue;
if (value.IsNull()) {
@@ -14185,10 +14184,9 @@
DispatchSuccess(context, objCValue);
};
-void MTRNullableBridgedActionsClusterEndpointListTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(
- void * context)
+void MTRNullableActionsClusterEndpointListTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context)
{
- auto * self = static_cast<MTRNullableBridgedActionsClusterEndpointListTypeEnumAttributeCallbackSubscriptionBridge *>(context);
+ auto * self = static_cast<MTRNullableActionsClusterEndpointListTypeEnumAttributeCallbackSubscriptionBridge *>(context);
if (!self->mQueue) {
return;
}
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge_internal.h b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge_internal.h
index f088c58..2b4c033 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge_internal.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge_internal.h
@@ -179,19 +179,18 @@
typedef void (*AccessControlClusterPrivilegeAttributeCallback)(void *, chip::app::Clusters::AccessControl::Privilege);
typedef void (*NullableAccessControlClusterPrivilegeAttributeCallback)(
void *, const chip::app::DataModel::Nullable<chip::app::Clusters::AccessControl::Privilege> &);
-typedef void (*BridgedActionsClusterActionErrorEnumAttributeCallback)(void *, chip::app::Clusters::BridgedActions::ActionErrorEnum);
-typedef void (*NullableBridgedActionsClusterActionErrorEnumAttributeCallback)(
- void *, const chip::app::DataModel::Nullable<chip::app::Clusters::BridgedActions::ActionErrorEnum> &);
-typedef void (*BridgedActionsClusterActionStateEnumAttributeCallback)(void *, chip::app::Clusters::BridgedActions::ActionStateEnum);
-typedef void (*NullableBridgedActionsClusterActionStateEnumAttributeCallback)(
- void *, const chip::app::DataModel::Nullable<chip::app::Clusters::BridgedActions::ActionStateEnum> &);
-typedef void (*BridgedActionsClusterActionTypeEnumAttributeCallback)(void *, chip::app::Clusters::BridgedActions::ActionTypeEnum);
-typedef void (*NullableBridgedActionsClusterActionTypeEnumAttributeCallback)(
- void *, const chip::app::DataModel::Nullable<chip::app::Clusters::BridgedActions::ActionTypeEnum> &);
-typedef void (*BridgedActionsClusterEndpointListTypeEnumAttributeCallback)(
- void *, chip::app::Clusters::BridgedActions::EndpointListTypeEnum);
-typedef void (*NullableBridgedActionsClusterEndpointListTypeEnumAttributeCallback)(
- void *, const chip::app::DataModel::Nullable<chip::app::Clusters::BridgedActions::EndpointListTypeEnum> &);
+typedef void (*ActionsClusterActionErrorEnumAttributeCallback)(void *, chip::app::Clusters::Actions::ActionErrorEnum);
+typedef void (*NullableActionsClusterActionErrorEnumAttributeCallback)(
+ void *, const chip::app::DataModel::Nullable<chip::app::Clusters::Actions::ActionErrorEnum> &);
+typedef void (*ActionsClusterActionStateEnumAttributeCallback)(void *, chip::app::Clusters::Actions::ActionStateEnum);
+typedef void (*NullableActionsClusterActionStateEnumAttributeCallback)(
+ void *, const chip::app::DataModel::Nullable<chip::app::Clusters::Actions::ActionStateEnum> &);
+typedef void (*ActionsClusterActionTypeEnumAttributeCallback)(void *, chip::app::Clusters::Actions::ActionTypeEnum);
+typedef void (*NullableActionsClusterActionTypeEnumAttributeCallback)(
+ void *, const chip::app::DataModel::Nullable<chip::app::Clusters::Actions::ActionTypeEnum> &);
+typedef void (*ActionsClusterEndpointListTypeEnumAttributeCallback)(void *, chip::app::Clusters::Actions::EndpointListTypeEnum);
+typedef void (*NullableActionsClusterEndpointListTypeEnumAttributeCallback)(
+ void *, const chip::app::DataModel::Nullable<chip::app::Clusters::Actions::EndpointListTypeEnum> &);
typedef void (*OtaSoftwareUpdateProviderClusterOTAApplyUpdateActionAttributeCallback)(
void *, chip::app::Clusters::OtaSoftwareUpdateProvider::OTAApplyUpdateAction);
typedef void (*NullableOtaSoftwareUpdateProviderClusterOTAApplyUpdateActionAttributeCallback)(
@@ -605,19 +604,18 @@
void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
typedef void (*AccessControlAttributeListListAttributeCallback)(
void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*BridgedActionsActionListListAttributeCallback)(
+typedef void (*ActionsActionListListAttributeCallback)(
void * context,
- const chip::app::DataModel::DecodableList<chip::app::Clusters::BridgedActions::Structs::ActionStruct::DecodableType> & data);
-typedef void (*BridgedActionsEndpointListListAttributeCallback)(
+ const chip::app::DataModel::DecodableList<chip::app::Clusters::Actions::Structs::ActionStruct::DecodableType> & data);
+typedef void (*ActionsEndpointListsListAttributeCallback)(
void * context,
- const chip::app::DataModel::DecodableList<chip::app::Clusters::BridgedActions::Structs::EndpointListStruct::DecodableType> &
- data);
-typedef void (*BridgedActionsGeneratedCommandListListAttributeCallback)(
- void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*BridgedActionsAcceptedCommandListListAttributeCallback)(
- void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*BridgedActionsAttributeListListAttributeCallback)(
- void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+ const chip::app::DataModel::DecodableList<chip::app::Clusters::Actions::Structs::EndpointListStruct::DecodableType> & data);
+typedef void (*ActionsGeneratedCommandListListAttributeCallback)(void * context,
+ const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*ActionsAcceptedCommandListListAttributeCallback)(void * context,
+ const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*ActionsAttributeListListAttributeCallback)(void * context,
+ const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
typedef void (*BasicCapabilityMinimaStructAttributeCallback)(
void *, const chip::app::Clusters::Basic::Structs::CapabilityMinimaStruct::DecodableType &);
typedef void (*BasicGeneratedCommandListListAttributeCallback)(void * context,
@@ -3992,46 +3990,42 @@
SubscriptionEstablishedHandler mEstablishedHandler;
};
-class MTRBridgedActionsActionListListAttributeCallbackBridge
- : public MTRCallbackBridge<BridgedActionsActionListListAttributeCallback>
+class MTRActionsActionListListAttributeCallbackBridge : public MTRCallbackBridge<ActionsActionListListAttributeCallback>
{
public:
- MTRBridgedActionsActionListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
- MTRLocalActionBlock action, bool keepAlive = false) :
- MTRCallbackBridge<BridgedActionsActionListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+ MTRActionsActionListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRLocalActionBlock action,
+ bool keepAlive = false) :
+ MTRCallbackBridge<ActionsActionListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
- MTRBridgedActionsActionListListAttributeCallbackBridge(dispatch_queue_t queue, chip::NodeId nodeID,
- MTRDeviceController * controller, ResponseHandler handler,
- MTRActionBlock action, bool keepAlive = false) :
- MTRCallbackBridge<BridgedActionsActionListListAttributeCallback>(queue, nodeID, controller, handler, action, OnSuccessFn,
- keepAlive){};
+ MTRActionsActionListListAttributeCallbackBridge(dispatch_queue_t queue, chip::NodeId nodeID, MTRDeviceController * controller,
+ ResponseHandler handler, MTRActionBlock action, bool keepAlive = false) :
+ MTRCallbackBridge<ActionsActionListListAttributeCallback>(queue, nodeID, controller, handler, action, OnSuccessFn,
+ keepAlive){};
- MTRBridgedActionsActionListListAttributeCallbackBridge(dispatch_queue_t queue, MTRBaseDevice * device, ResponseHandler handler,
- MTRActionBlock action, bool keepAlive = false) :
- MTRCallbackBridge<BridgedActionsActionListListAttributeCallback>(queue, device, handler, action, OnSuccessFn, keepAlive){};
+ MTRActionsActionListListAttributeCallbackBridge(dispatch_queue_t queue, MTRBaseDevice * device, ResponseHandler handler,
+ MTRActionBlock action, bool keepAlive = false) :
+ MTRCallbackBridge<ActionsActionListListAttributeCallback>(queue, device, handler, action, OnSuccessFn, keepAlive){};
static void OnSuccessFn(
void * context,
- const chip::app::DataModel::DecodableList<chip::app::Clusters::BridgedActions::Structs::ActionStruct::DecodableType> &
- value);
+ const chip::app::DataModel::DecodableList<chip::app::Clusters::Actions::Structs::ActionStruct::DecodableType> & value);
};
-class MTRBridgedActionsActionListListAttributeCallbackSubscriptionBridge
- : public MTRBridgedActionsActionListListAttributeCallbackBridge
+class MTRActionsActionListListAttributeCallbackSubscriptionBridge : public MTRActionsActionListListAttributeCallbackBridge
{
public:
- MTRBridgedActionsActionListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, chip::NodeId nodeID,
- MTRDeviceController * controller, ResponseHandler handler,
- MTRActionBlock action,
- SubscriptionEstablishedHandler establishedHandler) :
- MTRBridgedActionsActionListListAttributeCallbackBridge(queue, nodeID, controller, handler, action, true),
+ MTRActionsActionListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, chip::NodeId nodeID,
+ MTRDeviceController * controller, ResponseHandler handler,
+ MTRActionBlock action,
+ SubscriptionEstablishedHandler establishedHandler) :
+ MTRActionsActionListListAttributeCallbackBridge(queue, nodeID, controller, handler, action, true),
mEstablishedHandler(establishedHandler)
{}
- MTRBridgedActionsActionListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, MTRBaseDevice * device,
- ResponseHandler handler, MTRActionBlock action,
- SubscriptionEstablishedHandler establishedHandler) :
- MTRBridgedActionsActionListListAttributeCallbackBridge(queue, device, handler, action, true),
+ MTRActionsActionListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, MTRBaseDevice * device,
+ ResponseHandler handler, MTRActionBlock action,
+ SubscriptionEstablishedHandler establishedHandler) :
+ MTRActionsActionListListAttributeCallbackBridge(queue, device, handler, action, true),
mEstablishedHandler(establishedHandler)
{}
@@ -4041,48 +4035,140 @@
SubscriptionEstablishedHandler mEstablishedHandler;
};
-class MTRBridgedActionsEndpointListListAttributeCallbackBridge
- : public MTRCallbackBridge<BridgedActionsEndpointListListAttributeCallback>
+class MTRActionsEndpointListsListAttributeCallbackBridge : public MTRCallbackBridge<ActionsEndpointListsListAttributeCallback>
{
public:
- MTRBridgedActionsEndpointListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
- MTRLocalActionBlock action, bool keepAlive = false) :
- MTRCallbackBridge<BridgedActionsEndpointListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+ MTRActionsEndpointListsListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRLocalActionBlock action,
+ bool keepAlive = false) :
+ MTRCallbackBridge<ActionsEndpointListsListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
- MTRBridgedActionsEndpointListListAttributeCallbackBridge(dispatch_queue_t queue, chip::NodeId nodeID,
- MTRDeviceController * controller, ResponseHandler handler,
- MTRActionBlock action, bool keepAlive = false) :
- MTRCallbackBridge<BridgedActionsEndpointListListAttributeCallback>(queue, nodeID, controller, handler, action, OnSuccessFn,
- keepAlive){};
+ MTRActionsEndpointListsListAttributeCallbackBridge(dispatch_queue_t queue, chip::NodeId nodeID,
+ MTRDeviceController * controller, ResponseHandler handler,
+ MTRActionBlock action, bool keepAlive = false) :
+ MTRCallbackBridge<ActionsEndpointListsListAttributeCallback>(queue, nodeID, controller, handler, action, OnSuccessFn,
+ keepAlive){};
- MTRBridgedActionsEndpointListListAttributeCallbackBridge(dispatch_queue_t queue, MTRBaseDevice * device,
- ResponseHandler handler, MTRActionBlock action,
- bool keepAlive = false) :
- MTRCallbackBridge<BridgedActionsEndpointListListAttributeCallback>(queue, device, handler, action, OnSuccessFn,
- keepAlive){};
+ MTRActionsEndpointListsListAttributeCallbackBridge(dispatch_queue_t queue, MTRBaseDevice * device, ResponseHandler handler,
+ MTRActionBlock action, bool keepAlive = false) :
+ MTRCallbackBridge<ActionsEndpointListsListAttributeCallback>(queue, device, handler, action, OnSuccessFn, keepAlive){};
static void OnSuccessFn(
void * context,
- const chip::app::DataModel::DecodableList<chip::app::Clusters::BridgedActions::Structs::EndpointListStruct::DecodableType> &
+ const chip::app::DataModel::DecodableList<chip::app::Clusters::Actions::Structs::EndpointListStruct::DecodableType> &
value);
};
-class MTRBridgedActionsEndpointListListAttributeCallbackSubscriptionBridge
- : public MTRBridgedActionsEndpointListListAttributeCallbackBridge
+class MTRActionsEndpointListsListAttributeCallbackSubscriptionBridge : public MTRActionsEndpointListsListAttributeCallbackBridge
{
public:
- MTRBridgedActionsEndpointListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, chip::NodeId nodeID,
+ MTRActionsEndpointListsListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, chip::NodeId nodeID,
+ MTRDeviceController * controller, ResponseHandler handler,
+ MTRActionBlock action,
+ SubscriptionEstablishedHandler establishedHandler) :
+ MTRActionsEndpointListsListAttributeCallbackBridge(queue, nodeID, controller, handler, action, true),
+ mEstablishedHandler(establishedHandler)
+ {}
+
+ MTRActionsEndpointListsListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, MTRBaseDevice * device,
+ ResponseHandler handler, MTRActionBlock action,
+ SubscriptionEstablishedHandler establishedHandler) :
+ MTRActionsEndpointListsListAttributeCallbackBridge(queue, device, handler, action, true),
+ mEstablishedHandler(establishedHandler)
+ {}
+
+ static void OnSubscriptionEstablished(void * context);
+
+private:
+ SubscriptionEstablishedHandler mEstablishedHandler;
+};
+
+class MTRActionsGeneratedCommandListListAttributeCallbackBridge
+ : public MTRCallbackBridge<ActionsGeneratedCommandListListAttributeCallback>
+{
+public:
+ MTRActionsGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+ MTRLocalActionBlock action, bool keepAlive = false) :
+ MTRCallbackBridge<ActionsGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+
+ MTRActionsGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, chip::NodeId nodeID,
+ MTRDeviceController * controller, ResponseHandler handler,
+ MTRActionBlock action, bool keepAlive = false) :
+ MTRCallbackBridge<ActionsGeneratedCommandListListAttributeCallback>(queue, nodeID, controller, handler, action, OnSuccessFn,
+ keepAlive){};
+
+ MTRActionsGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, MTRBaseDevice * device,
+ ResponseHandler handler, MTRActionBlock action,
+ bool keepAlive = false) :
+ MTRCallbackBridge<ActionsGeneratedCommandListListAttributeCallback>(queue, device, handler, action, OnSuccessFn,
+ keepAlive){};
+
+ static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+};
+
+class MTRActionsGeneratedCommandListListAttributeCallbackSubscriptionBridge
+ : public MTRActionsGeneratedCommandListListAttributeCallbackBridge
+{
+public:
+ MTRActionsGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, chip::NodeId nodeID,
+ MTRDeviceController * controller, ResponseHandler handler,
+ MTRActionBlock action,
+ SubscriptionEstablishedHandler establishedHandler) :
+ MTRActionsGeneratedCommandListListAttributeCallbackBridge(queue, nodeID, controller, handler, action, true),
+ mEstablishedHandler(establishedHandler)
+ {}
+
+ MTRActionsGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, MTRBaseDevice * device,
+ ResponseHandler handler, MTRActionBlock action,
+ SubscriptionEstablishedHandler establishedHandler) :
+ MTRActionsGeneratedCommandListListAttributeCallbackBridge(queue, device, handler, action, true),
+ mEstablishedHandler(establishedHandler)
+ {}
+
+ static void OnSubscriptionEstablished(void * context);
+
+private:
+ SubscriptionEstablishedHandler mEstablishedHandler;
+};
+
+class MTRActionsAcceptedCommandListListAttributeCallbackBridge
+ : public MTRCallbackBridge<ActionsAcceptedCommandListListAttributeCallback>
+{
+public:
+ MTRActionsAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+ MTRLocalActionBlock action, bool keepAlive = false) :
+ MTRCallbackBridge<ActionsAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+
+ MTRActionsAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, chip::NodeId nodeID,
+ MTRDeviceController * controller, ResponseHandler handler,
+ MTRActionBlock action, bool keepAlive = false) :
+ MTRCallbackBridge<ActionsAcceptedCommandListListAttributeCallback>(queue, nodeID, controller, handler, action, OnSuccessFn,
+ keepAlive){};
+
+ MTRActionsAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, MTRBaseDevice * device,
+ ResponseHandler handler, MTRActionBlock action,
+ bool keepAlive = false) :
+ MTRCallbackBridge<ActionsAcceptedCommandListListAttributeCallback>(queue, device, handler, action, OnSuccessFn,
+ keepAlive){};
+
+ static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
+};
+
+class MTRActionsAcceptedCommandListListAttributeCallbackSubscriptionBridge
+ : public MTRActionsAcceptedCommandListListAttributeCallbackBridge
+{
+public:
+ MTRActionsAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, chip::NodeId nodeID,
MTRDeviceController * controller, ResponseHandler handler,
MTRActionBlock action,
SubscriptionEstablishedHandler establishedHandler) :
- MTRBridgedActionsEndpointListListAttributeCallbackBridge(queue, nodeID, controller, handler, action, true),
+ MTRActionsAcceptedCommandListListAttributeCallbackBridge(queue, nodeID, controller, handler, action, true),
mEstablishedHandler(establishedHandler)
{}
- MTRBridgedActionsEndpointListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, MTRBaseDevice * device,
+ MTRActionsAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, MTRBaseDevice * device,
ResponseHandler handler, MTRActionBlock action,
SubscriptionEstablishedHandler establishedHandler) :
- MTRBridgedActionsEndpointListListAttributeCallbackBridge(queue, device, handler, action, true),
+ MTRActionsAcceptedCommandListListAttributeCallbackBridge(queue, device, handler, action, true),
mEstablishedHandler(establishedHandler)
{}
@@ -4092,141 +4178,41 @@
SubscriptionEstablishedHandler mEstablishedHandler;
};
-class MTRBridgedActionsGeneratedCommandListListAttributeCallbackBridge
- : public MTRCallbackBridge<BridgedActionsGeneratedCommandListListAttributeCallback>
+class MTRActionsAttributeListListAttributeCallbackBridge : public MTRCallbackBridge<ActionsAttributeListListAttributeCallback>
{
public:
- MTRBridgedActionsGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
- MTRLocalActionBlock action, bool keepAlive = false) :
- MTRCallbackBridge<BridgedActionsGeneratedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn,
- keepAlive){};
+ MTRActionsAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRLocalActionBlock action,
+ bool keepAlive = false) :
+ MTRCallbackBridge<ActionsAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
- MTRBridgedActionsGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, chip::NodeId nodeID,
- MTRDeviceController * controller, ResponseHandler handler,
- MTRActionBlock action, bool keepAlive = false) :
- MTRCallbackBridge<BridgedActionsGeneratedCommandListListAttributeCallback>(queue, nodeID, controller, handler, action,
- OnSuccessFn, keepAlive){};
+ MTRActionsAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, chip::NodeId nodeID,
+ MTRDeviceController * controller, ResponseHandler handler,
+ MTRActionBlock action, bool keepAlive = false) :
+ MTRCallbackBridge<ActionsAttributeListListAttributeCallback>(queue, nodeID, controller, handler, action, OnSuccessFn,
+ keepAlive){};
- MTRBridgedActionsGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, MTRBaseDevice * device,
- ResponseHandler handler, MTRActionBlock action,
- bool keepAlive = false) :
- MTRCallbackBridge<BridgedActionsGeneratedCommandListListAttributeCallback>(queue, device, handler, action, OnSuccessFn,
- keepAlive){};
-
- static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
-};
-
-class MTRBridgedActionsGeneratedCommandListListAttributeCallbackSubscriptionBridge
- : public MTRBridgedActionsGeneratedCommandListListAttributeCallbackBridge
-{
-public:
- MTRBridgedActionsGeneratedCommandListListAttributeCallbackSubscriptionBridge(
- dispatch_queue_t queue, chip::NodeId nodeID, MTRDeviceController * controller, ResponseHandler handler,
- MTRActionBlock action, SubscriptionEstablishedHandler establishedHandler) :
- MTRBridgedActionsGeneratedCommandListListAttributeCallbackBridge(queue, nodeID, controller, handler, action, true),
- mEstablishedHandler(establishedHandler)
- {}
-
- MTRBridgedActionsGeneratedCommandListListAttributeCallbackSubscriptionBridge(
- dispatch_queue_t queue, MTRBaseDevice * device, ResponseHandler handler, MTRActionBlock action,
- SubscriptionEstablishedHandler establishedHandler) :
- MTRBridgedActionsGeneratedCommandListListAttributeCallbackBridge(queue, device, handler, action, true),
- mEstablishedHandler(establishedHandler)
- {}
-
- static void OnSubscriptionEstablished(void * context);
-
-private:
- SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class MTRBridgedActionsAcceptedCommandListListAttributeCallbackBridge
- : public MTRCallbackBridge<BridgedActionsAcceptedCommandListListAttributeCallback>
-{
-public:
- MTRBridgedActionsAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
- MTRLocalActionBlock action, bool keepAlive = false) :
- MTRCallbackBridge<BridgedActionsAcceptedCommandListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
-
- MTRBridgedActionsAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, chip::NodeId nodeID,
- MTRDeviceController * controller, ResponseHandler handler,
- MTRActionBlock action, bool keepAlive = false) :
- MTRCallbackBridge<BridgedActionsAcceptedCommandListListAttributeCallback>(queue, nodeID, controller, handler, action,
- OnSuccessFn, keepAlive){};
-
- MTRBridgedActionsAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, MTRBaseDevice * device,
- ResponseHandler handler, MTRActionBlock action,
- bool keepAlive = false) :
- MTRCallbackBridge<BridgedActionsAcceptedCommandListListAttributeCallback>(queue, device, handler, action, OnSuccessFn,
- keepAlive){};
-
- static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & value);
-};
-
-class MTRBridgedActionsAcceptedCommandListListAttributeCallbackSubscriptionBridge
- : public MTRBridgedActionsAcceptedCommandListListAttributeCallbackBridge
-{
-public:
- MTRBridgedActionsAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, chip::NodeId nodeID,
- MTRDeviceController * controller,
- ResponseHandler handler, MTRActionBlock action,
- SubscriptionEstablishedHandler establishedHandler) :
- MTRBridgedActionsAcceptedCommandListListAttributeCallbackBridge(queue, nodeID, controller, handler, action, true),
- mEstablishedHandler(establishedHandler)
- {}
-
- MTRBridgedActionsAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, MTRBaseDevice * device,
- ResponseHandler handler, MTRActionBlock action,
- SubscriptionEstablishedHandler establishedHandler) :
- MTRBridgedActionsAcceptedCommandListListAttributeCallbackBridge(queue, device, handler, action, true),
- mEstablishedHandler(establishedHandler)
- {}
-
- static void OnSubscriptionEstablished(void * context);
-
-private:
- SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class MTRBridgedActionsAttributeListListAttributeCallbackBridge
- : public MTRCallbackBridge<BridgedActionsAttributeListListAttributeCallback>
-{
-public:
- MTRBridgedActionsAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
- MTRLocalActionBlock action, bool keepAlive = false) :
- MTRCallbackBridge<BridgedActionsAttributeListListAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
-
- MTRBridgedActionsAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, chip::NodeId nodeID,
- MTRDeviceController * controller, ResponseHandler handler,
- MTRActionBlock action, bool keepAlive = false) :
- MTRCallbackBridge<BridgedActionsAttributeListListAttributeCallback>(queue, nodeID, controller, handler, action, OnSuccessFn,
- keepAlive){};
-
- MTRBridgedActionsAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, MTRBaseDevice * device,
- ResponseHandler handler, MTRActionBlock action,
- bool keepAlive = false) :
- MTRCallbackBridge<BridgedActionsAttributeListListAttributeCallback>(queue, device, handler, action, OnSuccessFn,
- keepAlive){};
+ MTRActionsAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, MTRBaseDevice * device, ResponseHandler handler,
+ MTRActionBlock action, bool keepAlive = false) :
+ MTRCallbackBridge<ActionsAttributeListListAttributeCallback>(queue, device, handler, action, OnSuccessFn, keepAlive){};
static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & value);
};
-class MTRBridgedActionsAttributeListListAttributeCallbackSubscriptionBridge
- : public MTRBridgedActionsAttributeListListAttributeCallbackBridge
+class MTRActionsAttributeListListAttributeCallbackSubscriptionBridge : public MTRActionsAttributeListListAttributeCallbackBridge
{
public:
- MTRBridgedActionsAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, chip::NodeId nodeID,
- MTRDeviceController * controller, ResponseHandler handler,
- MTRActionBlock action,
- SubscriptionEstablishedHandler establishedHandler) :
- MTRBridgedActionsAttributeListListAttributeCallbackBridge(queue, nodeID, controller, handler, action, true),
+ MTRActionsAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, chip::NodeId nodeID,
+ MTRDeviceController * controller, ResponseHandler handler,
+ MTRActionBlock action,
+ SubscriptionEstablishedHandler establishedHandler) :
+ MTRActionsAttributeListListAttributeCallbackBridge(queue, nodeID, controller, handler, action, true),
mEstablishedHandler(establishedHandler)
{}
- MTRBridgedActionsAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, MTRBaseDevice * device,
- ResponseHandler handler, MTRActionBlock action,
- SubscriptionEstablishedHandler establishedHandler) :
- MTRBridgedActionsAttributeListListAttributeCallbackBridge(queue, device, handler, action, true),
+ MTRActionsAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, MTRBaseDevice * device,
+ ResponseHandler handler, MTRActionBlock action,
+ SubscriptionEstablishedHandler establishedHandler) :
+ MTRActionsAttributeListListAttributeCallbackBridge(queue, device, handler, action, true),
mEstablishedHandler(establishedHandler)
{}
@@ -17578,338 +17564,43 @@
SubscriptionEstablishedHandler mEstablishedHandler;
};
-class MTRBridgedActionsClusterActionErrorEnumAttributeCallbackBridge
- : public MTRCallbackBridge<BridgedActionsClusterActionErrorEnumAttributeCallback>
+class MTRActionsClusterActionErrorEnumAttributeCallbackBridge
+ : public MTRCallbackBridge<ActionsClusterActionErrorEnumAttributeCallback>
{
public:
- MTRBridgedActionsClusterActionErrorEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
- MTRLocalActionBlock action, bool keepAlive = false) :
- MTRCallbackBridge<BridgedActionsClusterActionErrorEnumAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+ MTRActionsClusterActionErrorEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+ MTRLocalActionBlock action, bool keepAlive = false) :
+ MTRCallbackBridge<ActionsClusterActionErrorEnumAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
- MTRBridgedActionsClusterActionErrorEnumAttributeCallbackBridge(dispatch_queue_t queue, chip::NodeId nodeID,
- MTRDeviceController * controller, ResponseHandler handler,
- MTRActionBlock action, bool keepAlive = false) :
- MTRCallbackBridge<BridgedActionsClusterActionErrorEnumAttributeCallback>(queue, nodeID, controller, handler, action,
- OnSuccessFn, keepAlive){};
+ MTRActionsClusterActionErrorEnumAttributeCallbackBridge(dispatch_queue_t queue, chip::NodeId nodeID,
+ MTRDeviceController * controller, ResponseHandler handler,
+ MTRActionBlock action, bool keepAlive = false) :
+ MTRCallbackBridge<ActionsClusterActionErrorEnumAttributeCallback>(queue, nodeID, controller, handler, action, OnSuccessFn,
+ keepAlive){};
- MTRBridgedActionsClusterActionErrorEnumAttributeCallbackBridge(dispatch_queue_t queue, MTRBaseDevice * device,
- ResponseHandler handler, MTRActionBlock action,
- bool keepAlive = false) :
- MTRCallbackBridge<BridgedActionsClusterActionErrorEnumAttributeCallback>(queue, device, handler, action, OnSuccessFn,
- keepAlive){};
+ MTRActionsClusterActionErrorEnumAttributeCallbackBridge(dispatch_queue_t queue, MTRBaseDevice * device, ResponseHandler handler,
+ MTRActionBlock action, bool keepAlive = false) :
+ MTRCallbackBridge<ActionsClusterActionErrorEnumAttributeCallback>(queue, device, handler, action, OnSuccessFn, keepAlive){};
- static void OnSuccessFn(void * context, chip::app::Clusters::BridgedActions::ActionErrorEnum value);
+ static void OnSuccessFn(void * context, chip::app::Clusters::Actions::ActionErrorEnum value);
};
-class MTRBridgedActionsClusterActionErrorEnumAttributeCallbackSubscriptionBridge
- : public MTRBridgedActionsClusterActionErrorEnumAttributeCallbackBridge
+class MTRActionsClusterActionErrorEnumAttributeCallbackSubscriptionBridge
+ : public MTRActionsClusterActionErrorEnumAttributeCallbackBridge
{
public:
- MTRBridgedActionsClusterActionErrorEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, chip::NodeId nodeID,
- MTRDeviceController * controller,
- ResponseHandler handler, MTRActionBlock action,
- SubscriptionEstablishedHandler establishedHandler) :
- MTRBridgedActionsClusterActionErrorEnumAttributeCallbackBridge(queue, nodeID, controller, handler, action, true),
- mEstablishedHandler(establishedHandler)
- {}
-
- MTRBridgedActionsClusterActionErrorEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, MTRBaseDevice * device,
- ResponseHandler handler, MTRActionBlock action,
- SubscriptionEstablishedHandler establishedHandler) :
- MTRBridgedActionsClusterActionErrorEnumAttributeCallbackBridge(queue, device, handler, action, true),
- mEstablishedHandler(establishedHandler)
- {}
-
- static void OnSubscriptionEstablished(void * context);
-
-private:
- SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class MTRNullableBridgedActionsClusterActionErrorEnumAttributeCallbackBridge
- : public MTRCallbackBridge<NullableBridgedActionsClusterActionErrorEnumAttributeCallback>
-{
-public:
- MTRNullableBridgedActionsClusterActionErrorEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
- MTRLocalActionBlock action, bool keepAlive = false) :
- MTRCallbackBridge<NullableBridgedActionsClusterActionErrorEnumAttributeCallback>(queue, handler, action, OnSuccessFn,
- keepAlive){};
-
- MTRNullableBridgedActionsClusterActionErrorEnumAttributeCallbackBridge(dispatch_queue_t queue, chip::NodeId nodeID,
- MTRDeviceController * controller,
- ResponseHandler handler, MTRActionBlock action,
- bool keepAlive = false) :
- MTRCallbackBridge<NullableBridgedActionsClusterActionErrorEnumAttributeCallback>(queue, nodeID, controller, handler, action,
- OnSuccessFn, keepAlive){};
-
- MTRNullableBridgedActionsClusterActionErrorEnumAttributeCallbackBridge(dispatch_queue_t queue, MTRBaseDevice * device,
- ResponseHandler handler, MTRActionBlock action,
- bool keepAlive = false) :
- MTRCallbackBridge<NullableBridgedActionsClusterActionErrorEnumAttributeCallback>(queue, device, handler, action,
- OnSuccessFn, keepAlive){};
-
- static void OnSuccessFn(void * context,
- const chip::app::DataModel::Nullable<chip::app::Clusters::BridgedActions::ActionErrorEnum> & value);
-};
-
-class MTRNullableBridgedActionsClusterActionErrorEnumAttributeCallbackSubscriptionBridge
- : public MTRNullableBridgedActionsClusterActionErrorEnumAttributeCallbackBridge
-{
-public:
- MTRNullableBridgedActionsClusterActionErrorEnumAttributeCallbackSubscriptionBridge(
- dispatch_queue_t queue, chip::NodeId nodeID, MTRDeviceController * controller, ResponseHandler handler,
- MTRActionBlock action, SubscriptionEstablishedHandler establishedHandler) :
- MTRNullableBridgedActionsClusterActionErrorEnumAttributeCallbackBridge(queue, nodeID, controller, handler, action, true),
- mEstablishedHandler(establishedHandler)
- {}
-
- MTRNullableBridgedActionsClusterActionErrorEnumAttributeCallbackSubscriptionBridge(
- dispatch_queue_t queue, MTRBaseDevice * device, ResponseHandler handler, MTRActionBlock action,
- SubscriptionEstablishedHandler establishedHandler) :
- MTRNullableBridgedActionsClusterActionErrorEnumAttributeCallbackBridge(queue, device, handler, action, true),
- mEstablishedHandler(establishedHandler)
- {}
-
- static void OnSubscriptionEstablished(void * context);
-
-private:
- SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class MTRBridgedActionsClusterActionStateEnumAttributeCallbackBridge
- : public MTRCallbackBridge<BridgedActionsClusterActionStateEnumAttributeCallback>
-{
-public:
- MTRBridgedActionsClusterActionStateEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
- MTRLocalActionBlock action, bool keepAlive = false) :
- MTRCallbackBridge<BridgedActionsClusterActionStateEnumAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
-
- MTRBridgedActionsClusterActionStateEnumAttributeCallbackBridge(dispatch_queue_t queue, chip::NodeId nodeID,
- MTRDeviceController * controller, ResponseHandler handler,
- MTRActionBlock action, bool keepAlive = false) :
- MTRCallbackBridge<BridgedActionsClusterActionStateEnumAttributeCallback>(queue, nodeID, controller, handler, action,
- OnSuccessFn, keepAlive){};
-
- MTRBridgedActionsClusterActionStateEnumAttributeCallbackBridge(dispatch_queue_t queue, MTRBaseDevice * device,
- ResponseHandler handler, MTRActionBlock action,
- bool keepAlive = false) :
- MTRCallbackBridge<BridgedActionsClusterActionStateEnumAttributeCallback>(queue, device, handler, action, OnSuccessFn,
- keepAlive){};
-
- static void OnSuccessFn(void * context, chip::app::Clusters::BridgedActions::ActionStateEnum value);
-};
-
-class MTRBridgedActionsClusterActionStateEnumAttributeCallbackSubscriptionBridge
- : public MTRBridgedActionsClusterActionStateEnumAttributeCallbackBridge
-{
-public:
- MTRBridgedActionsClusterActionStateEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, chip::NodeId nodeID,
- MTRDeviceController * controller,
- ResponseHandler handler, MTRActionBlock action,
- SubscriptionEstablishedHandler establishedHandler) :
- MTRBridgedActionsClusterActionStateEnumAttributeCallbackBridge(queue, nodeID, controller, handler, action, true),
- mEstablishedHandler(establishedHandler)
- {}
-
- MTRBridgedActionsClusterActionStateEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, MTRBaseDevice * device,
- ResponseHandler handler, MTRActionBlock action,
- SubscriptionEstablishedHandler establishedHandler) :
- MTRBridgedActionsClusterActionStateEnumAttributeCallbackBridge(queue, device, handler, action, true),
- mEstablishedHandler(establishedHandler)
- {}
-
- static void OnSubscriptionEstablished(void * context);
-
-private:
- SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class MTRNullableBridgedActionsClusterActionStateEnumAttributeCallbackBridge
- : public MTRCallbackBridge<NullableBridgedActionsClusterActionStateEnumAttributeCallback>
-{
-public:
- MTRNullableBridgedActionsClusterActionStateEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
- MTRLocalActionBlock action, bool keepAlive = false) :
- MTRCallbackBridge<NullableBridgedActionsClusterActionStateEnumAttributeCallback>(queue, handler, action, OnSuccessFn,
- keepAlive){};
-
- MTRNullableBridgedActionsClusterActionStateEnumAttributeCallbackBridge(dispatch_queue_t queue, chip::NodeId nodeID,
- MTRDeviceController * controller,
- ResponseHandler handler, MTRActionBlock action,
- bool keepAlive = false) :
- MTRCallbackBridge<NullableBridgedActionsClusterActionStateEnumAttributeCallback>(queue, nodeID, controller, handler, action,
- OnSuccessFn, keepAlive){};
-
- MTRNullableBridgedActionsClusterActionStateEnumAttributeCallbackBridge(dispatch_queue_t queue, MTRBaseDevice * device,
- ResponseHandler handler, MTRActionBlock action,
- bool keepAlive = false) :
- MTRCallbackBridge<NullableBridgedActionsClusterActionStateEnumAttributeCallback>(queue, device, handler, action,
- OnSuccessFn, keepAlive){};
-
- static void OnSuccessFn(void * context,
- const chip::app::DataModel::Nullable<chip::app::Clusters::BridgedActions::ActionStateEnum> & value);
-};
-
-class MTRNullableBridgedActionsClusterActionStateEnumAttributeCallbackSubscriptionBridge
- : public MTRNullableBridgedActionsClusterActionStateEnumAttributeCallbackBridge
-{
-public:
- MTRNullableBridgedActionsClusterActionStateEnumAttributeCallbackSubscriptionBridge(
- dispatch_queue_t queue, chip::NodeId nodeID, MTRDeviceController * controller, ResponseHandler handler,
- MTRActionBlock action, SubscriptionEstablishedHandler establishedHandler) :
- MTRNullableBridgedActionsClusterActionStateEnumAttributeCallbackBridge(queue, nodeID, controller, handler, action, true),
- mEstablishedHandler(establishedHandler)
- {}
-
- MTRNullableBridgedActionsClusterActionStateEnumAttributeCallbackSubscriptionBridge(
- dispatch_queue_t queue, MTRBaseDevice * device, ResponseHandler handler, MTRActionBlock action,
- SubscriptionEstablishedHandler establishedHandler) :
- MTRNullableBridgedActionsClusterActionStateEnumAttributeCallbackBridge(queue, device, handler, action, true),
- mEstablishedHandler(establishedHandler)
- {}
-
- static void OnSubscriptionEstablished(void * context);
-
-private:
- SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class MTRBridgedActionsClusterActionTypeEnumAttributeCallbackBridge
- : public MTRCallbackBridge<BridgedActionsClusterActionTypeEnumAttributeCallback>
-{
-public:
- MTRBridgedActionsClusterActionTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
- MTRLocalActionBlock action, bool keepAlive = false) :
- MTRCallbackBridge<BridgedActionsClusterActionTypeEnumAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
-
- MTRBridgedActionsClusterActionTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, chip::NodeId nodeID,
- MTRDeviceController * controller, ResponseHandler handler,
- MTRActionBlock action, bool keepAlive = false) :
- MTRCallbackBridge<BridgedActionsClusterActionTypeEnumAttributeCallback>(queue, nodeID, controller, handler, action,
- OnSuccessFn, keepAlive){};
-
- MTRBridgedActionsClusterActionTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, MTRBaseDevice * device,
- ResponseHandler handler, MTRActionBlock action,
- bool keepAlive = false) :
- MTRCallbackBridge<BridgedActionsClusterActionTypeEnumAttributeCallback>(queue, device, handler, action, OnSuccessFn,
- keepAlive){};
-
- static void OnSuccessFn(void * context, chip::app::Clusters::BridgedActions::ActionTypeEnum value);
-};
-
-class MTRBridgedActionsClusterActionTypeEnumAttributeCallbackSubscriptionBridge
- : public MTRBridgedActionsClusterActionTypeEnumAttributeCallbackBridge
-{
-public:
- MTRBridgedActionsClusterActionTypeEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, chip::NodeId nodeID,
- MTRDeviceController * controller,
- ResponseHandler handler, MTRActionBlock action,
- SubscriptionEstablishedHandler establishedHandler) :
- MTRBridgedActionsClusterActionTypeEnumAttributeCallbackBridge(queue, nodeID, controller, handler, action, true),
- mEstablishedHandler(establishedHandler)
- {}
-
- MTRBridgedActionsClusterActionTypeEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, MTRBaseDevice * device,
- ResponseHandler handler, MTRActionBlock action,
- SubscriptionEstablishedHandler establishedHandler) :
- MTRBridgedActionsClusterActionTypeEnumAttributeCallbackBridge(queue, device, handler, action, true),
- mEstablishedHandler(establishedHandler)
- {}
-
- static void OnSubscriptionEstablished(void * context);
-
-private:
- SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class MTRNullableBridgedActionsClusterActionTypeEnumAttributeCallbackBridge
- : public MTRCallbackBridge<NullableBridgedActionsClusterActionTypeEnumAttributeCallback>
-{
-public:
- MTRNullableBridgedActionsClusterActionTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
- MTRLocalActionBlock action, bool keepAlive = false) :
- MTRCallbackBridge<NullableBridgedActionsClusterActionTypeEnumAttributeCallback>(queue, handler, action, OnSuccessFn,
- keepAlive){};
-
- MTRNullableBridgedActionsClusterActionTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, chip::NodeId nodeID,
- MTRDeviceController * controller, ResponseHandler handler,
- MTRActionBlock action, bool keepAlive = false) :
- MTRCallbackBridge<NullableBridgedActionsClusterActionTypeEnumAttributeCallback>(queue, nodeID, controller, handler, action,
- OnSuccessFn, keepAlive){};
-
- MTRNullableBridgedActionsClusterActionTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, MTRBaseDevice * device,
- ResponseHandler handler, MTRActionBlock action,
- bool keepAlive = false) :
- MTRCallbackBridge<NullableBridgedActionsClusterActionTypeEnumAttributeCallback>(queue, device, handler, action, OnSuccessFn,
- keepAlive){};
-
- static void OnSuccessFn(void * context,
- const chip::app::DataModel::Nullable<chip::app::Clusters::BridgedActions::ActionTypeEnum> & value);
-};
-
-class MTRNullableBridgedActionsClusterActionTypeEnumAttributeCallbackSubscriptionBridge
- : public MTRNullableBridgedActionsClusterActionTypeEnumAttributeCallbackBridge
-{
-public:
- MTRNullableBridgedActionsClusterActionTypeEnumAttributeCallbackSubscriptionBridge(
- dispatch_queue_t queue, chip::NodeId nodeID, MTRDeviceController * controller, ResponseHandler handler,
- MTRActionBlock action, SubscriptionEstablishedHandler establishedHandler) :
- MTRNullableBridgedActionsClusterActionTypeEnumAttributeCallbackBridge(queue, nodeID, controller, handler, action, true),
- mEstablishedHandler(establishedHandler)
- {}
-
- MTRNullableBridgedActionsClusterActionTypeEnumAttributeCallbackSubscriptionBridge(
- dispatch_queue_t queue, MTRBaseDevice * device, ResponseHandler handler, MTRActionBlock action,
- SubscriptionEstablishedHandler establishedHandler) :
- MTRNullableBridgedActionsClusterActionTypeEnumAttributeCallbackBridge(queue, device, handler, action, true),
- mEstablishedHandler(establishedHandler)
- {}
-
- static void OnSubscriptionEstablished(void * context);
-
-private:
- SubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class MTRBridgedActionsClusterEndpointListTypeEnumAttributeCallbackBridge
- : public MTRCallbackBridge<BridgedActionsClusterEndpointListTypeEnumAttributeCallback>
-{
-public:
- MTRBridgedActionsClusterEndpointListTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
- MTRLocalActionBlock action, bool keepAlive = false) :
- MTRCallbackBridge<BridgedActionsClusterEndpointListTypeEnumAttributeCallback>(queue, handler, action, OnSuccessFn,
- keepAlive){};
-
- MTRBridgedActionsClusterEndpointListTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, chip::NodeId nodeID,
+ MTRActionsClusterActionErrorEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, chip::NodeId nodeID,
MTRDeviceController * controller, ResponseHandler handler,
- MTRActionBlock action, bool keepAlive = false) :
- MTRCallbackBridge<BridgedActionsClusterEndpointListTypeEnumAttributeCallback>(queue, nodeID, controller, handler, action,
- OnSuccessFn, keepAlive){};
-
- MTRBridgedActionsClusterEndpointListTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, MTRBaseDevice * device,
- ResponseHandler handler, MTRActionBlock action,
- bool keepAlive = false) :
- MTRCallbackBridge<BridgedActionsClusterEndpointListTypeEnumAttributeCallback>(queue, device, handler, action, OnSuccessFn,
- keepAlive){};
-
- static void OnSuccessFn(void * context, chip::app::Clusters::BridgedActions::EndpointListTypeEnum value);
-};
-
-class MTRBridgedActionsClusterEndpointListTypeEnumAttributeCallbackSubscriptionBridge
- : public MTRBridgedActionsClusterEndpointListTypeEnumAttributeCallbackBridge
-{
-public:
- MTRBridgedActionsClusterEndpointListTypeEnumAttributeCallbackSubscriptionBridge(
- dispatch_queue_t queue, chip::NodeId nodeID, MTRDeviceController * controller, ResponseHandler handler,
- MTRActionBlock action, SubscriptionEstablishedHandler establishedHandler) :
- MTRBridgedActionsClusterEndpointListTypeEnumAttributeCallbackBridge(queue, nodeID, controller, handler, action, true),
+ MTRActionBlock action,
+ SubscriptionEstablishedHandler establishedHandler) :
+ MTRActionsClusterActionErrorEnumAttributeCallbackBridge(queue, nodeID, controller, handler, action, true),
mEstablishedHandler(establishedHandler)
{}
- MTRBridgedActionsClusterEndpointListTypeEnumAttributeCallbackSubscriptionBridge(
- dispatch_queue_t queue, MTRBaseDevice * device, ResponseHandler handler, MTRActionBlock action,
- SubscriptionEstablishedHandler establishedHandler) :
- MTRBridgedActionsClusterEndpointListTypeEnumAttributeCallbackBridge(queue, device, handler, action, true),
+ MTRActionsClusterActionErrorEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, MTRBaseDevice * device,
+ ResponseHandler handler, MTRActionBlock action,
+ SubscriptionEstablishedHandler establishedHandler) :
+ MTRActionsClusterActionErrorEnumAttributeCallbackBridge(queue, device, handler, action, true),
mEstablishedHandler(establishedHandler)
{}
@@ -17919,50 +17610,333 @@
SubscriptionEstablishedHandler mEstablishedHandler;
};
-class MTRNullableBridgedActionsClusterEndpointListTypeEnumAttributeCallbackBridge
- : public MTRCallbackBridge<NullableBridgedActionsClusterEndpointListTypeEnumAttributeCallback>
+class MTRNullableActionsClusterActionErrorEnumAttributeCallbackBridge
+ : public MTRCallbackBridge<NullableActionsClusterActionErrorEnumAttributeCallback>
{
public:
- MTRNullableBridgedActionsClusterEndpointListTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
- MTRLocalActionBlock action,
- bool keepAlive = false) :
- MTRCallbackBridge<NullableBridgedActionsClusterEndpointListTypeEnumAttributeCallback>(queue, handler, action, OnSuccessFn,
- keepAlive){};
+ MTRNullableActionsClusterActionErrorEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+ MTRLocalActionBlock action, bool keepAlive = false) :
+ MTRCallbackBridge<NullableActionsClusterActionErrorEnumAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
- MTRNullableBridgedActionsClusterEndpointListTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, chip::NodeId nodeID,
+ MTRNullableActionsClusterActionErrorEnumAttributeCallbackBridge(dispatch_queue_t queue, chip::NodeId nodeID,
+ MTRDeviceController * controller, ResponseHandler handler,
+ MTRActionBlock action, bool keepAlive = false) :
+ MTRCallbackBridge<NullableActionsClusterActionErrorEnumAttributeCallback>(queue, nodeID, controller, handler, action,
+ OnSuccessFn, keepAlive){};
+
+ MTRNullableActionsClusterActionErrorEnumAttributeCallbackBridge(dispatch_queue_t queue, MTRBaseDevice * device,
+ ResponseHandler handler, MTRActionBlock action,
+ bool keepAlive = false) :
+ MTRCallbackBridge<NullableActionsClusterActionErrorEnumAttributeCallback>(queue, device, handler, action, OnSuccessFn,
+ keepAlive){};
+
+ static void OnSuccessFn(void * context,
+ const chip::app::DataModel::Nullable<chip::app::Clusters::Actions::ActionErrorEnum> & value);
+};
+
+class MTRNullableActionsClusterActionErrorEnumAttributeCallbackSubscriptionBridge
+ : public MTRNullableActionsClusterActionErrorEnumAttributeCallbackBridge
+{
+public:
+ MTRNullableActionsClusterActionErrorEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, chip::NodeId nodeID,
MTRDeviceController * controller,
ResponseHandler handler, MTRActionBlock action,
- bool keepAlive = false) :
- MTRCallbackBridge<NullableBridgedActionsClusterEndpointListTypeEnumAttributeCallback>(queue, nodeID, controller, handler,
- action, OnSuccessFn, keepAlive){};
-
- MTRNullableBridgedActionsClusterEndpointListTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, MTRBaseDevice * device,
- ResponseHandler handler, MTRActionBlock action,
- bool keepAlive = false) :
- MTRCallbackBridge<NullableBridgedActionsClusterEndpointListTypeEnumAttributeCallback>(queue, device, handler, action,
- OnSuccessFn, keepAlive){};
-
- static void
- OnSuccessFn(void * context,
- const chip::app::DataModel::Nullable<chip::app::Clusters::BridgedActions::EndpointListTypeEnum> & value);
-};
-
-class MTRNullableBridgedActionsClusterEndpointListTypeEnumAttributeCallbackSubscriptionBridge
- : public MTRNullableBridgedActionsClusterEndpointListTypeEnumAttributeCallbackBridge
-{
-public:
- MTRNullableBridgedActionsClusterEndpointListTypeEnumAttributeCallbackSubscriptionBridge(
- dispatch_queue_t queue, chip::NodeId nodeID, MTRDeviceController * controller, ResponseHandler handler,
- MTRActionBlock action, SubscriptionEstablishedHandler establishedHandler) :
- MTRNullableBridgedActionsClusterEndpointListTypeEnumAttributeCallbackBridge(queue, nodeID, controller, handler, action,
- true),
+ SubscriptionEstablishedHandler establishedHandler) :
+ MTRNullableActionsClusterActionErrorEnumAttributeCallbackBridge(queue, nodeID, controller, handler, action, true),
mEstablishedHandler(establishedHandler)
{}
- MTRNullableBridgedActionsClusterEndpointListTypeEnumAttributeCallbackSubscriptionBridge(
+ MTRNullableActionsClusterActionErrorEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, MTRBaseDevice * device,
+ ResponseHandler handler, MTRActionBlock action,
+ SubscriptionEstablishedHandler establishedHandler) :
+ MTRNullableActionsClusterActionErrorEnumAttributeCallbackBridge(queue, device, handler, action, true),
+ mEstablishedHandler(establishedHandler)
+ {}
+
+ static void OnSubscriptionEstablished(void * context);
+
+private:
+ SubscriptionEstablishedHandler mEstablishedHandler;
+};
+
+class MTRActionsClusterActionStateEnumAttributeCallbackBridge
+ : public MTRCallbackBridge<ActionsClusterActionStateEnumAttributeCallback>
+{
+public:
+ MTRActionsClusterActionStateEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+ MTRLocalActionBlock action, bool keepAlive = false) :
+ MTRCallbackBridge<ActionsClusterActionStateEnumAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+
+ MTRActionsClusterActionStateEnumAttributeCallbackBridge(dispatch_queue_t queue, chip::NodeId nodeID,
+ MTRDeviceController * controller, ResponseHandler handler,
+ MTRActionBlock action, bool keepAlive = false) :
+ MTRCallbackBridge<ActionsClusterActionStateEnumAttributeCallback>(queue, nodeID, controller, handler, action, OnSuccessFn,
+ keepAlive){};
+
+ MTRActionsClusterActionStateEnumAttributeCallbackBridge(dispatch_queue_t queue, MTRBaseDevice * device, ResponseHandler handler,
+ MTRActionBlock action, bool keepAlive = false) :
+ MTRCallbackBridge<ActionsClusterActionStateEnumAttributeCallback>(queue, device, handler, action, OnSuccessFn, keepAlive){};
+
+ static void OnSuccessFn(void * context, chip::app::Clusters::Actions::ActionStateEnum value);
+};
+
+class MTRActionsClusterActionStateEnumAttributeCallbackSubscriptionBridge
+ : public MTRActionsClusterActionStateEnumAttributeCallbackBridge
+{
+public:
+ MTRActionsClusterActionStateEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, chip::NodeId nodeID,
+ MTRDeviceController * controller, ResponseHandler handler,
+ MTRActionBlock action,
+ SubscriptionEstablishedHandler establishedHandler) :
+ MTRActionsClusterActionStateEnumAttributeCallbackBridge(queue, nodeID, controller, handler, action, true),
+ mEstablishedHandler(establishedHandler)
+ {}
+
+ MTRActionsClusterActionStateEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, MTRBaseDevice * device,
+ ResponseHandler handler, MTRActionBlock action,
+ SubscriptionEstablishedHandler establishedHandler) :
+ MTRActionsClusterActionStateEnumAttributeCallbackBridge(queue, device, handler, action, true),
+ mEstablishedHandler(establishedHandler)
+ {}
+
+ static void OnSubscriptionEstablished(void * context);
+
+private:
+ SubscriptionEstablishedHandler mEstablishedHandler;
+};
+
+class MTRNullableActionsClusterActionStateEnumAttributeCallbackBridge
+ : public MTRCallbackBridge<NullableActionsClusterActionStateEnumAttributeCallback>
+{
+public:
+ MTRNullableActionsClusterActionStateEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+ MTRLocalActionBlock action, bool keepAlive = false) :
+ MTRCallbackBridge<NullableActionsClusterActionStateEnumAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+
+ MTRNullableActionsClusterActionStateEnumAttributeCallbackBridge(dispatch_queue_t queue, chip::NodeId nodeID,
+ MTRDeviceController * controller, ResponseHandler handler,
+ MTRActionBlock action, bool keepAlive = false) :
+ MTRCallbackBridge<NullableActionsClusterActionStateEnumAttributeCallback>(queue, nodeID, controller, handler, action,
+ OnSuccessFn, keepAlive){};
+
+ MTRNullableActionsClusterActionStateEnumAttributeCallbackBridge(dispatch_queue_t queue, MTRBaseDevice * device,
+ ResponseHandler handler, MTRActionBlock action,
+ bool keepAlive = false) :
+ MTRCallbackBridge<NullableActionsClusterActionStateEnumAttributeCallback>(queue, device, handler, action, OnSuccessFn,
+ keepAlive){};
+
+ static void OnSuccessFn(void * context,
+ const chip::app::DataModel::Nullable<chip::app::Clusters::Actions::ActionStateEnum> & value);
+};
+
+class MTRNullableActionsClusterActionStateEnumAttributeCallbackSubscriptionBridge
+ : public MTRNullableActionsClusterActionStateEnumAttributeCallbackBridge
+{
+public:
+ MTRNullableActionsClusterActionStateEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, chip::NodeId nodeID,
+ MTRDeviceController * controller,
+ ResponseHandler handler, MTRActionBlock action,
+ SubscriptionEstablishedHandler establishedHandler) :
+ MTRNullableActionsClusterActionStateEnumAttributeCallbackBridge(queue, nodeID, controller, handler, action, true),
+ mEstablishedHandler(establishedHandler)
+ {}
+
+ MTRNullableActionsClusterActionStateEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, MTRBaseDevice * device,
+ ResponseHandler handler, MTRActionBlock action,
+ SubscriptionEstablishedHandler establishedHandler) :
+ MTRNullableActionsClusterActionStateEnumAttributeCallbackBridge(queue, device, handler, action, true),
+ mEstablishedHandler(establishedHandler)
+ {}
+
+ static void OnSubscriptionEstablished(void * context);
+
+private:
+ SubscriptionEstablishedHandler mEstablishedHandler;
+};
+
+class MTRActionsClusterActionTypeEnumAttributeCallbackBridge
+ : public MTRCallbackBridge<ActionsClusterActionTypeEnumAttributeCallback>
+{
+public:
+ MTRActionsClusterActionTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+ MTRLocalActionBlock action, bool keepAlive = false) :
+ MTRCallbackBridge<ActionsClusterActionTypeEnumAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+
+ MTRActionsClusterActionTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, chip::NodeId nodeID,
+ MTRDeviceController * controller, ResponseHandler handler,
+ MTRActionBlock action, bool keepAlive = false) :
+ MTRCallbackBridge<ActionsClusterActionTypeEnumAttributeCallback>(queue, nodeID, controller, handler, action, OnSuccessFn,
+ keepAlive){};
+
+ MTRActionsClusterActionTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, MTRBaseDevice * device, ResponseHandler handler,
+ MTRActionBlock action, bool keepAlive = false) :
+ MTRCallbackBridge<ActionsClusterActionTypeEnumAttributeCallback>(queue, device, handler, action, OnSuccessFn, keepAlive){};
+
+ static void OnSuccessFn(void * context, chip::app::Clusters::Actions::ActionTypeEnum value);
+};
+
+class MTRActionsClusterActionTypeEnumAttributeCallbackSubscriptionBridge
+ : public MTRActionsClusterActionTypeEnumAttributeCallbackBridge
+{
+public:
+ MTRActionsClusterActionTypeEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, chip::NodeId nodeID,
+ MTRDeviceController * controller, ResponseHandler handler,
+ MTRActionBlock action,
+ SubscriptionEstablishedHandler establishedHandler) :
+ MTRActionsClusterActionTypeEnumAttributeCallbackBridge(queue, nodeID, controller, handler, action, true),
+ mEstablishedHandler(establishedHandler)
+ {}
+
+ MTRActionsClusterActionTypeEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, MTRBaseDevice * device,
+ ResponseHandler handler, MTRActionBlock action,
+ SubscriptionEstablishedHandler establishedHandler) :
+ MTRActionsClusterActionTypeEnumAttributeCallbackBridge(queue, device, handler, action, true),
+ mEstablishedHandler(establishedHandler)
+ {}
+
+ static void OnSubscriptionEstablished(void * context);
+
+private:
+ SubscriptionEstablishedHandler mEstablishedHandler;
+};
+
+class MTRNullableActionsClusterActionTypeEnumAttributeCallbackBridge
+ : public MTRCallbackBridge<NullableActionsClusterActionTypeEnumAttributeCallback>
+{
+public:
+ MTRNullableActionsClusterActionTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+ MTRLocalActionBlock action, bool keepAlive = false) :
+ MTRCallbackBridge<NullableActionsClusterActionTypeEnumAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+
+ MTRNullableActionsClusterActionTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, chip::NodeId nodeID,
+ MTRDeviceController * controller, ResponseHandler handler,
+ MTRActionBlock action, bool keepAlive = false) :
+ MTRCallbackBridge<NullableActionsClusterActionTypeEnumAttributeCallback>(queue, nodeID, controller, handler, action,
+ OnSuccessFn, keepAlive){};
+
+ MTRNullableActionsClusterActionTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, MTRBaseDevice * device,
+ ResponseHandler handler, MTRActionBlock action,
+ bool keepAlive = false) :
+ MTRCallbackBridge<NullableActionsClusterActionTypeEnumAttributeCallback>(queue, device, handler, action, OnSuccessFn,
+ keepAlive){};
+
+ static void OnSuccessFn(void * context,
+ const chip::app::DataModel::Nullable<chip::app::Clusters::Actions::ActionTypeEnum> & value);
+};
+
+class MTRNullableActionsClusterActionTypeEnumAttributeCallbackSubscriptionBridge
+ : public MTRNullableActionsClusterActionTypeEnumAttributeCallbackBridge
+{
+public:
+ MTRNullableActionsClusterActionTypeEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, chip::NodeId nodeID,
+ MTRDeviceController * controller,
+ ResponseHandler handler, MTRActionBlock action,
+ SubscriptionEstablishedHandler establishedHandler) :
+ MTRNullableActionsClusterActionTypeEnumAttributeCallbackBridge(queue, nodeID, controller, handler, action, true),
+ mEstablishedHandler(establishedHandler)
+ {}
+
+ MTRNullableActionsClusterActionTypeEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, MTRBaseDevice * device,
+ ResponseHandler handler, MTRActionBlock action,
+ SubscriptionEstablishedHandler establishedHandler) :
+ MTRNullableActionsClusterActionTypeEnumAttributeCallbackBridge(queue, device, handler, action, true),
+ mEstablishedHandler(establishedHandler)
+ {}
+
+ static void OnSubscriptionEstablished(void * context);
+
+private:
+ SubscriptionEstablishedHandler mEstablishedHandler;
+};
+
+class MTRActionsClusterEndpointListTypeEnumAttributeCallbackBridge
+ : public MTRCallbackBridge<ActionsClusterEndpointListTypeEnumAttributeCallback>
+{
+public:
+ MTRActionsClusterEndpointListTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+ MTRLocalActionBlock action, bool keepAlive = false) :
+ MTRCallbackBridge<ActionsClusterEndpointListTypeEnumAttributeCallback>(queue, handler, action, OnSuccessFn, keepAlive){};
+
+ MTRActionsClusterEndpointListTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, chip::NodeId nodeID,
+ MTRDeviceController * controller, ResponseHandler handler,
+ MTRActionBlock action, bool keepAlive = false) :
+ MTRCallbackBridge<ActionsClusterEndpointListTypeEnumAttributeCallback>(queue, nodeID, controller, handler, action,
+ OnSuccessFn, keepAlive){};
+
+ MTRActionsClusterEndpointListTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, MTRBaseDevice * device,
+ ResponseHandler handler, MTRActionBlock action,
+ bool keepAlive = false) :
+ MTRCallbackBridge<ActionsClusterEndpointListTypeEnumAttributeCallback>(queue, device, handler, action, OnSuccessFn,
+ keepAlive){};
+
+ static void OnSuccessFn(void * context, chip::app::Clusters::Actions::EndpointListTypeEnum value);
+};
+
+class MTRActionsClusterEndpointListTypeEnumAttributeCallbackSubscriptionBridge
+ : public MTRActionsClusterEndpointListTypeEnumAttributeCallbackBridge
+{
+public:
+ MTRActionsClusterEndpointListTypeEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, chip::NodeId nodeID,
+ MTRDeviceController * controller,
+ ResponseHandler handler, MTRActionBlock action,
+ SubscriptionEstablishedHandler establishedHandler) :
+ MTRActionsClusterEndpointListTypeEnumAttributeCallbackBridge(queue, nodeID, controller, handler, action, true),
+ mEstablishedHandler(establishedHandler)
+ {}
+
+ MTRActionsClusterEndpointListTypeEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, MTRBaseDevice * device,
+ ResponseHandler handler, MTRActionBlock action,
+ SubscriptionEstablishedHandler establishedHandler) :
+ MTRActionsClusterEndpointListTypeEnumAttributeCallbackBridge(queue, device, handler, action, true),
+ mEstablishedHandler(establishedHandler)
+ {}
+
+ static void OnSubscriptionEstablished(void * context);
+
+private:
+ SubscriptionEstablishedHandler mEstablishedHandler;
+};
+
+class MTRNullableActionsClusterEndpointListTypeEnumAttributeCallbackBridge
+ : public MTRCallbackBridge<NullableActionsClusterEndpointListTypeEnumAttributeCallback>
+{
+public:
+ MTRNullableActionsClusterEndpointListTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+ MTRLocalActionBlock action, bool keepAlive = false) :
+ MTRCallbackBridge<NullableActionsClusterEndpointListTypeEnumAttributeCallback>(queue, handler, action, OnSuccessFn,
+ keepAlive){};
+
+ MTRNullableActionsClusterEndpointListTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, chip::NodeId nodeID,
+ MTRDeviceController * controller, ResponseHandler handler,
+ MTRActionBlock action, bool keepAlive = false) :
+ MTRCallbackBridge<NullableActionsClusterEndpointListTypeEnumAttributeCallback>(queue, nodeID, controller, handler, action,
+ OnSuccessFn, keepAlive){};
+
+ MTRNullableActionsClusterEndpointListTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, MTRBaseDevice * device,
+ ResponseHandler handler, MTRActionBlock action,
+ bool keepAlive = false) :
+ MTRCallbackBridge<NullableActionsClusterEndpointListTypeEnumAttributeCallback>(queue, device, handler, action, OnSuccessFn,
+ keepAlive){};
+
+ static void OnSuccessFn(void * context,
+ const chip::app::DataModel::Nullable<chip::app::Clusters::Actions::EndpointListTypeEnum> & value);
+};
+
+class MTRNullableActionsClusterEndpointListTypeEnumAttributeCallbackSubscriptionBridge
+ : public MTRNullableActionsClusterEndpointListTypeEnumAttributeCallbackBridge
+{
+public:
+ MTRNullableActionsClusterEndpointListTypeEnumAttributeCallbackSubscriptionBridge(
+ dispatch_queue_t queue, chip::NodeId nodeID, MTRDeviceController * controller, ResponseHandler handler,
+ MTRActionBlock action, SubscriptionEstablishedHandler establishedHandler) :
+ MTRNullableActionsClusterEndpointListTypeEnumAttributeCallbackBridge(queue, nodeID, controller, handler, action, true),
+ mEstablishedHandler(establishedHandler)
+ {}
+
+ MTRNullableActionsClusterEndpointListTypeEnumAttributeCallbackSubscriptionBridge(
dispatch_queue_t queue, MTRBaseDevice * device, ResponseHandler handler, MTRActionBlock action,
SubscriptionEstablishedHandler establishedHandler) :
- MTRNullableBridgedActionsClusterEndpointListTypeEnumAttributeCallbackBridge(queue, device, handler, action, true),
+ MTRNullableActionsClusterEndpointListTypeEnumAttributeCallbackBridge(queue, device, handler, action, true),
mEstablishedHandler(establishedHandler)
{}
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
index ba1e102..858b48d 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
@@ -34,7 +34,7 @@
MTRClusterDescriptorID = 0x0000001D,
MTRClusterBindingID = 0x0000001E,
MTRClusterAccessControlID = 0x0000001F,
- MTRClusterBridgedActionsID = 0x00000025,
+ MTRClusterActionsID = 0x00000025,
MTRClusterBasicID = 0x00000028,
MTRClusterOtaSoftwareUpdateProviderID = 0x00000029,
MTRClusterOtaSoftwareUpdateRequestorID = 0x0000002A,
@@ -231,15 +231,15 @@
MTRClusterAccessControlAttributeFeatureMapID = MTRClusterGlobalAttributeFeatureMapID,
MTRClusterAccessControlAttributeClusterRevisionID = MTRClusterGlobalAttributeClusterRevisionID,
- // Cluster BridgedActions attributes
- MTRClusterBridgedActionsAttributeActionListID = 0x00000000,
- MTRClusterBridgedActionsAttributeEndpointListID = 0x00000001,
- MTRClusterBridgedActionsAttributeSetupUrlID = 0x00000002,
- MTRClusterBridgedActionsAttributeGeneratedCommandListID = MTRClusterGlobalAttributeGeneratedCommandListID,
- MTRClusterBridgedActionsAttributeAcceptedCommandListID = MTRClusterGlobalAttributeAcceptedCommandListID,
- MTRClusterBridgedActionsAttributeAttributeListID = MTRClusterGlobalAttributeAttributeListID,
- MTRClusterBridgedActionsAttributeFeatureMapID = MTRClusterGlobalAttributeFeatureMapID,
- MTRClusterBridgedActionsAttributeClusterRevisionID = MTRClusterGlobalAttributeClusterRevisionID,
+ // Cluster Actions attributes
+ MTRClusterActionsAttributeActionListID = 0x00000000,
+ MTRClusterActionsAttributeEndpointListsID = 0x00000001,
+ MTRClusterActionsAttributeSetupURLID = 0x00000002,
+ MTRClusterActionsAttributeGeneratedCommandListID = MTRClusterGlobalAttributeGeneratedCommandListID,
+ MTRClusterActionsAttributeAcceptedCommandListID = MTRClusterGlobalAttributeAcceptedCommandListID,
+ MTRClusterActionsAttributeAttributeListID = MTRClusterGlobalAttributeAttributeListID,
+ MTRClusterActionsAttributeFeatureMapID = MTRClusterGlobalAttributeFeatureMapID,
+ MTRClusterActionsAttributeClusterRevisionID = MTRClusterGlobalAttributeClusterRevisionID,
// Cluster Basic attributes
MTRClusterBasicAttributeDataModelRevisionID = 0x00000000,
@@ -1417,19 +1417,19 @@
MTRClusterLevelControlCommandStopWithOnOffID = 0x00000007,
MTRClusterLevelControlCommandMoveToClosestFrequencyID = 0x00000008,
- // Cluster BridgedActions commands
- MTRClusterBridgedActionsCommandInstantActionID = 0x00000000,
- MTRClusterBridgedActionsCommandInstantActionWithTransitionID = 0x00000001,
- MTRClusterBridgedActionsCommandStartActionID = 0x00000002,
- MTRClusterBridgedActionsCommandStartActionWithDurationID = 0x00000003,
- MTRClusterBridgedActionsCommandStopActionID = 0x00000004,
- MTRClusterBridgedActionsCommandPauseActionID = 0x00000005,
- MTRClusterBridgedActionsCommandPauseActionWithDurationID = 0x00000006,
- MTRClusterBridgedActionsCommandResumeActionID = 0x00000007,
- MTRClusterBridgedActionsCommandEnableActionID = 0x00000008,
- MTRClusterBridgedActionsCommandEnableActionWithDurationID = 0x00000009,
- MTRClusterBridgedActionsCommandDisableActionID = 0x0000000A,
- MTRClusterBridgedActionsCommandDisableActionWithDurationID = 0x0000000B,
+ // Cluster Actions commands
+ MTRClusterActionsCommandInstantActionID = 0x00000000,
+ MTRClusterActionsCommandInstantActionWithTransitionID = 0x00000001,
+ MTRClusterActionsCommandStartActionID = 0x00000002,
+ MTRClusterActionsCommandStartActionWithDurationID = 0x00000003,
+ MTRClusterActionsCommandStopActionID = 0x00000004,
+ MTRClusterActionsCommandPauseActionID = 0x00000005,
+ MTRClusterActionsCommandPauseActionWithDurationID = 0x00000006,
+ MTRClusterActionsCommandResumeActionID = 0x00000007,
+ MTRClusterActionsCommandEnableActionID = 0x00000008,
+ MTRClusterActionsCommandEnableActionWithDurationID = 0x00000009,
+ MTRClusterActionsCommandDisableActionID = 0x0000000A,
+ MTRClusterActionsCommandDisableActionWithDurationID = 0x0000000B,
// Cluster Basic commands
MTRClusterBasicCommandMfgSpecificPingID = 0x10020000,
@@ -1688,9 +1688,9 @@
MTRClusterAccessControlEventAccessControlEntryChangedID = 0x00000000,
MTRClusterAccessControlEventAccessControlExtensionChangedID = 0x00000001,
- // Cluster BridgedActions events
- MTRClusterBridgedActionsEventStateChangedID = 0x00000000,
- MTRClusterBridgedActionsEventActionFailedID = 0x00000001,
+ // Cluster Actions events
+ MTRClusterActionsEventStateChangedID = 0x00000000,
+ MTRClusterActionsEventActionFailedID = 0x00000001,
// Cluster Basic events
MTRClusterBasicEventStartUpID = 0x00000000,
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h
index 4c72654..c2eed67 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h
@@ -647,69 +647,69 @@
@end
/**
- * Cluster Bridged Actions
+ * Cluster Actions
*
*/
-@interface MTRClusterBridgedActions : MTRCluster
+@interface MTRClusterActions : MTRCluster
- (nullable instancetype)initWithDevice:(MTRDevice *)device
endpoint:(uint16_t)endpoint
queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER;
-- (void)instantActionWithParams:(MTRBridgedActionsClusterInstantActionParams *)params
+- (void)instantActionWithParams:(MTRActionsClusterInstantActionParams *)params
expectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedDataValueDictionaries
expectedValueInterval:(NSNumber *)expectedValueIntervalMs
completionHandler:(StatusCompletion)completionHandler;
-- (void)instantActionWithTransitionWithParams:(MTRBridgedActionsClusterInstantActionWithTransitionParams *)params
+- (void)instantActionWithTransitionWithParams:(MTRActionsClusterInstantActionWithTransitionParams *)params
expectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedDataValueDictionaries
expectedValueInterval:(NSNumber *)expectedValueIntervalMs
completionHandler:(StatusCompletion)completionHandler;
-- (void)startActionWithParams:(MTRBridgedActionsClusterStartActionParams *)params
+- (void)startActionWithParams:(MTRActionsClusterStartActionParams *)params
expectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedDataValueDictionaries
expectedValueInterval:(NSNumber *)expectedValueIntervalMs
completionHandler:(StatusCompletion)completionHandler;
-- (void)startActionWithDurationWithParams:(MTRBridgedActionsClusterStartActionWithDurationParams *)params
+- (void)startActionWithDurationWithParams:(MTRActionsClusterStartActionWithDurationParams *)params
expectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedDataValueDictionaries
expectedValueInterval:(NSNumber *)expectedValueIntervalMs
completionHandler:(StatusCompletion)completionHandler;
-- (void)stopActionWithParams:(MTRBridgedActionsClusterStopActionParams *)params
+- (void)stopActionWithParams:(MTRActionsClusterStopActionParams *)params
expectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedDataValueDictionaries
expectedValueInterval:(NSNumber *)expectedValueIntervalMs
completionHandler:(StatusCompletion)completionHandler;
-- (void)pauseActionWithParams:(MTRBridgedActionsClusterPauseActionParams *)params
+- (void)pauseActionWithParams:(MTRActionsClusterPauseActionParams *)params
expectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedDataValueDictionaries
expectedValueInterval:(NSNumber *)expectedValueIntervalMs
completionHandler:(StatusCompletion)completionHandler;
-- (void)pauseActionWithDurationWithParams:(MTRBridgedActionsClusterPauseActionWithDurationParams *)params
+- (void)pauseActionWithDurationWithParams:(MTRActionsClusterPauseActionWithDurationParams *)params
expectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedDataValueDictionaries
expectedValueInterval:(NSNumber *)expectedValueIntervalMs
completionHandler:(StatusCompletion)completionHandler;
-- (void)resumeActionWithParams:(MTRBridgedActionsClusterResumeActionParams *)params
+- (void)resumeActionWithParams:(MTRActionsClusterResumeActionParams *)params
expectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedDataValueDictionaries
expectedValueInterval:(NSNumber *)expectedValueIntervalMs
completionHandler:(StatusCompletion)completionHandler;
-- (void)enableActionWithParams:(MTRBridgedActionsClusterEnableActionParams *)params
+- (void)enableActionWithParams:(MTRActionsClusterEnableActionParams *)params
expectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedDataValueDictionaries
expectedValueInterval:(NSNumber *)expectedValueIntervalMs
completionHandler:(StatusCompletion)completionHandler;
-- (void)enableActionWithDurationWithParams:(MTRBridgedActionsClusterEnableActionWithDurationParams *)params
+- (void)enableActionWithDurationWithParams:(MTRActionsClusterEnableActionWithDurationParams *)params
expectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedDataValueDictionaries
expectedValueInterval:(NSNumber *)expectedValueIntervalMs
completionHandler:(StatusCompletion)completionHandler;
-- (void)disableActionWithParams:(MTRBridgedActionsClusterDisableActionParams *)params
+- (void)disableActionWithParams:(MTRActionsClusterDisableActionParams *)params
expectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedDataValueDictionaries
expectedValueInterval:(NSNumber *)expectedValueIntervalMs
completionHandler:(StatusCompletion)completionHandler;
-- (void)disableActionWithDurationWithParams:(MTRBridgedActionsClusterDisableActionWithDurationParams *)params
+- (void)disableActionWithDurationWithParams:(MTRActionsClusterDisableActionWithDurationParams *)params
expectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedDataValueDictionaries
expectedValueInterval:(NSNumber *)expectedValueIntervalMs
completionHandler:(StatusCompletion)completionHandler;
- (NSDictionary<NSString *, id> *)readAttributeActionListWithParams:(MTRReadParams * _Nullable)params;
-- (NSDictionary<NSString *, id> *)readAttributeEndpointListWithParams:(MTRReadParams * _Nullable)params;
+- (NSDictionary<NSString *, id> *)readAttributeEndpointListsWithParams:(MTRReadParams * _Nullable)params;
-- (NSDictionary<NSString *, id> *)readAttributeSetupUrlWithParams:(MTRReadParams * _Nullable)params;
+- (NSDictionary<NSString *, id> *)readAttributeSetupURLWithParams:(MTRReadParams * _Nullable)params;
- (NSDictionary<NSString *, id> *)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params;
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
index e1bf12a..e33a7f6 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
@@ -2818,7 +2818,7 @@
@end
-@implementation MTRClusterBridgedActions
+@implementation MTRClusterActions
- (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint queue:(dispatch_queue_t)queue
{
@@ -2833,7 +2833,7 @@
return self;
}
-- (void)instantActionWithParams:(MTRBridgedActionsClusterInstantActionParams *)params
+- (void)instantActionWithParams:(MTRActionsClusterInstantActionParams *)params
expectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues
expectedValueInterval:(NSNumber *)expectedValueIntervalMs
completionHandler:(StatusCompletion)completionHandler
@@ -2849,7 +2849,7 @@
^(ExchangeManager & exchangeManager, const SessionHandle & session, Cancelable * success, Cancelable * failure) {
chip::Optional<uint16_t> timedInvokeTimeoutMs;
ListFreer listFreer;
- BridgedActions::Commands::InstantAction::Type request;
+ Actions::Commands::InstantAction::Type request;
if (params != nil) {
if (params.timedInvokeTimeoutMs != nil) {
timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
@@ -2863,7 +2863,7 @@
auto successFn = Callback<CommandSuccessCallbackType>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.InvokeCommand(
request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
});
@@ -2872,7 +2872,7 @@
[self.device setExpectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs];
}
-- (void)instantActionWithTransitionWithParams:(MTRBridgedActionsClusterInstantActionWithTransitionParams *)params
+- (void)instantActionWithTransitionWithParams:(MTRActionsClusterInstantActionWithTransitionParams *)params
expectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues
expectedValueInterval:(NSNumber *)expectedValueIntervalMs
completionHandler:(StatusCompletion)completionHandler
@@ -2888,7 +2888,7 @@
^(ExchangeManager & exchangeManager, const SessionHandle & session, Cancelable * success, Cancelable * failure) {
chip::Optional<uint16_t> timedInvokeTimeoutMs;
ListFreer listFreer;
- BridgedActions::Commands::InstantActionWithTransition::Type request;
+ Actions::Commands::InstantActionWithTransition::Type request;
if (params != nil) {
if (params.timedInvokeTimeoutMs != nil) {
timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
@@ -2903,7 +2903,7 @@
auto successFn = Callback<CommandSuccessCallbackType>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.InvokeCommand(
request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
});
@@ -2912,7 +2912,7 @@
[self.device setExpectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs];
}
-- (void)startActionWithParams:(MTRBridgedActionsClusterStartActionParams *)params
+- (void)startActionWithParams:(MTRActionsClusterStartActionParams *)params
expectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues
expectedValueInterval:(NSNumber *)expectedValueIntervalMs
completionHandler:(StatusCompletion)completionHandler
@@ -2928,7 +2928,7 @@
^(ExchangeManager & exchangeManager, const SessionHandle & session, Cancelable * success, Cancelable * failure) {
chip::Optional<uint16_t> timedInvokeTimeoutMs;
ListFreer listFreer;
- BridgedActions::Commands::StartAction::Type request;
+ Actions::Commands::StartAction::Type request;
if (params != nil) {
if (params.timedInvokeTimeoutMs != nil) {
timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
@@ -2942,7 +2942,7 @@
auto successFn = Callback<CommandSuccessCallbackType>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.InvokeCommand(
request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
});
@@ -2951,7 +2951,7 @@
[self.device setExpectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs];
}
-- (void)startActionWithDurationWithParams:(MTRBridgedActionsClusterStartActionWithDurationParams *)params
+- (void)startActionWithDurationWithParams:(MTRActionsClusterStartActionWithDurationParams *)params
expectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues
expectedValueInterval:(NSNumber *)expectedValueIntervalMs
completionHandler:(StatusCompletion)completionHandler
@@ -2967,7 +2967,7 @@
^(ExchangeManager & exchangeManager, const SessionHandle & session, Cancelable * success, Cancelable * failure) {
chip::Optional<uint16_t> timedInvokeTimeoutMs;
ListFreer listFreer;
- BridgedActions::Commands::StartActionWithDuration::Type request;
+ Actions::Commands::StartActionWithDuration::Type request;
if (params != nil) {
if (params.timedInvokeTimeoutMs != nil) {
timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
@@ -2982,7 +2982,7 @@
auto successFn = Callback<CommandSuccessCallbackType>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.InvokeCommand(
request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
});
@@ -2991,7 +2991,7 @@
[self.device setExpectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs];
}
-- (void)stopActionWithParams:(MTRBridgedActionsClusterStopActionParams *)params
+- (void)stopActionWithParams:(MTRActionsClusterStopActionParams *)params
expectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues
expectedValueInterval:(NSNumber *)expectedValueIntervalMs
completionHandler:(StatusCompletion)completionHandler
@@ -3007,7 +3007,7 @@
^(ExchangeManager & exchangeManager, const SessionHandle & session, Cancelable * success, Cancelable * failure) {
chip::Optional<uint16_t> timedInvokeTimeoutMs;
ListFreer listFreer;
- BridgedActions::Commands::StopAction::Type request;
+ Actions::Commands::StopAction::Type request;
if (params != nil) {
if (params.timedInvokeTimeoutMs != nil) {
timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
@@ -3021,7 +3021,7 @@
auto successFn = Callback<CommandSuccessCallbackType>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.InvokeCommand(
request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
});
@@ -3030,7 +3030,7 @@
[self.device setExpectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs];
}
-- (void)pauseActionWithParams:(MTRBridgedActionsClusterPauseActionParams *)params
+- (void)pauseActionWithParams:(MTRActionsClusterPauseActionParams *)params
expectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues
expectedValueInterval:(NSNumber *)expectedValueIntervalMs
completionHandler:(StatusCompletion)completionHandler
@@ -3046,7 +3046,7 @@
^(ExchangeManager & exchangeManager, const SessionHandle & session, Cancelable * success, Cancelable * failure) {
chip::Optional<uint16_t> timedInvokeTimeoutMs;
ListFreer listFreer;
- BridgedActions::Commands::PauseAction::Type request;
+ Actions::Commands::PauseAction::Type request;
if (params != nil) {
if (params.timedInvokeTimeoutMs != nil) {
timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
@@ -3060,7 +3060,7 @@
auto successFn = Callback<CommandSuccessCallbackType>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.InvokeCommand(
request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
});
@@ -3069,7 +3069,7 @@
[self.device setExpectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs];
}
-- (void)pauseActionWithDurationWithParams:(MTRBridgedActionsClusterPauseActionWithDurationParams *)params
+- (void)pauseActionWithDurationWithParams:(MTRActionsClusterPauseActionWithDurationParams *)params
expectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues
expectedValueInterval:(NSNumber *)expectedValueIntervalMs
completionHandler:(StatusCompletion)completionHandler
@@ -3085,7 +3085,7 @@
^(ExchangeManager & exchangeManager, const SessionHandle & session, Cancelable * success, Cancelable * failure) {
chip::Optional<uint16_t> timedInvokeTimeoutMs;
ListFreer listFreer;
- BridgedActions::Commands::PauseActionWithDuration::Type request;
+ Actions::Commands::PauseActionWithDuration::Type request;
if (params != nil) {
if (params.timedInvokeTimeoutMs != nil) {
timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
@@ -3100,7 +3100,7 @@
auto successFn = Callback<CommandSuccessCallbackType>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.InvokeCommand(
request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
});
@@ -3109,7 +3109,7 @@
[self.device setExpectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs];
}
-- (void)resumeActionWithParams:(MTRBridgedActionsClusterResumeActionParams *)params
+- (void)resumeActionWithParams:(MTRActionsClusterResumeActionParams *)params
expectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues
expectedValueInterval:(NSNumber *)expectedValueIntervalMs
completionHandler:(StatusCompletion)completionHandler
@@ -3125,7 +3125,7 @@
^(ExchangeManager & exchangeManager, const SessionHandle & session, Cancelable * success, Cancelable * failure) {
chip::Optional<uint16_t> timedInvokeTimeoutMs;
ListFreer listFreer;
- BridgedActions::Commands::ResumeAction::Type request;
+ Actions::Commands::ResumeAction::Type request;
if (params != nil) {
if (params.timedInvokeTimeoutMs != nil) {
timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
@@ -3139,7 +3139,7 @@
auto successFn = Callback<CommandSuccessCallbackType>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.InvokeCommand(
request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
});
@@ -3148,7 +3148,7 @@
[self.device setExpectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs];
}
-- (void)enableActionWithParams:(MTRBridgedActionsClusterEnableActionParams *)params
+- (void)enableActionWithParams:(MTRActionsClusterEnableActionParams *)params
expectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues
expectedValueInterval:(NSNumber *)expectedValueIntervalMs
completionHandler:(StatusCompletion)completionHandler
@@ -3164,7 +3164,7 @@
^(ExchangeManager & exchangeManager, const SessionHandle & session, Cancelable * success, Cancelable * failure) {
chip::Optional<uint16_t> timedInvokeTimeoutMs;
ListFreer listFreer;
- BridgedActions::Commands::EnableAction::Type request;
+ Actions::Commands::EnableAction::Type request;
if (params != nil) {
if (params.timedInvokeTimeoutMs != nil) {
timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
@@ -3178,7 +3178,7 @@
auto successFn = Callback<CommandSuccessCallbackType>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.InvokeCommand(
request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
});
@@ -3187,7 +3187,7 @@
[self.device setExpectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs];
}
-- (void)enableActionWithDurationWithParams:(MTRBridgedActionsClusterEnableActionWithDurationParams *)params
+- (void)enableActionWithDurationWithParams:(MTRActionsClusterEnableActionWithDurationParams *)params
expectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues
expectedValueInterval:(NSNumber *)expectedValueIntervalMs
completionHandler:(StatusCompletion)completionHandler
@@ -3203,7 +3203,7 @@
^(ExchangeManager & exchangeManager, const SessionHandle & session, Cancelable * success, Cancelable * failure) {
chip::Optional<uint16_t> timedInvokeTimeoutMs;
ListFreer listFreer;
- BridgedActions::Commands::EnableActionWithDuration::Type request;
+ Actions::Commands::EnableActionWithDuration::Type request;
if (params != nil) {
if (params.timedInvokeTimeoutMs != nil) {
timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
@@ -3218,7 +3218,7 @@
auto successFn = Callback<CommandSuccessCallbackType>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.InvokeCommand(
request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
});
@@ -3227,7 +3227,7 @@
[self.device setExpectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs];
}
-- (void)disableActionWithParams:(MTRBridgedActionsClusterDisableActionParams *)params
+- (void)disableActionWithParams:(MTRActionsClusterDisableActionParams *)params
expectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues
expectedValueInterval:(NSNumber *)expectedValueIntervalMs
completionHandler:(StatusCompletion)completionHandler
@@ -3243,7 +3243,7 @@
^(ExchangeManager & exchangeManager, const SessionHandle & session, Cancelable * success, Cancelable * failure) {
chip::Optional<uint16_t> timedInvokeTimeoutMs;
ListFreer listFreer;
- BridgedActions::Commands::DisableAction::Type request;
+ Actions::Commands::DisableAction::Type request;
if (params != nil) {
if (params.timedInvokeTimeoutMs != nil) {
timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
@@ -3257,7 +3257,7 @@
auto successFn = Callback<CommandSuccessCallbackType>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.InvokeCommand(
request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
});
@@ -3266,7 +3266,7 @@
[self.device setExpectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs];
}
-- (void)disableActionWithDurationWithParams:(MTRBridgedActionsClusterDisableActionWithDurationParams *)params
+- (void)disableActionWithDurationWithParams:(MTRActionsClusterDisableActionWithDurationParams *)params
expectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues
expectedValueInterval:(NSNumber *)expectedValueIntervalMs
completionHandler:(StatusCompletion)completionHandler
@@ -3282,7 +3282,7 @@
^(ExchangeManager & exchangeManager, const SessionHandle & session, Cancelable * success, Cancelable * failure) {
chip::Optional<uint16_t> timedInvokeTimeoutMs;
ListFreer listFreer;
- BridgedActions::Commands::DisableActionWithDuration::Type request;
+ Actions::Commands::DisableActionWithDuration::Type request;
if (params != nil) {
if (params.timedInvokeTimeoutMs != nil) {
timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
@@ -3297,7 +3297,7 @@
auto successFn = Callback<CommandSuccessCallbackType>::FromCancelable(success);
auto failureFn = Callback<DefaultFailureCallbackType>::FromCancelable(failure);
- chip::Controller::BridgedActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
+ chip::Controller::ActionsCluster cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.InvokeCommand(
request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs);
});
@@ -3309,64 +3309,64 @@
- (NSDictionary<NSString *, id> *)readAttributeActionListWithParams:(MTRReadParams * _Nullable)params
{
return [self.device readAttributeWithEndpointId:@(_endpoint)
- clusterId:@(MTRClusterBridgedActionsID)
- attributeId:@(MTRClusterBridgedActionsAttributeActionListID)
+ clusterId:@(MTRClusterActionsID)
+ attributeId:@(MTRClusterActionsAttributeActionListID)
params:params];
}
-- (NSDictionary<NSString *, id> *)readAttributeEndpointListWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> *)readAttributeEndpointListsWithParams:(MTRReadParams * _Nullable)params
{
return [self.device readAttributeWithEndpointId:@(_endpoint)
- clusterId:@(MTRClusterBridgedActionsID)
- attributeId:@(MTRClusterBridgedActionsAttributeEndpointListID)
+ clusterId:@(MTRClusterActionsID)
+ attributeId:@(MTRClusterActionsAttributeEndpointListsID)
params:params];
}
-- (NSDictionary<NSString *, id> *)readAttributeSetupUrlWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> *)readAttributeSetupURLWithParams:(MTRReadParams * _Nullable)params
{
return [self.device readAttributeWithEndpointId:@(_endpoint)
- clusterId:@(MTRClusterBridgedActionsID)
- attributeId:@(MTRClusterBridgedActionsAttributeSetupUrlID)
+ clusterId:@(MTRClusterActionsID)
+ attributeId:@(MTRClusterActionsAttributeSetupURLID)
params:params];
}
- (NSDictionary<NSString *, id> *)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
{
return [self.device readAttributeWithEndpointId:@(_endpoint)
- clusterId:@(MTRClusterBridgedActionsID)
- attributeId:@(MTRClusterBridgedActionsAttributeGeneratedCommandListID)
+ clusterId:@(MTRClusterActionsID)
+ attributeId:@(MTRClusterActionsAttributeGeneratedCommandListID)
params:params];
}
- (NSDictionary<NSString *, id> *)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params
{
return [self.device readAttributeWithEndpointId:@(_endpoint)
- clusterId:@(MTRClusterBridgedActionsID)
- attributeId:@(MTRClusterBridgedActionsAttributeAcceptedCommandListID)
+ clusterId:@(MTRClusterActionsID)
+ attributeId:@(MTRClusterActionsAttributeAcceptedCommandListID)
params:params];
}
- (NSDictionary<NSString *, id> *)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params
{
return [self.device readAttributeWithEndpointId:@(_endpoint)
- clusterId:@(MTRClusterBridgedActionsID)
- attributeId:@(MTRClusterBridgedActionsAttributeAttributeListID)
+ clusterId:@(MTRClusterActionsID)
+ attributeId:@(MTRClusterActionsAttributeAttributeListID)
params:params];
}
- (NSDictionary<NSString *, id> *)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params
{
return [self.device readAttributeWithEndpointId:@(_endpoint)
- clusterId:@(MTRClusterBridgedActionsID)
- attributeId:@(MTRClusterBridgedActionsAttributeFeatureMapID)
+ clusterId:@(MTRClusterActionsID)
+ attributeId:@(MTRClusterActionsAttributeFeatureMapID)
params:params];
}
- (NSDictionary<NSString *, id> *)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params
{
return [self.device readAttributeWithEndpointId:@(_endpoint)
- clusterId:@(MTRClusterBridgedActionsID)
- attributeId:@(MTRClusterBridgedActionsAttributeClusterRevisionID)
+ clusterId:@(MTRClusterActionsID)
+ attributeId:@(MTRClusterActionsAttributeClusterRevisionID)
params:params];
}
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClustersObjc_internal.h b/src/darwin/Framework/CHIP/zap-generated/MTRClustersObjc_internal.h
index 8d3b23c..8cc50fd 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClustersObjc_internal.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClustersObjc_internal.h
@@ -81,10 +81,10 @@
- (chip::Controller::AccessControlCluster **)cppClusterSlot;
@end
-@interface MTRBridgedActions ()
+@interface MTRActions ()
// Must only touch cppCluster on the Matter queue.
-@property (readonly) chip::Controller::BridgedActionsCluster * cppCluster;
-- (chip::Controller::BridgedActionsCluster **)cppClusterSlot;
+@property (readonly) chip::Controller::ActionsCluster * cppCluster;
+- (chip::Controller::ActionsCluster **)cppClusterSlot;
@end
@interface MTRBasic ()
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters_internal.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters_internal.h
index 40e9861..bdbddb5 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters_internal.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters_internal.h
@@ -76,7 +76,7 @@
@property (nonatomic, readonly) MTRDevice * device;
@end
-@interface MTRClusterBridgedActions ()
+@interface MTRClusterActions ()
@property (nonatomic, readonly) uint16_t endpoint;
@property (nonatomic, readonly) MTRDevice * device;
@end
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h
index 239779a..f4aa364 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h
@@ -1174,7 +1174,7 @@
- (instancetype)init;
- (id)copyWithZone:(nullable NSZone *)zone;
@end
-@interface MTRBridgedActionsClusterInstantActionParams : NSObject <NSCopying>
+@interface MTRActionsClusterInstantActionParams : NSObject <NSCopying>
@property (nonatomic, copy) NSNumber * _Nonnull actionID;
@@ -1198,7 +1198,7 @@
- (instancetype)init;
- (id)copyWithZone:(nullable NSZone *)zone;
@end
-@interface MTRBridgedActionsClusterInstantActionWithTransitionParams : NSObject <NSCopying>
+@interface MTRActionsClusterInstantActionWithTransitionParams : NSObject <NSCopying>
@property (nonatomic, copy) NSNumber * _Nonnull actionID;
@@ -1224,7 +1224,7 @@
- (instancetype)init;
- (id)copyWithZone:(nullable NSZone *)zone;
@end
-@interface MTRBridgedActionsClusterStartActionParams : NSObject <NSCopying>
+@interface MTRActionsClusterStartActionParams : NSObject <NSCopying>
@property (nonatomic, copy) NSNumber * _Nonnull actionID;
@@ -1248,7 +1248,7 @@
- (instancetype)init;
- (id)copyWithZone:(nullable NSZone *)zone;
@end
-@interface MTRBridgedActionsClusterStartActionWithDurationParams : NSObject <NSCopying>
+@interface MTRActionsClusterStartActionWithDurationParams : NSObject <NSCopying>
@property (nonatomic, copy) NSNumber * _Nonnull actionID;
@@ -1274,7 +1274,7 @@
- (instancetype)init;
- (id)copyWithZone:(nullable NSZone *)zone;
@end
-@interface MTRBridgedActionsClusterStopActionParams : NSObject <NSCopying>
+@interface MTRActionsClusterStopActionParams : NSObject <NSCopying>
@property (nonatomic, copy) NSNumber * _Nonnull actionID;
@@ -1298,7 +1298,7 @@
- (instancetype)init;
- (id)copyWithZone:(nullable NSZone *)zone;
@end
-@interface MTRBridgedActionsClusterPauseActionParams : NSObject <NSCopying>
+@interface MTRActionsClusterPauseActionParams : NSObject <NSCopying>
@property (nonatomic, copy) NSNumber * _Nonnull actionID;
@@ -1322,7 +1322,7 @@
- (instancetype)init;
- (id)copyWithZone:(nullable NSZone *)zone;
@end
-@interface MTRBridgedActionsClusterPauseActionWithDurationParams : NSObject <NSCopying>
+@interface MTRActionsClusterPauseActionWithDurationParams : NSObject <NSCopying>
@property (nonatomic, copy) NSNumber * _Nonnull actionID;
@@ -1348,7 +1348,7 @@
- (instancetype)init;
- (id)copyWithZone:(nullable NSZone *)zone;
@end
-@interface MTRBridgedActionsClusterResumeActionParams : NSObject <NSCopying>
+@interface MTRActionsClusterResumeActionParams : NSObject <NSCopying>
@property (nonatomic, copy) NSNumber * _Nonnull actionID;
@@ -1372,7 +1372,7 @@
- (instancetype)init;
- (id)copyWithZone:(nullable NSZone *)zone;
@end
-@interface MTRBridgedActionsClusterEnableActionParams : NSObject <NSCopying>
+@interface MTRActionsClusterEnableActionParams : NSObject <NSCopying>
@property (nonatomic, copy) NSNumber * _Nonnull actionID;
@@ -1396,7 +1396,7 @@
- (instancetype)init;
- (id)copyWithZone:(nullable NSZone *)zone;
@end
-@interface MTRBridgedActionsClusterEnableActionWithDurationParams : NSObject <NSCopying>
+@interface MTRActionsClusterEnableActionWithDurationParams : NSObject <NSCopying>
@property (nonatomic, copy) NSNumber * _Nonnull actionID;
@@ -1422,7 +1422,7 @@
- (instancetype)init;
- (id)copyWithZone:(nullable NSZone *)zone;
@end
-@interface MTRBridgedActionsClusterDisableActionParams : NSObject <NSCopying>
+@interface MTRActionsClusterDisableActionParams : NSObject <NSCopying>
@property (nonatomic, copy) NSNumber * _Nonnull actionID;
@@ -1446,7 +1446,7 @@
- (instancetype)init;
- (id)copyWithZone:(nullable NSZone *)zone;
@end
-@interface MTRBridgedActionsClusterDisableActionWithDurationParams : NSObject <NSCopying>
+@interface MTRActionsClusterDisableActionWithDurationParams : NSObject <NSCopying>
@property (nonatomic, copy) NSNumber * _Nonnull actionID;
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm
index 941a8c9..a48ecc3 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm
@@ -1563,7 +1563,7 @@
}
@end
-@implementation MTRBridgedActionsClusterInstantActionParams
+@implementation MTRActionsClusterInstantActionParams
- (instancetype)init
{
if (self = [super init]) {
@@ -1578,7 +1578,7 @@
- (id)copyWithZone:(nullable NSZone *)zone;
{
- auto other = [[MTRBridgedActionsClusterInstantActionParams alloc] init];
+ auto other = [[MTRActionsClusterInstantActionParams alloc] init];
other.actionID = self.actionID;
other.invokeID = self.invokeID;
@@ -1595,7 +1595,7 @@
}
@end
-@implementation MTRBridgedActionsClusterInstantActionWithTransitionParams
+@implementation MTRActionsClusterInstantActionWithTransitionParams
- (instancetype)init
{
if (self = [super init]) {
@@ -1612,7 +1612,7 @@
- (id)copyWithZone:(nullable NSZone *)zone;
{
- auto other = [[MTRBridgedActionsClusterInstantActionWithTransitionParams alloc] init];
+ auto other = [[MTRActionsClusterInstantActionWithTransitionParams alloc] init];
other.actionID = self.actionID;
other.invokeID = self.invokeID;
@@ -1630,7 +1630,7 @@
}
@end
-@implementation MTRBridgedActionsClusterStartActionParams
+@implementation MTRActionsClusterStartActionParams
- (instancetype)init
{
if (self = [super init]) {
@@ -1645,7 +1645,7 @@
- (id)copyWithZone:(nullable NSZone *)zone;
{
- auto other = [[MTRBridgedActionsClusterStartActionParams alloc] init];
+ auto other = [[MTRActionsClusterStartActionParams alloc] init];
other.actionID = self.actionID;
other.invokeID = self.invokeID;
@@ -1662,7 +1662,7 @@
}
@end
-@implementation MTRBridgedActionsClusterStartActionWithDurationParams
+@implementation MTRActionsClusterStartActionWithDurationParams
- (instancetype)init
{
if (self = [super init]) {
@@ -1679,7 +1679,7 @@
- (id)copyWithZone:(nullable NSZone *)zone;
{
- auto other = [[MTRBridgedActionsClusterStartActionWithDurationParams alloc] init];
+ auto other = [[MTRActionsClusterStartActionWithDurationParams alloc] init];
other.actionID = self.actionID;
other.invokeID = self.invokeID;
@@ -1697,7 +1697,7 @@
}
@end
-@implementation MTRBridgedActionsClusterStopActionParams
+@implementation MTRActionsClusterStopActionParams
- (instancetype)init
{
if (self = [super init]) {
@@ -1712,7 +1712,7 @@
- (id)copyWithZone:(nullable NSZone *)zone;
{
- auto other = [[MTRBridgedActionsClusterStopActionParams alloc] init];
+ auto other = [[MTRActionsClusterStopActionParams alloc] init];
other.actionID = self.actionID;
other.invokeID = self.invokeID;
@@ -1729,7 +1729,7 @@
}
@end
-@implementation MTRBridgedActionsClusterPauseActionParams
+@implementation MTRActionsClusterPauseActionParams
- (instancetype)init
{
if (self = [super init]) {
@@ -1744,7 +1744,7 @@
- (id)copyWithZone:(nullable NSZone *)zone;
{
- auto other = [[MTRBridgedActionsClusterPauseActionParams alloc] init];
+ auto other = [[MTRActionsClusterPauseActionParams alloc] init];
other.actionID = self.actionID;
other.invokeID = self.invokeID;
@@ -1761,7 +1761,7 @@
}
@end
-@implementation MTRBridgedActionsClusterPauseActionWithDurationParams
+@implementation MTRActionsClusterPauseActionWithDurationParams
- (instancetype)init
{
if (self = [super init]) {
@@ -1778,7 +1778,7 @@
- (id)copyWithZone:(nullable NSZone *)zone;
{
- auto other = [[MTRBridgedActionsClusterPauseActionWithDurationParams alloc] init];
+ auto other = [[MTRActionsClusterPauseActionWithDurationParams alloc] init];
other.actionID = self.actionID;
other.invokeID = self.invokeID;
@@ -1796,7 +1796,7 @@
}
@end
-@implementation MTRBridgedActionsClusterResumeActionParams
+@implementation MTRActionsClusterResumeActionParams
- (instancetype)init
{
if (self = [super init]) {
@@ -1811,7 +1811,7 @@
- (id)copyWithZone:(nullable NSZone *)zone;
{
- auto other = [[MTRBridgedActionsClusterResumeActionParams alloc] init];
+ auto other = [[MTRActionsClusterResumeActionParams alloc] init];
other.actionID = self.actionID;
other.invokeID = self.invokeID;
@@ -1828,7 +1828,7 @@
}
@end
-@implementation MTRBridgedActionsClusterEnableActionParams
+@implementation MTRActionsClusterEnableActionParams
- (instancetype)init
{
if (self = [super init]) {
@@ -1843,7 +1843,7 @@
- (id)copyWithZone:(nullable NSZone *)zone;
{
- auto other = [[MTRBridgedActionsClusterEnableActionParams alloc] init];
+ auto other = [[MTRActionsClusterEnableActionParams alloc] init];
other.actionID = self.actionID;
other.invokeID = self.invokeID;
@@ -1860,7 +1860,7 @@
}
@end
-@implementation MTRBridgedActionsClusterEnableActionWithDurationParams
+@implementation MTRActionsClusterEnableActionWithDurationParams
- (instancetype)init
{
if (self = [super init]) {
@@ -1877,7 +1877,7 @@
- (id)copyWithZone:(nullable NSZone *)zone;
{
- auto other = [[MTRBridgedActionsClusterEnableActionWithDurationParams alloc] init];
+ auto other = [[MTRActionsClusterEnableActionWithDurationParams alloc] init];
other.actionID = self.actionID;
other.invokeID = self.invokeID;
@@ -1895,7 +1895,7 @@
}
@end
-@implementation MTRBridgedActionsClusterDisableActionParams
+@implementation MTRActionsClusterDisableActionParams
- (instancetype)init
{
if (self = [super init]) {
@@ -1910,7 +1910,7 @@
- (id)copyWithZone:(nullable NSZone *)zone;
{
- auto other = [[MTRBridgedActionsClusterDisableActionParams alloc] init];
+ auto other = [[MTRActionsClusterDisableActionParams alloc] init];
other.actionID = self.actionID;
other.invokeID = self.invokeID;
@@ -1927,7 +1927,7 @@
}
@end
-@implementation MTRBridgedActionsClusterDisableActionWithDurationParams
+@implementation MTRActionsClusterDisableActionWithDurationParams
- (instancetype)init
{
if (self = [super init]) {
@@ -1944,7 +1944,7 @@
- (id)copyWithZone:(nullable NSZone *)zone;
{
- auto other = [[MTRBridgedActionsClusterDisableActionWithDurationParams alloc] init];
+ auto other = [[MTRActionsClusterDisableActionWithDurationParams alloc] init];
other.actionID = self.actionID;
other.invokeID = self.invokeID;
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm
index 8c46c6c..6ee6ada 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm
@@ -302,8 +302,8 @@
}
break;
}
- case Clusters::BridgedActions::Id: {
- using namespace Clusters::BridgedActions;
+ case Clusters::Actions::Id: {
+ using namespace Clusters::Actions;
switch (aPath.mEventId) {
case Events::StateChanged::Id: {
@@ -313,7 +313,7 @@
return nil;
}
- MTRBridgedActionsClusterStateChangedEvent * value = [MTRBridgedActionsClusterStateChangedEvent new];
+ MTRActionsClusterStateChangedEvent * value = [MTRActionsClusterStateChangedEvent new];
do {
NSNumber * _Nonnull memberValue;
@@ -341,7 +341,7 @@
return nil;
}
- MTRBridgedActionsClusterActionFailedEvent * value = [MTRBridgedActionsClusterActionFailedEvent new];
+ MTRActionsClusterActionFailedEvent * value = [MTRActionsClusterActionFailedEvent new];
do {
NSNumber * _Nonnull memberValue;
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
index 884eb8f..6cf016c 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
@@ -106,19 +106,19 @@
- (id)copyWithZone:(nullable NSZone *)zone;
@end
-@interface MTRBridgedActionsClusterActionStruct : NSObject <NSCopying>
+@interface MTRActionsClusterActionStruct : NSObject <NSCopying>
@property (nonatomic, copy) NSNumber * _Nonnull actionID;
@property (nonatomic, copy) NSString * _Nonnull name;
@property (nonatomic, copy) NSNumber * _Nonnull type;
@property (nonatomic, copy) NSNumber * _Nonnull endpointListID;
@property (nonatomic, copy) NSNumber * _Nonnull supportedCommands;
-@property (nonatomic, copy) NSNumber * _Nonnull status;
+@property (nonatomic, copy) NSNumber * _Nonnull state;
- (instancetype)init;
- (id)copyWithZone:(nullable NSZone *)zone;
@end
-@interface MTRBridgedActionsClusterEndpointListStruct : NSObject <NSCopying>
+@interface MTRActionsClusterEndpointListStruct : NSObject <NSCopying>
@property (nonatomic, copy) NSNumber * _Nonnull endpointListID;
@property (nonatomic, copy) NSString * _Nonnull name;
@property (nonatomic, copy) NSNumber * _Nonnull type;
@@ -128,7 +128,7 @@
- (id)copyWithZone:(nullable NSZone *)zone;
@end
-@interface MTRBridgedActionsClusterStateChangedEvent : NSObject <NSCopying>
+@interface MTRActionsClusterStateChangedEvent : NSObject <NSCopying>
@property (nonatomic, copy) NSNumber * _Nonnull actionID;
@property (nonatomic, copy) NSNumber * _Nonnull invokeID;
@property (nonatomic, copy, getter=getNewState) NSNumber * _Nonnull newState;
@@ -137,7 +137,7 @@
- (id)copyWithZone:(nullable NSZone *)zone;
@end
-@interface MTRBridgedActionsClusterActionFailedEvent : NSObject <NSCopying>
+@interface MTRActionsClusterActionFailedEvent : NSObject <NSCopying>
@property (nonatomic, copy) NSNumber * _Nonnull actionID;
@property (nonatomic, copy) NSNumber * _Nonnull invokeID;
@property (nonatomic, copy, getter=getNewState) NSNumber * _Nonnull newState;
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
index b7d739e..4ed92c2 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
@@ -342,7 +342,7 @@
@end
-@implementation MTRBridgedActionsClusterActionStruct
+@implementation MTRActionsClusterActionStruct
- (instancetype)init
{
if (self = [super init]) {
@@ -357,21 +357,21 @@
_supportedCommands = @(0);
- _status = @(0);
+ _state = @(0);
}
return self;
}
- (id)copyWithZone:(nullable NSZone *)zone
{
- auto other = [[MTRBridgedActionsClusterActionStruct alloc] init];
+ auto other = [[MTRActionsClusterActionStruct alloc] init];
other.actionID = self.actionID;
other.name = self.name;
other.type = self.type;
other.endpointListID = self.endpointListID;
other.supportedCommands = self.supportedCommands;
- other.status = self.status;
+ other.state = self.state;
return other;
}
@@ -379,14 +379,14 @@
- (NSString *)description
{
NSString * descriptionString =
- [NSString stringWithFormat:@"<%@: actionID:%@; name:%@; type:%@; endpointListID:%@; supportedCommands:%@; status:%@; >",
- NSStringFromClass([self class]), _actionID, _name, _type, _endpointListID, _supportedCommands, _status];
+ [NSString stringWithFormat:@"<%@: actionID:%@; name:%@; type:%@; endpointListID:%@; supportedCommands:%@; state:%@; >",
+ NSStringFromClass([self class]), _actionID, _name, _type, _endpointListID, _supportedCommands, _state];
return descriptionString;
}
@end
-@implementation MTRBridgedActionsClusterEndpointListStruct
+@implementation MTRActionsClusterEndpointListStruct
- (instancetype)init
{
if (self = [super init]) {
@@ -404,7 +404,7 @@
- (id)copyWithZone:(nullable NSZone *)zone
{
- auto other = [[MTRBridgedActionsClusterEndpointListStruct alloc] init];
+ auto other = [[MTRActionsClusterEndpointListStruct alloc] init];
other.endpointListID = self.endpointListID;
other.name = self.name;
@@ -423,7 +423,7 @@
@end
-@implementation MTRBridgedActionsClusterStateChangedEvent
+@implementation MTRActionsClusterStateChangedEvent
- (instancetype)init
{
if (self = [super init]) {
@@ -439,7 +439,7 @@
- (id)copyWithZone:(nullable NSZone *)zone
{
- auto other = [[MTRBridgedActionsClusterStateChangedEvent alloc] init];
+ auto other = [[MTRActionsClusterStateChangedEvent alloc] init];
other.actionID = self.actionID;
other.invokeID = self.invokeID;
@@ -457,7 +457,7 @@
@end
-@implementation MTRBridgedActionsClusterActionFailedEvent
+@implementation MTRActionsClusterActionFailedEvent
- (instancetype)init
{
if (self = [super init]) {
@@ -475,7 +475,7 @@
- (id)copyWithZone:(nullable NSZone *)zone
{
- auto other = [[MTRBridgedActionsClusterActionFailedEvent alloc] init];
+ auto other = [[MTRActionsClusterActionFailedEvent alloc] init];
other.actionID = self.actionID;
other.invokeID = self.invokeID;
diff --git a/zzz_generated/all-clusters-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/all-clusters-app/zap-generated/PluginApplicationCallbacks.h
index a1ca42f..91b13eb 100644
--- a/zzz_generated/all-clusters-app/zap-generated/PluginApplicationCallbacks.h
+++ b/zzz_generated/all-clusters-app/zap-generated/PluginApplicationCallbacks.h
@@ -32,7 +32,7 @@
MatterDescriptorPluginServerInitCallback(); \
MatterBindingPluginServerInitCallback(); \
MatterAccessControlPluginServerInitCallback(); \
- MatterBridgedActionsPluginServerInitCallback(); \
+ MatterActionsPluginServerInitCallback(); \
MatterBasicPluginServerInitCallback(); \
MatterOtaSoftwareUpdateProviderPluginClientInitCallback(); \
MatterOtaSoftwareUpdateRequestorPluginServerInitCallback(); \
diff --git a/zzz_generated/all-clusters-app/zap-generated/callback-stub.cpp b/zzz_generated/all-clusters-app/zap-generated/callback-stub.cpp
index dea4049..ef520e0 100644
--- a/zzz_generated/all-clusters-app/zap-generated/callback-stub.cpp
+++ b/zzz_generated/all-clusters-app/zap-generated/callback-stub.cpp
@@ -35,6 +35,9 @@
case ZCL_ACCOUNT_LOGIN_CLUSTER_ID:
emberAfAccountLoginClusterInitCallback(endpoint);
break;
+ case ZCL_ACTIONS_CLUSTER_ID:
+ emberAfActionsClusterInitCallback(endpoint);
+ break;
case ZCL_ADMINISTRATOR_COMMISSIONING_CLUSTER_ID:
emberAfAdministratorCommissioningClusterInitCallback(endpoint);
break;
@@ -62,9 +65,6 @@
case ZCL_BOOLEAN_STATE_CLUSTER_ID:
emberAfBooleanStateClusterInitCallback(endpoint);
break;
- case ZCL_BRIDGED_ACTIONS_CLUSTER_ID:
- emberAfBridgedActionsClusterInitCallback(endpoint);
- break;
case ZCL_CHANNEL_CLUSTER_ID:
emberAfChannelClusterInitCallback(endpoint);
break;
@@ -234,6 +234,11 @@
// To prevent warning
(void) endpoint;
}
+void __attribute__((weak)) emberAfActionsClusterInitCallback(EndpointId endpoint)
+{
+ // To prevent warning
+ (void) endpoint;
+}
void __attribute__((weak)) emberAfAdministratorCommissioningClusterInitCallback(EndpointId endpoint)
{
// To prevent warning
@@ -279,11 +284,6 @@
// To prevent warning
(void) endpoint;
}
-void __attribute__((weak)) emberAfBridgedActionsClusterInitCallback(EndpointId endpoint)
-{
- // To prevent warning
- (void) endpoint;
-}
void __attribute__((weak)) emberAfChannelClusterInitCallback(EndpointId endpoint)
{
// To prevent warning
diff --git a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h
index 9e47c5e..594868e 100644
--- a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h
@@ -849,11 +849,11 @@
{ 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \
\
- /* Endpoint: 1, Cluster: Bridged Actions (server) */ \
- { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* action list */ \
- { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* endpoint list */ \
+ /* Endpoint: 1, Cluster: Actions (server) */ \
+ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActionList */ \
+ { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* EndpointLists */ \
{ 0x00000002, ZAP_TYPE(LONG_CHAR_STRING), 514, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
- ZAP_EMPTY_DEFAULT() }, /* setup url */ \
+ ZAP_EMPTY_DEFAULT() }, /* SetupURL */ \
{ 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */ \
\
@@ -2292,7 +2292,7 @@
.generatedCommandList = nullptr ,\
},\
{ \
- /* Endpoint: 1, Cluster: Bridged Actions (server) */ \
+ /* Endpoint: 1, Cluster: Actions (server) */ \
.clusterId = 0x00000025, \
.attributes = ZAP_ATTRIBUTE_INDEX(286), \
.attributeCount = 5, \
diff --git a/zzz_generated/all-clusters-app/zap-generated/gen_config.h b/zzz_generated/all-clusters-app/zap-generated/gen_config.h
index 9c3164e..a5e29ac 100644
--- a/zzz_generated/all-clusters-app/zap-generated/gen_config.h
+++ b/zzz_generated/all-clusters-app/zap-generated/gen_config.h
@@ -39,7 +39,7 @@
#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (3)
#define EMBER_AF_BINDING_CLUSTER_SERVER_ENDPOINT_COUNT (2)
#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BRIDGED_ACTIONS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ACTIONS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
#define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
@@ -161,10 +161,10 @@
#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
#define EMBER_AF_PLUGIN_ACCESS_CONTROL
-// Use this macro to check if the server side of the Bridged Actions cluster is included
-#define ZCL_USING_BRIDGED_ACTIONS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_BRIDGED_ACTIONS_SERVER
-#define EMBER_AF_PLUGIN_BRIDGED_ACTIONS
+// Use this macro to check if the server side of the Actions cluster is included
+#define ZCL_USING_ACTIONS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ACTIONS_SERVER
+#define EMBER_AF_PLUGIN_ACTIONS
// Use this macro to check if the server side of the Basic cluster is included
#define ZCL_USING_BASIC_CLUSTER_SERVER
diff --git a/zzz_generated/all-clusters-minimal-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/all-clusters-minimal-app/zap-generated/PluginApplicationCallbacks.h
index 7816ea2..67219dc 100644
--- a/zzz_generated/all-clusters-minimal-app/zap-generated/PluginApplicationCallbacks.h
+++ b/zzz_generated/all-clusters-minimal-app/zap-generated/PluginApplicationCallbacks.h
@@ -30,7 +30,7 @@
MatterDescriptorPluginServerInitCallback(); \
MatterBindingPluginServerInitCallback(); \
MatterAccessControlPluginServerInitCallback(); \
- MatterBridgedActionsPluginServerInitCallback(); \
+ MatterActionsPluginServerInitCallback(); \
MatterBasicPluginServerInitCallback(); \
MatterOtaSoftwareUpdateProviderPluginClientInitCallback(); \
MatterOtaSoftwareUpdateRequestorPluginServerInitCallback(); \
diff --git a/zzz_generated/all-clusters-minimal-app/zap-generated/callback-stub.cpp b/zzz_generated/all-clusters-minimal-app/zap-generated/callback-stub.cpp
index 4f6d431..1e748d6 100644
--- a/zzz_generated/all-clusters-minimal-app/zap-generated/callback-stub.cpp
+++ b/zzz_generated/all-clusters-minimal-app/zap-generated/callback-stub.cpp
@@ -35,6 +35,9 @@
case ZCL_ACCOUNT_LOGIN_CLUSTER_ID:
emberAfAccountLoginClusterInitCallback(endpoint);
break;
+ case ZCL_ACTIONS_CLUSTER_ID:
+ emberAfActionsClusterInitCallback(endpoint);
+ break;
case ZCL_ADMINISTRATOR_COMMISSIONING_CLUSTER_ID:
emberAfAdministratorCommissioningClusterInitCallback(endpoint);
break;
@@ -56,9 +59,6 @@
case ZCL_BOOLEAN_STATE_CLUSTER_ID:
emberAfBooleanStateClusterInitCallback(endpoint);
break;
- case ZCL_BRIDGED_ACTIONS_CLUSTER_ID:
- emberAfBridgedActionsClusterInitCallback(endpoint);
- break;
case ZCL_CHANNEL_CLUSTER_ID:
emberAfChannelClusterInitCallback(endpoint);
break;
@@ -222,6 +222,11 @@
// To prevent warning
(void) endpoint;
}
+void __attribute__((weak)) emberAfActionsClusterInitCallback(EndpointId endpoint)
+{
+ // To prevent warning
+ (void) endpoint;
+}
void __attribute__((weak)) emberAfAdministratorCommissioningClusterInitCallback(EndpointId endpoint)
{
// To prevent warning
@@ -257,11 +262,6 @@
// To prevent warning
(void) endpoint;
}
-void __attribute__((weak)) emberAfBridgedActionsClusterInitCallback(EndpointId endpoint)
-{
- // To prevent warning
- (void) endpoint;
-}
void __attribute__((weak)) emberAfChannelClusterInitCallback(EndpointId endpoint)
{
// To prevent warning
diff --git a/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h
index ada8022..61bfcef 100644
--- a/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h
@@ -612,9 +612,9 @@
{ 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \
\
- /* Endpoint: 1, Cluster: Bridged Actions (server) */ \
- { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* action list */ \
- { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* endpoint list */ \
+ /* Endpoint: 1, Cluster: Actions (server) */ \
+ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActionList */ \
+ { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* EndpointLists */ \
{ 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */ \
\
@@ -1770,7 +1770,7 @@
.generatedCommandList = nullptr ,\
},\
{ \
- /* Endpoint: 1, Cluster: Bridged Actions (server) */ \
+ /* Endpoint: 1, Cluster: Actions (server) */ \
.clusterId = 0x00000025, \
.attributes = ZAP_ATTRIBUTE_INDEX(183), \
.attributeCount = 4, \
diff --git a/zzz_generated/all-clusters-minimal-app/zap-generated/gen_config.h b/zzz_generated/all-clusters-minimal-app/zap-generated/gen_config.h
index 4e73328..39eb911 100644
--- a/zzz_generated/all-clusters-minimal-app/zap-generated/gen_config.h
+++ b/zzz_generated/all-clusters-minimal-app/zap-generated/gen_config.h
@@ -37,7 +37,7 @@
#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (3)
#define EMBER_AF_BINDING_CLUSTER_SERVER_ENDPOINT_COUNT (2)
#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BRIDGED_ACTIONS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ACTIONS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
#define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
@@ -147,10 +147,10 @@
#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
#define EMBER_AF_PLUGIN_ACCESS_CONTROL
-// Use this macro to check if the server side of the Bridged Actions cluster is included
-#define ZCL_USING_BRIDGED_ACTIONS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_BRIDGED_ACTIONS_SERVER
-#define EMBER_AF_PLUGIN_BRIDGED_ACTIONS
+// Use this macro to check if the server side of the Actions cluster is included
+#define ZCL_USING_ACTIONS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ACTIONS_SERVER
+#define EMBER_AF_PLUGIN_ACTIONS
// Use this macro to check if the server side of the Basic cluster is included
#define ZCL_USING_BASIC_CLUSTER_SERVER
diff --git a/zzz_generated/app-common/app-common/zap-generated/af-structs.h b/zzz_generated/app-common/app-common/zap-generated/af-structs.h
index c617ca1..93a09ff 100644
--- a/zzz_generated/app-common/app-common/zap-generated/af-structs.h
+++ b/zzz_generated/app-common/app-common/zap-generated/af-structs.h
@@ -216,7 +216,7 @@
uint8_t Type;
uint16_t EndpointListID;
uint16_t SupportedCommands;
- uint8_t Status;
+ uint8_t State;
} ActionStruct;
// Struct for ApplicationBasicApplication
diff --git a/zzz_generated/app-common/app-common/zap-generated/attribute-id.h b/zzz_generated/app-common/app-common/zap-generated/attribute-id.h
index c72b898..d8054f9 100644
--- a/zzz_generated/app-common/app-common/zap-generated/attribute-id.h
+++ b/zzz_generated/app-common/app-common/zap-generated/attribute-id.h
@@ -144,7 +144,7 @@
#define ZCL_TARGETS_PER_ACCESS_CONTROL_ENTRY_ATTRIBUTE_ID (0x0003)
#define ZCL_ACCESS_CONTROL_ENTRIES_PER_FABRIC_ATTRIBUTE_ID (0x0004)
-// Attribute ids for cluster: Bridged Actions
+// Attribute ids for cluster: Actions
// Client attributes
diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp
index b7cc41c..9035492 100644
--- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp
+++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp
@@ -2259,15 +2259,15 @@
} // namespace Attributes
} // namespace AccessControl
-namespace BridgedActions {
+namespace Actions {
namespace Attributes {
-namespace SetupUrl {
+namespace SetupURL {
EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value)
{
uint8_t zclString[512 + 2];
- EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::BridgedActions::Id, Id, zclString, sizeof(zclString));
+ EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::Actions::Id, Id, zclString, sizeof(zclString));
VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
size_t length = emberAfLongStringLength(zclString);
if (length == NumericAttributeTraits<uint16_t>::kNullValue)
@@ -2287,10 +2287,10 @@
uint8_t zclString[512 + 2];
emberAfCopyInt16u(zclString, 0, static_cast<uint16_t>(value.size()));
memcpy(&zclString[2], value.data(), value.size());
- return emberAfWriteServerAttribute(endpoint, Clusters::BridgedActions::Id, Id, zclString, ZCL_LONG_CHAR_STRING_ATTRIBUTE_TYPE);
+ return emberAfWriteServerAttribute(endpoint, Clusters::Actions::Id, Id, zclString, ZCL_LONG_CHAR_STRING_ATTRIBUTE_TYPE);
}
-} // namespace SetupUrl
+} // namespace SetupURL
namespace FeatureMap {
@@ -2299,7 +2299,7 @@
using Traits = NumericAttributeTraits<uint32_t>;
Traits::StorageType temp;
uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp);
- EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::BridgedActions::Id, Id, readable, sizeof(temp));
+ EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::Actions::Id, Id, readable, sizeof(temp));
VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
{
@@ -2318,7 +2318,7 @@
Traits::StorageType storageValue;
Traits::WorkingToStorage(value, storageValue);
uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
- return emberAfWriteServerAttribute(endpoint, Clusters::BridgedActions::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+ return emberAfWriteServerAttribute(endpoint, Clusters::Actions::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
}
} // namespace FeatureMap
@@ -2330,7 +2330,7 @@
using Traits = NumericAttributeTraits<uint16_t>;
Traits::StorageType temp;
uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp);
- EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::BridgedActions::Id, Id, readable, sizeof(temp));
+ EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::Actions::Id, Id, readable, sizeof(temp));
VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
{
@@ -2349,13 +2349,13 @@
Traits::StorageType storageValue;
Traits::WorkingToStorage(value, storageValue);
uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
- return emberAfWriteServerAttribute(endpoint, Clusters::BridgedActions::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+ return emberAfWriteServerAttribute(endpoint, Clusters::Actions::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
}
} // namespace ClusterRevision
} // namespace Attributes
-} // namespace BridgedActions
+} // namespace Actions
namespace Basic {
namespace Attributes {
diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h
index 82072ee..6c4aceb 100644
--- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h
+++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h
@@ -437,13 +437,13 @@
} // namespace Attributes
} // namespace AccessControl
-namespace BridgedActions {
+namespace Actions {
namespace Attributes {
-namespace SetupUrl {
+namespace SetupURL {
EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value); // long_char_string
EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value);
-} // namespace SetupUrl
+} // namespace SetupURL
namespace FeatureMap {
EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32
@@ -456,7 +456,7 @@
} // namespace ClusterRevision
} // namespace Attributes
-} // namespace BridgedActions
+} // namespace Actions
namespace Basic {
namespace Attributes {
diff --git a/zzz_generated/app-common/app-common/zap-generated/callback.h b/zzz_generated/app-common/app-common/zap-generated/callback.h
index 0336d05..cfefbae 100644
--- a/zzz_generated/app-common/app-common/zap-generated/callback.h
+++ b/zzz_generated/app-common/app-common/zap-generated/callback.h
@@ -133,13 +133,13 @@
*/
void emberAfAccessControlClusterInitCallback(chip::EndpointId endpoint);
-/** @brief Bridged Actions Cluster Init
+/** @brief Actions Cluster Init
*
* Cluster Init
*
* @param endpoint Endpoint that is being initialized
*/
-void emberAfBridgedActionsClusterInitCallback(chip::EndpointId endpoint);
+void emberAfActionsClusterInitCallback(chip::EndpointId endpoint);
/** @brief Basic Cluster Init
*
@@ -1668,34 +1668,34 @@
void emberAfAccessControlClusterClientTickCallback(chip::EndpointId endpoint);
//
-// Bridged Actions Cluster
+// Actions Cluster
//
-/** @brief Bridged Actions Cluster Server Init
+/** @brief Actions Cluster Server Init
*
* Server Init
*
* @param endpoint Endpoint that is being initialized
*/
-void emberAfBridgedActionsClusterServerInitCallback(chip::EndpointId endpoint);
+void emberAfActionsClusterServerInitCallback(chip::EndpointId endpoint);
-/** @brief Bridged Actions Cluster Client Init
+/** @brief Actions Cluster Client Init
*
* Client Init
*
* @param endpoint Endpoint that is being initialized
*/
-void emberAfBridgedActionsClusterClientInitCallback(chip::EndpointId endpoint);
+void emberAfActionsClusterClientInitCallback(chip::EndpointId endpoint);
-/** @brief Bridged Actions Cluster Server Attribute Changed
+/** @brief Actions Cluster Server Attribute Changed
*
* Server Attribute Changed
*
* @param attributePath Concrete attribute path that changed
*/
-void MatterBridgedActionsClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
+void MatterActionsClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
-/** @brief Bridged Actions Cluster Server Message Sent
+/** @brief Actions Cluster Server Message Sent
*
* Server Message Sent
*
@@ -1705,11 +1705,10 @@
* @param message The message that was sent
* @param status The status of the sent message
*/
-void emberAfBridgedActionsClusterServerMessageSentCallback(const chip::MessageSendDestination & destination,
- EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
- EmberStatus status);
+void emberAfActionsClusterServerMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame,
+ uint16_t msgLen, uint8_t * message, EmberStatus status);
-/** @brief Bridged Actions Cluster Client Message Sent
+/** @brief Actions Cluster Client Message Sent
*
* Client Message Sent
*
@@ -1719,11 +1718,10 @@
* @param message The message that was sent
* @param status The status of the sent message
*/
-void emberAfBridgedActionsClusterClientMessageSentCallback(const chip::MessageSendDestination & destination,
- EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
- EmberStatus status);
+void emberAfActionsClusterClientMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame,
+ uint16_t msgLen, uint8_t * message, EmberStatus status);
-/** @brief Bridged Actions Cluster Server Pre Attribute Changed
+/** @brief Actions Cluster Server Pre Attribute Changed
*
* Server Pre Attribute Changed
*
@@ -1733,10 +1731,10 @@
* @param value Attribute value
*/
chip::Protocols::InteractionModel::Status
-MatterBridgedActionsClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
- EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+MatterActionsClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+ EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
-/** @brief Bridged Actions Cluster Client Pre Attribute Changed
+/** @brief Actions Cluster Client Pre Attribute Changed
*
* Client Pre Attribute Changed
*
@@ -1746,24 +1744,24 @@
* @param value Attribute value
*/
chip::Protocols::InteractionModel::Status
-MatterBridgedActionsClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
- EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+MatterActionsClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+ EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
-/** @brief Bridged Actions Cluster Server Tick
+/** @brief Actions Cluster Server Tick
*
* Server Tick
*
* @param endpoint Endpoint that is being served
*/
-void emberAfBridgedActionsClusterServerTickCallback(chip::EndpointId endpoint);
+void emberAfActionsClusterServerTickCallback(chip::EndpointId endpoint);
-/** @brief Bridged Actions Cluster Client Tick
+/** @brief Actions Cluster Client Tick
*
* Client Tick
*
* @param endpoint Endpoint that is being served
*/
-void emberAfBridgedActionsClusterClientTickCallback(chip::EndpointId endpoint);
+void emberAfActionsClusterClientTickCallback(chip::EndpointId endpoint);
//
// Basic Cluster
@@ -7624,77 +7622,77 @@
chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
const chip::app::Clusters::LevelControl::Commands::MoveToClosestFrequency::DecodableType & commandData);
/**
- * @brief Bridged Actions Cluster InstantAction Command callback (from client)
+ * @brief Actions Cluster InstantAction Command callback (from client)
*/
-bool emberAfBridgedActionsClusterInstantActionCallback(
+bool emberAfActionsClusterInstantActionCallback(
chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
- const chip::app::Clusters::BridgedActions::Commands::InstantAction::DecodableType & commandData);
+ const chip::app::Clusters::Actions::Commands::InstantAction::DecodableType & commandData);
/**
- * @brief Bridged Actions Cluster InstantActionWithTransition Command callback (from client)
+ * @brief Actions Cluster InstantActionWithTransition Command callback (from client)
*/
-bool emberAfBridgedActionsClusterInstantActionWithTransitionCallback(
+bool emberAfActionsClusterInstantActionWithTransitionCallback(
chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
- const chip::app::Clusters::BridgedActions::Commands::InstantActionWithTransition::DecodableType & commandData);
+ const chip::app::Clusters::Actions::Commands::InstantActionWithTransition::DecodableType & commandData);
/**
- * @brief Bridged Actions Cluster StartAction Command callback (from client)
+ * @brief Actions Cluster StartAction Command callback (from client)
*/
-bool emberAfBridgedActionsClusterStartActionCallback(
+bool emberAfActionsClusterStartActionCallback(
chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
- const chip::app::Clusters::BridgedActions::Commands::StartAction::DecodableType & commandData);
+ const chip::app::Clusters::Actions::Commands::StartAction::DecodableType & commandData);
/**
- * @brief Bridged Actions Cluster StartActionWithDuration Command callback (from client)
+ * @brief Actions Cluster StartActionWithDuration Command callback (from client)
*/
-bool emberAfBridgedActionsClusterStartActionWithDurationCallback(
+bool emberAfActionsClusterStartActionWithDurationCallback(
chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
- const chip::app::Clusters::BridgedActions::Commands::StartActionWithDuration::DecodableType & commandData);
+ const chip::app::Clusters::Actions::Commands::StartActionWithDuration::DecodableType & commandData);
/**
- * @brief Bridged Actions Cluster StopAction Command callback (from client)
+ * @brief Actions Cluster StopAction Command callback (from client)
*/
-bool emberAfBridgedActionsClusterStopActionCallback(
- chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
- const chip::app::Clusters::BridgedActions::Commands::StopAction::DecodableType & commandData);
+bool emberAfActionsClusterStopActionCallback(chip::app::CommandHandler * commandObj,
+ const chip::app::ConcreteCommandPath & commandPath,
+ const chip::app::Clusters::Actions::Commands::StopAction::DecodableType & commandData);
/**
- * @brief Bridged Actions Cluster PauseAction Command callback (from client)
+ * @brief Actions Cluster PauseAction Command callback (from client)
*/
-bool emberAfBridgedActionsClusterPauseActionCallback(
+bool emberAfActionsClusterPauseActionCallback(
chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
- const chip::app::Clusters::BridgedActions::Commands::PauseAction::DecodableType & commandData);
+ const chip::app::Clusters::Actions::Commands::PauseAction::DecodableType & commandData);
/**
- * @brief Bridged Actions Cluster PauseActionWithDuration Command callback (from client)
+ * @brief Actions Cluster PauseActionWithDuration Command callback (from client)
*/
-bool emberAfBridgedActionsClusterPauseActionWithDurationCallback(
+bool emberAfActionsClusterPauseActionWithDurationCallback(
chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
- const chip::app::Clusters::BridgedActions::Commands::PauseActionWithDuration::DecodableType & commandData);
+ const chip::app::Clusters::Actions::Commands::PauseActionWithDuration::DecodableType & commandData);
/**
- * @brief Bridged Actions Cluster ResumeAction Command callback (from client)
+ * @brief Actions Cluster ResumeAction Command callback (from client)
*/
-bool emberAfBridgedActionsClusterResumeActionCallback(
+bool emberAfActionsClusterResumeActionCallback(
chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
- const chip::app::Clusters::BridgedActions::Commands::ResumeAction::DecodableType & commandData);
+ const chip::app::Clusters::Actions::Commands::ResumeAction::DecodableType & commandData);
/**
- * @brief Bridged Actions Cluster EnableAction Command callback (from client)
+ * @brief Actions Cluster EnableAction Command callback (from client)
*/
-bool emberAfBridgedActionsClusterEnableActionCallback(
+bool emberAfActionsClusterEnableActionCallback(
chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
- const chip::app::Clusters::BridgedActions::Commands::EnableAction::DecodableType & commandData);
+ const chip::app::Clusters::Actions::Commands::EnableAction::DecodableType & commandData);
/**
- * @brief Bridged Actions Cluster EnableActionWithDuration Command callback (from client)
+ * @brief Actions Cluster EnableActionWithDuration Command callback (from client)
*/
-bool emberAfBridgedActionsClusterEnableActionWithDurationCallback(
+bool emberAfActionsClusterEnableActionWithDurationCallback(
chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
- const chip::app::Clusters::BridgedActions::Commands::EnableActionWithDuration::DecodableType & commandData);
+ const chip::app::Clusters::Actions::Commands::EnableActionWithDuration::DecodableType & commandData);
/**
- * @brief Bridged Actions Cluster DisableAction Command callback (from client)
+ * @brief Actions Cluster DisableAction Command callback (from client)
*/
-bool emberAfBridgedActionsClusterDisableActionCallback(
+bool emberAfActionsClusterDisableActionCallback(
chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
- const chip::app::Clusters::BridgedActions::Commands::DisableAction::DecodableType & commandData);
+ const chip::app::Clusters::Actions::Commands::DisableAction::DecodableType & commandData);
/**
- * @brief Bridged Actions Cluster DisableActionWithDuration Command callback (from client)
+ * @brief Actions Cluster DisableActionWithDuration Command callback (from client)
*/
-bool emberAfBridgedActionsClusterDisableActionWithDurationCallback(
+bool emberAfActionsClusterDisableActionWithDurationCallback(
chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
- const chip::app::Clusters::BridgedActions::Commands::DisableActionWithDuration::DecodableType & commandData);
+ const chip::app::Clusters::Actions::Commands::DisableActionWithDuration::DecodableType & commandData);
/**
* @brief Basic Cluster MfgSpecificPing Command callback (from client)
*/
diff --git a/zzz_generated/app-common/app-common/zap-generated/callbacks/PluginCallbacks.h b/zzz_generated/app-common/app-common/zap-generated/callbacks/PluginCallbacks.h
index 4294dbd..8fb031e 100644
--- a/zzz_generated/app-common/app-common/zap-generated/callbacks/PluginCallbacks.h
+++ b/zzz_generated/app-common/app-common/zap-generated/callbacks/PluginCallbacks.h
@@ -41,8 +41,8 @@
void MatterBindingPluginServerInitCallback();
void __attribute__((weak)) MatterAccessControlPluginClientInitCallback() {}
void MatterAccessControlPluginServerInitCallback();
-void __attribute__((weak)) MatterBridgedActionsPluginClientInitCallback() {}
-void MatterBridgedActionsPluginServerInitCallback();
+void __attribute__((weak)) MatterActionsPluginClientInitCallback() {}
+void MatterActionsPluginServerInitCallback();
void __attribute__((weak)) MatterBasicPluginClientInitCallback() {}
void MatterBasicPluginServerInitCallback();
void __attribute__((weak)) MatterOtaSoftwareUpdateProviderPluginClientInitCallback() {}
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h
index 441c044..aad0077 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h
@@ -248,9 +248,9 @@
}
}
-static auto __attribute__((unused)) EnsureKnownEnumValue(BridgedActions::ActionErrorEnum val)
+static auto __attribute__((unused)) EnsureKnownEnumValue(Actions::ActionErrorEnum val)
{
- using EnumType = BridgedActions::ActionErrorEnum;
+ using EnumType = Actions::ActionErrorEnum;
switch (val)
{
case EnumType::kUnknown:
@@ -260,9 +260,9 @@
return static_cast<EnumType>(2);
}
}
-static auto __attribute__((unused)) EnsureKnownEnumValue(BridgedActions::ActionStateEnum val)
+static auto __attribute__((unused)) EnsureKnownEnumValue(Actions::ActionStateEnum val)
{
- using EnumType = BridgedActions::ActionStateEnum;
+ using EnumType = Actions::ActionStateEnum;
switch (val)
{
case EnumType::kInactive:
@@ -274,9 +274,9 @@
return static_cast<EnumType>(4);
}
}
-static auto __attribute__((unused)) EnsureKnownEnumValue(BridgedActions::ActionTypeEnum val)
+static auto __attribute__((unused)) EnsureKnownEnumValue(Actions::ActionTypeEnum val)
{
- using EnumType = BridgedActions::ActionTypeEnum;
+ using EnumType = Actions::ActionTypeEnum;
switch (val)
{
case EnumType::kOther:
@@ -291,9 +291,9 @@
return static_cast<EnumType>(7);
}
}
-static auto __attribute__((unused)) EnsureKnownEnumValue(BridgedActions::EndpointListTypeEnum val)
+static auto __attribute__((unused)) EnsureKnownEnumValue(Actions::EndpointListTypeEnum val)
{
- using EnumType = BridgedActions::EndpointListTypeEnum;
+ using EnumType = Actions::EndpointListTypeEnum;
switch (val)
{
case EnumType::kOther:
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h
index 828bece..d07c83b 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h
@@ -268,7 +268,7 @@
};
} // namespace AccessControl
-namespace BridgedActions {
+namespace Actions {
// Enum for ActionErrorEnum
enum class ActionErrorEnum : uint8_t
@@ -326,7 +326,7 @@
kDisableAction = 0x400,
kDisableActionWithDuration = 0x800,
};
-} // namespace BridgedActions
+} // namespace Actions
namespace Basic {
} // namespace Basic
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-id.h b/zzz_generated/app-common/app-common/zap-generated/cluster-id.h
index bf87b9e..65c4bc4 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-id.h
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-id.h
@@ -55,8 +55,8 @@
// Definitions for cluster: Access Control
static constexpr chip::ClusterId ZCL_ACCESS_CONTROL_CLUSTER_ID = 0x001F;
-// Definitions for cluster: Bridged Actions
-static constexpr chip::ClusterId ZCL_BRIDGED_ACTIONS_CLUSTER_ID = 0x0025;
+// Definitions for cluster: Actions
+static constexpr chip::ClusterId ZCL_ACTIONS_CLUSTER_ID = 0x0025;
// Definitions for cluster: Basic
static constexpr chip::ClusterId ZCL_BASIC_CLUSTER_ID = 0x0028;
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
index d1663f2..00f5e64 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
@@ -3122,7 +3122,7 @@
} // namespace Events
} // namespace AccessControl
-namespace BridgedActions {
+namespace Actions {
namespace Structs {
namespace ActionStruct {
CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
@@ -3134,7 +3134,7 @@
ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kType)), type));
ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEndpointListID)), endpointListID));
ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSupportedCommands)), supportedCommands));
- ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status));
+ ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kState)), state));
ReturnErrorOnFailure(writer.EndContainer(outer));
return CHIP_NO_ERROR;
}
@@ -3169,8 +3169,8 @@
case to_underlying(Fields::kSupportedCommands):
ReturnErrorOnFailure(DataModel::Decode(reader, supportedCommands));
break;
- case to_underlying(Fields::kStatus):
- ReturnErrorOnFailure(DataModel::Decode(reader, status));
+ case to_underlying(Fields::kState):
+ ReturnErrorOnFailure(DataModel::Decode(reader, state));
break;
default:
break;
@@ -3761,11 +3761,11 @@
case Attributes::ActionList::TypeInfo::GetAttributeId():
ReturnErrorOnFailure(DataModel::Decode(reader, actionList));
break;
- case Attributes::EndpointList::TypeInfo::GetAttributeId():
- ReturnErrorOnFailure(DataModel::Decode(reader, endpointList));
+ case Attributes::EndpointLists::TypeInfo::GetAttributeId():
+ ReturnErrorOnFailure(DataModel::Decode(reader, endpointLists));
break;
- case Attributes::SetupUrl::TypeInfo::GetAttributeId():
- ReturnErrorOnFailure(DataModel::Decode(reader, setupUrl));
+ case Attributes::SetupURL::TypeInfo::GetAttributeId():
+ ReturnErrorOnFailure(DataModel::Decode(reader, setupURL));
break;
case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList));
@@ -3887,7 +3887,7 @@
} // namespace ActionFailed.
} // namespace Events
-} // namespace BridgedActions
+} // namespace Actions
namespace Basic {
namespace Structs {
namespace CapabilityMinimaStruct {
@@ -20845,7 +20845,7 @@
return false;
}
}
- case Clusters::BridgedActions::Id: {
+ case Clusters::Actions::Id: {
switch (aCommand)
{
default:
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
index 818cd0f..e4adf34 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
@@ -3630,7 +3630,7 @@
} // namespace AccessControlExtensionChanged
} // namespace Events
} // namespace AccessControl
-namespace BridgedActions {
+namespace Actions {
namespace Structs {
namespace ActionStruct {
enum class Fields
@@ -3640,7 +3640,7 @@
kType = 2,
kEndpointListID = 3,
kSupportedCommands = 4,
- kStatus = 5,
+ kState = 5,
};
struct Type
@@ -3648,10 +3648,10 @@
public:
uint16_t actionID = static_cast<uint16_t>(0);
chip::CharSpan name;
- ActionTypeEnum type = static_cast<ActionTypeEnum>(0);
- uint16_t endpointListID = static_cast<uint16_t>(0);
- uint16_t supportedCommands = static_cast<uint16_t>(0);
- ActionStateEnum status = static_cast<ActionStateEnum>(0);
+ ActionTypeEnum type = static_cast<ActionTypeEnum>(0);
+ uint16_t endpointListID = static_cast<uint16_t>(0);
+ chip::BitMask<CommandBits> supportedCommands = static_cast<chip::BitMask<CommandBits>>(0);
+ ActionStateEnum state = static_cast<ActionStateEnum>(0);
CHIP_ERROR Decode(TLV::TLVReader & reader);
@@ -3779,7 +3779,7 @@
public:
// Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
static constexpr CommandId GetCommandId() { return Commands::InstantAction::Id; }
- static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
+ static constexpr ClusterId GetClusterId() { return Clusters::Actions::Id; }
uint16_t actionID = static_cast<uint16_t>(0);
Optional<uint32_t> invokeID;
@@ -3795,7 +3795,7 @@
{
public:
static constexpr CommandId GetCommandId() { return Commands::InstantAction::Id; }
- static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
+ static constexpr ClusterId GetClusterId() { return Clusters::Actions::Id; }
uint16_t actionID = static_cast<uint16_t>(0);
Optional<uint32_t> invokeID;
@@ -3815,7 +3815,7 @@
public:
// Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
static constexpr CommandId GetCommandId() { return Commands::InstantActionWithTransition::Id; }
- static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
+ static constexpr ClusterId GetClusterId() { return Clusters::Actions::Id; }
uint16_t actionID = static_cast<uint16_t>(0);
Optional<uint32_t> invokeID;
@@ -3832,7 +3832,7 @@
{
public:
static constexpr CommandId GetCommandId() { return Commands::InstantActionWithTransition::Id; }
- static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
+ static constexpr ClusterId GetClusterId() { return Clusters::Actions::Id; }
uint16_t actionID = static_cast<uint16_t>(0);
Optional<uint32_t> invokeID;
@@ -3852,7 +3852,7 @@
public:
// Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
static constexpr CommandId GetCommandId() { return Commands::StartAction::Id; }
- static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
+ static constexpr ClusterId GetClusterId() { return Clusters::Actions::Id; }
uint16_t actionID = static_cast<uint16_t>(0);
Optional<uint32_t> invokeID;
@@ -3868,7 +3868,7 @@
{
public:
static constexpr CommandId GetCommandId() { return Commands::StartAction::Id; }
- static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
+ static constexpr ClusterId GetClusterId() { return Clusters::Actions::Id; }
uint16_t actionID = static_cast<uint16_t>(0);
Optional<uint32_t> invokeID;
@@ -3888,7 +3888,7 @@
public:
// Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
static constexpr CommandId GetCommandId() { return Commands::StartActionWithDuration::Id; }
- static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
+ static constexpr ClusterId GetClusterId() { return Clusters::Actions::Id; }
uint16_t actionID = static_cast<uint16_t>(0);
Optional<uint32_t> invokeID;
@@ -3905,7 +3905,7 @@
{
public:
static constexpr CommandId GetCommandId() { return Commands::StartActionWithDuration::Id; }
- static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
+ static constexpr ClusterId GetClusterId() { return Clusters::Actions::Id; }
uint16_t actionID = static_cast<uint16_t>(0);
Optional<uint32_t> invokeID;
@@ -3925,7 +3925,7 @@
public:
// Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
static constexpr CommandId GetCommandId() { return Commands::StopAction::Id; }
- static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
+ static constexpr ClusterId GetClusterId() { return Clusters::Actions::Id; }
uint16_t actionID = static_cast<uint16_t>(0);
Optional<uint32_t> invokeID;
@@ -3941,7 +3941,7 @@
{
public:
static constexpr CommandId GetCommandId() { return Commands::StopAction::Id; }
- static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
+ static constexpr ClusterId GetClusterId() { return Clusters::Actions::Id; }
uint16_t actionID = static_cast<uint16_t>(0);
Optional<uint32_t> invokeID;
@@ -3960,7 +3960,7 @@
public:
// Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
static constexpr CommandId GetCommandId() { return Commands::PauseAction::Id; }
- static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
+ static constexpr ClusterId GetClusterId() { return Clusters::Actions::Id; }
uint16_t actionID = static_cast<uint16_t>(0);
Optional<uint32_t> invokeID;
@@ -3976,7 +3976,7 @@
{
public:
static constexpr CommandId GetCommandId() { return Commands::PauseAction::Id; }
- static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
+ static constexpr ClusterId GetClusterId() { return Clusters::Actions::Id; }
uint16_t actionID = static_cast<uint16_t>(0);
Optional<uint32_t> invokeID;
@@ -3996,7 +3996,7 @@
public:
// Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
static constexpr CommandId GetCommandId() { return Commands::PauseActionWithDuration::Id; }
- static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
+ static constexpr ClusterId GetClusterId() { return Clusters::Actions::Id; }
uint16_t actionID = static_cast<uint16_t>(0);
Optional<uint32_t> invokeID;
@@ -4013,7 +4013,7 @@
{
public:
static constexpr CommandId GetCommandId() { return Commands::PauseActionWithDuration::Id; }
- static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
+ static constexpr ClusterId GetClusterId() { return Clusters::Actions::Id; }
uint16_t actionID = static_cast<uint16_t>(0);
Optional<uint32_t> invokeID;
@@ -4033,7 +4033,7 @@
public:
// Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
static constexpr CommandId GetCommandId() { return Commands::ResumeAction::Id; }
- static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
+ static constexpr ClusterId GetClusterId() { return Clusters::Actions::Id; }
uint16_t actionID = static_cast<uint16_t>(0);
Optional<uint32_t> invokeID;
@@ -4049,7 +4049,7 @@
{
public:
static constexpr CommandId GetCommandId() { return Commands::ResumeAction::Id; }
- static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
+ static constexpr ClusterId GetClusterId() { return Clusters::Actions::Id; }
uint16_t actionID = static_cast<uint16_t>(0);
Optional<uint32_t> invokeID;
@@ -4068,7 +4068,7 @@
public:
// Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
static constexpr CommandId GetCommandId() { return Commands::EnableAction::Id; }
- static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
+ static constexpr ClusterId GetClusterId() { return Clusters::Actions::Id; }
uint16_t actionID = static_cast<uint16_t>(0);
Optional<uint32_t> invokeID;
@@ -4084,7 +4084,7 @@
{
public:
static constexpr CommandId GetCommandId() { return Commands::EnableAction::Id; }
- static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
+ static constexpr ClusterId GetClusterId() { return Clusters::Actions::Id; }
uint16_t actionID = static_cast<uint16_t>(0);
Optional<uint32_t> invokeID;
@@ -4104,7 +4104,7 @@
public:
// Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
static constexpr CommandId GetCommandId() { return Commands::EnableActionWithDuration::Id; }
- static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
+ static constexpr ClusterId GetClusterId() { return Clusters::Actions::Id; }
uint16_t actionID = static_cast<uint16_t>(0);
Optional<uint32_t> invokeID;
@@ -4121,7 +4121,7 @@
{
public:
static constexpr CommandId GetCommandId() { return Commands::EnableActionWithDuration::Id; }
- static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
+ static constexpr ClusterId GetClusterId() { return Clusters::Actions::Id; }
uint16_t actionID = static_cast<uint16_t>(0);
Optional<uint32_t> invokeID;
@@ -4141,7 +4141,7 @@
public:
// Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
static constexpr CommandId GetCommandId() { return Commands::DisableAction::Id; }
- static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
+ static constexpr ClusterId GetClusterId() { return Clusters::Actions::Id; }
uint16_t actionID = static_cast<uint16_t>(0);
Optional<uint32_t> invokeID;
@@ -4157,7 +4157,7 @@
{
public:
static constexpr CommandId GetCommandId() { return Commands::DisableAction::Id; }
- static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
+ static constexpr ClusterId GetClusterId() { return Clusters::Actions::Id; }
uint16_t actionID = static_cast<uint16_t>(0);
Optional<uint32_t> invokeID;
@@ -4177,7 +4177,7 @@
public:
// Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
static constexpr CommandId GetCommandId() { return Commands::DisableActionWithDuration::Id; }
- static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
+ static constexpr ClusterId GetClusterId() { return Clusters::Actions::Id; }
uint16_t actionID = static_cast<uint16_t>(0);
Optional<uint32_t> invokeID;
@@ -4194,7 +4194,7 @@
{
public:
static constexpr CommandId GetCommandId() { return Commands::DisableActionWithDuration::Id; }
- static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
+ static constexpr ClusterId GetClusterId() { return Clusters::Actions::Id; }
uint16_t actionID = static_cast<uint16_t>(0);
Optional<uint32_t> invokeID;
@@ -4209,72 +4209,71 @@
namespace ActionList {
struct TypeInfo
{
- using Type = chip::app::DataModel::List<const chip::app::Clusters::BridgedActions::Structs::ActionStruct::Type>;
- using DecodableType =
- chip::app::DataModel::DecodableList<chip::app::Clusters::BridgedActions::Structs::ActionStruct::DecodableType>;
+ using Type = chip::app::DataModel::List<const chip::app::Clusters::Actions::Structs::ActionStruct::Type>;
+ using DecodableType = chip::app::DataModel::DecodableList<chip::app::Clusters::Actions::Structs::ActionStruct::DecodableType>;
using DecodableArgType =
- const chip::app::DataModel::DecodableList<chip::app::Clusters::BridgedActions::Structs::ActionStruct::DecodableType> &;
+ const chip::app::DataModel::DecodableList<chip::app::Clusters::Actions::Structs::ActionStruct::DecodableType> &;
- static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
+ static constexpr ClusterId GetClusterId() { return Clusters::Actions::Id; }
static constexpr AttributeId GetAttributeId() { return Attributes::ActionList::Id; }
static constexpr bool MustUseTimedWrite() { return false; }
};
} // namespace ActionList
-namespace EndpointList {
+namespace EndpointLists {
struct TypeInfo
{
- using Type = chip::app::DataModel::List<const chip::app::Clusters::BridgedActions::Structs::EndpointListStruct::Type>;
+ using Type = chip::app::DataModel::List<const chip::app::Clusters::Actions::Structs::EndpointListStruct::Type>;
using DecodableType =
- chip::app::DataModel::DecodableList<chip::app::Clusters::BridgedActions::Structs::EndpointListStruct::DecodableType>;
- using DecodableArgType = const chip::app::DataModel::DecodableList<
- chip::app::Clusters::BridgedActions::Structs::EndpointListStruct::DecodableType> &;
+ chip::app::DataModel::DecodableList<chip::app::Clusters::Actions::Structs::EndpointListStruct::DecodableType>;
+ using DecodableArgType =
+ const chip::app::DataModel::DecodableList<chip::app::Clusters::Actions::Structs::EndpointListStruct::DecodableType> &;
- static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
- static constexpr AttributeId GetAttributeId() { return Attributes::EndpointList::Id; }
+ static constexpr ClusterId GetClusterId() { return Clusters::Actions::Id; }
+ static constexpr AttributeId GetAttributeId() { return Attributes::EndpointLists::Id; }
static constexpr bool MustUseTimedWrite() { return false; }
};
-} // namespace EndpointList
-namespace SetupUrl {
+} // namespace EndpointLists
+namespace SetupURL {
struct TypeInfo
{
using Type = chip::CharSpan;
using DecodableType = chip::CharSpan;
using DecodableArgType = chip::CharSpan;
- static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
- static constexpr AttributeId GetAttributeId() { return Attributes::SetupUrl::Id; }
+ static constexpr ClusterId GetClusterId() { return Clusters::Actions::Id; }
+ static constexpr AttributeId GetAttributeId() { return Attributes::SetupURL::Id; }
static constexpr bool MustUseTimedWrite() { return false; }
static constexpr size_t MaxLength() { return 512; }
};
-} // namespace SetupUrl
+} // namespace SetupURL
namespace GeneratedCommandList {
struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
{
- static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
+ static constexpr ClusterId GetClusterId() { return Clusters::Actions::Id; }
};
} // namespace GeneratedCommandList
namespace AcceptedCommandList {
struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
{
- static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
+ static constexpr ClusterId GetClusterId() { return Clusters::Actions::Id; }
};
} // namespace AcceptedCommandList
namespace AttributeList {
struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
{
- static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
+ static constexpr ClusterId GetClusterId() { return Clusters::Actions::Id; }
};
} // namespace AttributeList
namespace FeatureMap {
struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
{
- static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
+ static constexpr ClusterId GetClusterId() { return Clusters::Actions::Id; }
};
} // namespace FeatureMap
namespace ClusterRevision {
struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
{
- static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
+ static constexpr ClusterId GetClusterId() { return Clusters::Actions::Id; }
};
} // namespace ClusterRevision
@@ -4282,13 +4281,13 @@
{
struct DecodableType
{
- static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
+ static constexpr ClusterId GetClusterId() { return Clusters::Actions::Id; }
CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
Attributes::ActionList::TypeInfo::DecodableType actionList;
- Attributes::EndpointList::TypeInfo::DecodableType endpointList;
- Attributes::SetupUrl::TypeInfo::DecodableType setupUrl;
+ Attributes::EndpointLists::TypeInfo::DecodableType endpointLists;
+ Attributes::SetupURL::TypeInfo::DecodableType setupURL;
Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
Attributes::AttributeList::TypeInfo::DecodableType attributeList;
@@ -4313,7 +4312,7 @@
public:
static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
static constexpr EventId GetEventId() { return Events::StateChanged::Id; }
- static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
+ static constexpr ClusterId GetClusterId() { return Clusters::Actions::Id; }
static constexpr bool kIsFabricScoped = false;
uint16_t actionID = static_cast<uint16_t>(0);
@@ -4328,7 +4327,7 @@
public:
static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
static constexpr EventId GetEventId() { return Events::StateChanged::Id; }
- static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
+ static constexpr ClusterId GetClusterId() { return Clusters::Actions::Id; }
uint16_t actionID = static_cast<uint16_t>(0);
uint32_t invokeID = static_cast<uint32_t>(0);
@@ -4353,7 +4352,7 @@
public:
static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
static constexpr EventId GetEventId() { return Events::ActionFailed::Id; }
- static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
+ static constexpr ClusterId GetClusterId() { return Clusters::Actions::Id; }
static constexpr bool kIsFabricScoped = false;
uint16_t actionID = static_cast<uint16_t>(0);
@@ -4369,7 +4368,7 @@
public:
static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
static constexpr EventId GetEventId() { return Events::ActionFailed::Id; }
- static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
+ static constexpr ClusterId GetClusterId() { return Clusters::Actions::Id; }
uint16_t actionID = static_cast<uint16_t>(0);
uint32_t invokeID = static_cast<uint32_t>(0);
@@ -4380,7 +4379,7 @@
};
} // namespace ActionFailed
} // namespace Events
-} // namespace BridgedActions
+} // namespace Actions
namespace Basic {
namespace Structs {
namespace CapabilityMinimaStruct {
diff --git a/zzz_generated/app-common/app-common/zap-generated/command-id.h b/zzz_generated/app-common/app-common/zap-generated/command-id.h
index de1c7cb..ad1b446 100644
--- a/zzz_generated/app-common/app-common/zap-generated/command-id.h
+++ b/zzz_generated/app-common/app-common/zap-generated/command-id.h
@@ -88,7 +88,7 @@
#define ZCL_STOP_WITH_ON_OFF_COMMAND_ID (0x07)
#define ZCL_MOVE_TO_CLOSEST_FREQUENCY_COMMAND_ID (0x08)
-// Commands for cluster: Bridged Actions
+// Commands for cluster: Actions
#define ZCL_INSTANT_ACTION_COMMAND_ID (0x00)
#define ZCL_INSTANT_ACTION_WITH_TRANSITION_COMMAND_ID (0x01)
#define ZCL_START_ACTION_COMMAND_ID (0x02)
diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h
index 2b7e664..02c182f 100644
--- a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h
+++ b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h
@@ -533,20 +533,20 @@
} // namespace Attributes
} // namespace AccessControl
-namespace BridgedActions {
+namespace Actions {
namespace Attributes {
namespace ActionList {
static constexpr AttributeId Id = 0x00000000;
} // namespace ActionList
-namespace EndpointList {
+namespace EndpointLists {
static constexpr AttributeId Id = 0x00000001;
-} // namespace EndpointList
+} // namespace EndpointLists
-namespace SetupUrl {
+namespace SetupURL {
static constexpr AttributeId Id = 0x00000002;
-} // namespace SetupUrl
+} // namespace SetupURL
namespace GeneratedCommandList {
static constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id;
@@ -569,7 +569,7 @@
} // namespace ClusterRevision
} // namespace Attributes
-} // namespace BridgedActions
+} // namespace Actions
namespace Basic {
namespace Attributes {
diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Clusters.h b/zzz_generated/app-common/app-common/zap-generated/ids/Clusters.h
index 7954cf6..9fb0221 100644
--- a/zzz_generated/app-common/app-common/zap-generated/ids/Clusters.h
+++ b/zzz_generated/app-common/app-common/zap-generated/ids/Clusters.h
@@ -58,9 +58,9 @@
namespace AccessControl {
static constexpr ClusterId Id = 0x0000001F;
} // namespace AccessControl
-namespace BridgedActions {
+namespace Actions {
static constexpr ClusterId Id = 0x00000025;
-} // namespace BridgedActions
+} // namespace Actions
namespace Basic {
static constexpr ClusterId Id = 0x00000028;
} // namespace Basic
diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h b/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h
index 3d057d3..57d1a77 100644
--- a/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h
+++ b/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h
@@ -241,7 +241,7 @@
} // namespace Commands
} // namespace LevelControl
-namespace BridgedActions {
+namespace Actions {
namespace Commands {
namespace InstantAction {
@@ -293,7 +293,7 @@
} // namespace DisableActionWithDuration
} // namespace Commands
-} // namespace BridgedActions
+} // namespace Actions
namespace Basic {
namespace Commands {
diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Events.h b/zzz_generated/app-common/app-common/zap-generated/ids/Events.h
index f05c4ba..0304e45 100644
--- a/zzz_generated/app-common/app-common/zap-generated/ids/Events.h
+++ b/zzz_generated/app-common/app-common/zap-generated/ids/Events.h
@@ -39,7 +39,7 @@
} // namespace Events
} // namespace AccessControl
-namespace BridgedActions {
+namespace Actions {
namespace Events {
namespace StateChanged {
@@ -51,7 +51,7 @@
} // namespace ActionFailed
} // namespace Events
-} // namespace BridgedActions
+} // namespace Actions
namespace Basic {
namespace Events {
diff --git a/zzz_generated/app-common/app-common/zap-generated/print-cluster.h b/zzz_generated/app-common/app-common/zap-generated/print-cluster.h
index c021979..f3c9e80 100644
--- a/zzz_generated/app-common/app-common/zap-generated/print-cluster.h
+++ b/zzz_generated/app-common/app-common/zap-generated/print-cluster.h
@@ -90,10 +90,10 @@
#define CHIP_PRINTCLUSTER_ACCESS_CONTROL_CLUSTER
#endif
-#if defined(ZCL_USING_BRIDGED_ACTIONS_CLUSTER_SERVER) || defined(ZCL_USING_BRIDGED_ACTIONS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BRIDGED_ACTIONS_CLUSTER { ZCL_BRIDGED_ACTIONS_CLUSTER_ID, "Bridged Actions" },
+#if defined(ZCL_USING_ACTIONS_CLUSTER_SERVER) || defined(ZCL_USING_ACTIONS_CLUSTER_CLIENT)
+#define CHIP_PRINTCLUSTER_ACTIONS_CLUSTER { ZCL_ACTIONS_CLUSTER_ID, "Actions" },
#else
-#define CHIP_PRINTCLUSTER_BRIDGED_ACTIONS_CLUSTER
+#define CHIP_PRINTCLUSTER_ACTIONS_CLUSTER
#endif
#if defined(ZCL_USING_BASIC_CLUSTER_SERVER) || defined(ZCL_USING_BASIC_CLUSTER_CLIENT)
@@ -464,7 +464,7 @@
CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER \
CHIP_PRINTCLUSTER_BINDING_CLUSTER \
CHIP_PRINTCLUSTER_ACCESS_CONTROL_CLUSTER \
- CHIP_PRINTCLUSTER_BRIDGED_ACTIONS_CLUSTER \
+ CHIP_PRINTCLUSTER_ACTIONS_CLUSTER \
CHIP_PRINTCLUSTER_BASIC_CLUSTER \
CHIP_PRINTCLUSTER_OTA_PROVIDER_CLUSTER \
CHIP_PRINTCLUSTER_OTA_REQUESTOR_CLUSTER \
diff --git a/zzz_generated/bridge-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/bridge-app/zap-generated/IMClusterCommandHandler.cpp
index 198b568..1fb8004 100644
--- a/zzz_generated/bridge-app/zap-generated/IMClusterCommandHandler.cpp
+++ b/zzz_generated/bridge-app/zap-generated/IMClusterCommandHandler.cpp
@@ -41,6 +41,43 @@
namespace Clusters {
+namespace Actions {
+
+void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
+{
+ CHIP_ERROR TLVError = CHIP_NO_ERROR;
+ bool wasHandled = false;
+ {
+ switch (aCommandPath.mCommandId)
+ {
+ case Commands::InstantAction::Id: {
+ Commands::InstantAction::DecodableType commandData;
+ TLVError = DataModel::Decode(aDataTlv, commandData);
+ if (TLVError == CHIP_NO_ERROR)
+ {
+ wasHandled = emberAfActionsClusterInstantActionCallback(apCommandObj, aCommandPath, commandData);
+ }
+ break;
+ }
+ default: {
+ // Unrecognized command ID, error status will apply.
+ apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
+ ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
+ ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
+ return;
+ }
+ }
+ }
+
+ if (CHIP_NO_ERROR != TLVError || !wasHandled)
+ {
+ apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
+ ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
+ }
+}
+
+} // namespace Actions
+
namespace AdministratorCommissioning {
void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -99,43 +136,6 @@
} // namespace AdministratorCommissioning
-namespace BridgedActions {
-
-void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
-{
- CHIP_ERROR TLVError = CHIP_NO_ERROR;
- bool wasHandled = false;
- {
- switch (aCommandPath.mCommandId)
- {
- case Commands::InstantAction::Id: {
- Commands::InstantAction::DecodableType commandData;
- TLVError = DataModel::Decode(aDataTlv, commandData);
- if (TLVError == CHIP_NO_ERROR)
- {
- wasHandled = emberAfBridgedActionsClusterInstantActionCallback(apCommandObj, aCommandPath, commandData);
- }
- break;
- }
- default: {
- // Unrecognized command ID, error status will apply.
- apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);
- ChipLogError(Zcl, "Unknown command " ChipLogFormatMEI " for cluster " ChipLogFormatMEI,
- ChipLogValueMEI(aCommandPath.mCommandId), ChipLogValueMEI(aCommandPath.mClusterId));
- return;
- }
- }
- }
-
- if (CHIP_NO_ERROR != TLVError || !wasHandled)
- {
- apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::InvalidCommand);
- ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, TLVError.Format());
- }
-}
-
-} // namespace BridgedActions
-
namespace DiagnosticLogs {
void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv)
@@ -763,12 +763,12 @@
switch (aCommandPath.mClusterId)
{
+ case Clusters::Actions::Id:
+ Clusters::Actions::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
+ break;
case Clusters::AdministratorCommissioning::Id:
Clusters::AdministratorCommissioning::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
break;
- case Clusters::BridgedActions::Id:
- Clusters::BridgedActions::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
- break;
case Clusters::DiagnosticLogs::Id:
Clusters::DiagnosticLogs::DispatchServerCommand(apCommandObj, aCommandPath, aReader);
break;
diff --git a/zzz_generated/bridge-app/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/bridge-app/zap-generated/PluginApplicationCallbacks.h
index 338a775..f0368e6 100644
--- a/zzz_generated/bridge-app/zap-generated/PluginApplicationCallbacks.h
+++ b/zzz_generated/bridge-app/zap-generated/PluginApplicationCallbacks.h
@@ -29,7 +29,7 @@
MatterBindingPluginClientInitCallback(); \
MatterAccessControlPluginClientInitCallback(); \
MatterAccessControlPluginServerInitCallback(); \
- MatterBridgedActionsPluginServerInitCallback(); \
+ MatterActionsPluginServerInitCallback(); \
MatterBasicPluginServerInitCallback(); \
MatterLocalizationConfigurationPluginServerInitCallback(); \
MatterTimeFormatLocalizationPluginServerInitCallback(); \
diff --git a/zzz_generated/bridge-app/zap-generated/callback-stub.cpp b/zzz_generated/bridge-app/zap-generated/callback-stub.cpp
index 65af89d..d8149a4 100644
--- a/zzz_generated/bridge-app/zap-generated/callback-stub.cpp
+++ b/zzz_generated/bridge-app/zap-generated/callback-stub.cpp
@@ -32,6 +32,9 @@
case ZCL_ACCESS_CONTROL_CLUSTER_ID:
emberAfAccessControlClusterInitCallback(endpoint);
break;
+ case ZCL_ACTIONS_CLUSTER_ID:
+ emberAfActionsClusterInitCallback(endpoint);
+ break;
case ZCL_ADMINISTRATOR_COMMISSIONING_CLUSTER_ID:
emberAfAdministratorCommissioningClusterInitCallback(endpoint);
break;
@@ -41,9 +44,6 @@
case ZCL_BINDING_CLUSTER_ID:
emberAfBindingClusterInitCallback(endpoint);
break;
- case ZCL_BRIDGED_ACTIONS_CLUSTER_ID:
- emberAfBridgedActionsClusterInitCallback(endpoint);
- break;
case ZCL_DESCRIPTOR_CLUSTER_ID:
emberAfDescriptorClusterInitCallback(endpoint);
break;
@@ -115,6 +115,11 @@
// To prevent warning
(void) endpoint;
}
+void __attribute__((weak)) emberAfActionsClusterInitCallback(EndpointId endpoint)
+{
+ // To prevent warning
+ (void) endpoint;
+}
void __attribute__((weak)) emberAfAdministratorCommissioningClusterInitCallback(EndpointId endpoint)
{
// To prevent warning
@@ -130,11 +135,6 @@
// To prevent warning
(void) endpoint;
}
-void __attribute__((weak)) emberAfBridgedActionsClusterInitCallback(EndpointId endpoint)
-{
- // To prevent warning
- (void) endpoint;
-}
void __attribute__((weak)) emberAfDescriptorClusterInitCallback(EndpointId endpoint)
{
// To prevent warning
diff --git a/zzz_generated/bridge-app/zap-generated/endpoint_config.h b/zzz_generated/bridge-app/zap-generated/endpoint_config.h
index e11b58e..793c4b8 100644
--- a/zzz_generated/bridge-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/bridge-app/zap-generated/endpoint_config.h
@@ -39,9 +39,9 @@
/* 6 - Breadcrumb, */ \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
- /* Endpoint: 1, Cluster: Bridged Actions (server), big-endian */ \
+ /* Endpoint: 1, Cluster: Actions (server), big-endian */ \
\
- /* 14 - setup url, */ \
+ /* 14 - SetupURL, */ \
19, 0, 'h', 't', 't', 'p', 's', ':', '/', '/', 'e', 'x', 'a', 'm', 'p', 'l', 'e', '.', 'c', 'o', 'm', \
}
@@ -59,9 +59,9 @@
/* 6 - Breadcrumb, */ \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
\
- /* Endpoint: 1, Cluster: Bridged Actions (server), little-endian */ \
+ /* Endpoint: 1, Cluster: Actions (server), little-endian */ \
\
- /* 14 - setup url, */ \
+ /* 14 - SetupURL, */ \
19, 0, 'h', 't', 't', 'p', 's', ':', '/', '/', 'e', 'x', 'a', 'm', 'p', 'l', 'e', '.', 'c', 'o', 'm', \
}
@@ -455,10 +455,10 @@
{ 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \
\
- /* Endpoint: 1, Cluster: Bridged Actions (server) */ \
- { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* action list */ \
- { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* endpoint list */ \
- { 0x00000002, ZAP_TYPE(LONG_CHAR_STRING), 514, 0, ZAP_LONG_DEFAULTS_INDEX(14) }, /* setup url */ \
+ /* Endpoint: 1, Cluster: Actions (server) */ \
+ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActionList */ \
+ { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* EndpointLists */ \
+ { 0x00000002, ZAP_TYPE(LONG_CHAR_STRING), 514, 0, ZAP_LONG_DEFAULTS_INDEX(14) }, /* SetupURL */ \
{ 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \
\
@@ -631,7 +631,7 @@
0x00000000 /* Identify */, \
0x00000040 /* TriggerEffect */, \
chip::kInvalidCommandId /* end of list */, \
- /* Endpoint: 1, Cluster: Bridged Actions (server) */\
+ /* Endpoint: 1, Cluster: Actions (server) */\
/* AcceptedCommandList (index=57) */ \
0x00000000 /* InstantAction */, \
chip::kInvalidCommandId /* end of list */, \
@@ -904,7 +904,7 @@
.generatedCommandList = nullptr ,\
},\
{ \
- /* Endpoint: 1, Cluster: Bridged Actions (server) */ \
+ /* Endpoint: 1, Cluster: Actions (server) */ \
.clusterId = 0x00000025, \
.attributes = ZAP_ATTRIBUTE_INDEX(206), \
.attributeCount = 5, \
diff --git a/zzz_generated/bridge-app/zap-generated/gen_config.h b/zzz_generated/bridge-app/zap-generated/gen_config.h
index cf6bed3..f675999 100644
--- a/zzz_generated/bridge-app/zap-generated/gen_config.h
+++ b/zzz_generated/bridge-app/zap-generated/gen_config.h
@@ -36,7 +36,7 @@
#define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
#define EMBER_AF_ACCESS_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
#define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BRIDGED_ACTIONS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ACTIONS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1)
#define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
#define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
@@ -95,10 +95,10 @@
#define EMBER_AF_PLUGIN_ACCESS_CONTROL_SERVER
#define EMBER_AF_PLUGIN_ACCESS_CONTROL
-// Use this macro to check if the server side of the Bridged Actions cluster is included
-#define ZCL_USING_BRIDGED_ACTIONS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_BRIDGED_ACTIONS_SERVER
-#define EMBER_AF_PLUGIN_BRIDGED_ACTIONS
+// Use this macro to check if the server side of the Actions cluster is included
+#define ZCL_USING_ACTIONS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ACTIONS_SERVER
+#define EMBER_AF_PLUGIN_ACTIONS
// Use this macro to check if the server side of the Basic cluster is included
#define ZCL_USING_BASIC_CLUSTER_SERVER
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
index dfec5c8..a460a48 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
@@ -44,7 +44,7 @@
| Descriptor | 0x001D |
| Binding | 0x001E |
| AccessControl | 0x001F |
-| BridgedActions | 0x0025 |
+| Actions | 0x0025 |
| Basic | 0x0028 |
| OtaSoftwareUpdateProvider | 0x0029 |
| OtaSoftwareUpdateRequestor | 0x002A |
@@ -1399,7 +1399,7 @@
\*----------------------------------------------------------------------------*/
/*----------------------------------------------------------------------------*\
-| Cluster BridgedActions | 0x0025 |
+| Cluster Actions | 0x0025 |
|------------------------------------------------------------------------------|
| Commands: | |
| * InstantAction | 0x00 |
@@ -1417,8 +1417,8 @@
|------------------------------------------------------------------------------|
| Attributes: | |
| * ActionList | 0x0000 |
-| * EndpointList | 0x0001 |
-| * SetupUrl | 0x0002 |
+| * EndpointLists | 0x0001 |
+| * SetupURL | 0x0002 |
| * GeneratedCommandList | 0xFFF8 |
| * AcceptedCommandList | 0xFFF9 |
| * AttributeList | 0xFFFB |
@@ -1433,10 +1433,10 @@
/*
* Command InstantAction
*/
-class BridgedActionsInstantAction : public ClusterCommand
+class ActionsInstantAction : public ClusterCommand
{
public:
- BridgedActionsInstantAction(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("instant-action", credsIssuerConfig)
+ ActionsInstantAction(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("instant-action", credsIssuerConfig)
{
AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
AddArgument("InvokeID", 0, UINT32_MAX, &mRequest.invokeID);
@@ -1458,16 +1458,16 @@
}
private:
- chip::app::Clusters::BridgedActions::Commands::InstantAction::Type mRequest;
+ chip::app::Clusters::Actions::Commands::InstantAction::Type mRequest;
};
/*
* Command InstantActionWithTransition
*/
-class BridgedActionsInstantActionWithTransition : public ClusterCommand
+class ActionsInstantActionWithTransition : public ClusterCommand
{
public:
- BridgedActionsInstantActionWithTransition(CredentialIssuerCommands * credsIssuerConfig) :
+ ActionsInstantActionWithTransition(CredentialIssuerCommands * credsIssuerConfig) :
ClusterCommand("instant-action-with-transition", credsIssuerConfig)
{
AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
@@ -1491,16 +1491,16 @@
}
private:
- chip::app::Clusters::BridgedActions::Commands::InstantActionWithTransition::Type mRequest;
+ chip::app::Clusters::Actions::Commands::InstantActionWithTransition::Type mRequest;
};
/*
* Command StartAction
*/
-class BridgedActionsStartAction : public ClusterCommand
+class ActionsStartAction : public ClusterCommand
{
public:
- BridgedActionsStartAction(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("start-action", credsIssuerConfig)
+ ActionsStartAction(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("start-action", credsIssuerConfig)
{
AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
AddArgument("InvokeID", 0, UINT32_MAX, &mRequest.invokeID);
@@ -1522,16 +1522,16 @@
}
private:
- chip::app::Clusters::BridgedActions::Commands::StartAction::Type mRequest;
+ chip::app::Clusters::Actions::Commands::StartAction::Type mRequest;
};
/*
* Command StartActionWithDuration
*/
-class BridgedActionsStartActionWithDuration : public ClusterCommand
+class ActionsStartActionWithDuration : public ClusterCommand
{
public:
- BridgedActionsStartActionWithDuration(CredentialIssuerCommands * credsIssuerConfig) :
+ ActionsStartActionWithDuration(CredentialIssuerCommands * credsIssuerConfig) :
ClusterCommand("start-action-with-duration", credsIssuerConfig)
{
AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
@@ -1555,16 +1555,16 @@
}
private:
- chip::app::Clusters::BridgedActions::Commands::StartActionWithDuration::Type mRequest;
+ chip::app::Clusters::Actions::Commands::StartActionWithDuration::Type mRequest;
};
/*
* Command StopAction
*/
-class BridgedActionsStopAction : public ClusterCommand
+class ActionsStopAction : public ClusterCommand
{
public:
- BridgedActionsStopAction(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("stop-action", credsIssuerConfig)
+ ActionsStopAction(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("stop-action", credsIssuerConfig)
{
AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
AddArgument("InvokeID", 0, UINT32_MAX, &mRequest.invokeID);
@@ -1586,16 +1586,16 @@
}
private:
- chip::app::Clusters::BridgedActions::Commands::StopAction::Type mRequest;
+ chip::app::Clusters::Actions::Commands::StopAction::Type mRequest;
};
/*
* Command PauseAction
*/
-class BridgedActionsPauseAction : public ClusterCommand
+class ActionsPauseAction : public ClusterCommand
{
public:
- BridgedActionsPauseAction(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("pause-action", credsIssuerConfig)
+ ActionsPauseAction(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("pause-action", credsIssuerConfig)
{
AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
AddArgument("InvokeID", 0, UINT32_MAX, &mRequest.invokeID);
@@ -1617,16 +1617,16 @@
}
private:
- chip::app::Clusters::BridgedActions::Commands::PauseAction::Type mRequest;
+ chip::app::Clusters::Actions::Commands::PauseAction::Type mRequest;
};
/*
* Command PauseActionWithDuration
*/
-class BridgedActionsPauseActionWithDuration : public ClusterCommand
+class ActionsPauseActionWithDuration : public ClusterCommand
{
public:
- BridgedActionsPauseActionWithDuration(CredentialIssuerCommands * credsIssuerConfig) :
+ ActionsPauseActionWithDuration(CredentialIssuerCommands * credsIssuerConfig) :
ClusterCommand("pause-action-with-duration", credsIssuerConfig)
{
AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
@@ -1650,16 +1650,16 @@
}
private:
- chip::app::Clusters::BridgedActions::Commands::PauseActionWithDuration::Type mRequest;
+ chip::app::Clusters::Actions::Commands::PauseActionWithDuration::Type mRequest;
};
/*
* Command ResumeAction
*/
-class BridgedActionsResumeAction : public ClusterCommand
+class ActionsResumeAction : public ClusterCommand
{
public:
- BridgedActionsResumeAction(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("resume-action", credsIssuerConfig)
+ ActionsResumeAction(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("resume-action", credsIssuerConfig)
{
AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
AddArgument("InvokeID", 0, UINT32_MAX, &mRequest.invokeID);
@@ -1681,16 +1681,16 @@
}
private:
- chip::app::Clusters::BridgedActions::Commands::ResumeAction::Type mRequest;
+ chip::app::Clusters::Actions::Commands::ResumeAction::Type mRequest;
};
/*
* Command EnableAction
*/
-class BridgedActionsEnableAction : public ClusterCommand
+class ActionsEnableAction : public ClusterCommand
{
public:
- BridgedActionsEnableAction(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("enable-action", credsIssuerConfig)
+ ActionsEnableAction(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("enable-action", credsIssuerConfig)
{
AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
AddArgument("InvokeID", 0, UINT32_MAX, &mRequest.invokeID);
@@ -1712,16 +1712,16 @@
}
private:
- chip::app::Clusters::BridgedActions::Commands::EnableAction::Type mRequest;
+ chip::app::Clusters::Actions::Commands::EnableAction::Type mRequest;
};
/*
* Command EnableActionWithDuration
*/
-class BridgedActionsEnableActionWithDuration : public ClusterCommand
+class ActionsEnableActionWithDuration : public ClusterCommand
{
public:
- BridgedActionsEnableActionWithDuration(CredentialIssuerCommands * credsIssuerConfig) :
+ ActionsEnableActionWithDuration(CredentialIssuerCommands * credsIssuerConfig) :
ClusterCommand("enable-action-with-duration", credsIssuerConfig)
{
AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
@@ -1745,16 +1745,16 @@
}
private:
- chip::app::Clusters::BridgedActions::Commands::EnableActionWithDuration::Type mRequest;
+ chip::app::Clusters::Actions::Commands::EnableActionWithDuration::Type mRequest;
};
/*
* Command DisableAction
*/
-class BridgedActionsDisableAction : public ClusterCommand
+class ActionsDisableAction : public ClusterCommand
{
public:
- BridgedActionsDisableAction(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("disable-action", credsIssuerConfig)
+ ActionsDisableAction(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("disable-action", credsIssuerConfig)
{
AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
AddArgument("InvokeID", 0, UINT32_MAX, &mRequest.invokeID);
@@ -1776,16 +1776,16 @@
}
private:
- chip::app::Clusters::BridgedActions::Commands::DisableAction::Type mRequest;
+ chip::app::Clusters::Actions::Commands::DisableAction::Type mRequest;
};
/*
* Command DisableActionWithDuration
*/
-class BridgedActionsDisableActionWithDuration : public ClusterCommand
+class ActionsDisableActionWithDuration : public ClusterCommand
{
public:
- BridgedActionsDisableActionWithDuration(CredentialIssuerCommands * credsIssuerConfig) :
+ ActionsDisableActionWithDuration(CredentialIssuerCommands * credsIssuerConfig) :
ClusterCommand("disable-action-with-duration", credsIssuerConfig)
{
AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
@@ -1809,7 +1809,7 @@
}
private:
- chip::app::Clusters::BridgedActions::Commands::DisableActionWithDuration::Type mRequest;
+ chip::app::Clusters::Actions::Commands::DisableActionWithDuration::Type mRequest;
};
/*----------------------------------------------------------------------------*\
@@ -8680,36 +8680,36 @@
commands.Register(clusterName, clusterCommands);
}
-void registerClusterBridgedActions(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+void registerClusterActions(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
- using namespace chip::app::Clusters::BridgedActions;
+ using namespace chip::app::Clusters::Actions;
- const char * clusterName = "BridgedActions";
+ const char * clusterName = "Actions";
commands_list clusterCommands = {
//
// Commands
//
- make_unique<ClusterCommand>(Id, credsIssuerConfig), //
- make_unique<BridgedActionsInstantAction>(credsIssuerConfig), //
- make_unique<BridgedActionsInstantActionWithTransition>(credsIssuerConfig), //
- make_unique<BridgedActionsStartAction>(credsIssuerConfig), //
- make_unique<BridgedActionsStartActionWithDuration>(credsIssuerConfig), //
- make_unique<BridgedActionsStopAction>(credsIssuerConfig), //
- make_unique<BridgedActionsPauseAction>(credsIssuerConfig), //
- make_unique<BridgedActionsPauseActionWithDuration>(credsIssuerConfig), //
- make_unique<BridgedActionsResumeAction>(credsIssuerConfig), //
- make_unique<BridgedActionsEnableAction>(credsIssuerConfig), //
- make_unique<BridgedActionsEnableActionWithDuration>(credsIssuerConfig), //
- make_unique<BridgedActionsDisableAction>(credsIssuerConfig), //
- make_unique<BridgedActionsDisableActionWithDuration>(credsIssuerConfig), //
+ make_unique<ClusterCommand>(Id, credsIssuerConfig), //
+ make_unique<ActionsInstantAction>(credsIssuerConfig), //
+ make_unique<ActionsInstantActionWithTransition>(credsIssuerConfig), //
+ make_unique<ActionsStartAction>(credsIssuerConfig), //
+ make_unique<ActionsStartActionWithDuration>(credsIssuerConfig), //
+ make_unique<ActionsStopAction>(credsIssuerConfig), //
+ make_unique<ActionsPauseAction>(credsIssuerConfig), //
+ make_unique<ActionsPauseActionWithDuration>(credsIssuerConfig), //
+ make_unique<ActionsResumeAction>(credsIssuerConfig), //
+ make_unique<ActionsEnableAction>(credsIssuerConfig), //
+ make_unique<ActionsEnableActionWithDuration>(credsIssuerConfig), //
+ make_unique<ActionsDisableAction>(credsIssuerConfig), //
+ make_unique<ActionsDisableActionWithDuration>(credsIssuerConfig), //
//
// Attributes
//
make_unique<ReadAttribute>(Id, credsIssuerConfig), //
make_unique<ReadAttribute>(Id, "action-list", Attributes::ActionList::Id, credsIssuerConfig), //
- make_unique<ReadAttribute>(Id, "endpoint-list", Attributes::EndpointList::Id, credsIssuerConfig), //
- make_unique<ReadAttribute>(Id, "setup-url", Attributes::SetupUrl::Id, credsIssuerConfig), //
+ make_unique<ReadAttribute>(Id, "endpoint-lists", Attributes::EndpointLists::Id, credsIssuerConfig), //
+ make_unique<ReadAttribute>(Id, "setup-url", Attributes::SetupURL::Id, credsIssuerConfig), //
make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), //
make_unique<ReadAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), //
@@ -8718,8 +8718,8 @@
make_unique<WriteAttribute<>>(Id, credsIssuerConfig), //
make_unique<SubscribeAttribute>(Id, credsIssuerConfig), //
make_unique<SubscribeAttribute>(Id, "action-list", Attributes::ActionList::Id, credsIssuerConfig), //
- make_unique<SubscribeAttribute>(Id, "endpoint-list", Attributes::EndpointList::Id, credsIssuerConfig), //
- make_unique<SubscribeAttribute>(Id, "setup-url", Attributes::SetupUrl::Id, credsIssuerConfig), //
+ make_unique<SubscribeAttribute>(Id, "endpoint-lists", Attributes::EndpointLists::Id, credsIssuerConfig), //
+ make_unique<SubscribeAttribute>(Id, "setup-url", Attributes::SetupURL::Id, credsIssuerConfig), //
make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), //
make_unique<SubscribeAttribute>(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), //
@@ -13164,7 +13164,7 @@
registerClusterDescriptor(commands, credsIssuerConfig);
registerClusterBinding(commands, credsIssuerConfig);
registerClusterAccessControl(commands, credsIssuerConfig);
- registerClusterBridgedActions(commands, credsIssuerConfig);
+ registerClusterActions(commands, credsIssuerConfig);
registerClusterBasic(commands, credsIssuerConfig);
registerClusterOtaSoftwareUpdateProvider(commands, credsIssuerConfig);
registerClusterOtaSoftwareUpdateRequestor(commands, credsIssuerConfig);
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp
index 3098988..de1b574 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp
@@ -64,8 +64,7 @@
ComplexArgumentParser::Finalize(request.targets);
ComplexArgumentParser::Finalize(request.fabricIndex);
}
-CHIP_ERROR ComplexArgumentParser::Setup(const char * label,
- chip::app::Clusters::BridgedActions::Structs::ActionStruct::Type & request,
+CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters::Actions::Structs::ActionStruct::Type & request,
Json::Value & value)
{
VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT);
@@ -77,7 +76,7 @@
value.isMember("endpointListID")));
ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("ActionStruct.supportedCommands", "supportedCommands",
value.isMember("supportedCommands")));
- ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("ActionStruct.status", "status", value.isMember("status")));
+ ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("ActionStruct.state", "state", value.isMember("state")));
char labelWithMember[kMaxLabelLength];
snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "actionID");
@@ -95,20 +94,20 @@
snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "supportedCommands");
ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.supportedCommands, value["supportedCommands"]));
- snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "status");
- ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.status, value["status"]));
+ snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "state");
+ ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.state, value["state"]));
return CHIP_NO_ERROR;
}
-void ComplexArgumentParser::Finalize(chip::app::Clusters::BridgedActions::Structs::ActionStruct::Type & request)
+void ComplexArgumentParser::Finalize(chip::app::Clusters::Actions::Structs::ActionStruct::Type & request)
{
ComplexArgumentParser::Finalize(request.actionID);
ComplexArgumentParser::Finalize(request.name);
ComplexArgumentParser::Finalize(request.type);
ComplexArgumentParser::Finalize(request.endpointListID);
ComplexArgumentParser::Finalize(request.supportedCommands);
- ComplexArgumentParser::Finalize(request.status);
+ ComplexArgumentParser::Finalize(request.state);
}
CHIP_ERROR ComplexArgumentParser::Setup(const char * label,
chip::app::Clusters::ContentLauncher::Structs::AdditionalInfo::Type & request,
@@ -568,7 +567,7 @@
ComplexArgumentParser::Finalize(request.a);
}
CHIP_ERROR ComplexArgumentParser::Setup(const char * label,
- chip::app::Clusters::BridgedActions::Structs::EndpointListStruct::Type & request,
+ chip::app::Clusters::Actions::Structs::EndpointListStruct::Type & request,
Json::Value & value)
{
VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT);
@@ -596,7 +595,7 @@
return CHIP_NO_ERROR;
}
-void ComplexArgumentParser::Finalize(chip::app::Clusters::BridgedActions::Structs::EndpointListStruct::Type & request)
+void ComplexArgumentParser::Finalize(chip::app::Clusters::Actions::Structs::EndpointListStruct::Type & request)
{
ComplexArgumentParser::Finalize(request.endpointListID);
ComplexArgumentParser::Finalize(request.name);
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h
index 026c9e0..f0aad84 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h
+++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h
@@ -21,10 +21,10 @@
Json::Value & value);
static void Finalize(chip::app::Clusters::AccessControl::Structs::AccessControlEntry::Type & request);
-static CHIP_ERROR Setup(const char * label, chip::app::Clusters::BridgedActions::Structs::ActionStruct::Type & request,
+static CHIP_ERROR Setup(const char * label, chip::app::Clusters::Actions::Structs::ActionStruct::Type & request,
Json::Value & value);
-static void Finalize(chip::app::Clusters::BridgedActions::Structs::ActionStruct::Type & request);
+static void Finalize(chip::app::Clusters::Actions::Structs::ActionStruct::Type & request);
static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ContentLauncher::Structs::AdditionalInfo::Type & request,
Json::Value & value);
@@ -91,10 +91,10 @@
Json::Value & value);
static void Finalize(chip::app::Clusters::TestCluster::Structs::DoubleNestedStructList::Type & request);
-static CHIP_ERROR Setup(const char * label, chip::app::Clusters::BridgedActions::Structs::EndpointListStruct::Type & request,
+static CHIP_ERROR Setup(const char * label, chip::app::Clusters::Actions::Structs::EndpointListStruct::Type & request,
Json::Value & value);
-static void Finalize(chip::app::Clusters::BridgedActions::Structs::EndpointListStruct::Type & request);
+static void Finalize(chip::app::Clusters::Actions::Structs::EndpointListStruct::Type & request);
static CHIP_ERROR Setup(const char * label, chip::app::Clusters::AccessControl::Structs::ExtensionEntry::Type & request,
Json::Value & value);
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
index d629460..71078e7 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
@@ -70,7 +70,7 @@
return CHIP_NO_ERROR;
}
CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
- const chip::app::Clusters::BridgedActions::Structs::ActionStruct::DecodableType & value)
+ const chip::app::Clusters::Actions::Structs::ActionStruct::DecodableType & value)
{
DataModelLogger::LogString(label, indent, "{");
{
@@ -114,10 +114,10 @@
}
}
{
- CHIP_ERROR err = LogValue("Status", indent + 1, value.status);
+ CHIP_ERROR err = LogValue("State", indent + 1, value.state);
if (err != CHIP_NO_ERROR)
{
- DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Status'");
+ DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'State'");
return err;
}
}
@@ -562,7 +562,7 @@
return CHIP_NO_ERROR;
}
CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
- const chip::app::Clusters::BridgedActions::Structs::EndpointListStruct::DecodableType & value)
+ const chip::app::Clusters::Actions::Structs::EndpointListStruct::DecodableType & value)
{
DataModelLogger::LogString(label, indent, "{");
{
@@ -2441,8 +2441,7 @@
return CHIP_NO_ERROR;
}
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
- const BridgedActions::Events::StateChanged::DecodableType & value)
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const Actions::Events::StateChanged::DecodableType & value)
{
DataModelLogger::LogString(label, indent, "{");
{
@@ -2473,8 +2472,7 @@
return CHIP_NO_ERROR;
}
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
- const BridgedActions::Events::ActionFailed::DecodableType & value)
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const Actions::Events::ActionFailed::DecodableType & value)
{
DataModelLogger::LogString(label, indent, "{");
{
@@ -4655,46 +4653,45 @@
}
break;
}
- case BridgedActions::Id: {
+ case Actions::Id: {
switch (path.mAttributeId)
{
- case BridgedActions::Attributes::ActionList::Id: {
- chip::app::DataModel::DecodableList<chip::app::Clusters::BridgedActions::Structs::ActionStruct::DecodableType> value;
+ case Actions::Attributes::ActionList::Id: {
+ chip::app::DataModel::DecodableList<chip::app::Clusters::Actions::Structs::ActionStruct::DecodableType> value;
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
- return DataModelLogger::LogValue("action list", 1, value);
+ return DataModelLogger::LogValue("ActionList", 1, value);
}
- case BridgedActions::Attributes::EndpointList::Id: {
- chip::app::DataModel::DecodableList<chip::app::Clusters::BridgedActions::Structs::EndpointListStruct::DecodableType>
- value;
+ case Actions::Attributes::EndpointLists::Id: {
+ chip::app::DataModel::DecodableList<chip::app::Clusters::Actions::Structs::EndpointListStruct::DecodableType> value;
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
- return DataModelLogger::LogValue("endpoint list", 1, value);
+ return DataModelLogger::LogValue("EndpointLists", 1, value);
}
- case BridgedActions::Attributes::SetupUrl::Id: {
+ case Actions::Attributes::SetupURL::Id: {
chip::CharSpan value;
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
- return DataModelLogger::LogValue("setup url", 1, value);
+ return DataModelLogger::LogValue("SetupURL", 1, value);
}
- case BridgedActions::Attributes::GeneratedCommandList::Id: {
+ case Actions::Attributes::GeneratedCommandList::Id: {
chip::app::DataModel::DecodableList<chip::CommandId> value;
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
return DataModelLogger::LogValue("GeneratedCommandList", 1, value);
}
- case BridgedActions::Attributes::AcceptedCommandList::Id: {
+ case Actions::Attributes::AcceptedCommandList::Id: {
chip::app::DataModel::DecodableList<chip::CommandId> value;
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
return DataModelLogger::LogValue("AcceptedCommandList", 1, value);
}
- case BridgedActions::Attributes::AttributeList::Id: {
+ case Actions::Attributes::AttributeList::Id: {
chip::app::DataModel::DecodableList<chip::AttributeId> value;
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
return DataModelLogger::LogValue("AttributeList", 1, value);
}
- case BridgedActions::Attributes::FeatureMap::Id: {
+ case Actions::Attributes::FeatureMap::Id: {
uint32_t value;
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
return DataModelLogger::LogValue("FeatureMap", 1, value);
}
- case BridgedActions::Attributes::ClusterRevision::Id: {
+ case Actions::Attributes::ClusterRevision::Id: {
uint16_t value;
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -10400,16 +10397,16 @@
}
break;
}
- case BridgedActions::Id: {
+ case Actions::Id: {
switch (header.mPath.mEventId)
{
- case BridgedActions::Events::StateChanged::Id: {
- chip::app::Clusters::BridgedActions::Events::StateChanged::DecodableType value;
+ case Actions::Events::StateChanged::Id: {
+ chip::app::Clusters::Actions::Events::StateChanged::DecodableType value;
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
return DataModelLogger::LogValue("StateChanged", 1, value);
}
- case BridgedActions::Events::ActionFailed::Id: {
- chip::app::Clusters::BridgedActions::Events::ActionFailed::DecodableType value;
+ case Actions::Events::ActionFailed::Id: {
+ chip::app::Clusters::Actions::Events::ActionFailed::DecodableType value;
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
return DataModelLogger::LogValue("ActionFailed", 1, value);
}
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h
index 193804f..6eaf6cb 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h
@@ -20,7 +20,7 @@
static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::AccessControl::Structs::AccessControlEntry::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent,
- const chip::app::Clusters::BridgedActions::Structs::ActionStruct::DecodableType & value);
+ const chip::app::Clusters::Actions::Structs::ActionStruct::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::ContentLauncher::Structs::AdditionalInfo::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent,
@@ -55,7 +55,7 @@
static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::TestCluster::Structs::DoubleNestedStructList::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent,
- const chip::app::Clusters::BridgedActions::Structs::EndpointListStruct::DecodableType & value);
+ const chip::app::Clusters::Actions::Structs::EndpointListStruct::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::AccessControl::Structs::ExtensionEntry::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent,
@@ -139,9 +139,9 @@
static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::AccessControl::Events::AccessControlExtensionChanged::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent,
- const chip::app::Clusters::BridgedActions::Events::StateChanged::DecodableType & value);
+ const chip::app::Clusters::Actions::Events::StateChanged::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent,
- const chip::app::Clusters::BridgedActions::Events::ActionFailed::DecodableType & value);
+ const chip::app::Clusters::Actions::Events::ActionFailed::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::Basic::Events::StartUp::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent,
diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h
index a585dd3..bbf5c2f 100644
--- a/zzz_generated/chip-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h
@@ -2248,34 +2248,34 @@
}
case 1: {
LogStep(1, "Read the global attribute: ClusterRevision");
- return ReadAttribute(kIdentityAlpha, GetEndpoint(1), BridgedActions::Id,
- BridgedActions::Attributes::ClusterRevision::Id, true, chip::NullOptional);
+ return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Actions::Id, Actions::Attributes::ClusterRevision::Id, true,
+ chip::NullOptional);
}
case 2: {
LogStep(2, "Read the global attribute: FeatureMap");
- return ReadAttribute(kIdentityAlpha, GetEndpoint(1), BridgedActions::Id, BridgedActions::Attributes::FeatureMap::Id,
- true, chip::NullOptional);
+ return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Actions::Id, Actions::Attributes::FeatureMap::Id, true,
+ chip::NullOptional);
}
case 3: {
LogStep(3, "Read the global attribute: AttributeList");
- return ReadAttribute(kIdentityAlpha, GetEndpoint(1), BridgedActions::Id, BridgedActions::Attributes::AttributeList::Id,
- true, chip::NullOptional);
+ return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Actions::Id, Actions::Attributes::AttributeList::Id, true,
+ chip::NullOptional);
}
case 4: {
LogStep(4, "Read the optional attribute(SetupURL) in AttributeList");
VerifyOrDo(!ShouldSkip("ACT.S.A0002"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
- return ReadAttribute(kIdentityAlpha, GetEndpoint(1), BridgedActions::Id, BridgedActions::Attributes::AttributeList::Id,
- true, chip::NullOptional);
+ return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Actions::Id, Actions::Attributes::AttributeList::Id, true,
+ chip::NullOptional);
}
case 5: {
LogStep(5, "Read the global attribute: AcceptedCommandList");
- return ReadAttribute(kIdentityAlpha, GetEndpoint(1), BridgedActions::Id,
- BridgedActions::Attributes::AcceptedCommandList::Id, true, chip::NullOptional);
+ return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Actions::Id, Actions::Attributes::AcceptedCommandList::Id, true,
+ chip::NullOptional);
}
case 6: {
LogStep(6, "Read the global attribute: GeneratedCommandList");
- return ReadAttribute(kIdentityAlpha, GetEndpoint(1), BridgedActions::Id,
- BridgedActions::Attributes::GeneratedCommandList::Id, true, chip::NullOptional);
+ return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Actions::Id, Actions::Attributes::GeneratedCommandList::Id, true,
+ chip::NullOptional);
}
case 7: {
LogStep(7,
diff --git a/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h b/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h
index 1331531..63a1b99 100644
--- a/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h
+++ b/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h
@@ -109,19 +109,18 @@
void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
typedef void (*AccessControlAttributeListListAttributeCallback)(
void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
-typedef void (*BridgedActionsActionListListAttributeCallback)(
+typedef void (*ActionsActionListListAttributeCallback)(
void * context,
- const chip::app::DataModel::DecodableList<chip::app::Clusters::BridgedActions::Structs::ActionStruct::DecodableType> & data);
-typedef void (*BridgedActionsEndpointListListAttributeCallback)(
+ const chip::app::DataModel::DecodableList<chip::app::Clusters::Actions::Structs::ActionStruct::DecodableType> & data);
+typedef void (*ActionsEndpointListsListAttributeCallback)(
void * context,
- const chip::app::DataModel::DecodableList<chip::app::Clusters::BridgedActions::Structs::EndpointListStruct::DecodableType> &
- data);
-typedef void (*BridgedActionsGeneratedCommandListListAttributeCallback)(
- void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*BridgedActionsAcceptedCommandListListAttributeCallback)(
- void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
-typedef void (*BridgedActionsAttributeListListAttributeCallback)(
- void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
+ const chip::app::DataModel::DecodableList<chip::app::Clusters::Actions::Structs::EndpointListStruct::DecodableType> & data);
+typedef void (*ActionsGeneratedCommandListListAttributeCallback)(void * context,
+ const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*ActionsAcceptedCommandListListAttributeCallback)(void * context,
+ const chip::app::DataModel::DecodableList<chip::CommandId> & data);
+typedef void (*ActionsAttributeListListAttributeCallback)(void * context,
+ const chip::app::DataModel::DecodableList<chip::AttributeId> & data);
typedef void (*BasicGeneratedCommandListListAttributeCallback)(void * context,
const chip::app::DataModel::DecodableList<chip::CommandId> & data);
typedef void (*BasicAcceptedCommandListListAttributeCallback)(void * context,
diff --git a/zzz_generated/controller-clusters/zap-generated/CHIPClusters.h b/zzz_generated/controller-clusters/zap-generated/CHIPClusters.h
index e4c2c1c..96283a0 100644
--- a/zzz_generated/controller-clusters/zap-generated/CHIPClusters.h
+++ b/zzz_generated/controller-clusters/zap-generated/CHIPClusters.h
@@ -121,13 +121,13 @@
~AccessControlCluster() {}
};
-class DLL_EXPORT BridgedActionsCluster : public ClusterBase
+class DLL_EXPORT ActionsCluster : public ClusterBase
{
public:
- BridgedActionsCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) :
- ClusterBase(exchangeManager, session, app::Clusters::BridgedActions::Id, endpoint)
+ ActionsCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) :
+ ClusterBase(exchangeManager, session, app::Clusters::Actions::Id, endpoint)
{}
- ~BridgedActionsCluster() {}
+ ~ActionsCluster() {}
};
class DLL_EXPORT BasicCluster : public ClusterBase
diff --git a/zzz_generated/controller-clusters/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/controller-clusters/zap-generated/PluginApplicationCallbacks.h
index 8deaa03..0b55a40 100644
--- a/zzz_generated/controller-clusters/zap-generated/PluginApplicationCallbacks.h
+++ b/zzz_generated/controller-clusters/zap-generated/PluginApplicationCallbacks.h
@@ -32,7 +32,7 @@
MatterDescriptorPluginClientInitCallback(); \
MatterBindingPluginClientInitCallback(); \
MatterAccessControlPluginClientInitCallback(); \
- MatterBridgedActionsPluginClientInitCallback(); \
+ MatterActionsPluginClientInitCallback(); \
MatterBasicPluginClientInitCallback(); \
MatterOtaSoftwareUpdateProviderPluginClientInitCallback(); \
MatterOtaSoftwareUpdateRequestorPluginClientInitCallback(); \
diff --git a/zzz_generated/controller-clusters/zap-generated/callback-stub.cpp b/zzz_generated/controller-clusters/zap-generated/callback-stub.cpp
index f8dee5d..8258822 100644
--- a/zzz_generated/controller-clusters/zap-generated/callback-stub.cpp
+++ b/zzz_generated/controller-clusters/zap-generated/callback-stub.cpp
@@ -35,6 +35,9 @@
case ZCL_ACCOUNT_LOGIN_CLUSTER_ID:
emberAfAccountLoginClusterInitCallback(endpoint);
break;
+ case ZCL_ACTIONS_CLUSTER_ID:
+ emberAfActionsClusterInitCallback(endpoint);
+ break;
case ZCL_ADMINISTRATOR_COMMISSIONING_CLUSTER_ID:
emberAfAdministratorCommissioningClusterInitCallback(endpoint);
break;
@@ -65,9 +68,6 @@
case ZCL_BOOLEAN_STATE_CLUSTER_ID:
emberAfBooleanStateClusterInitCallback(endpoint);
break;
- case ZCL_BRIDGED_ACTIONS_CLUSTER_ID:
- emberAfBridgedActionsClusterInitCallback(endpoint);
- break;
case ZCL_BRIDGED_DEVICE_BASIC_CLUSTER_ID:
emberAfBridgedDeviceBasicClusterInitCallback(endpoint);
break;
@@ -240,6 +240,11 @@
// To prevent warning
(void) endpoint;
}
+void __attribute__((weak)) emberAfActionsClusterInitCallback(EndpointId endpoint)
+{
+ // To prevent warning
+ (void) endpoint;
+}
void __attribute__((weak)) emberAfAdministratorCommissioningClusterInitCallback(EndpointId endpoint)
{
// To prevent warning
@@ -290,11 +295,6 @@
// To prevent warning
(void) endpoint;
}
-void __attribute__((weak)) emberAfBridgedActionsClusterInitCallback(EndpointId endpoint)
-{
- // To prevent warning
- (void) endpoint;
-}
void __attribute__((weak)) emberAfBridgedDeviceBasicClusterInitCallback(EndpointId endpoint)
{
// To prevent warning
diff --git a/zzz_generated/controller-clusters/zap-generated/endpoint_config.h b/zzz_generated/controller-clusters/zap-generated/endpoint_config.h
index e4a89d5..02e8566 100644
--- a/zzz_generated/controller-clusters/zap-generated/endpoint_config.h
+++ b/zzz_generated/controller-clusters/zap-generated/endpoint_config.h
@@ -194,7 +194,7 @@
.generatedCommandList = nullptr ,\
},\
{ \
- /* Endpoint: 1, Cluster: Bridged Actions (client) */ \
+ /* Endpoint: 1, Cluster: Actions (client) */ \
.clusterId = 0x00000025, \
.attributes = ZAP_ATTRIBUTE_INDEX(0), \
.attributeCount = 0, \
diff --git a/zzz_generated/controller-clusters/zap-generated/gen_config.h b/zzz_generated/controller-clusters/zap-generated/gen_config.h
index b10de1a..0653ff3 100644
--- a/zzz_generated/controller-clusters/zap-generated/gen_config.h
+++ b/zzz_generated/controller-clusters/zap-generated/gen_config.h
@@ -39,7 +39,7 @@
#define EMBER_AF_DESCRIPTOR_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
#define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
#define EMBER_AF_ACCESS_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_BRIDGED_ACTIONS_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_ACTIONS_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
#define EMBER_AF_BASIC_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
#define EMBER_AF_OTA_REQUESTOR_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
@@ -137,9 +137,9 @@
#define ZCL_USING_ACCESS_CONTROL_CLUSTER_CLIENT
#define EMBER_AF_PLUGIN_ACCESS_CONTROL_CLIENT
-// Use this macro to check if the client side of the Bridged Actions cluster is included
-#define ZCL_USING_BRIDGED_ACTIONS_CLUSTER_CLIENT
-#define EMBER_AF_PLUGIN_BRIDGED_ACTIONS_CLIENT
+// Use this macro to check if the client side of the Actions cluster is included
+#define ZCL_USING_ACTIONS_CLUSTER_CLIENT
+#define EMBER_AF_PLUGIN_ACTIONS_CLIENT
// Use this macro to check if the client side of the Basic cluster is included
#define ZCL_USING_BASIC_CLUSTER_CLIENT
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
index 21813d5..fb2dc70 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
@@ -46,7 +46,7 @@
| Descriptor | 0x001D |
| Binding | 0x001E |
| AccessControl | 0x001F |
-| BridgedActions | 0x0025 |
+| Actions | 0x0025 |
| Basic | 0x0028 |
| OtaSoftwareUpdateProvider | 0x0029 |
| OtaSoftwareUpdateRequestor | 0x002A |
@@ -9499,7 +9499,7 @@
};
/*----------------------------------------------------------------------------*\
-| Cluster BridgedActions | 0x0025 |
+| Cluster Actions | 0x0025 |
|------------------------------------------------------------------------------|
| Commands: | |
| * InstantAction | 0x00 |
@@ -9517,8 +9517,8 @@
|------------------------------------------------------------------------------|
| Attributes: | |
| * ActionList | 0x0000 |
-| * EndpointList | 0x0001 |
-| * SetupUrl | 0x0002 |
+| * EndpointLists | 0x0001 |
+| * SetupURL | 0x0002 |
| * GeneratedCommandList | 0xFFF8 |
| * AcceptedCommandList | 0xFFF9 |
| * AttributeList | 0xFFFB |
@@ -9533,9 +9533,9 @@
/*
* Command InstantAction
*/
-class BridgedActionsInstantAction : public ClusterCommand {
+class ActionsInstantAction : public ClusterCommand {
public:
- BridgedActionsInstantAction()
+ ActionsInstantAction()
: ClusterCommand("instant-action")
{
AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
@@ -9548,10 +9548,10 @@
ChipLogProgress(chipTool, "Sending cluster (0x00000025) command (0x00000000) on endpoint %u", endpointId);
dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
- MTRBaseClusterBridgedActions * cluster = [[MTRBaseClusterBridgedActions alloc] initWithDevice:device
- endpoint:endpointId
- queue:callbackQueue];
- __auto_type * params = [[MTRBridgedActionsClusterInstantActionParams alloc] init];
+ MTRBaseClusterActions * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device
+ endpoint:endpointId
+ queue:callbackQueue];
+ __auto_type * params = [[MTRActionsClusterInstantActionParams alloc] init];
params.timedInvokeTimeoutMs
= mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
params.actionID = [NSNumber numberWithUnsignedShort:mRequest.actionID];
@@ -9579,15 +9579,15 @@
}
private:
- chip::app::Clusters::BridgedActions::Commands::InstantAction::Type mRequest;
+ chip::app::Clusters::Actions::Commands::InstantAction::Type mRequest;
};
/*
* Command InstantActionWithTransition
*/
-class BridgedActionsInstantActionWithTransition : public ClusterCommand {
+class ActionsInstantActionWithTransition : public ClusterCommand {
public:
- BridgedActionsInstantActionWithTransition()
+ ActionsInstantActionWithTransition()
: ClusterCommand("instant-action-with-transition")
{
AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
@@ -9601,10 +9601,10 @@
ChipLogProgress(chipTool, "Sending cluster (0x00000025) command (0x00000001) on endpoint %u", endpointId);
dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
- MTRBaseClusterBridgedActions * cluster = [[MTRBaseClusterBridgedActions alloc] initWithDevice:device
- endpoint:endpointId
- queue:callbackQueue];
- __auto_type * params = [[MTRBridgedActionsClusterInstantActionWithTransitionParams alloc] init];
+ MTRBaseClusterActions * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device
+ endpoint:endpointId
+ queue:callbackQueue];
+ __auto_type * params = [[MTRActionsClusterInstantActionWithTransitionParams alloc] init];
params.timedInvokeTimeoutMs
= mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
params.actionID = [NSNumber numberWithUnsignedShort:mRequest.actionID];
@@ -9633,15 +9633,15 @@
}
private:
- chip::app::Clusters::BridgedActions::Commands::InstantActionWithTransition::Type mRequest;
+ chip::app::Clusters::Actions::Commands::InstantActionWithTransition::Type mRequest;
};
/*
* Command StartAction
*/
-class BridgedActionsStartAction : public ClusterCommand {
+class ActionsStartAction : public ClusterCommand {
public:
- BridgedActionsStartAction()
+ ActionsStartAction()
: ClusterCommand("start-action")
{
AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
@@ -9654,10 +9654,10 @@
ChipLogProgress(chipTool, "Sending cluster (0x00000025) command (0x00000002) on endpoint %u", endpointId);
dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
- MTRBaseClusterBridgedActions * cluster = [[MTRBaseClusterBridgedActions alloc] initWithDevice:device
- endpoint:endpointId
- queue:callbackQueue];
- __auto_type * params = [[MTRBridgedActionsClusterStartActionParams alloc] init];
+ MTRBaseClusterActions * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device
+ endpoint:endpointId
+ queue:callbackQueue];
+ __auto_type * params = [[MTRActionsClusterStartActionParams alloc] init];
params.timedInvokeTimeoutMs
= mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
params.actionID = [NSNumber numberWithUnsignedShort:mRequest.actionID];
@@ -9685,15 +9685,15 @@
}
private:
- chip::app::Clusters::BridgedActions::Commands::StartAction::Type mRequest;
+ chip::app::Clusters::Actions::Commands::StartAction::Type mRequest;
};
/*
* Command StartActionWithDuration
*/
-class BridgedActionsStartActionWithDuration : public ClusterCommand {
+class ActionsStartActionWithDuration : public ClusterCommand {
public:
- BridgedActionsStartActionWithDuration()
+ ActionsStartActionWithDuration()
: ClusterCommand("start-action-with-duration")
{
AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
@@ -9707,10 +9707,10 @@
ChipLogProgress(chipTool, "Sending cluster (0x00000025) command (0x00000003) on endpoint %u", endpointId);
dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
- MTRBaseClusterBridgedActions * cluster = [[MTRBaseClusterBridgedActions alloc] initWithDevice:device
- endpoint:endpointId
- queue:callbackQueue];
- __auto_type * params = [[MTRBridgedActionsClusterStartActionWithDurationParams alloc] init];
+ MTRBaseClusterActions * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device
+ endpoint:endpointId
+ queue:callbackQueue];
+ __auto_type * params = [[MTRActionsClusterStartActionWithDurationParams alloc] init];
params.timedInvokeTimeoutMs
= mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
params.actionID = [NSNumber numberWithUnsignedShort:mRequest.actionID];
@@ -9739,15 +9739,15 @@
}
private:
- chip::app::Clusters::BridgedActions::Commands::StartActionWithDuration::Type mRequest;
+ chip::app::Clusters::Actions::Commands::StartActionWithDuration::Type mRequest;
};
/*
* Command StopAction
*/
-class BridgedActionsStopAction : public ClusterCommand {
+class ActionsStopAction : public ClusterCommand {
public:
- BridgedActionsStopAction()
+ ActionsStopAction()
: ClusterCommand("stop-action")
{
AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
@@ -9760,10 +9760,10 @@
ChipLogProgress(chipTool, "Sending cluster (0x00000025) command (0x00000004) on endpoint %u", endpointId);
dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
- MTRBaseClusterBridgedActions * cluster = [[MTRBaseClusterBridgedActions alloc] initWithDevice:device
- endpoint:endpointId
- queue:callbackQueue];
- __auto_type * params = [[MTRBridgedActionsClusterStopActionParams alloc] init];
+ MTRBaseClusterActions * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device
+ endpoint:endpointId
+ queue:callbackQueue];
+ __auto_type * params = [[MTRActionsClusterStopActionParams alloc] init];
params.timedInvokeTimeoutMs
= mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
params.actionID = [NSNumber numberWithUnsignedShort:mRequest.actionID];
@@ -9791,15 +9791,15 @@
}
private:
- chip::app::Clusters::BridgedActions::Commands::StopAction::Type mRequest;
+ chip::app::Clusters::Actions::Commands::StopAction::Type mRequest;
};
/*
* Command PauseAction
*/
-class BridgedActionsPauseAction : public ClusterCommand {
+class ActionsPauseAction : public ClusterCommand {
public:
- BridgedActionsPauseAction()
+ ActionsPauseAction()
: ClusterCommand("pause-action")
{
AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
@@ -9812,10 +9812,10 @@
ChipLogProgress(chipTool, "Sending cluster (0x00000025) command (0x00000005) on endpoint %u", endpointId);
dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
- MTRBaseClusterBridgedActions * cluster = [[MTRBaseClusterBridgedActions alloc] initWithDevice:device
- endpoint:endpointId
- queue:callbackQueue];
- __auto_type * params = [[MTRBridgedActionsClusterPauseActionParams alloc] init];
+ MTRBaseClusterActions * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device
+ endpoint:endpointId
+ queue:callbackQueue];
+ __auto_type * params = [[MTRActionsClusterPauseActionParams alloc] init];
params.timedInvokeTimeoutMs
= mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
params.actionID = [NSNumber numberWithUnsignedShort:mRequest.actionID];
@@ -9843,15 +9843,15 @@
}
private:
- chip::app::Clusters::BridgedActions::Commands::PauseAction::Type mRequest;
+ chip::app::Clusters::Actions::Commands::PauseAction::Type mRequest;
};
/*
* Command PauseActionWithDuration
*/
-class BridgedActionsPauseActionWithDuration : public ClusterCommand {
+class ActionsPauseActionWithDuration : public ClusterCommand {
public:
- BridgedActionsPauseActionWithDuration()
+ ActionsPauseActionWithDuration()
: ClusterCommand("pause-action-with-duration")
{
AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
@@ -9865,10 +9865,10 @@
ChipLogProgress(chipTool, "Sending cluster (0x00000025) command (0x00000006) on endpoint %u", endpointId);
dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
- MTRBaseClusterBridgedActions * cluster = [[MTRBaseClusterBridgedActions alloc] initWithDevice:device
- endpoint:endpointId
- queue:callbackQueue];
- __auto_type * params = [[MTRBridgedActionsClusterPauseActionWithDurationParams alloc] init];
+ MTRBaseClusterActions * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device
+ endpoint:endpointId
+ queue:callbackQueue];
+ __auto_type * params = [[MTRActionsClusterPauseActionWithDurationParams alloc] init];
params.timedInvokeTimeoutMs
= mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
params.actionID = [NSNumber numberWithUnsignedShort:mRequest.actionID];
@@ -9897,15 +9897,15 @@
}
private:
- chip::app::Clusters::BridgedActions::Commands::PauseActionWithDuration::Type mRequest;
+ chip::app::Clusters::Actions::Commands::PauseActionWithDuration::Type mRequest;
};
/*
* Command ResumeAction
*/
-class BridgedActionsResumeAction : public ClusterCommand {
+class ActionsResumeAction : public ClusterCommand {
public:
- BridgedActionsResumeAction()
+ ActionsResumeAction()
: ClusterCommand("resume-action")
{
AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
@@ -9918,10 +9918,10 @@
ChipLogProgress(chipTool, "Sending cluster (0x00000025) command (0x00000007) on endpoint %u", endpointId);
dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
- MTRBaseClusterBridgedActions * cluster = [[MTRBaseClusterBridgedActions alloc] initWithDevice:device
- endpoint:endpointId
- queue:callbackQueue];
- __auto_type * params = [[MTRBridgedActionsClusterResumeActionParams alloc] init];
+ MTRBaseClusterActions * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device
+ endpoint:endpointId
+ queue:callbackQueue];
+ __auto_type * params = [[MTRActionsClusterResumeActionParams alloc] init];
params.timedInvokeTimeoutMs
= mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
params.actionID = [NSNumber numberWithUnsignedShort:mRequest.actionID];
@@ -9949,15 +9949,15 @@
}
private:
- chip::app::Clusters::BridgedActions::Commands::ResumeAction::Type mRequest;
+ chip::app::Clusters::Actions::Commands::ResumeAction::Type mRequest;
};
/*
* Command EnableAction
*/
-class BridgedActionsEnableAction : public ClusterCommand {
+class ActionsEnableAction : public ClusterCommand {
public:
- BridgedActionsEnableAction()
+ ActionsEnableAction()
: ClusterCommand("enable-action")
{
AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
@@ -9970,10 +9970,10 @@
ChipLogProgress(chipTool, "Sending cluster (0x00000025) command (0x00000008) on endpoint %u", endpointId);
dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
- MTRBaseClusterBridgedActions * cluster = [[MTRBaseClusterBridgedActions alloc] initWithDevice:device
- endpoint:endpointId
- queue:callbackQueue];
- __auto_type * params = [[MTRBridgedActionsClusterEnableActionParams alloc] init];
+ MTRBaseClusterActions * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device
+ endpoint:endpointId
+ queue:callbackQueue];
+ __auto_type * params = [[MTRActionsClusterEnableActionParams alloc] init];
params.timedInvokeTimeoutMs
= mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
params.actionID = [NSNumber numberWithUnsignedShort:mRequest.actionID];
@@ -10001,15 +10001,15 @@
}
private:
- chip::app::Clusters::BridgedActions::Commands::EnableAction::Type mRequest;
+ chip::app::Clusters::Actions::Commands::EnableAction::Type mRequest;
};
/*
* Command EnableActionWithDuration
*/
-class BridgedActionsEnableActionWithDuration : public ClusterCommand {
+class ActionsEnableActionWithDuration : public ClusterCommand {
public:
- BridgedActionsEnableActionWithDuration()
+ ActionsEnableActionWithDuration()
: ClusterCommand("enable-action-with-duration")
{
AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
@@ -10023,10 +10023,10 @@
ChipLogProgress(chipTool, "Sending cluster (0x00000025) command (0x00000009) on endpoint %u", endpointId);
dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
- MTRBaseClusterBridgedActions * cluster = [[MTRBaseClusterBridgedActions alloc] initWithDevice:device
- endpoint:endpointId
- queue:callbackQueue];
- __auto_type * params = [[MTRBridgedActionsClusterEnableActionWithDurationParams alloc] init];
+ MTRBaseClusterActions * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device
+ endpoint:endpointId
+ queue:callbackQueue];
+ __auto_type * params = [[MTRActionsClusterEnableActionWithDurationParams alloc] init];
params.timedInvokeTimeoutMs
= mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
params.actionID = [NSNumber numberWithUnsignedShort:mRequest.actionID];
@@ -10055,15 +10055,15 @@
}
private:
- chip::app::Clusters::BridgedActions::Commands::EnableActionWithDuration::Type mRequest;
+ chip::app::Clusters::Actions::Commands::EnableActionWithDuration::Type mRequest;
};
/*
* Command DisableAction
*/
-class BridgedActionsDisableAction : public ClusterCommand {
+class ActionsDisableAction : public ClusterCommand {
public:
- BridgedActionsDisableAction()
+ ActionsDisableAction()
: ClusterCommand("disable-action")
{
AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
@@ -10076,10 +10076,10 @@
ChipLogProgress(chipTool, "Sending cluster (0x00000025) command (0x0000000A) on endpoint %u", endpointId);
dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
- MTRBaseClusterBridgedActions * cluster = [[MTRBaseClusterBridgedActions alloc] initWithDevice:device
- endpoint:endpointId
- queue:callbackQueue];
- __auto_type * params = [[MTRBridgedActionsClusterDisableActionParams alloc] init];
+ MTRBaseClusterActions * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device
+ endpoint:endpointId
+ queue:callbackQueue];
+ __auto_type * params = [[MTRActionsClusterDisableActionParams alloc] init];
params.timedInvokeTimeoutMs
= mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
params.actionID = [NSNumber numberWithUnsignedShort:mRequest.actionID];
@@ -10107,15 +10107,15 @@
}
private:
- chip::app::Clusters::BridgedActions::Commands::DisableAction::Type mRequest;
+ chip::app::Clusters::Actions::Commands::DisableAction::Type mRequest;
};
/*
* Command DisableActionWithDuration
*/
-class BridgedActionsDisableActionWithDuration : public ClusterCommand {
+class ActionsDisableActionWithDuration : public ClusterCommand {
public:
- BridgedActionsDisableActionWithDuration()
+ ActionsDisableActionWithDuration()
: ClusterCommand("disable-action-with-duration")
{
AddArgument("ActionID", 0, UINT16_MAX, &mRequest.actionID);
@@ -10129,10 +10129,10 @@
ChipLogProgress(chipTool, "Sending cluster (0x00000025) command (0x0000000B) on endpoint %u", endpointId);
dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
- MTRBaseClusterBridgedActions * cluster = [[MTRBaseClusterBridgedActions alloc] initWithDevice:device
- endpoint:endpointId
- queue:callbackQueue];
- __auto_type * params = [[MTRBridgedActionsClusterDisableActionWithDurationParams alloc] init];
+ MTRBaseClusterActions * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device
+ endpoint:endpointId
+ queue:callbackQueue];
+ __auto_type * params = [[MTRActionsClusterDisableActionWithDurationParams alloc] init];
params.timedInvokeTimeoutMs
= mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
params.actionID = [NSNumber numberWithUnsignedShort:mRequest.actionID];
@@ -10161,33 +10161,33 @@
}
private:
- chip::app::Clusters::BridgedActions::Commands::DisableActionWithDuration::Type mRequest;
+ chip::app::Clusters::Actions::Commands::DisableActionWithDuration::Type mRequest;
};
/*
* Attribute ActionList
*/
-class ReadBridgedActionsActionList : public ReadAttribute {
+class ReadActionsActionList : public ReadAttribute {
public:
- ReadBridgedActionsActionList()
+ ReadActionsActionList()
: ReadAttribute("action-list")
{
}
- ~ReadBridgedActionsActionList() {}
+ ~ReadActionsActionList() {}
CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
{
ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReadAttribute (0x00000000) on endpoint %u", endpointId);
dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
- MTRBaseClusterBridgedActions * cluster = [[MTRBaseClusterBridgedActions alloc] initWithDevice:device
- endpoint:endpointId
- queue:callbackQueue];
+ MTRBaseClusterActions * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device
+ endpoint:endpointId
+ queue:callbackQueue];
[cluster readAttributeActionListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
- NSLog(@"BridgedActions.ActionList response %@", [value description]);
+ NSLog(@"Actions.ActionList response %@", [value description]);
if (error != nil) {
- LogNSError("BridgedActions ActionList read Error", error);
+ LogNSError("Actions ActionList read Error", error);
}
SetCommandExitStatus(error);
}];
@@ -10195,22 +10195,22 @@
}
};
-class SubscribeAttributeBridgedActionsActionList : public SubscribeAttribute {
+class SubscribeAttributeActionsActionList : public SubscribeAttribute {
public:
- SubscribeAttributeBridgedActionsActionList()
+ SubscribeAttributeActionsActionList()
: SubscribeAttribute("action-list")
{
}
- ~SubscribeAttributeBridgedActionsActionList() {}
+ ~SubscribeAttributeActionsActionList() {}
CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
{
ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReportAttribute (0x00000000) on endpoint %u", endpointId);
dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
- MTRBaseClusterBridgedActions * cluster = [[MTRBaseClusterBridgedActions alloc] initWithDevice:device
- endpoint:endpointId
- queue:callbackQueue];
+ MTRBaseClusterActions * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device
+ endpoint:endpointId
+ queue:callbackQueue];
MTRSubscribeParams * params = [[MTRSubscribeParams alloc] init];
params.keepPreviousSubscriptions
= mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -10222,7 +10222,7 @@
mSubscriptionEstablished = YES;
}
reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
- NSLog(@"BridgedActions.ActionList response %@", [value description]);
+ NSLog(@"Actions.ActionList response %@", [value description]);
SetCommandExitStatus(error);
}];
@@ -10231,29 +10231,29 @@
};
/*
- * Attribute EndpointList
+ * Attribute EndpointLists
*/
-class ReadBridgedActionsEndpointList : public ReadAttribute {
+class ReadActionsEndpointLists : public ReadAttribute {
public:
- ReadBridgedActionsEndpointList()
- : ReadAttribute("endpoint-list")
+ ReadActionsEndpointLists()
+ : ReadAttribute("endpoint-lists")
{
}
- ~ReadBridgedActionsEndpointList() {}
+ ~ReadActionsEndpointLists() {}
CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
{
ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReadAttribute (0x00000001) on endpoint %u", endpointId);
dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
- MTRBaseClusterBridgedActions * cluster = [[MTRBaseClusterBridgedActions alloc] initWithDevice:device
- endpoint:endpointId
- queue:callbackQueue];
- [cluster readAttributeEndpointListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
- NSLog(@"BridgedActions.EndpointList response %@", [value description]);
+ MTRBaseClusterActions * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device
+ endpoint:endpointId
+ queue:callbackQueue];
+ [cluster readAttributeEndpointListsWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+ NSLog(@"Actions.EndpointLists response %@", [value description]);
if (error != nil) {
- LogNSError("BridgedActions EndpointList read Error", error);
+ LogNSError("Actions EndpointLists read Error", error);
}
SetCommandExitStatus(error);
}];
@@ -10261,34 +10261,34 @@
}
};
-class SubscribeAttributeBridgedActionsEndpointList : public SubscribeAttribute {
+class SubscribeAttributeActionsEndpointLists : public SubscribeAttribute {
public:
- SubscribeAttributeBridgedActionsEndpointList()
- : SubscribeAttribute("endpoint-list")
+ SubscribeAttributeActionsEndpointLists()
+ : SubscribeAttribute("endpoint-lists")
{
}
- ~SubscribeAttributeBridgedActionsEndpointList() {}
+ ~SubscribeAttributeActionsEndpointLists() {}
CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
{
ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReportAttribute (0x00000001) on endpoint %u", endpointId);
dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
- MTRBaseClusterBridgedActions * cluster = [[MTRBaseClusterBridgedActions alloc] initWithDevice:device
- endpoint:endpointId
- queue:callbackQueue];
+ MTRBaseClusterActions * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device
+ endpoint:endpointId
+ queue:callbackQueue];
MTRSubscribeParams * params = [[MTRSubscribeParams alloc] init];
params.keepPreviousSubscriptions
= mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
- [cluster subscribeAttributeEndpointListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+ [cluster subscribeAttributeEndpointListsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
params:params
subscriptionEstablished:^() {
mSubscriptionEstablished = YES;
}
reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
- NSLog(@"BridgedActions.EndpointList response %@", [value description]);
+ NSLog(@"Actions.EndpointLists response %@", [value description]);
SetCommandExitStatus(error);
}];
@@ -10297,29 +10297,29 @@
};
/*
- * Attribute SetupUrl
+ * Attribute SetupURL
*/
-class ReadBridgedActionsSetupUrl : public ReadAttribute {
+class ReadActionsSetupURL : public ReadAttribute {
public:
- ReadBridgedActionsSetupUrl()
+ ReadActionsSetupURL()
: ReadAttribute("setup-url")
{
}
- ~ReadBridgedActionsSetupUrl() {}
+ ~ReadActionsSetupURL() {}
CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
{
ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReadAttribute (0x00000002) on endpoint %u", endpointId);
dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
- MTRBaseClusterBridgedActions * cluster = [[MTRBaseClusterBridgedActions alloc] initWithDevice:device
- endpoint:endpointId
- queue:callbackQueue];
- [cluster readAttributeSetupUrlWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
- NSLog(@"BridgedActions.SetupUrl response %@", [value description]);
+ MTRBaseClusterActions * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device
+ endpoint:endpointId
+ queue:callbackQueue];
+ [cluster readAttributeSetupURLWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
+ NSLog(@"Actions.SetupURL response %@", [value description]);
if (error != nil) {
- LogNSError("BridgedActions SetupUrl read Error", error);
+ LogNSError("Actions SetupURL read Error", error);
}
SetCommandExitStatus(error);
}];
@@ -10327,34 +10327,34 @@
}
};
-class SubscribeAttributeBridgedActionsSetupUrl : public SubscribeAttribute {
+class SubscribeAttributeActionsSetupURL : public SubscribeAttribute {
public:
- SubscribeAttributeBridgedActionsSetupUrl()
+ SubscribeAttributeActionsSetupURL()
: SubscribeAttribute("setup-url")
{
}
- ~SubscribeAttributeBridgedActionsSetupUrl() {}
+ ~SubscribeAttributeActionsSetupURL() {}
CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
{
ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReportAttribute (0x00000002) on endpoint %u", endpointId);
dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
- MTRBaseClusterBridgedActions * cluster = [[MTRBaseClusterBridgedActions alloc] initWithDevice:device
- endpoint:endpointId
- queue:callbackQueue];
+ MTRBaseClusterActions * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device
+ endpoint:endpointId
+ queue:callbackQueue];
MTRSubscribeParams * params = [[MTRSubscribeParams alloc] init];
params.keepPreviousSubscriptions
= mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil;
- [cluster subscribeAttributeSetupUrlWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
+ [cluster subscribeAttributeSetupURLWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval]
maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval]
params:params
subscriptionEstablished:^() {
mSubscriptionEstablished = YES;
}
reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) {
- NSLog(@"BridgedActions.SetupUrl response %@", [value description]);
+ NSLog(@"Actions.SetupURL response %@", [value description]);
SetCommandExitStatus(error);
}];
@@ -10365,27 +10365,27 @@
/*
* Attribute GeneratedCommandList
*/
-class ReadBridgedActionsGeneratedCommandList : public ReadAttribute {
+class ReadActionsGeneratedCommandList : public ReadAttribute {
public:
- ReadBridgedActionsGeneratedCommandList()
+ ReadActionsGeneratedCommandList()
: ReadAttribute("generated-command-list")
{
}
- ~ReadBridgedActionsGeneratedCommandList() {}
+ ~ReadActionsGeneratedCommandList() {}
CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
{
ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId);
dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
- MTRBaseClusterBridgedActions * cluster = [[MTRBaseClusterBridgedActions alloc] initWithDevice:device
- endpoint:endpointId
- queue:callbackQueue];
+ MTRBaseClusterActions * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device
+ endpoint:endpointId
+ queue:callbackQueue];
[cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
- NSLog(@"BridgedActions.GeneratedCommandList response %@", [value description]);
+ NSLog(@"Actions.GeneratedCommandList response %@", [value description]);
if (error != nil) {
- LogNSError("BridgedActions GeneratedCommandList read Error", error);
+ LogNSError("Actions GeneratedCommandList read Error", error);
}
SetCommandExitStatus(error);
}];
@@ -10393,22 +10393,22 @@
}
};
-class SubscribeAttributeBridgedActionsGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeActionsGeneratedCommandList : public SubscribeAttribute {
public:
- SubscribeAttributeBridgedActionsGeneratedCommandList()
+ SubscribeAttributeActionsGeneratedCommandList()
: SubscribeAttribute("generated-command-list")
{
}
- ~SubscribeAttributeBridgedActionsGeneratedCommandList() {}
+ ~SubscribeAttributeActionsGeneratedCommandList() {}
CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
{
ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId);
dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
- MTRBaseClusterBridgedActions * cluster = [[MTRBaseClusterBridgedActions alloc] initWithDevice:device
- endpoint:endpointId
- queue:callbackQueue];
+ MTRBaseClusterActions * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device
+ endpoint:endpointId
+ queue:callbackQueue];
MTRSubscribeParams * params = [[MTRSubscribeParams alloc] init];
params.keepPreviousSubscriptions
= mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -10420,7 +10420,7 @@
mSubscriptionEstablished = YES;
}
reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
- NSLog(@"BridgedActions.GeneratedCommandList response %@", [value description]);
+ NSLog(@"Actions.GeneratedCommandList response %@", [value description]);
SetCommandExitStatus(error);
}];
@@ -10431,27 +10431,27 @@
/*
* Attribute AcceptedCommandList
*/
-class ReadBridgedActionsAcceptedCommandList : public ReadAttribute {
+class ReadActionsAcceptedCommandList : public ReadAttribute {
public:
- ReadBridgedActionsAcceptedCommandList()
+ ReadActionsAcceptedCommandList()
: ReadAttribute("accepted-command-list")
{
}
- ~ReadBridgedActionsAcceptedCommandList() {}
+ ~ReadActionsAcceptedCommandList() {}
CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
{
ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId);
dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
- MTRBaseClusterBridgedActions * cluster = [[MTRBaseClusterBridgedActions alloc] initWithDevice:device
- endpoint:endpointId
- queue:callbackQueue];
+ MTRBaseClusterActions * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device
+ endpoint:endpointId
+ queue:callbackQueue];
[cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
- NSLog(@"BridgedActions.AcceptedCommandList response %@", [value description]);
+ NSLog(@"Actions.AcceptedCommandList response %@", [value description]);
if (error != nil) {
- LogNSError("BridgedActions AcceptedCommandList read Error", error);
+ LogNSError("Actions AcceptedCommandList read Error", error);
}
SetCommandExitStatus(error);
}];
@@ -10459,22 +10459,22 @@
}
};
-class SubscribeAttributeBridgedActionsAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeActionsAcceptedCommandList : public SubscribeAttribute {
public:
- SubscribeAttributeBridgedActionsAcceptedCommandList()
+ SubscribeAttributeActionsAcceptedCommandList()
: SubscribeAttribute("accepted-command-list")
{
}
- ~SubscribeAttributeBridgedActionsAcceptedCommandList() {}
+ ~SubscribeAttributeActionsAcceptedCommandList() {}
CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
{
ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId);
dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
- MTRBaseClusterBridgedActions * cluster = [[MTRBaseClusterBridgedActions alloc] initWithDevice:device
- endpoint:endpointId
- queue:callbackQueue];
+ MTRBaseClusterActions * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device
+ endpoint:endpointId
+ queue:callbackQueue];
MTRSubscribeParams * params = [[MTRSubscribeParams alloc] init];
params.keepPreviousSubscriptions
= mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -10486,7 +10486,7 @@
mSubscriptionEstablished = YES;
}
reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
- NSLog(@"BridgedActions.AcceptedCommandList response %@", [value description]);
+ NSLog(@"Actions.AcceptedCommandList response %@", [value description]);
SetCommandExitStatus(error);
}];
@@ -10497,27 +10497,27 @@
/*
* Attribute AttributeList
*/
-class ReadBridgedActionsAttributeList : public ReadAttribute {
+class ReadActionsAttributeList : public ReadAttribute {
public:
- ReadBridgedActionsAttributeList()
+ ReadActionsAttributeList()
: ReadAttribute("attribute-list")
{
}
- ~ReadBridgedActionsAttributeList() {}
+ ~ReadActionsAttributeList() {}
CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
{
ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId);
dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
- MTRBaseClusterBridgedActions * cluster = [[MTRBaseClusterBridgedActions alloc] initWithDevice:device
- endpoint:endpointId
- queue:callbackQueue];
+ MTRBaseClusterActions * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device
+ endpoint:endpointId
+ queue:callbackQueue];
[cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
- NSLog(@"BridgedActions.AttributeList response %@", [value description]);
+ NSLog(@"Actions.AttributeList response %@", [value description]);
if (error != nil) {
- LogNSError("BridgedActions AttributeList read Error", error);
+ LogNSError("Actions AttributeList read Error", error);
}
SetCommandExitStatus(error);
}];
@@ -10525,22 +10525,22 @@
}
};
-class SubscribeAttributeBridgedActionsAttributeList : public SubscribeAttribute {
+class SubscribeAttributeActionsAttributeList : public SubscribeAttribute {
public:
- SubscribeAttributeBridgedActionsAttributeList()
+ SubscribeAttributeActionsAttributeList()
: SubscribeAttribute("attribute-list")
{
}
- ~SubscribeAttributeBridgedActionsAttributeList() {}
+ ~SubscribeAttributeActionsAttributeList() {}
CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
{
ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId);
dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
- MTRBaseClusterBridgedActions * cluster = [[MTRBaseClusterBridgedActions alloc] initWithDevice:device
- endpoint:endpointId
- queue:callbackQueue];
+ MTRBaseClusterActions * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device
+ endpoint:endpointId
+ queue:callbackQueue];
MTRSubscribeParams * params = [[MTRSubscribeParams alloc] init];
params.keepPreviousSubscriptions
= mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -10552,7 +10552,7 @@
mSubscriptionEstablished = YES;
}
reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
- NSLog(@"BridgedActions.AttributeList response %@", [value description]);
+ NSLog(@"Actions.AttributeList response %@", [value description]);
SetCommandExitStatus(error);
}];
@@ -10563,27 +10563,27 @@
/*
* Attribute FeatureMap
*/
-class ReadBridgedActionsFeatureMap : public ReadAttribute {
+class ReadActionsFeatureMap : public ReadAttribute {
public:
- ReadBridgedActionsFeatureMap()
+ ReadActionsFeatureMap()
: ReadAttribute("feature-map")
{
}
- ~ReadBridgedActionsFeatureMap() {}
+ ~ReadActionsFeatureMap() {}
CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
{
ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId);
dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
- MTRBaseClusterBridgedActions * cluster = [[MTRBaseClusterBridgedActions alloc] initWithDevice:device
- endpoint:endpointId
- queue:callbackQueue];
+ MTRBaseClusterActions * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device
+ endpoint:endpointId
+ queue:callbackQueue];
[cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
- NSLog(@"BridgedActions.FeatureMap response %@", [value description]);
+ NSLog(@"Actions.FeatureMap response %@", [value description]);
if (error != nil) {
- LogNSError("BridgedActions FeatureMap read Error", error);
+ LogNSError("Actions FeatureMap read Error", error);
}
SetCommandExitStatus(error);
}];
@@ -10591,22 +10591,22 @@
}
};
-class SubscribeAttributeBridgedActionsFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeActionsFeatureMap : public SubscribeAttribute {
public:
- SubscribeAttributeBridgedActionsFeatureMap()
+ SubscribeAttributeActionsFeatureMap()
: SubscribeAttribute("feature-map")
{
}
- ~SubscribeAttributeBridgedActionsFeatureMap() {}
+ ~SubscribeAttributeActionsFeatureMap() {}
CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
{
ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId);
dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
- MTRBaseClusterBridgedActions * cluster = [[MTRBaseClusterBridgedActions alloc] initWithDevice:device
- endpoint:endpointId
- queue:callbackQueue];
+ MTRBaseClusterActions * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device
+ endpoint:endpointId
+ queue:callbackQueue];
MTRSubscribeParams * params = [[MTRSubscribeParams alloc] init];
params.keepPreviousSubscriptions
= mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -10618,7 +10618,7 @@
mSubscriptionEstablished = YES;
}
reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
- NSLog(@"BridgedActions.FeatureMap response %@", [value description]);
+ NSLog(@"Actions.FeatureMap response %@", [value description]);
SetCommandExitStatus(error);
}];
@@ -10629,27 +10629,27 @@
/*
* Attribute ClusterRevision
*/
-class ReadBridgedActionsClusterRevision : public ReadAttribute {
+class ReadActionsClusterRevision : public ReadAttribute {
public:
- ReadBridgedActionsClusterRevision()
+ ReadActionsClusterRevision()
: ReadAttribute("cluster-revision")
{
}
- ~ReadBridgedActionsClusterRevision() {}
+ ~ReadActionsClusterRevision() {}
CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
{
ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId);
dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
- MTRBaseClusterBridgedActions * cluster = [[MTRBaseClusterBridgedActions alloc] initWithDevice:device
- endpoint:endpointId
- queue:callbackQueue];
+ MTRBaseClusterActions * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device
+ endpoint:endpointId
+ queue:callbackQueue];
[cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
- NSLog(@"BridgedActions.ClusterRevision response %@", [value description]);
+ NSLog(@"Actions.ClusterRevision response %@", [value description]);
if (error != nil) {
- LogNSError("BridgedActions ClusterRevision read Error", error);
+ LogNSError("Actions ClusterRevision read Error", error);
}
SetCommandExitStatus(error);
}];
@@ -10657,22 +10657,22 @@
}
};
-class SubscribeAttributeBridgedActionsClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeActionsClusterRevision : public SubscribeAttribute {
public:
- SubscribeAttributeBridgedActionsClusterRevision()
+ SubscribeAttributeActionsClusterRevision()
: SubscribeAttribute("cluster-revision")
{
}
- ~SubscribeAttributeBridgedActionsClusterRevision() {}
+ ~SubscribeAttributeActionsClusterRevision() {}
CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
{
ChipLogProgress(chipTool, "Sending cluster (0x00000025) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId);
dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
- MTRBaseClusterBridgedActions * cluster = [[MTRBaseClusterBridgedActions alloc] initWithDevice:device
- endpoint:endpointId
- queue:callbackQueue];
+ MTRBaseClusterActions * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device
+ endpoint:endpointId
+ queue:callbackQueue];
MTRSubscribeParams * params = [[MTRSubscribeParams alloc] init];
params.keepPreviousSubscriptions
= mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil;
@@ -10684,7 +10684,7 @@
mSubscriptionEstablished = YES;
}
reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
- NSLog(@"BridgedActions.ClusterRevision response %@", [value description]);
+ NSLog(@"Actions.ClusterRevision response %@", [value description]);
SetCommandExitStatus(error);
}];
@@ -93453,45 +93453,45 @@
commands.Register(clusterName, clusterCommands);
}
-void registerClusterBridgedActions(Commands & commands)
+void registerClusterActions(Commands & commands)
{
- using namespace chip::app::Clusters::BridgedActions;
+ using namespace chip::app::Clusters::Actions;
- const char * clusterName = "BridgedActions";
+ const char * clusterName = "Actions";
commands_list clusterCommands = {
make_unique<ClusterCommand>(Id), //
- make_unique<BridgedActionsInstantAction>(), //
- make_unique<BridgedActionsInstantActionWithTransition>(), //
- make_unique<BridgedActionsStartAction>(), //
- make_unique<BridgedActionsStartActionWithDuration>(), //
- make_unique<BridgedActionsStopAction>(), //
- make_unique<BridgedActionsPauseAction>(), //
- make_unique<BridgedActionsPauseActionWithDuration>(), //
- make_unique<BridgedActionsResumeAction>(), //
- make_unique<BridgedActionsEnableAction>(), //
- make_unique<BridgedActionsEnableActionWithDuration>(), //
- make_unique<BridgedActionsDisableAction>(), //
- make_unique<BridgedActionsDisableActionWithDuration>(), //
+ make_unique<ActionsInstantAction>(), //
+ make_unique<ActionsInstantActionWithTransition>(), //
+ make_unique<ActionsStartAction>(), //
+ make_unique<ActionsStartActionWithDuration>(), //
+ make_unique<ActionsStopAction>(), //
+ make_unique<ActionsPauseAction>(), //
+ make_unique<ActionsPauseActionWithDuration>(), //
+ make_unique<ActionsResumeAction>(), //
+ make_unique<ActionsEnableAction>(), //
+ make_unique<ActionsEnableActionWithDuration>(), //
+ make_unique<ActionsDisableAction>(), //
+ make_unique<ActionsDisableActionWithDuration>(), //
make_unique<ReadAttribute>(Id), //
- make_unique<ReadBridgedActionsActionList>(), //
+ make_unique<ReadActionsActionList>(), //
make_unique<WriteAttribute>(Id), //
make_unique<SubscribeAttribute>(Id), //
- make_unique<SubscribeAttributeBridgedActionsActionList>(), //
- make_unique<ReadBridgedActionsEndpointList>(), //
- make_unique<SubscribeAttributeBridgedActionsEndpointList>(), //
- make_unique<ReadBridgedActionsSetupUrl>(), //
- make_unique<SubscribeAttributeBridgedActionsSetupUrl>(), //
- make_unique<ReadBridgedActionsGeneratedCommandList>(), //
- make_unique<SubscribeAttributeBridgedActionsGeneratedCommandList>(), //
- make_unique<ReadBridgedActionsAcceptedCommandList>(), //
- make_unique<SubscribeAttributeBridgedActionsAcceptedCommandList>(), //
- make_unique<ReadBridgedActionsAttributeList>(), //
- make_unique<SubscribeAttributeBridgedActionsAttributeList>(), //
- make_unique<ReadBridgedActionsFeatureMap>(), //
- make_unique<SubscribeAttributeBridgedActionsFeatureMap>(), //
- make_unique<ReadBridgedActionsClusterRevision>(), //
- make_unique<SubscribeAttributeBridgedActionsClusterRevision>(), //
+ make_unique<SubscribeAttributeActionsActionList>(), //
+ make_unique<ReadActionsEndpointLists>(), //
+ make_unique<SubscribeAttributeActionsEndpointLists>(), //
+ make_unique<ReadActionsSetupURL>(), //
+ make_unique<SubscribeAttributeActionsSetupURL>(), //
+ make_unique<ReadActionsGeneratedCommandList>(), //
+ make_unique<SubscribeAttributeActionsGeneratedCommandList>(), //
+ make_unique<ReadActionsAcceptedCommandList>(), //
+ make_unique<SubscribeAttributeActionsAcceptedCommandList>(), //
+ make_unique<ReadActionsAttributeList>(), //
+ make_unique<SubscribeAttributeActionsAttributeList>(), //
+ make_unique<ReadActionsFeatureMap>(), //
+ make_unique<SubscribeAttributeActionsFeatureMap>(), //
+ make_unique<ReadActionsClusterRevision>(), //
+ make_unique<SubscribeAttributeActionsClusterRevision>(), //
};
commands.Register(clusterName, clusterCommands);
@@ -96637,7 +96637,7 @@
registerClusterDescriptor(commands);
registerClusterBinding(commands);
registerClusterAccessControl(commands);
- registerClusterBridgedActions(commands);
+ registerClusterActions(commands);
registerClusterBasic(commands);
registerClusterOtaSoftwareUpdateProvider(commands);
registerClusterOtaSoftwareUpdateRequestor(commands);
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
index 7c12b0b..d7738d3 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
@@ -2616,9 +2616,7 @@
CHIP_ERROR TestReadTheGlobalAttributeClusterRevision_1()
{
MTRBaseDevice * device = GetDevice("alpha");
- MTRBaseClusterBridgedActions * cluster = [[MTRBaseClusterBridgedActions alloc] initWithDevice:device
- endpoint:1
- queue:mCallbackQueue];
+ MTRBaseClusterActions * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
[cluster readAttributeClusterRevisionWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
@@ -2641,9 +2639,7 @@
CHIP_ERROR TestReadTheGlobalAttributeFeatureMap_2()
{
MTRBaseDevice * device = GetDevice("alpha");
- MTRBaseClusterBridgedActions * cluster = [[MTRBaseClusterBridgedActions alloc] initWithDevice:device
- endpoint:1
- queue:mCallbackQueue];
+ MTRBaseClusterActions * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
[cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
@@ -2666,9 +2662,7 @@
CHIP_ERROR TestReadTheGlobalAttributeAttributeList_3()
{
MTRBaseDevice * device = GetDevice("alpha");
- MTRBaseClusterBridgedActions * cluster = [[MTRBaseClusterBridgedActions alloc] initWithDevice:device
- endpoint:1
- queue:mCallbackQueue];
+ MTRBaseClusterActions * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
[cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
@@ -2689,9 +2683,7 @@
CHIP_ERROR TestReadTheOptionalAttributeSetupURLInAttributeList_4()
{
MTRBaseDevice * device = GetDevice("alpha");
- MTRBaseClusterBridgedActions * cluster = [[MTRBaseClusterBridgedActions alloc] initWithDevice:device
- endpoint:1
- queue:mCallbackQueue];
+ MTRBaseClusterActions * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
[cluster readAttributeAttributeListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
@@ -2713,9 +2705,7 @@
CHIP_ERROR TestReadTheGlobalAttributeAcceptedCommandList_5()
{
MTRBaseDevice * device = GetDevice("alpha");
- MTRBaseClusterBridgedActions * cluster = [[MTRBaseClusterBridgedActions alloc] initWithDevice:device
- endpoint:1
- queue:mCallbackQueue];
+ MTRBaseClusterActions * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
[cluster readAttributeAcceptedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
@@ -2734,9 +2724,7 @@
CHIP_ERROR TestReadTheGlobalAttributeGeneratedCommandList_6()
{
MTRBaseDevice * device = GetDevice("alpha");
- MTRBaseClusterBridgedActions * cluster = [[MTRBaseClusterBridgedActions alloc] initWithDevice:device
- endpoint:1
- queue:mCallbackQueue];
+ MTRBaseClusterActions * cluster = [[MTRBaseClusterActions alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
[cluster readAttributeGeneratedCommandListWithCompletionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
diff --git a/zzz_generated/placeholder/app1/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/placeholder/app1/zap-generated/PluginApplicationCallbacks.h
index 9e8ed20..aa0b143 100644
--- a/zzz_generated/placeholder/app1/zap-generated/PluginApplicationCallbacks.h
+++ b/zzz_generated/placeholder/app1/zap-generated/PluginApplicationCallbacks.h
@@ -29,7 +29,7 @@
MatterOnOffPluginServerInitCallback(); \
MatterLevelControlPluginServerInitCallback(); \
MatterDescriptorPluginServerInitCallback(); \
- MatterBridgedActionsPluginServerInitCallback(); \
+ MatterActionsPluginServerInitCallback(); \
MatterBasicPluginServerInitCallback(); \
MatterPowerSourceConfigurationPluginServerInitCallback(); \
MatterPowerSourcePluginServerInitCallback(); \
diff --git a/zzz_generated/placeholder/app1/zap-generated/callback-stub.cpp b/zzz_generated/placeholder/app1/zap-generated/callback-stub.cpp
index 96c0397..07638a5 100644
--- a/zzz_generated/placeholder/app1/zap-generated/callback-stub.cpp
+++ b/zzz_generated/placeholder/app1/zap-generated/callback-stub.cpp
@@ -29,6 +29,9 @@
{
switch (clusterId)
{
+ case ZCL_ACTIONS_CLUSTER_ID:
+ emberAfActionsClusterInitCallback(endpoint);
+ break;
case ZCL_ADMINISTRATOR_COMMISSIONING_CLUSTER_ID:
emberAfAdministratorCommissioningClusterInitCallback(endpoint);
break;
@@ -41,9 +44,6 @@
case ZCL_BOOLEAN_STATE_CLUSTER_ID:
emberAfBooleanStateClusterInitCallback(endpoint);
break;
- case ZCL_BRIDGED_ACTIONS_CLUSTER_ID:
- emberAfBridgedActionsClusterInitCallback(endpoint);
- break;
case ZCL_COLOR_CONTROL_CLUSTER_ID:
emberAfColorControlClusterInitCallback(endpoint);
break;
@@ -140,6 +140,11 @@
}
}
+void __attribute__((weak)) emberAfActionsClusterInitCallback(EndpointId endpoint)
+{
+ // To prevent warning
+ (void) endpoint;
+}
void __attribute__((weak)) emberAfAdministratorCommissioningClusterInitCallback(EndpointId endpoint)
{
// To prevent warning
@@ -160,11 +165,6 @@
// To prevent warning
(void) endpoint;
}
-void __attribute__((weak)) emberAfBridgedActionsClusterInitCallback(EndpointId endpoint)
-{
- // To prevent warning
- (void) endpoint;
-}
void __attribute__((weak)) emberAfColorControlClusterInitCallback(EndpointId endpoint)
{
// To prevent warning
diff --git a/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h b/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h
index 99be179..22783ee 100644
--- a/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h
+++ b/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h
@@ -129,11 +129,11 @@
{ 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */ \
\
- /* Endpoint: 0, Cluster: Bridged Actions (server) */ \
- { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* action list */ \
- { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* endpoint list */ \
+ /* Endpoint: 0, Cluster: Actions (server) */ \
+ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActionList */ \
+ { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* EndpointLists */ \
{ 0x00000002, ZAP_TYPE(LONG_CHAR_STRING), 514, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
- ZAP_EMPTY_DEFAULT() }, /* setup url */ \
+ ZAP_EMPTY_DEFAULT() }, /* SetupURL */ \
{ 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */ \
\
@@ -895,7 +895,7 @@
.generatedCommandList = nullptr ,\
},\
{ \
- /* Endpoint: 0, Cluster: Bridged Actions (server) */ \
+ /* Endpoint: 0, Cluster: Actions (server) */ \
.clusterId = 0x00000025, \
.attributes = ZAP_ATTRIBUTE_INDEX(13), \
.attributeCount = 5, \
diff --git a/zzz_generated/placeholder/app1/zap-generated/gen_config.h b/zzz_generated/placeholder/app1/zap-generated/gen_config.h
index cbc7db1..9290aa4 100644
--- a/zzz_generated/placeholder/app1/zap-generated/gen_config.h
+++ b/zzz_generated/placeholder/app1/zap-generated/gen_config.h
@@ -36,7 +36,7 @@
#define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (2)
#define EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BRIDGED_ACTIONS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ACTIONS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (2)
#define EMBER_AF_POWER_SOURCE_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
#define EMBER_AF_POWER_SOURCE_CLUSTER_SERVER_ENDPOINT_COUNT (1)
@@ -129,10 +129,10 @@
#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
#define EMBER_AF_PLUGIN_DESCRIPTOR
-// Use this macro to check if the server side of the Bridged Actions cluster is included
-#define ZCL_USING_BRIDGED_ACTIONS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_BRIDGED_ACTIONS_SERVER
-#define EMBER_AF_PLUGIN_BRIDGED_ACTIONS
+// Use this macro to check if the server side of the Actions cluster is included
+#define ZCL_USING_ACTIONS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ACTIONS_SERVER
+#define EMBER_AF_PLUGIN_ACTIONS
// Use this macro to check if the server side of the Basic cluster is included
#define ZCL_USING_BASIC_CLUSTER_SERVER
diff --git a/zzz_generated/placeholder/app2/zap-generated/PluginApplicationCallbacks.h b/zzz_generated/placeholder/app2/zap-generated/PluginApplicationCallbacks.h
index 9e8ed20..aa0b143 100644
--- a/zzz_generated/placeholder/app2/zap-generated/PluginApplicationCallbacks.h
+++ b/zzz_generated/placeholder/app2/zap-generated/PluginApplicationCallbacks.h
@@ -29,7 +29,7 @@
MatterOnOffPluginServerInitCallback(); \
MatterLevelControlPluginServerInitCallback(); \
MatterDescriptorPluginServerInitCallback(); \
- MatterBridgedActionsPluginServerInitCallback(); \
+ MatterActionsPluginServerInitCallback(); \
MatterBasicPluginServerInitCallback(); \
MatterPowerSourceConfigurationPluginServerInitCallback(); \
MatterPowerSourcePluginServerInitCallback(); \
diff --git a/zzz_generated/placeholder/app2/zap-generated/callback-stub.cpp b/zzz_generated/placeholder/app2/zap-generated/callback-stub.cpp
index 96c0397..07638a5 100644
--- a/zzz_generated/placeholder/app2/zap-generated/callback-stub.cpp
+++ b/zzz_generated/placeholder/app2/zap-generated/callback-stub.cpp
@@ -29,6 +29,9 @@
{
switch (clusterId)
{
+ case ZCL_ACTIONS_CLUSTER_ID:
+ emberAfActionsClusterInitCallback(endpoint);
+ break;
case ZCL_ADMINISTRATOR_COMMISSIONING_CLUSTER_ID:
emberAfAdministratorCommissioningClusterInitCallback(endpoint);
break;
@@ -41,9 +44,6 @@
case ZCL_BOOLEAN_STATE_CLUSTER_ID:
emberAfBooleanStateClusterInitCallback(endpoint);
break;
- case ZCL_BRIDGED_ACTIONS_CLUSTER_ID:
- emberAfBridgedActionsClusterInitCallback(endpoint);
- break;
case ZCL_COLOR_CONTROL_CLUSTER_ID:
emberAfColorControlClusterInitCallback(endpoint);
break;
@@ -140,6 +140,11 @@
}
}
+void __attribute__((weak)) emberAfActionsClusterInitCallback(EndpointId endpoint)
+{
+ // To prevent warning
+ (void) endpoint;
+}
void __attribute__((weak)) emberAfAdministratorCommissioningClusterInitCallback(EndpointId endpoint)
{
// To prevent warning
@@ -160,11 +165,6 @@
// To prevent warning
(void) endpoint;
}
-void __attribute__((weak)) emberAfBridgedActionsClusterInitCallback(EndpointId endpoint)
-{
- // To prevent warning
- (void) endpoint;
-}
void __attribute__((weak)) emberAfColorControlClusterInitCallback(EndpointId endpoint)
{
// To prevent warning
diff --git a/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h b/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h
index 99be179..22783ee 100644
--- a/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h
+++ b/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h
@@ -129,11 +129,11 @@
{ 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */ \
\
- /* Endpoint: 0, Cluster: Bridged Actions (server) */ \
- { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* action list */ \
- { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* endpoint list */ \
+ /* Endpoint: 0, Cluster: Actions (server) */ \
+ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ActionList */ \
+ { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* EndpointLists */ \
{ 0x00000002, ZAP_TYPE(LONG_CHAR_STRING), 514, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \
- ZAP_EMPTY_DEFAULT() }, /* setup url */ \
+ ZAP_EMPTY_DEFAULT() }, /* SetupURL */ \
{ 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \
{ 0x0000FFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */ \
\
@@ -895,7 +895,7 @@
.generatedCommandList = nullptr ,\
},\
{ \
- /* Endpoint: 0, Cluster: Bridged Actions (server) */ \
+ /* Endpoint: 0, Cluster: Actions (server) */ \
.clusterId = 0x00000025, \
.attributes = ZAP_ATTRIBUTE_INDEX(13), \
.attributeCount = 5, \
diff --git a/zzz_generated/placeholder/app2/zap-generated/gen_config.h b/zzz_generated/placeholder/app2/zap-generated/gen_config.h
index cbc7db1..9290aa4 100644
--- a/zzz_generated/placeholder/app2/zap-generated/gen_config.h
+++ b/zzz_generated/placeholder/app2/zap-generated/gen_config.h
@@ -36,7 +36,7 @@
#define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (2)
#define EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1)
-#define EMBER_AF_BRIDGED_ACTIONS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_ACTIONS_CLUSTER_SERVER_ENDPOINT_COUNT (1)
#define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (2)
#define EMBER_AF_POWER_SOURCE_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1)
#define EMBER_AF_POWER_SOURCE_CLUSTER_SERVER_ENDPOINT_COUNT (1)
@@ -129,10 +129,10 @@
#define EMBER_AF_PLUGIN_DESCRIPTOR_SERVER
#define EMBER_AF_PLUGIN_DESCRIPTOR
-// Use this macro to check if the server side of the Bridged Actions cluster is included
-#define ZCL_USING_BRIDGED_ACTIONS_CLUSTER_SERVER
-#define EMBER_AF_PLUGIN_BRIDGED_ACTIONS_SERVER
-#define EMBER_AF_PLUGIN_BRIDGED_ACTIONS
+// Use this macro to check if the server side of the Actions cluster is included
+#define ZCL_USING_ACTIONS_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_ACTIONS_SERVER
+#define EMBER_AF_PLUGIN_ACTIONS
// Use this macro to check if the server side of the Basic cluster is included
#define ZCL_USING_BASIC_CLUSTER_SERVER
