Skip to content

Commit

Permalink
Align Actions cluster better with spec. (#21638)
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@bzbarsky-apple @pull
bzbarsky-apple authored and pull[bot] committed Jan 23, 2024
1 parent f655814 commit 9573299
Show file tree
Hide file tree
Showing 147 changed files with 6,607 additions and 10,670 deletions.
1 change: 0 additions & 1 deletion .github/.wordlist.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ bouffalolab
BRD
breakpoint
bredr
BridgedActions
BridgedDeviceBasic
bridgedLightEndpoint
bringup
Expand Down
20 changes: 10 additions & 10 deletions docs/guides/repl/Matter - Basic Interactions.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1799,11 +1799,11 @@
"<span style=\"color: #7fbf7f; text-decoration-color: #7fbf7f\">│ │ </span><span style=\"font-weight: bold\">&lt;</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\">&gt;</span>: <span style=\"font-weight: bold\">{</span>\n",
"<span style=\"color: #7fbf7f; text-decoration-color: #7fbf7f\">│ │ │ </span><span style=\"font-weight: bold\">&lt;</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\">&gt;</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\">&lt;</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\">&gt;</span>: <span style=\"font-weight: bold\">{</span>\n",
"<span style=\"color: #7fbf7f; text-decoration-color: #7fbf7f\">│ │ │ </span><span style=\"font-weight: bold\">&lt;</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\">&gt;</span>: <span style=\"font-weight: bold\">[]</span>,\n",
"<span style=\"color: #7fbf7f; text-decoration-color: #7fbf7f\">│ │ │ </span><span style=\"font-weight: bold\">&lt;</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\">&gt;</span>: <span style=\"font-weight: bold\">[]</span>,\n",
"<span style=\"color: #7fbf7f; text-decoration-color: #7fbf7f\">│ │ │ </span><span style=\"font-weight: bold\">&lt;</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\">&gt;</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\">&lt;</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\">&gt;</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\">&lt;</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\">&gt;</span>: <span style=\"font-weight: bold\">{</span>\n",
"<span style=\"color: #7fbf7f; text-decoration-color: #7fbf7f\">│ │ │ </span><span style=\"font-weight: bold\">&lt;</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\">&gt;</span>: <span style=\"font-weight: bold\">[]</span>,\n",
"<span style=\"color: #7fbf7f; text-decoration-color: #7fbf7f\">│ │ │ </span><span style=\"font-weight: bold\">&lt;</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\">&gt;</span>: <span style=\"font-weight: bold\">[]</span>,\n",
"<span style=\"color: #7fbf7f; text-decoration-color: #7fbf7f\">│ │ │ </span><span style=\"font-weight: bold\">&lt;</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\">&gt;</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\">&lt;</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\">&gt;</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\">&lt;</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\">&gt;</span>: <span style=\"font-weight: bold\">{</span>\n",
"<span style=\"color: #7fbf7f; text-decoration-color: #7fbf7f\">│ │ │ </span><span style=\"font-weight: bold\">&lt;</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\">&gt;</span>: <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">0</span>,\n",
Expand Down Expand Up @@ -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",
Expand Down
16 changes: 8 additions & 8 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ server cluster AccessControl = 31 {
readonly attribute int16u clusterRevision = 65533;
}

server cluster BridgedActions = 37 {
server cluster Actions = 37 {
enum ActionErrorEnum : ENUM8 {
kUnknown = 0;
kInterrupted = 1;
Expand Down Expand Up @@ -531,8 +531,8 @@ server cluster BridgedActions = 37 {
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 {
Expand All @@ -556,8 +556,8 @@ server cluster BridgedActions = 37 {
}

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;
}
Expand Down Expand Up @@ -4230,10 +4230,10 @@ endpoint 1 {
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;
}
Expand Down
55 changes: 27 additions & 28 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,7 @@
"enabled": 0,
"attributes": [
{
"name": "current level",
"name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
Expand Down Expand Up @@ -9443,7 +9443,7 @@
"enabled": 1,
"attributes": [
{
"name": "current level",
"name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
Expand All @@ -9459,7 +9459,7 @@
"reportableChange": 0
},
{
"name": "remaining time",
"name": "RemainingTime",
"code": 1,
"mfgCode": null,
"side": "server",
Expand All @@ -9475,7 +9475,7 @@
"reportableChange": 0
},
{
"name": "min level",
"name": "MinLevel",
"code": 2,
"mfgCode": null,
"side": "server",
Expand All @@ -9491,7 +9491,7 @@
"reportableChange": 0
},
{
"name": "max level",
"name": "MaxLevel",
"code": 3,
"mfgCode": null,
"side": "server",
Expand All @@ -9507,7 +9507,7 @@
"reportableChange": 0
},
{
"name": "current frequency",
"name": "CurrentFrequency",
"code": 4,
"mfgCode": null,
"side": "server",
Expand All @@ -9523,7 +9523,7 @@
"reportableChange": 0
},
{
"name": "min frequency",
"name": "MinFrequency",
"code": 5,
"mfgCode": null,
"side": "server",
Expand All @@ -9539,7 +9539,7 @@
"reportableChange": 0
},
{
"name": "max frequency",
"name": "MaxFrequency",
"code": 6,
"mfgCode": null,
"side": "server",
Expand All @@ -9555,7 +9555,7 @@
"reportableChange": 0
},
{
"name": "options",
"name": "Options",
"code": 15,
"mfgCode": null,
"side": "server",
Expand All @@ -9571,7 +9571,7 @@
"reportableChange": 0
},
{
"name": "on off transition time",
"name": "OnOffTransitionTime",
"code": 16,
"mfgCode": null,
"side": "server",
Expand All @@ -9587,7 +9587,7 @@
"reportableChange": 0
},
{
"name": "on level",
"name": "OnLevel",
"code": 17,
"mfgCode": null,
"side": "server",
Expand All @@ -9603,7 +9603,7 @@
"reportableChange": 0
},
{
"name": "on transition time",
"name": "OnTransitionTime",
"code": 18,
"mfgCode": null,
"side": "server",
Expand All @@ -9619,7 +9619,7 @@
"reportableChange": 0
},
{
"name": "off transition time",
"name": "OffTransitionTime",
"code": 19,
"mfgCode": null,
"side": "server",
Expand All @@ -9635,7 +9635,7 @@
"reportableChange": 0
},
{
"name": "default move rate",
"name": "DefaultMoveRate",
"code": 20,
"mfgCode": null,
"side": "server",
Expand All @@ -9651,7 +9651,7 @@
"reportableChange": 0
},
{
"name": "start up current level",
"name": "StartUpCurrentLevel",
"code": 16384,
"mfgCode": null,
"side": "server",
Expand Down Expand Up @@ -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": [
Expand All @@ -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",
Expand All @@ -10131,7 +10131,7 @@
"reportableChange": 0
},
{
"name": "endpoint list",
"name": "EndpointLists",
"code": 1,
"mfgCode": null,
"side": "server",
Expand All @@ -10147,7 +10147,7 @@
"reportableChange": 0
},
{
"name": "setup url",
"name": "SetupURL",
"code": 2,
"mfgCode": null,
"side": "server",
Expand Down Expand Up @@ -14789,7 +14789,7 @@
"side": "server",
"type": "array",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand All @@ -14805,7 +14805,7 @@
"side": "server",
"type": "array",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand All @@ -14821,7 +14821,7 @@
"side": "server",
"type": "array",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand Down Expand Up @@ -21353,7 +21353,7 @@
"enabled": 0,
"attributes": [
{
"name": "current level",
"name": "CurrentLevel",
"code": 0,
"mfgCode": null,
"side": "server",
Expand Down Expand Up @@ -24558,6 +24558,5 @@
"endpointVersion": 1,
"deviceIdentifier": 61442
}
],
"log": []
]
}
Loading

0 comments on commit 9573299

Please sign in to comment.