remove the topology request and response command and fix the id of ac…

…tivedatasettimestamp
project-chip · Jun 18, 2024 · 2612540 · 2612540
1 parent 23e0fe4
commit 2612540
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 32 deletions.
diff --git a/src/app/zap-templates/zcl/data-model/chip/thread-border-router-management-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/thread-border-router-management-cluster.xml
@@ -41,7 +41,7 @@ limitations under the License.
 
     <attribute side="server" code="0x0003" define="INTERFACE_ENABLED" type="boolean" default="0">InterfaceEnabled</attribute>
 
-    <attribute side="server" code="0x0005" define="ACTIVE_DATASET_TIMESTAMP" type="int64u" isNullable="true">ActiveDatasetTimestamp</attribute>
+    <attribute side="server" code="0x0004" define="ACTIVE_DATASET_TIMESTAMP" type="int64u" isNullable="true">ActiveDatasetTimestamp</attribute>
 
 
     <command source="client" code="0x00" name="GetActiveDatasetRequest" response="DatasetResponse" optional="false">

diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
@@ -7698,7 +7698,7 @@ provisional cluster ThreadBorderRouterManagement = 1106 {
   readonly attribute octet_string<254> borderAgentID = 1;
   readonly attribute int16u threadVersion = 2;
   readonly attribute boolean interfaceEnabled = 3;
-  readonly attribute nullable int64u activeDatasetTimestamp = 5;
+  readonly attribute nullable int64u activeDatasetTimestamp = 4;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;

diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap
@@ -1206,43 +1206,27 @@
             },
             {
               "name": "DatasetResponse",
-              "code": 2,
+              "code": 3,
               "mfgCode": null,
               "source": "server",
               "isIncoming": 0,
               "isEnabled": 1
             },
             {
               "name": "SetActiveDatasetRequest",
-              "code": 3,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 0,
-              "isEnabled": 1
-            },
-            {
-              "name": "SetPendingDatasetRequest",
               "code": 4,
               "mfgCode": null,
               "source": "client",
               "isIncoming": 0,
               "isEnabled": 1
             },
             {
-              "name": "TopologyRequest",
+              "name": "SetPendingDatasetRequest",
               "code": 5,
               "mfgCode": null,
               "source": "client",
               "isIncoming": 0,
               "isEnabled": 1
-            },
-            {
-              "name": "TopologyResponse",
-              "code": 6,
-              "mfgCode": null,
-              "source": "server",
-              "isIncoming": 0,
-              "isEnabled": 1
             }
           ],
           "attributes": [

diff --git a/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java
@@ -53090,7 +53090,7 @@ public static class ThreadBorderRouterManagementCluster extends BaseChipCluster
     private static final long BORDER_AGENT_I_D_ATTRIBUTE_ID = 1L;
     private static final long THREAD_VERSION_ATTRIBUTE_ID = 2L;
     private static final long INTERFACE_ENABLED_ATTRIBUTE_ID = 3L;
-    private static final long ACTIVE_DATASET_TIMESTAMP_ATTRIBUTE_ID = 5L;
+    private static final long ACTIVE_DATASET_TIMESTAMP_ATTRIBUTE_ID = 4L;
     private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
     private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
     private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;

diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java
@@ -14435,7 +14435,7 @@ public enum Attribute {
             BorderAgentID(1L),
             ThreadVersion(2L),
             InterfaceEnabled(3L),
-            ActiveDatasetTimestamp(5L),
+            ActiveDatasetTimestamp(4L),
             GeneratedCommandList(65528L),
             AcceptedCommandList(65529L),
             EventList(65530L),

diff --git a/.../generated/java/matter/controller/cluster/clusters/ThreadBorderRouterManagementCluster.kt b/.../generated/java/matter/controller/cluster/clusters/ThreadBorderRouterManagementCluster.kt
@@ -561,7 +561,7 @@ class ThreadBorderRouterManagementCluster(
   }
 
   suspend fun readActiveDatasetTimestampAttribute(): ActiveDatasetTimestampAttribute {
-    val ATTRIBUTE_ID: UInt = 5u
+    val ATTRIBUTE_ID: UInt = 4u
 
     val attributePath =
       AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
@@ -601,7 +601,7 @@ class ThreadBorderRouterManagementCluster(
     minInterval: Int,
     maxInterval: Int
   ): Flow<ActiveDatasetTimestampAttributeSubscriptionState> {
-    val ATTRIBUTE_ID: UInt = 5u
+    val ATTRIBUTE_ID: UInt = 4u
     val attributePaths =
       listOf(
         AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)

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/MTRClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h