Skip to content

Commit 99cfacb

Browse files
committed
remove the topology request and response command and fix the id of activedatasettimestamp
1 parent 5bd131b commit 99cfacb

File tree

12 files changed

+16
-32
lines changed

12 files changed

+16
-32
lines changed

src/app/zap-templates/zcl/data-model/chip/thread-border-router-management-cluster.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ limitations under the License.
4141

4242
<attribute side="server" code="0x0003" define="INTERFACE_ENABLED" type="boolean" default="0">InterfaceEnabled</attribute>
4343

44-
<attribute side="server" code="0x0005" define="ACTIVE_DATASET_TIMESTAMP" type="int64u" isNullable="true">ActiveDatasetTimestamp</attribute>
44+
<attribute side="server" code="0x0004" define="ACTIVE_DATASET_TIMESTAMP" type="int64u" isNullable="true">ActiveDatasetTimestamp</attribute>
4545

4646

4747
<command source="client" code="0x00" name="GetActiveDatasetRequest" response="DatasetResponse" optional="false">

src/controller/data_model/controller-clusters.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -7686,7 +7686,7 @@ provisional cluster ThreadBorderRouterManagement = 1106 {
76867686
readonly attribute octet_string<254> borderAgentID = 1;
76877687
readonly attribute int16u threadVersion = 2;
76887688
readonly attribute boolean interfaceEnabled = 3;
7689-
readonly attribute nullable int64u activeDatasetTimestamp = 5;
7689+
readonly attribute nullable int64u activeDatasetTimestamp = 4;
76907690
readonly attribute command_id generatedCommandList[] = 65528;
76917691
readonly attribute command_id acceptedCommandList[] = 65529;
76927692
readonly attribute event_id eventList[] = 65530;

src/controller/data_model/controller-clusters.zap

+2-18
Original file line numberDiff line numberDiff line change
@@ -1206,43 +1206,27 @@
12061206
},
12071207
{
12081208
"name": "DatasetResponse",
1209-
"code": 2,
1209+
"code": 3,
12101210
"mfgCode": null,
12111211
"source": "server",
12121212
"isIncoming": 0,
12131213
"isEnabled": 1
12141214
},
12151215
{
12161216
"name": "SetActiveDatasetRequest",
1217-
"code": 3,
1218-
"mfgCode": null,
1219-
"source": "client",
1220-
"isIncoming": 0,
1221-
"isEnabled": 1
1222-
},
1223-
{
1224-
"name": "SetPendingDatasetRequest",
12251217
"code": 4,
12261218
"mfgCode": null,
12271219
"source": "client",
12281220
"isIncoming": 0,
12291221
"isEnabled": 1
12301222
},
12311223
{
1232-
"name": "TopologyRequest",
1224+
"name": "SetPendingDatasetRequest",
12331225
"code": 5,
12341226
"mfgCode": null,
12351227
"source": "client",
12361228
"isIncoming": 0,
12371229
"isEnabled": 1
1238-
},
1239-
{
1240-
"name": "TopologyResponse",
1241-
"code": 6,
1242-
"mfgCode": null,
1243-
"source": "server",
1244-
"isIncoming": 0,
1245-
"isEnabled": 1
12461230
}
12471231
],
12481232
"attributes": [

src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -53090,7 +53090,7 @@ public static class ThreadBorderRouterManagementCluster extends BaseChipCluster
5309053090
private static final long BORDER_AGENT_I_D_ATTRIBUTE_ID = 1L;
5309153091
private static final long THREAD_VERSION_ATTRIBUTE_ID = 2L;
5309253092
private static final long INTERFACE_ENABLED_ATTRIBUTE_ID = 3L;
53093-
private static final long ACTIVE_DATASET_TIMESTAMP_ATTRIBUTE_ID = 5L;
53093+
private static final long ACTIVE_DATASET_TIMESTAMP_ATTRIBUTE_ID = 4L;
5309453094
private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
5309553095
private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
5309653096
private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;

src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14435,7 +14435,7 @@ public enum Attribute {
1443514435
BorderAgentID(1L),
1443614436
ThreadVersion(2L),
1443714437
InterfaceEnabled(3L),
14438-
ActiveDatasetTimestamp(5L),
14438+
ActiveDatasetTimestamp(4L),
1443914439
GeneratedCommandList(65528L),
1444014440
AcceptedCommandList(65529L),
1444114441
EventList(65530L),

src/controller/java/generated/java/matter/controller/cluster/clusters/ThreadBorderRouterManagementCluster.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ class ThreadBorderRouterManagementCluster(
561561
}
562562

563563
suspend fun readActiveDatasetTimestampAttribute(): ActiveDatasetTimestampAttribute {
564-
val ATTRIBUTE_ID: UInt = 5u
564+
val ATTRIBUTE_ID: UInt = 4u
565565

566566
val attributePath =
567567
AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
@@ -601,7 +601,7 @@ class ThreadBorderRouterManagementCluster(
601601
minInterval: Int,
602602
maxInterval: Int
603603
): Flow<ActiveDatasetTimestampAttributeSubscriptionState> {
604-
val ATTRIBUTE_ID: UInt = 5u
604+
val ATTRIBUTE_ID: UInt = 4u
605605
val attributePaths =
606606
listOf(
607607
AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)

src/controller/python/chip/clusters/CHIPClusters.py

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/controller/python/chip/clusters/Objects.py

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

zzz_generated/chip-tool/zap-generated/cluster/Commands.h

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)