Skip to content

Commit 6b2e179

Browse files
wqx6wqx6
committed
review changes
1 parent 28a8dfb commit 6b2e179

File tree

19 files changed

+438
-63
lines changed

19 files changed

+438
-63
lines changed

‎src/app/common/templates/config-data.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ CommandHandlerInterfaceOnlyClusters:
4141
- Electrical Power Measurement
4242
- Electrical Energy Measurement
4343
- Wi-Fi Network Management
44-
- Thread Border Router Management
4544

4645
# We need a more configurable way of deciding which clusters have which init functions....
4746
# See https://github.com/project-chip/connectedhomeip/issues/4369

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

+10-10
Original file line numberDiff line numberDiff line change
@@ -35,39 +35,39 @@ limitations under the License.
3535

3636
<attribute side="server" code="0x0000" define="BORDER_ROUTER_NAME" type="char_string" length="63">BorderRouterName</attribute>
3737

38-
<attribute side="server" code="0x0001" define="BORDER_AGENT_ID" type="octet_string" length="16">BorderAgentId</attribute>
38+
<attribute side="server" code="0x0001" define="BORDER_AGENT_ID" type="octet_string">BorderAgentId</attribute>
3939

4040
<attribute side="server" code="0x0002" define="THREAD_VERSION" type="int16u">ThreadVersion</attribute>
4141

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

4444
<attribute side="server" code="0x0005" define="ACTIVE_DATASET_TIMESTAMP" type="int64u" isNullable="true">ActiveDatasetTimestamp</attribute>
4545

4646

4747
<command source="client" code="0x00" name="GetActiveDatasetRequest" response="DatasetResponse" optional="false">
48-
<description>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</description>
48+
<description>Command to request the active operational dataset of the Thread network to which the border router is connected. This command must be sent over a valid CASE session</description>
4949
<access op="invoke" privilege="manage"/>
5050
</command>
5151

5252
<command source="client" code="0x01" name="GetPendingDatasetRequest" response="DatasetResponse" optional="false">
53-
<description>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</description>
53+
<description>Command to request the pending dataset of the Thread network to which the border router is connected. This command must be sent over a valid CASE session</description>
5454
<access op="invoke" privilege="manage"/>
5555
</command>
5656

57-
<command source="server" code="0x02" name="DatasetResponse" optional="false">
58-
<description>Generated response to GetActiveDatasetRequest or GetPendingDatasetRequest commands</description>
57+
<command source="server" code="0x03" name="DatasetResponse" optional="false">
58+
<description>Generated response to GetActiveDatasetRequest or GetPendingDatasetRequest commands.</description>
5959
<arg name="Dataset" type="octet_string" length="254"/>
6060
</command>
6161

62-
<command source="client" code="0x03" name="SetActiveDatasetRequest" optional="false">
63-
<description>On receipt of this command, the Thread Border Router will set or update the active Dataset of the Thread network that the Stub Router is connected to.</description>
62+
<command source="client" code="0x04" name="SetActiveDatasetRequest" optional="false">
63+
<description>Command to set or update the active Dataset of the Thread network to which the Border Router is connected.</description>
6464
<arg name="ActiveDataset" type="octet_string" length="254"/>
6565
<arg name="Breadcrumb" type="int64u" optional="true"/>
6666
<access op="invoke" privilege="manage"/>
6767
</command>
6868

69-
<command source="client" code="0x04" name="SetPendingDatasetRequest" optional="true">
70-
<description>On receipt of this command, the Thread Border Router will set or update the pending Dataset</description>
69+
<command source="client" code="0x05" name="SetPendingDatasetRequest" optional="true">
70+
<description>Command set or update the pending Dataset of the Thread network to which the Border Router is connected.</description>
7171
<arg name="PendingDataset" type="octet_string" length="254"/>
7272
<access op="invoke" privilege="manage"/>
7373
</command>

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

-8
Original file line numberDiff line numberDiff line change
@@ -291,14 +291,6 @@
291291
"general_error_boolean",
292292
"cluster_error_boolean"
293293
],
294-
"Thread Border Router Management": [
295-
"BorderRouterName",
296-
"BorderAgentId",
297-
"ThreadVersion",
298-
"InterfaceEnabled",
299-
"ActiveDatasetTimestamp",
300-
"FeatureMap"
301-
],
302294
"Thread Network Diagnostics": [
303295
"Channel",
304296
"RoutingRole",

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

-8
Original file line numberDiff line numberDiff line change
@@ -289,14 +289,6 @@
289289
"general_error_boolean",
290290
"cluster_error_boolean"
291291
],
292-
"Thread Border Router Management": [
293-
"BorderRouterName",
294-
"BorderAgentId",
295-
"ThreadVersion",
296-
"InterfaceEnabled",
297-
"ActiveDatasetTimestamp",
298-
"FeatureMap"
299-
],
300292
"Thread Network Diagnostics": [
301293
"Channel",
302294
"RoutingRole",

‎src/controller/data_model/controller-clusters.matter

+8-8
Original file line numberDiff line numberDiff line change
@@ -7683,7 +7683,7 @@ cluster ThreadBorderRouterManagement = 1106 {
76837683
}
76847684

76857685
readonly attribute char_string<63> borderRouterName = 0;
7686-
readonly attribute octet_string<16> borderAgentId = 1;
7686+
readonly attribute octet_string<254> borderAgentId = 1;
76877687
readonly attribute int16u threadVersion = 2;
76887688
readonly attribute boolean interfaceEnabled = 3;
76897689
readonly attribute nullable int64u activeDatasetTimestamp = 5;
@@ -7694,7 +7694,7 @@ cluster ThreadBorderRouterManagement = 1106 {
76947694
readonly attribute bitmap32 featureMap = 65532;
76957695
readonly attribute int16u clusterRevision = 65533;
76967696

7697-
response struct DatasetResponse = 2 {
7697+
response struct DatasetResponse = 3 {
76987698
octet_string<254> dataset = 0;
76997699
}
77007700

@@ -7707,14 +7707,14 @@ cluster ThreadBorderRouterManagement = 1106 {
77077707
octet_string<254> pendingDataset = 0;
77087708
}
77097709

7710-
/** 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 */
7710+
/** Command to request the active operational dataset of the Thread network to which the border router is connected. This command must be sent over a valid CASE session */
77117711
command access(invoke: manage) GetActiveDatasetRequest(): DatasetResponse = 0;
7712-
/** 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 */
7712+
/** Command to request the pending dataset of the Thread network to which the border router is connected. This command must be sent over a valid CASE session */
77137713
command access(invoke: manage) GetPendingDatasetRequest(): DatasetResponse = 1;
7714-
/** On receipt of this command, the Thread Border Router will set or update the active Dataset of the Thread network that the Stub Router is connected to. */
7715-
command access(invoke: manage) SetActiveDatasetRequest(SetActiveDatasetRequestRequest): DefaultSuccess = 3;
7716-
/** On receipt of this command, the Thread Border Router will set or update the pending Dataset */
7717-
command access(invoke: manage) SetPendingDatasetRequest(SetPendingDatasetRequestRequest): DefaultSuccess = 4;
7714+
/** Command to set or update the active Dataset of the Thread network to which the Border Router is connected. */
7715+
command access(invoke: manage) SetActiveDatasetRequest(SetActiveDatasetRequestRequest): DefaultSuccess = 4;
7716+
/** Command set or update the pending Dataset of the Thread network to which the Border Router is connected. */
7717+
command access(invoke: manage) SetPendingDatasetRequest(SetPendingDatasetRequestRequest): DefaultSuccess = 5;
77187718
}
77197719

77207720
/** 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

+2-2
Original file line numberDiff line numberDiff line change
@@ -53165,7 +53165,7 @@ public void setActiveDatasetRequest(DefaultClusterCallback callback, byte[] acti
5316553165
}
5316653166

5316753167
public void setActiveDatasetRequest(DefaultClusterCallback callback, byte[] activeDataset, Optional<Long> breadcrumb, int timedInvokeTimeoutMs) {
53168-
final long commandId = 3L;
53168+
final long commandId = 4L;
5316953169

5317053170
ArrayList<StructElement> elements = new ArrayList<>();
5317153171
final long activeDatasetFieldID = 0L;
@@ -53189,7 +53189,7 @@ public void setPendingDatasetRequest(DefaultClusterCallback callback, byte[] pen
5318953189
}
5319053190

5319153191
public void setPendingDatasetRequest(DefaultClusterCallback callback, byte[] pendingDataset, int timedInvokeTimeoutMs) {
53192-
final long commandId = 4L;
53192+
final long commandId = 5L;
5319353193

5319453194
ArrayList<StructElement> elements = new ArrayList<>();
5319553195
final long pendingDatasetFieldID = 0L;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -14481,8 +14481,8 @@ public static Event value(long id) throws NoSuchFieldError {
1448114481
public enum Command {
1448214482
GetActiveDatasetRequest(0L),
1448314483
GetPendingDatasetRequest(1L),
14484-
SetActiveDatasetRequest(3L),
14485-
SetPendingDatasetRequest(4L),;
14484+
SetActiveDatasetRequest(4L),
14485+
SetPendingDatasetRequest(5L),;
1448614486
private final long id;
1448714487
Command(long id) {
1448814488
this.id = id;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ class ThreadBorderRouterManagementCluster(
185185
breadcrumb: ULong?,
186186
timedInvokeTimeout: Duration? = null
187187
) {
188-
val commandId: UInt = 3u
188+
val commandId: UInt = 4u
189189

190190
val tlvWriter = TlvWriter()
191191
tlvWriter.startStructure(AnonymousTag)
@@ -212,7 +212,7 @@ class ThreadBorderRouterManagementCluster(
212212
pendingDataset: ByteArray,
213213
timedInvokeTimeout: Duration? = null
214214
) {
215-
val commandId: UInt = 4u
215+
val commandId: UInt = 5u
216216

217217
val tlvWriter = TlvWriter()
218218
tlvWriter.startStructure(AnonymousTag)

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

+4-4
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

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

‎src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h

+4-4
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

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

0 commit comments

Comments
 (0)