Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Moving zap templates away from zap helpers which use State (eg. ensureClusters, etc) and other cleanup #23410

Closed
wants to merge 11 commits into from
Closed

Moving zap templates away from zap helpers which use State (eg. ensureClusters, etc) and other cleanup #23410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bb2ef81
Moving zap templates away from zap helpers which use State (eg. ensur…
brdandu Oct 20, 2022
d8e10d3
Regening and updating the submodule pointer of zap
brdandu Oct 31, 2022
04553e5
Just capturing the server side attributes of the client clusters in M…
brdandu Nov 1, 2022
2a00312
Just capturing the enabled server side attributes of the client clust…
brdandu Nov 1, 2022
6894fbc
Moving zap templates away from zap helpers which use State (eg. ensur…
brdandu Nov 4, 2022
3217b14
Switching from chip_server_cluster_attributes to zcl_attributes_server
brdandu Nov 4, 2022
6b91d8a
Updating zap submodule pointer
brdandu Nov 4, 2022
f1c9b4f
UPdating zap submodule after rebase
brdandu Nov 9, 2022
94bcdf9
Moving zap templates away from zap helpers which use State (eg. ensur…
brdandu Nov 11, 2022
4f77351
Updating zap repo after rebase
brdandu Nov 11, 2022
ffeeae8
Moving zap templates away from zap helpers which use State and other …
brdandu Jan 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,6 @@ client cluster OtaSoftwareUpdateProvider = 41 {
kDownloadProtocolNotSupported = 3;
}

readonly attribute int16u clusterRevision = 65533;

request struct QueryImageRequest {
vendor_id vendorId = 0;
Expand Down
1 change: 0 additions & 1 deletion examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,6 @@ client cluster OtaSoftwareUpdateProvider = 41 {
kDownloadProtocolNotSupported = 3;
}

readonly attribute int16u clusterRevision = 65533;

request struct QueryImageRequest {
vendor_id vendorId = 0;
Expand Down
6 changes: 0 additions & 6 deletions examples/bridge-app/bridge-common/bridge-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,12 +212,6 @@ client cluster Binding = 30 {
fabric_idx fabricIndex = 254;
}

attribute TargetStruct binding[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Were removed because as per the zap file. The binding server cluster was not enabled and therefore this should be be generated here as well.

readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are the server side attributes of binding cluster which are not enabled and therefore removed because the binding cluster on the server side is not enabled.

}

client cluster AccessControl = 31 {
Expand Down
13 changes: 0 additions & 13 deletions examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,11 +272,6 @@ client cluster Binding = 30 {
fabric_idx fabricIndex = 254;
}

attribute TargetStruct binding[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute int16u clusterRevision = 65533;
}

server cluster AccessControl = 31 {
Expand Down Expand Up @@ -402,7 +397,6 @@ client cluster OtaSoftwareUpdateProvider = 41 {
kDownloadProtocolNotSupported = 3;
}

readonly attribute int16u clusterRevision = 65533;

request struct QueryImageRequest {
vendor_id vendorId = 0;
Expand Down Expand Up @@ -1283,13 +1277,6 @@ server cluster FixedLabel = 64 {
}

client cluster OccupancySensing = 1030 {
readonly attribute bitmap8 occupancy = 0;
readonly attribute enum8 occupancySensorType = 1;
readonly attribute bitmap8 occupancySensorTypeBitmap = 2;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute int16u clusterRevision = 65533;
}

endpoint 0 {
Expand Down
1 change: 0 additions & 1 deletion examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,6 @@ client cluster OtaSoftwareUpdateProvider = 41 {
kDownloadProtocolNotSupported = 3;
}

readonly attribute int16u clusterRevision = 65533;

request struct QueryImageRequest {
vendor_id vendorId = 0;
Expand Down
6 changes: 0 additions & 6 deletions examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,6 @@ client cluster Binding = 30 {
fabric_idx fabricIndex = 254;
}

attribute TargetStruct binding[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute int16u clusterRevision = 65533;
}

server cluster AccessControl = 31 {
Expand Down Expand Up @@ -258,7 +253,6 @@ client cluster OtaSoftwareUpdateProvider = 41 {
kDownloadProtocolNotSupported = 3;
}

readonly attribute int16u clusterRevision = 65533;

request struct QueryImageRequest {
vendor_id vendorId = 0;
Expand Down
13 changes: 0 additions & 13 deletions examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,11 +272,6 @@ client cluster Binding = 30 {
fabric_idx fabricIndex = 254;
}

attribute TargetStruct binding[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute int16u clusterRevision = 65533;
}

server cluster AccessControl = 31 {
Expand Down Expand Up @@ -402,7 +397,6 @@ client cluster OtaSoftwareUpdateProvider = 41 {
kDownloadProtocolNotSupported = 3;
}

readonly attribute int16u clusterRevision = 65533;

request struct QueryImageRequest {
vendor_id vendorId = 0;
Expand Down Expand Up @@ -1167,13 +1161,6 @@ server cluster FixedLabel = 64 {
}

client cluster OccupancySensing = 1030 {
readonly attribute bitmap8 occupancy = 0;
readonly attribute enum8 occupancySensorType = 1;
readonly attribute bitmap8 occupancySensorTypeBitmap = 2;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute int16u clusterRevision = 65533;
}

endpoint 0 {
Expand Down
6 changes: 0 additions & 6 deletions examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,6 @@ client cluster Binding = 30 {
fabric_idx fabricIndex = 254;
}

attribute TargetStruct binding[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute int16u clusterRevision = 65533;
}

server cluster AccessControl = 31 {
Expand Down Expand Up @@ -258,7 +253,6 @@ client cluster OtaSoftwareUpdateProvider = 41 {
kDownloadProtocolNotSupported = 3;
}

readonly attribute int16u clusterRevision = 65533;

request struct QueryImageRequest {
vendor_id vendorId = 0;
Expand Down
6 changes: 0 additions & 6 deletions examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,11 +272,6 @@ client cluster Binding = 30 {
fabric_idx fabricIndex = 254;
}

attribute TargetStruct binding[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute int16u clusterRevision = 65533;
}

server cluster AccessControl = 31 {
Expand Down Expand Up @@ -402,7 +397,6 @@ client cluster OtaSoftwareUpdateProvider = 41 {
kDownloadProtocolNotSupported = 3;
}

readonly attribute int16u clusterRevision = 65533;

request struct QueryImageRequest {
vendor_id vendorId = 0;
Expand Down
1 change: 0 additions & 1 deletion examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,6 @@ client cluster OtaSoftwareUpdateProvider = 41 {
kDownloadProtocolNotSupported = 3;
}

readonly attribute int16u clusterRevision = 65533;

request struct QueryImageRequest {
vendor_id vendorId = 0;
Expand Down
12 changes: 0 additions & 12 deletions examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@ client cluster Groups = 4 {
}

readonly attribute bitmap8 nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
}
Expand All @@ -58,9 +55,6 @@ server cluster Groups = 4 {
}

readonly attribute bitmap8 nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

Expand Down Expand Up @@ -141,11 +135,6 @@ client cluster Binding = 30 {
fabric_idx fabricIndex = 254;
}

attribute TargetStruct binding[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute int16u clusterRevision = 65533;
}

server cluster AccessControl = 31 {
Expand Down Expand Up @@ -271,7 +260,6 @@ client cluster OtaSoftwareUpdateProvider = 41 {
kDownloadProtocolNotSupported = 3;
}

readonly attribute int16u clusterRevision = 65533;

request struct QueryImageRequest {
vendor_id vendorId = 0;
Expand Down
15 changes: 0 additions & 15 deletions examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,11 +265,6 @@ client cluster Binding = 30 {
fabric_idx fabricIndex = 254;
}

attribute TargetStruct binding[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute int16u clusterRevision = 65533;
}

server cluster AccessControl = 31 {
Expand Down Expand Up @@ -395,7 +390,6 @@ client cluster OtaSoftwareUpdateProvider = 41 {
kDownloadProtocolNotSupported = 3;
}

readonly attribute int16u clusterRevision = 65533;

request struct QueryImageRequest {
vendor_id vendorId = 0;
Expand Down Expand Up @@ -1216,15 +1210,6 @@ client cluster Thermostat = 513 {
kAutomode = 0x20;
}

readonly attribute nullable int16s localTemperature = 0;
attribute int16s occupiedCoolingSetpoint = 17;
attribute int16s occupiedHeatingSetpoint = 18;
attribute access(write: manage) ThermostatControlSequence controlSequenceOfOperation = 27;
attribute access(write: manage) enum8 systemMode = 28;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute int16u clusterRevision = 65533;
}

server cluster FanControl = 514 {
Expand Down
12 changes: 0 additions & 12 deletions examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@ client cluster Groups = 4 {
}

readonly attribute bitmap8 nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
}
Expand All @@ -58,9 +55,6 @@ server cluster Groups = 4 {
}

readonly attribute bitmap8 nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

Expand Down Expand Up @@ -141,11 +135,6 @@ client cluster Binding = 30 {
fabric_idx fabricIndex = 254;
}

attribute TargetStruct binding[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute int16u clusterRevision = 65533;
}

server cluster AccessControl = 31 {
Expand Down Expand Up @@ -271,7 +260,6 @@ client cluster OtaSoftwareUpdateProvider = 41 {
kDownloadProtocolNotSupported = 3;
}

readonly attribute int16u clusterRevision = 65533;

request struct QueryImageRequest {
vendor_id vendorId = 0;
Expand Down
12 changes: 0 additions & 12 deletions examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@ client cluster Groups = 4 {
}

readonly attribute bitmap8 nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
}
Expand All @@ -58,9 +55,6 @@ server cluster Groups = 4 {
}

readonly attribute bitmap8 nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

Expand Down Expand Up @@ -141,11 +135,6 @@ client cluster Binding = 30 {
fabric_idx fabricIndex = 254;
}

attribute TargetStruct binding[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute int16u clusterRevision = 65533;
}

server cluster AccessControl = 31 {
Expand Down Expand Up @@ -271,7 +260,6 @@ client cluster OtaSoftwareUpdateProvider = 41 {
kDownloadProtocolNotSupported = 3;
}

readonly attribute int16u clusterRevision = 65533;

request struct QueryImageRequest {
vendor_id vendorId = 0;
Expand Down
12 changes: 0 additions & 12 deletions examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@ client cluster Groups = 4 {
}

readonly attribute bitmap8 nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
}
Expand All @@ -58,9 +55,6 @@ server cluster Groups = 4 {
}

readonly attribute bitmap8 nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

Expand Down Expand Up @@ -141,11 +135,6 @@ client cluster Binding = 30 {
fabric_idx fabricIndex = 254;
}

attribute TargetStruct binding[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute int16u clusterRevision = 65533;
}

server cluster AccessControl = 31 {
Expand Down Expand Up @@ -271,7 +260,6 @@ client cluster OtaSoftwareUpdateProvider = 41 {
kDownloadProtocolNotSupported = 3;
}

readonly attribute int16u clusterRevision = 65533;

request struct QueryImageRequest {
vendor_id vendorId = 0;
Expand Down
6 changes: 0 additions & 6 deletions examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,11 +272,6 @@ client cluster Binding = 30 {
fabric_idx fabricIndex = 254;
}

attribute TargetStruct binding[] = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute int16u clusterRevision = 65533;
}

server cluster AccessControl = 31 {
Expand Down Expand Up @@ -402,7 +397,6 @@ client cluster OtaSoftwareUpdateProvider = 41 {
kDownloadProtocolNotSupported = 3;
}

readonly attribute int16u clusterRevision = 65533;

request struct QueryImageRequest {
vendor_id vendorId = 0;
Expand Down
Loading