Skip to content

Commit

Permalink
Update ZAP to tip. (#19190)
Browse files Browse the repository at this point in the history
This fixes a bug where we would claim commands in our AcceptedCommandList that
we did not actually implement if we happened to be mis-configured to not
implement a mandatory command.

Enables the mandatory SendKey command in the Keypad Input cluster in
all-clusters-app, to keep passing existing tests.

Enables the mandatory NavigateTarget command in the Target Navigator cluster in
all-clusters-app, to keep passing existing tests.
  • Loading branch information
bzbarsky-apple authored and pull[bot] committed Jul 1, 2022
1 parent ed86aed commit 3526295
Show file tree
Hide file tree
Showing 13 changed files with 379 additions and 325 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1956,6 +1956,16 @@ server cluster KeypadInput = 1289 {

readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

request struct SendKeyRequest {
CecKeyCode keyCode = 0;
}

response struct SendKeyResponse = 1 {
KeypadInputStatusEnum status = 0;
}

command SendKey(SendKeyRequest): SendKeyResponse = 0;
}

server cluster LevelControl = 8 {
Expand Down Expand Up @@ -3004,6 +3014,18 @@ server cluster TargetNavigator = 1285 {
readonly attribute int8u currentTarget = 1;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

request struct NavigateTargetRequest {
INT8U target = 0;
optional CHAR_STRING data = 1;
}

response struct NavigateTargetResponse = 1 {
TargetNavigatorStatusEnum status = 0;
optional CHAR_STRING data = 1;
}

command NavigateTarget(NavigateTargetRequest): NavigateTargetResponse = 0;
}

server cluster TemperatureMeasurement = 1026 {
Expand Down
35 changes: 27 additions & 8 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -13955,7 +13955,7 @@
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 0,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
Expand All @@ -13971,7 +13971,7 @@
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 0,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
Expand Down Expand Up @@ -17823,7 +17823,7 @@
"code": 0,
"mfgCode": null,
"source": "client",
"incoming": 0,
"incoming": 1,
"outgoing": 1
}
],
Expand Down Expand Up @@ -17853,7 +17853,16 @@
"define": "TARGET_NAVIGATOR_CLUSTER",
"side": "server",
"enabled": 1,
"commands": [],
"commands": [
{
"name": "NavigateTargetResponse",
"code": 1,
"mfgCode": null,
"source": "server",
"incoming": 0,
"outgoing": 1
}
],
"attributes": [
{
"name": "TargetList",
Expand Down Expand Up @@ -18459,7 +18468,7 @@
"code": 0,
"mfgCode": null,
"source": "client",
"incoming": 0,
"incoming": 1,
"outgoing": 1
}
],
Expand Down Expand Up @@ -18489,7 +18498,16 @@
"define": "KEYPAD_INPUT_CLUSTER",
"side": "server",
"enabled": 1,
"commands": [],
"commands": [
{
"name": "SendKeyResponse",
"code": 1,
"mfgCode": null,
"source": "server",
"incoming": 0,
"outgoing": 1
}
],
"attributes": [
{
"name": "FeatureMap",
Expand Down Expand Up @@ -25124,5 +25142,6 @@
"endpointVersion": 1,
"deviceIdentifier": 61442
}
]
}
],
"log": []
}
2 changes: 1 addition & 1 deletion third_party/zap/repo
Submodule repo updated 104 files

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 3526295

Please sign in to comment.