Addressed review comments

project-chip · Jun 6, 2023 · d64905a · d64905a
1 parent b23588c
commit d64905a
Show file tree

Hide file tree

Showing 22 changed files with 18 additions and 471 deletions.
diff --git a/src/app/zap-templates/zcl/data-model/chip/refrigerator-alarm.xml b/src/app/zap-templates/zcl/data-model/chip/refrigerator-alarm.xml
@@ -29,12 +29,7 @@ limitations under the License.
     <client tick="false" init="false">true</client>
     <server tick="false" init="false">true</server>
     <attribute side="server" code="0x0000" define="MASK" type="AlarmMap" default="0" writable="false" optional="false">Mask</attribute>
-    <attribute side="server" code="0x0001" define="STATE" type="AlarmMap" default="0" writable="false" optional="false">State</attribute>
-
-    <command source="client" code="0x00" name="ModifyEnabledAlarms" optional="true">
-        <description>Modify enabled alarms</description>
-        <arg name="Mask" type="AlarmMap" optional="false"/>
-    </command>
+    <attribute side="server" code="0x0002" define="STATE" type="AlarmMap" default="0" writable="false" optional="false">State</attribute>
 
     <event side="server" code="0x00" priority="info" name="Notify" optional="false">
         <description>Notify</description>

diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
@@ -3128,20 +3128,13 @@ client cluster RefrigeratorAlarm = 87 {
   }
 
   readonly attribute AlarmMap mask = 0;
-  readonly attribute AlarmMap state = 1;
+  readonly attribute AlarmMap state = 2;
   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 ModifyEnabledAlarmsRequest {
-    AlarmMap mask = 0;
-  }
-
-  /** Modify enabled alarms */
-  command ModifyEnabledAlarms(ModifyEnabledAlarmsRequest): DefaultSuccess = 0;
 }
 
 /** This cluster is an alias of the Mode Select cluster, defining additional semantics and

diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java
@@ -7043,7 +7043,7 @@ public long getID() {
 
         public enum Attribute {
             Mask(0L),
-            State(1L),
+            State(2L),
             GeneratedCommandList(65528L),
             AcceptedCommandList(65529L),
             EventList(65530L),
@@ -7090,8 +7090,7 @@ public static Event value(long id) throws NoSuchFieldError {
             }
         }
 
-        public enum Command {
-            ModifyEnabledAlarms(0L),;
+        public enum Command {;
             private final long id;
             Command(long id) {
                 this.id = id;
@@ -7109,24 +7108,7 @@ public static Command value(long id) throws NoSuchFieldError {
                 }
                 throw new NoSuchFieldError();
             }
-        }public enum ModifyEnabledAlarmsCommandField {Mask(0),;
-                    private final int id;
-                    ModifyEnabledAlarmsCommandField(int id) {
-                        this.id = id;
-                    }
-
-                    public int getID() {
-                        return id;
-                    }
-                    public static ModifyEnabledAlarmsCommandField value(int id) throws NoSuchFieldError {
-                        for (ModifyEnabledAlarmsCommandField field : ModifyEnabledAlarmsCommandField.values()) {
-                        if (field.getID() == id) {
-                            return field;
-                        }
-                        }
-                        throw new NoSuchFieldError();
-                    }
-                }@Override
+        }@Override
         public String getAttributeName(long id) throws NoSuchFieldError {
             return Attribute.value(id).toString();
         }

diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm