[fix] optimize zap for rootnode_dishwasher (#29042)

* optimize zap for rootnode_dishwasher * fix CI error * Revert "fix CI error" This reverts commit 93a05fa.
project-chip · Jan 9, 2024 · 2174916 · 2174916
1 parent e5e6b9a
commit 2174916
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 113 deletions.
diff --git a/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter b/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter
@@ -79,75 +79,6 @@ server cluster Identify = 3 {
  command access(invoke: manage) TriggerEffect(TriggerEffectRequest): DefaultSuccess = 64;
 }
 
-/** Attributes and commands for group configuration and manipulation. */
-server cluster Groups = 4 {
- bitmap Feature : BITMAP32 {
- kGroupNames = 0x1;
- }
-
- bitmap NameSupportBitmap : BITMAP8 {
- kGroupNames = 0x80;
- }
-
- readonly attribute NameSupportBitmap nameSupport = 0;
- readonly attribute command_id generatedCommandList[] = 65528;
- readonly attribute command_id acceptedCommandList[] = 65529;
- readonly attribute event_id eventList[] = 65530;
- readonly attribute attrib_id attributeList[] = 65531;
- readonly attribute bitmap32 featureMap = 65532;
- readonly attribute int16u clusterRevision = 65533;
-
- request struct AddGroupRequest {
- group_id groupID = 0;
- CHAR_STRING groupName = 1;
- }
-
- request struct ViewGroupRequest {
- group_id groupID = 0;
- }
-
- request struct GetGroupMembershipRequest {
- group_id groupList[] = 0;
- }
-
- request struct RemoveGroupRequest {
- group_id groupID = 0;
- }
-
- request struct AddGroupIfIdentifyingRequest {
- group_id groupID = 0;
- CHAR_STRING groupName = 1;
- }
-
- response struct AddGroupResponse = 0 {
- ENUM8 status = 0;
- group_id groupID = 1;
- }
-
- response struct ViewGroupResponse = 1 {
- ENUM8 status = 0;
- group_id groupID = 1;
- CHAR_STRING groupName = 2;
- }
-
- response struct GetGroupMembershipResponse = 2 {
- nullable INT8U capacity = 0;
- group_id groupList[] = 1;
- }
-
- response struct RemoveGroupResponse = 3 {
- ENUM8 status = 0;
- group_id groupID = 1;
- }
-
- fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
- fabric command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
- fabric command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
- fabric command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
- fabric command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
- fabric command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
-}
-
 /** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
 server cluster Descriptor = 29 {
  bitmap Feature : BITMAP32 {
@@ -178,25 +109,6 @@ server cluster Descriptor = 29 {
  readonly attribute int16u clusterRevision = 65533;
 }
 
-/** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
-server cluster Binding = 30 {
- fabric_scoped struct TargetStruct {
- optional node_id node = 1;
- optional group_id group = 2;
- optional endpoint_no endpoint = 3;
- optional cluster_id cluster = 4;
- fabric_idx fabricIndex = 254;
- }
-
- attribute TargetStruct binding[] = 0;
- readonly attribute command_id generatedCommandList[] = 65528;
- readonly attribute command_id acceptedCommandList[] = 65529;
- readonly attribute event_id eventList[] = 65530;
- readonly attribute attrib_id attributeList[] = 65531;
- readonly attribute bitmap32 featureMap = 65532;
- readonly attribute int16u clusterRevision = 65533;
-}
-
 /** The Access Control Cluster exposes a data model view of a
  Node's Access Control List (ACL), which codifies the rules used to manage
  and enforce Access Control for the Node's endpoints and their associated
@@ -1120,12 +1032,6 @@ endpoint 0 {
  ram attribute clusterRevision default = 4;
  }
 
- server cluster Groups {
- ram attribute nameSupport;
- ram attribute featureMap default = 0;
- ram attribute clusterRevision default = 4;
- }
-
  server cluster Descriptor {
  callback attribute deviceTypeList;
  callback attribute serverList;
@@ -1331,12 +1237,6 @@ endpoint 1 {
  ram attribute clusterRevision default = 4;
  }
 
- server cluster Groups {
- ram attribute nameSupport;
- ram attribute featureMap default = 0;
- ram attribute clusterRevision default = 4;
- }
-
  server cluster Descriptor {
  callback attribute deviceTypeList;
  callback attribute serverList;
@@ -1349,15 +1249,6 @@ endpoint 1 {
  callback attribute clusterRevision default = 1;
  }
 
- server cluster Binding {
- callback attribute binding;
- callback attribute generatedCommandList;
- callback attribute acceptedCommandList;
- callback attribute attributeList;
- ram attribute featureMap default = 0;
- ram attribute clusterRevision default = 1;
- }
-
  server cluster OperationalState {
  emits event OperationalError;
  emits event OperationCompletion;

diff --git a/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap b/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap
@@ -259,7 +259,7 @@
  "mfgCode": null,
  "define": "GROUPS_CLUSTER",
  "side": "server",
- "enabled": 1,
+ "enabled": 0,
  "commands": [
  {
  "name": "AddGroupResponse",
@@ -6553,7 +6553,7 @@
  "mfgCode": null,
  "define": "GROUPS_CLUSTER",
  "side": "server",
- "enabled": 1,
+ "enabled": 0,
  "commands": [
  {
  "name": "AddGroupResponse",
@@ -7863,7 +7863,7 @@
  "mfgCode": null,
  "define": "BINDING_CLUSTER",
  "side": "server",
- "enabled": 1,
+ "enabled": 0,
  "attributes": [
  {
  "name": "Binding",
@@ -10833,5 +10833,6 @@
  "endpointId": 1,
  "networkId": 0
  }
- ]
+ ],
+ "log": []
 }