Skip to content

Commit

Permalink
Add missing commands and attributes for CI (project-chip#16090)
Browse files Browse the repository at this point in the history 
* Update simulated app to include missing clusters.

* Generated code.
  • Loading branch information
@andrei-menzopol
Josh V [Apple] authored and andrei-menzopol committed Apr 14, 2022
1 parent 1bb1fc5 commit 3b0da1c
Show file tree
Hide file tree
Showing 6 changed files with 152 additions and 37 deletions.
65 changes: 65 additions & 0 deletions examples/placeholder/linux/apps/app1/config.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,16 @@ client cluster ApplicationBasic = 1293 {
kActiveVisibleNotFocus = 3;
}

struct ApplicationBasicApplication {
INT16U catalogVendorId = 0;
CHAR_STRING applicationId = 1;
}

readonly attribute char_string<32> vendorName = 0;
readonly attribute int16u vendorID = 1;
readonly attribute char_string<32> applicationName = 2;
readonly attribute int16u productID = 3;
readonly attribute ApplicationBasicApplication application = 4;
readonly attribute ApplicationStatusEnum status = 5;
readonly attribute char_string<32> applicationVersion = 6;
readonly attribute vendor_id allowedVendorList[] = 7;
Expand All @@ -30,10 +36,16 @@ server cluster ApplicationBasic = 1293 {
kActiveVisibleNotFocus = 3;
}

struct ApplicationBasicApplication {
INT16U catalogVendorId = 0;
CHAR_STRING applicationId = 1;
}

readonly attribute char_string<32> vendorName = 0;
readonly attribute int16u vendorID = 1;
readonly attribute char_string<32> applicationName = 2;
readonly attribute int16u productID = 3;
readonly attribute ApplicationBasicApplication application = 4;
readonly attribute ApplicationStatusEnum status = 5;
readonly attribute char_string<32> applicationVersion = 6;
readonly attribute vendor_id allowedVendorList[] = 7;
Expand Down Expand Up @@ -1122,6 +1134,57 @@ server cluster NetworkCommissioning = 49 {
command ScanNetworks(ScanNetworksRequest): ScanNetworksResponse = 0;
}

client cluster OnOff = 6 {
enum OnOffDelayedAllOffEffectVariant : enum8 {
kFadeToOffIn0p8Seconds = 0;
kNoFade = 1;
k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
}

enum OnOffDyingLightEffectVariant : enum8 {
k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
}

enum OnOffEffectIdentifier : enum8 {
kDelayedAllOff = 0;
kDyingLight = 1;
}

bitmap OnOffControl : BITMAP8 {
kAcceptOnlyWhenOn = 0x1;
}

bitmap OnOffFeature : BITMAP32 {
kLighting = 0x1;
}

readonly attribute boolean onOff = 0;
readonly attribute boolean globalSceneControl = 16384;
attribute int16u onTime = 16385;
attribute int16u offWaitTime = 16386;
attribute enum8 startUpOnOff = 16387;
readonly global attribute bitmap32 featureMap = 65532;
readonly global attribute int16u clusterRevision = 65533;

request struct OffWithEffectRequest {
OnOffEffectIdentifier effectId = 0;
OnOffDelayedAllOffEffectVariant effectVariant = 1;
}

request struct OnWithTimedOffRequest {
OnOffControl onOffControl = 0;
int16u onTime = 1;
int16u offWaitTime = 2;
}

command Off(): DefaultSuccess = 0;
command OffWithEffect(OffWithEffectRequest): DefaultSuccess = 64;
command On(): DefaultSuccess = 1;
command OnWithRecallGlobalScene(): DefaultSuccess = 65;
command OnWithTimedOff(OnWithTimedOffRequest): DefaultSuccess = 66;
command Toggle(): DefaultSuccess = 2;
}

server cluster OnOff = 6 {
enum OnOffDelayedAllOffEffectVariant : enum8 {
kFadeToOffIn0p8Seconds = 0;
Expand Down Expand Up @@ -1833,6 +1896,7 @@ endpoint 0 {
binding cluster KeypadInput;
server cluster KeypadInput;
server cluster NetworkCommissioning;
binding cluster OnOff;
server cluster OnOff;
binding cluster OperationalCredentials;
server cluster OperationalCredentials;
Expand All @@ -1851,6 +1915,7 @@ endpoint 1 {
server cluster Groups;
server cluster Identify;
server cluster LevelControl;
binding cluster OnOff;
server cluster OnOff;
server cluster Scenes;
}
Expand Down
56 changes: 35 additions & 21 deletions examples/placeholder/linux/apps/app1/config.zap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"mfgCode": null,
"define": "ON_OFF_CLUSTER",
"side": "client",
"enabled": 0,
"enabled": 1,
"commands": [
{
"name": "Off",
Expand Down Expand Up @@ -827,7 +827,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand All @@ -842,7 +842,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand All @@ -857,7 +857,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand Down Expand Up @@ -2981,7 +2981,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand Down Expand Up @@ -3011,7 +3011,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand All @@ -3026,7 +3026,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand All @@ -3041,7 +3041,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand Down Expand Up @@ -3126,7 +3126,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand All @@ -3141,7 +3141,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand All @@ -3156,7 +3156,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand Down Expand Up @@ -3249,7 +3249,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand Down Expand Up @@ -3279,7 +3279,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand All @@ -3294,7 +3294,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand All @@ -3309,7 +3309,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand Down Expand Up @@ -3430,7 +3430,21 @@
"maxInterval": 65534,
"reportableChange": 0
},

{
"name": "Application",
"code": 4,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "Status",
"code": 5,
Expand Down Expand Up @@ -3467,7 +3481,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand All @@ -3482,7 +3496,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand All @@ -3497,7 +3511,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand All @@ -3512,7 +3526,7 @@
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand Down Expand Up @@ -4042,7 +4056,7 @@
"mfgCode": null,
"define": "ON_OFF_CLUSTER",
"side": "client",
"enabled": 0,
"enabled": 1,
"commands": [
{
"name": "Off",
Expand Down
7 changes: 7 additions & 0 deletions zzz_generated/placeholder/app1/zap-generated/CHIPClusters.h
View file

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

1 change: 1 addition & 0 deletions zzz_generated/placeholder/app1/zap-generated/PluginApplicationCallbacks.h
View file

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

Loading

0 comments on commit 3b0da1c

Please sign in to comment.