rename the Robotic Vacuum Operational State cluster

project-chip · Jun 15, 2023 · 5a36676 · 5a36676
1 parent b9f0476
commit 5a36676
Show file tree

Hide file tree

Showing 55 changed files with 1,293 additions and 1,373 deletions.
diff --git a/.gitignore b/.gitignore
@@ -80,4 +80,3 @@ examples/thermostat/ameba/build
 # https://github.com/espressif/idf-component-manager#using-with-a-project
 examples/*/esp32/managed_components
 examples/*/esp32/dependencies.lock
-examples/all-clusters-app/all-clusters-common/all-clusters-app.zap.old
diff --git a/src/app/zap-templates/zcl/data-model/chip/operational-state-rvc-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/operational-state-rvc-cluster.xml
@@ -38,7 +38,7 @@ limitations under the License.
 
   <cluster>
     <domain>Robots</domain>
-    <name>Robotic Vacuum Operational State</name>
+    <name>RVC Operational State</name>
     <code>0x0061</code>
     <define>OPERATIONAL_STATE_RVC_CLUSTER</define>
     <client init="false" tick="false">true</client>

diff --git a/src/app/zap-templates/zcl/zcl-with-test-extensions.json b/src/app/zap-templates/zcl/zcl-with-test-extensions.json
@@ -301,8 +301,11 @@
             "LocalTime"
         ],
         "Temperature Control": ["SupportedTemperatureLevels"],
-        "Operational State": ["OperationalState", "OperationalError"],
-        "Robotic Vacuum Operational State": [
+        "Operational State": [
+            "OperationalState", 
+            "OperationalError"
+        ],
+        "RVC Operational State": [
             "OperationalState",
             "OperationalError"
         ]

diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json
@@ -299,8 +299,11 @@
             "LocalTime"
         ],
         "Temperature Control": ["SupportedTemperatureLevels"],
-        "Operational State": ["OperationalState", "OperationalError"],
-        "Robotic Vacuum Operational State": [
+        "Operational State": [
+            "OperationalState", 
+            "OperationalError"
+        ],
+        "RVC Operational State": [
             "OperationalState",
             "OperationalError"
         ]

diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
@@ -3416,7 +3416,7 @@ client cluster OperationalState = 96 {
 }
 
 /** This cluster supports remotely monitoring and, where supported, changing the operational state of a Robotic Vacuum. */
-client cluster RoboticVacuumOperationalState = 97 {
+client cluster RvcOperationalState = 97 {
   enum ErrorStateEnum : ENUM8 {
     kFailedToFindChargingDock = 64;
     kStuck = 65;

diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap
@@ -16,19 +16,19 @@
     }
   ],
   "package": [
+    {
+      "pathRelativity": "relativeToZap",
+      "path": "../../app/zap-templates/app-templates.json",
+      "type": "gen-templates-json",
+      "version": "chip-v1"
+    },
     {
       "pathRelativity": "relativeToZap",
       "path": "../../app/zap-templates/zcl/zcl.json",
       "type": "zcl-properties",
       "category": "matter",
       "version": 1,
       "description": "Matter SDK ZCL data"
-    },
-    {
-      "pathRelativity": "relativeToZap",
-      "path": "../../app/zap-templates/app-templates.json",
-      "type": "gen-templates-json",
-      "version": "chip-v1"
     }
   ],
   "endpointTypes": [
@@ -13154,7 +13154,7 @@
           ]
         },
         {
-          "name": "Robotic Vacuum Operational State",
+          "name": "RVC Operational State",
           "code": 97,
           "mfgCode": null,
           "define": "OPERATIONAL_STATE_RVC_CLUSTER",
@@ -13230,7 +13230,7 @@
           ]
         },
         {
-          "name": "Robotic Vacuum Operational State",
+          "name": "RVC Operational State",
           "code": 97,
           "mfgCode": null,
           "define": "OPERATIONAL_STATE_RVC_CLUSTER",

diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java
@@ -187,8 +187,8 @@ public static BaseCluster getCluster(long clusterId) {
         if (clusterId == OperationalState.ID) {
             return new OperationalState();
         }
-        if (clusterId == RoboticVacuumOperationalState.ID) {
-            return new RoboticVacuumOperationalState();
+        if (clusterId == RvcOperationalState.ID) {
+            return new RvcOperationalState();
         }
         if (clusterId == HepaFilterMonitoring.ID) {
             return new HepaFilterMonitoring();
@@ -7709,7 +7709,7 @@ public long getCommandID(String name) throws IllegalArgumentException {
             return Command.valueOf(name).getID();
         }
     }
-    public static class RoboticVacuumOperationalState implements BaseCluster {
+    public static class RvcOperationalState implements BaseCluster {
         public static final long ID = 97L;
         public long getID() {
             return ID;

diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java
diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterWriteMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterWriteMapping.java
@@ -1078,8 +1078,8 @@ public Map<String, Map<String, InteractionInfo>> getWriteAttributeMap() {
     writeAttributeMap.put("smokeCoAlarm", writeSmokeCoAlarmInteractionInfo);
     Map<String, InteractionInfo> writeOperationalStateInteractionInfo = new LinkedHashMap<>();
     writeAttributeMap.put("operationalState", writeOperationalStateInteractionInfo);
-    Map<String, InteractionInfo> writeRoboticVacuumOperationalStateInteractionInfo = new LinkedHashMap<>();
-    writeAttributeMap.put("roboticVacuumOperationalState", writeRoboticVacuumOperationalStateInteractionInfo);
+    Map<String, InteractionInfo> writeRvcOperationalStateInteractionInfo = new LinkedHashMap<>();
+    writeAttributeMap.put("rvcOperationalState", writeRvcOperationalStateInteractionInfo);
     Map<String, InteractionInfo> writeHepaFilterMonitoringInteractionInfo = new LinkedHashMap<>();
     writeAttributeMap.put("hepaFilterMonitoring", writeHepaFilterMonitoringInteractionInfo);
     Map<String, InteractionInfo> writeActivatedCarbonFilterMonitoringInteractionInfo = new LinkedHashMap<>();

diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
diff --git a/src/controller/java/zap-generated/CHIPClientCallbacks.h b/src/controller/java/zap-generated/CHIPClientCallbacks.h
diff --git a/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp