Skip to content

Commit a7ba8c1

Browse files
committed
Update the xml file
1 parent 30a4e29 commit a7ba8c1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+8
-3220
lines changed

src/app/zap-templates/zcl/data-model/chip/matter-devices.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2433,13 +2433,13 @@ limitations under the License.
24332433
<domain>HRAP</domain>
24342434
<typeName>Matter Thread Border Router</typeName>
24352435
<profileId editable="false">0x0103</profileId>
2436-
<deviceId editable="false">0xFFF10011</deviceId><!-- TODO: ID-TBD -->
2436+
<deviceId editable="false">0x0091</deviceId>
24372437
<class>Simple</class>
24382438
<scope>Endpoint</scope>
24392439
<clusters lockOthers="true">
24402440
<include cluster="Descriptor" client="false" server="true" clientLocked="true" serverLocked="true"/>
24412441
<include cluster="Thread Network Diagnostics" client="false" server="true" clientLocked="true" serverLocked="true"></include>
2442-
<include cluster="Thread Border Router Mangement" client="false" server="true" clientLocked="true" serverLocked="true"></include>
2442+
<include cluster="Thread Border Router Management" client="false" server="true" clientLocked="true" serverLocked="true"></include>
24432443
</clusters>
24442444
</deviceType>
24452445

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

+1-64
Original file line numberDiff line numberDiff line change
@@ -22,60 +22,14 @@ limitations under the License.
2222
<field name="PANChange" mask="0x1"/>
2323
</bitmap>
2424

25-
<enum name="RoutingRoleEnum" type="enum8">
26-
<cluster code="0x0452"/>
27-
<item name="Unspecified" value="0x00"/>
28-
<item name="Unassigned" value="0x01"/>
29-
<item name="SleepyEndDevice" value="0x02"/>
30-
<item name="EndDevice" value="0x03"/>
31-
<item name="REED" value="0x04"/>
32-
<item name="Router" value="0x05"/>
33-
<item name="Leader" value="0x06"/>
34-
</enum>
35-
36-
<struct name="NeiborTableStruct">
37-
<cluster code="0x0452"/>
38-
<item fieldId="0" name="ExtAddress" type="int64u"/>
39-
<item fieldId="1" name="Age" type="int32u"/>
40-
<item fieldId="2" name="Rloc16" type="int16u"/>
41-
<item fieldId="3" name="AverageRssi" type="int8s" isNullable="true"/>
42-
<item fieldId="4" name="LastRssi" type="int8s" isNullable="true"/>
43-
<item fieldId="5" name="RoutingRole" type="RoutingRoleEnum"/>
44-
</struct>
45-
46-
<struct name="RouteTableStruct">
47-
<cluster code="0x0452"/>
48-
<item fieldId="0" name="RouterId" type="int8u"/>
49-
<item fieldId="1" name="PathCost" type="int8u"/>
50-
<item fieldId="2" name="LQIIn" type="int8u"/>
51-
<item fieldId="3" name="LQIOut" type="int8u"/>
52-
</struct>
53-
54-
<struct name="ChildTableStruct">
55-
<cluster code="0x0452"/>
56-
<item fieldId="0" name="Rloc16" type="int16u"/>
57-
<item fieldId="1" name="LinkQuality" type="int8u"/>
58-
<item fieldId="2" name="RoutingRole" type="RoutingRoleEnum"/>
59-
</struct>
60-
61-
<struct name="ThreadNodeStruct">
62-
<cluster code="0x0452"/>
63-
<item fieldId="0" name="ExtAddress" type="int64u"/>
64-
<item fieldId="1" name="Rloc16" type="int16u"/>
65-
<item fieldId="2" name="IPv6s" type="octet_string" array="true"/>
66-
<item fieldId="3" name="RoutingRole" type="RoutingRoleEnum"/>
67-
<item fieldId="4" name="RouteTable" type="RouteTableStruct" array="true"/>
68-
<item fieldId="5" name="ChildTable" type="ChildTableStruct" array="true"/>
69-
</struct>
70-
7125
<cluster>
7226
<domain>HRAP</domain>
7327
<name>Thread Border Router Management</name>
7428
<code>0x0452</code>
7529
<define>THREAD_BORDER_ROUTER_MANAGEMENT</define>
7630
<client init="false" tick="false">true</client>
7731
<server init="false" tick="false">true</server>
78-
<description>Thread BR management</description>
32+
<description>Manage the Thread network of Thread Border Router</description>
7933

8034
<globalAttribute code="0xFFFD" side="either" value="1"/>
8135

@@ -87,8 +41,6 @@ limitations under the License.
8741

8842
<attribute side="server" code="0x0003" define="INTERFACE_ENABLED" type="boolean">InterfaceEnabled</attribute>
8943

90-
<attribute side="server" code="0x0004" define="THREAD_NODE" type="ThreadNodeStruct">ThreadNode</attribute>
91-
9244
<attribute side="server" code="0x0005" define="ACTIVE_DATASET_TIMESTAMP" type="int64u" isNullable="true">ActiveDatasetTimestamp</attribute>
9345

9446

@@ -120,20 +72,5 @@ limitations under the License.
12072
<access op="invoke" privilege="manage"/>
12173
</command>
12274

123-
<command source="client" code="0x05" name="TopologyRequest" response="TopologyResponse" optional="false">
124-
<description>On receipt of this command, the Thread Border Router will response the current topology of the Thread network that it is connected to.</description>
125-
<arg name="Count" type="int16u"/>
126-
<arg name="StartIndex" type="int16u"/>
127-
<arg name="Snapshot" type="int8u"/>
128-
<access op="invoke" privilege="administer"/>
129-
</command>
130-
131-
<command source="server" code="0x06" name="TopologyResponse" optional="false">
132-
<description>Generated response to TopologyRequest command</description>
133-
<arg name="Snapshot" type="int8u"/>
134-
<arg name="NumberOfDevices" type="int16u"/>
135-
<arg name="ThreadTopology" type="ThreadNodeStruct" array="true"/>
136-
</command>
137-
13875
</cluster>
13976
</configurator>

src/app/zap-templates/zcl/zcl-with-test-extensions.json

-1
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,6 @@
296296
"BorderAgentId",
297297
"ThreadVersion",
298298
"InterfaceEnabled",
299-
"ThreadNode",
300299
"ActiveDatasetTimestamp",
301300
"FeatureMap"
302301
],

src/app/zap-templates/zcl/zcl.json

-1
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,6 @@
294294
"BorderAgentId",
295295
"ThreadVersion",
296296
"InterfaceEnabled",
297-
"ThreadNode",
298297
"ActiveDatasetTimestamp",
299298
"FeatureMap"
300299
],

src/controller/data_model/controller-clusters.matter

+1-57
Original file line numberDiff line numberDiff line change
@@ -7674,60 +7674,18 @@ cluster WiFiNetworkManagement = 1105 {
76747674
command access(invoke: administer) NetworkPassphraseRequest(): NetworkPassphraseResponse = 0;
76757675
}
76767676

7677-
/** Thread BR management */
7677+
/** Manage the Thread network of Thread Border Router */
76787678
cluster ThreadBorderRouterManagement = 1106 {
76797679
revision 1;
76807680

7681-
enum RoutingRoleEnum : enum8 {
7682-
kUnspecified = 0;
7683-
kUnassigned = 1;
7684-
kSleepyEndDevice = 2;
7685-
kEndDevice = 3;
7686-
kREED = 4;
7687-
kRouter = 5;
7688-
kLeader = 6;
7689-
}
7690-
76917681
bitmap Feature : bitmap32 {
76927682
kPANChange = 0x1;
76937683
}
76947684

7695-
struct ChildTableStruct {
7696-
int16u rloc16 = 0;
7697-
int8u linkQuality = 1;
7698-
RoutingRoleEnum routingRole = 2;
7699-
}
7700-
7701-
struct RouteTableStruct {
7702-
int8u routerId = 0;
7703-
int8u pathCost = 1;
7704-
int8u LQIIn = 2;
7705-
int8u LQIOut = 3;
7706-
}
7707-
7708-
struct ThreadNodeStruct {
7709-
int64u extAddress = 0;
7710-
int16u rloc16 = 1;
7711-
octet_string IPv6s[] = 2;
7712-
RoutingRoleEnum routingRole = 3;
7713-
RouteTableStruct routeTable[] = 4;
7714-
ChildTableStruct childTable[] = 5;
7715-
}
7716-
7717-
struct NeiborTableStruct {
7718-
int64u extAddress = 0;
7719-
int32u age = 1;
7720-
int16u rloc16 = 2;
7721-
nullable int8s averageRssi = 3;
7722-
nullable int8s lastRssi = 4;
7723-
RoutingRoleEnum routingRole = 5;
7724-
}
7725-
77267685
readonly attribute char_string<63> borderRouterName = 0;
77277686
readonly attribute octet_string<16> borderAgentId = 1;
77287687
readonly attribute int16u threadVersion = 2;
77297688
readonly attribute boolean interfaceEnabled = 3;
7730-
readonly attribute ThreadNodeStruct threadNode = 4;
77317689
readonly attribute nullable int64u activeDatasetTimestamp = 5;
77327690
readonly attribute command_id generatedCommandList[] = 65528;
77337691
readonly attribute command_id acceptedCommandList[] = 65529;
@@ -7749,18 +7707,6 @@ cluster ThreadBorderRouterManagement = 1106 {
77497707
octet_string<254> pendingDataset = 0;
77507708
}
77517709

7752-
request struct TopologyRequestRequest {
7753-
int16u count = 0;
7754-
int16u startIndex = 1;
7755-
int8u snapshot = 2;
7756-
}
7757-
7758-
response struct TopologyResponse = 6 {
7759-
int8u snapshot = 0;
7760-
int16u numberOfDevices = 1;
7761-
ThreadNodeStruct threadTopology[] = 2;
7762-
}
7763-
77647710
/** On receipt of this command, the Thread Border Router will read the active operational dataset of the Thread network that it is connaected to, and send the DatasetResponse as the response. This command must be sent over a valid CASE session */
77657711
command access(invoke: manage) GetActiveDatasetRequest(): DatasetResponse = 0;
77667712
/** On receipt of this command, the Thread Border Router will read the pending dataset and send the DatasetResponse as the response. This command must be sent over a valid CASE session */
@@ -7769,8 +7715,6 @@ cluster ThreadBorderRouterManagement = 1106 {
77697715
command access(invoke: manage) SetActiveDatasetRequest(SetActiveDatasetRequestRequest): DefaultSuccess = 3;
77707716
/** On receipt of this command, the Thread Border Router will set or update the pending Dataset */
77717717
command access(invoke: manage) SetPendingDatasetRequest(SetPendingDatasetRequestRequest): DefaultSuccess = 4;
7772-
/** On receipt of this command, the Thread Border Router will response the current topology of the Thread network that it is connected to. */
7773-
command access(invoke: administer) TopologyRequest(TopologyRequestRequest): TopologyResponse = 5;
77747718
}
77757719

77767720
/** This cluster provides an interface for managing low power mode on a device that supports the Wake On LAN protocol. */

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

-87
Original file line numberDiff line numberDiff line change
@@ -53090,7 +53090,6 @@ public static class ThreadBorderRouterManagementCluster extends BaseChipCluster
5309053090
private static final long BORDER_AGENT_ID_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 THREAD_NODE_ATTRIBUTE_ID = 4L;
5309453093
private static final long ACTIVE_DATASET_TIMESTAMP_ATTRIBUTE_ID = 5L;
5309553094
private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
5309653095
private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
@@ -53205,70 +53204,10 @@ public void onResponse(StructType invokeStructValue) {
5320553204
}}, commandId, commandArgs, timedInvokeTimeoutMs);
5320653205
}
5320753206

53208-
public void topologyRequest(TopologyResponseCallback callback, Integer count, Integer startIndex, Integer snapshot) {
53209-
topologyRequest(callback, count, startIndex, snapshot, 0);
53210-
}
53211-
53212-
public void topologyRequest(TopologyResponseCallback callback, Integer count, Integer startIndex, Integer snapshot, int timedInvokeTimeoutMs) {
53213-
final long commandId = 5L;
53214-
53215-
ArrayList<StructElement> elements = new ArrayList<>();
53216-
final long countFieldID = 0L;
53217-
BaseTLVType counttlvValue = new UIntType(count);
53218-
elements.add(new StructElement(countFieldID, counttlvValue));
53219-
53220-
final long startIndexFieldID = 1L;
53221-
BaseTLVType startIndextlvValue = new UIntType(startIndex);
53222-
elements.add(new StructElement(startIndexFieldID, startIndextlvValue));
53223-
53224-
final long snapshotFieldID = 2L;
53225-
BaseTLVType snapshottlvValue = new UIntType(snapshot);
53226-
elements.add(new StructElement(snapshotFieldID, snapshottlvValue));
53227-
53228-
StructType commandArgs = new StructType(elements);
53229-
invoke(new InvokeCallbackImpl(callback) {
53230-
@Override
53231-
public void onResponse(StructType invokeStructValue) {
53232-
final long snapshotFieldID = 0L;
53233-
Integer snapshot = null;
53234-
final long numberOfDevicesFieldID = 1L;
53235-
Integer numberOfDevices = null;
53236-
final long threadTopologyFieldID = 2L;
53237-
ArrayList<ChipStructs.ThreadBorderRouterManagementClusterThreadNodeStruct> threadTopology = null;
53238-
for (StructElement element: invokeStructValue.value()) {
53239-
if (element.contextTagNum() == snapshotFieldID) {
53240-
if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
53241-
UIntType castingValue = element.value(UIntType.class);
53242-
snapshot = castingValue.value(Integer.class);
53243-
}
53244-
} else if (element.contextTagNum() == numberOfDevicesFieldID) {
53245-
if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
53246-
UIntType castingValue = element.value(UIntType.class);
53247-
numberOfDevices = castingValue.value(Integer.class);
53248-
}
53249-
} else if (element.contextTagNum() == threadTopologyFieldID) {
53250-
if (element.value(BaseTLVType.class).type() == TLVType.Array) {
53251-
ArrayType castingValue = element.value(ArrayType.class);
53252-
threadTopology = castingValue.map((elementcastingValue) -> ChipStructs.ThreadBorderRouterManagementClusterThreadNodeStruct.decodeTlv(elementcastingValue));
53253-
}
53254-
}
53255-
}
53256-
callback.onSuccess(snapshot, numberOfDevices, threadTopology);
53257-
}}, commandId, commandArgs, timedInvokeTimeoutMs);
53258-
}
53259-
5326053207
public interface DatasetResponseCallback extends BaseClusterCallback {
5326153208
void onSuccess(byte[] dataset);
5326253209
}
5326353210

53264-
public interface TopologyResponseCallback extends BaseClusterCallback {
53265-
void onSuccess(Integer snapshot, Integer numberOfDevices, ArrayList<ChipStructs.ThreadBorderRouterManagementClusterThreadNodeStruct> threadTopology);
53266-
}
53267-
53268-
public interface ThreadNodeAttributeCallback extends BaseAttributeCallback {
53269-
void onSuccess(ChipStructs.ThreadBorderRouterManagementClusterThreadNodeStruct value);
53270-
}
53271-
5327253211
public interface ActiveDatasetTimestampAttributeCallback extends BaseAttributeCallback {
5327353212
void onSuccess(@Nullable Long value);
5327453213
}
@@ -53393,32 +53332,6 @@ public void onSuccess(byte[] tlv) {
5339353332
}, INTERFACE_ENABLED_ATTRIBUTE_ID, minInterval, maxInterval);
5339453333
}
5339553334

53396-
public void readThreadNodeAttribute(
53397-
ThreadNodeAttributeCallback callback) {
53398-
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, THREAD_NODE_ATTRIBUTE_ID);
53399-
53400-
readAttribute(new ReportCallbackImpl(callback, path) {
53401-
@Override
53402-
public void onSuccess(byte[] tlv) {
53403-
ChipStructs.ThreadBorderRouterManagementClusterThreadNodeStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
53404-
callback.onSuccess(value);
53405-
}
53406-
}, THREAD_NODE_ATTRIBUTE_ID, true);
53407-
}
53408-
53409-
public void subscribeThreadNodeAttribute(
53410-
ThreadNodeAttributeCallback callback, int minInterval, int maxInterval) {
53411-
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, THREAD_NODE_ATTRIBUTE_ID);
53412-
53413-
subscribeAttribute(new ReportCallbackImpl(callback, path) {
53414-
@Override
53415-
public void onSuccess(byte[] tlv) {
53416-
ChipStructs.ThreadBorderRouterManagementClusterThreadNodeStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
53417-
callback.onSuccess(value);
53418-
}
53419-
}, THREAD_NODE_ATTRIBUTE_ID, minInterval, maxInterval);
53420-
}
53421-
5342253335
public void readActiveDatasetTimestampAttribute(
5342353336
ActiveDatasetTimestampAttributeCallback callback) {
5342453337
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_DATASET_TIMESTAMP_ATTRIBUTE_ID);

0 commit comments

Comments
 (0)