From c83190c154a88a4b74a503666e3cff17a021265f Mon Sep 17 00:00:00 2001 From: WanqQixiang Date: Thu, 20 Feb 2025 11:00:56 +0800 Subject: [PATCH] zap-template: remove provisional marks for the NIM clusters that were added in v1.4 SPEC --- .../network-manager-app.matter | 18 +++++++------- .../placeholder/linux/apps/app1/config.matter | 14 +++++------ .../nxp/zap/thermostat_matter_br.matter | 14 +++++------ .../thread-br-common/thread-br-app.matter | 14 +++++------ ...hread-border-router-management-cluster.xml | 24 +++++++++---------- .../chip/thread-network-directory-cluster.xml | 4 ++-- .../chip/wifi-network-management-cluster.xml | 2 +- .../data_model/controller-clusters.matter | 18 +++++++------- 8 files changed, 54 insertions(+), 54 deletions(-) diff --git a/examples/network-manager-app/network-manager-common/network-manager-app.matter b/examples/network-manager-app/network-manager-common/network-manager-app.matter index c9fbb02c983809..4935286a81fdba 100644 --- a/examples/network-manager-app/network-manager-common/network-manager-app.matter +++ b/examples/network-manager-app/network-manager-common/network-manager-app.matter @@ -1439,7 +1439,7 @@ cluster GroupKeyManagement = 63 { } /** Functionality to retrieve operational information about a managed Wi-Fi network. */ -provisional cluster WiFiNetworkManagement = 1105 { +cluster WiFiNetworkManagement = 1105 { revision 1; readonly attribute nullable octet_string<32> ssid = 0; @@ -1460,19 +1460,19 @@ provisional cluster WiFiNetworkManagement = 1105 { } /** Manage the Thread network of Thread Border Router */ -provisional cluster ThreadBorderRouterManagement = 1106 { +cluster ThreadBorderRouterManagement = 1106 { revision 1; bitmap Feature : bitmap32 { kPANChange = 0x1; } - provisional readonly attribute char_string<63> borderRouterName = 0; - provisional readonly attribute octet_string<254> borderAgentID = 1; - provisional readonly attribute int16u threadVersion = 2; - provisional readonly attribute boolean interfaceEnabled = 3; - provisional readonly attribute nullable int64u activeDatasetTimestamp = 4; - provisional readonly attribute nullable int64u pendingDatasetTimestamp = 5; + readonly attribute char_string<63> borderRouterName = 0; + readonly attribute octet_string<254> borderAgentID = 1; + readonly attribute int16u threadVersion = 2; + readonly attribute boolean interfaceEnabled = 3; + readonly attribute nullable int64u activeDatasetTimestamp = 4; + readonly attribute nullable int64u pendingDatasetTimestamp = 5; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; @@ -1504,7 +1504,7 @@ provisional cluster ThreadBorderRouterManagement = 1106 { } /** Manages the names and credentials of Thread networks visible to the user. */ -provisional cluster ThreadNetworkDirectory = 1107 { +cluster ThreadNetworkDirectory = 1107 { revision 1; struct ThreadNetworkStruct { diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index 3d67d53abadfd3..e49124ffd1ec30 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -6724,19 +6724,19 @@ cluster OccupancySensing = 1030 { } /** Manage the Thread network of Thread Border Router */ -provisional cluster ThreadBorderRouterManagement = 1106 { +cluster ThreadBorderRouterManagement = 1106 { revision 1; bitmap Feature : bitmap32 { kPANChange = 0x1; } - provisional readonly attribute char_string<63> borderRouterName = 0; - provisional readonly attribute octet_string<254> borderAgentID = 1; - provisional readonly attribute int16u threadVersion = 2; - provisional readonly attribute boolean interfaceEnabled = 3; - provisional readonly attribute nullable int64u activeDatasetTimestamp = 4; - provisional readonly attribute nullable int64u pendingDatasetTimestamp = 5; + readonly attribute char_string<63> borderRouterName = 0; + readonly attribute octet_string<254> borderAgentID = 1; + readonly attribute int16u threadVersion = 2; + readonly attribute boolean interfaceEnabled = 3; + readonly attribute nullable int64u activeDatasetTimestamp = 4; + readonly attribute nullable int64u pendingDatasetTimestamp = 5; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/thermostat/nxp/zap/thermostat_matter_br.matter b/examples/thermostat/nxp/zap/thermostat_matter_br.matter index 2facf0aae2387c..57de5577e0f904 100644 --- a/examples/thermostat/nxp/zap/thermostat_matter_br.matter +++ b/examples/thermostat/nxp/zap/thermostat_matter_br.matter @@ -2077,19 +2077,19 @@ cluster Thermostat = 513 { } /** Manage the Thread network of Thread Border Router */ -provisional cluster ThreadBorderRouterManagement = 1106 { +cluster ThreadBorderRouterManagement = 1106 { revision 1; bitmap Feature : bitmap32 { kPANChange = 0x1; } - provisional readonly attribute char_string<63> borderRouterName = 0; - provisional readonly attribute octet_string<254> borderAgentID = 1; - provisional readonly attribute int16u threadVersion = 2; - provisional readonly attribute boolean interfaceEnabled = 3; - provisional readonly attribute nullable int64u activeDatasetTimestamp = 4; - provisional readonly attribute nullable int64u pendingDatasetTimestamp = 5; + readonly attribute char_string<63> borderRouterName = 0; + readonly attribute octet_string<254> borderAgentID = 1; + readonly attribute int16u threadVersion = 2; + readonly attribute boolean interfaceEnabled = 3; + readonly attribute nullable int64u activeDatasetTimestamp = 4; + readonly attribute nullable int64u pendingDatasetTimestamp = 5; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/thread-br-app/thread-br-common/thread-br-app.matter b/examples/thread-br-app/thread-br-common/thread-br-app.matter index 06e5778747b0ea..0bffa31e5e362b 100644 --- a/examples/thread-br-app/thread-br-common/thread-br-app.matter +++ b/examples/thread-br-app/thread-br-common/thread-br-app.matter @@ -1357,19 +1357,19 @@ cluster UserLabel = 65 { } /** Manage the Thread network of Thread Border Router */ -provisional cluster ThreadBorderRouterManagement = 1106 { +cluster ThreadBorderRouterManagement = 1106 { revision 1; bitmap Feature : bitmap32 { kPANChange = 0x1; } - provisional readonly attribute char_string<63> borderRouterName = 0; - provisional readonly attribute octet_string<254> borderAgentID = 1; - provisional readonly attribute int16u threadVersion = 2; - provisional readonly attribute boolean interfaceEnabled = 3; - provisional readonly attribute nullable int64u activeDatasetTimestamp = 4; - provisional readonly attribute nullable int64u pendingDatasetTimestamp = 5; + readonly attribute char_string<63> borderRouterName = 0; + readonly attribute octet_string<254> borderAgentID = 1; + readonly attribute int16u threadVersion = 2; + readonly attribute boolean interfaceEnabled = 3; + readonly attribute nullable int64u activeDatasetTimestamp = 4; + readonly attribute nullable int64u pendingDatasetTimestamp = 5; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; 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 index 38612b5eb6d117..e789eca96efbb6 100644 --- 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 @@ -22,7 +22,7 @@ limitations under the License. - + Network Infrastructure Thread Border Router Management 0x0452 @@ -33,49 +33,49 @@ limitations under the License. - + - + - + - + - + - + - + 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 - + 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 - + Generated response to GetActiveDatasetRequest or GetPendingDatasetRequest commands. - + Command to set or update the active Dataset of the Thread network to which the Border Router is connected. @@ -83,7 +83,7 @@ limitations under the License. - + Command set or update the pending Dataset of the Thread network to which the Border Router is connected. diff --git a/src/app/zap-templates/zcl/data-model/chip/thread-network-directory-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/thread-network-directory-cluster.xml index 2b00af31024a29..0f264414aac547 100644 --- a/src/app/zap-templates/zcl/data-model/chip/thread-network-directory-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/thread-network-directory-cluster.xml @@ -17,7 +17,7 @@ limitations under the License. - + @@ -25,7 +25,7 @@ limitations under the License. - + Network Infrastructure Thread Network Directory 0x0453 diff --git a/src/app/zap-templates/zcl/data-model/chip/wifi-network-management-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/wifi-network-management-cluster.xml index 1c14050fc24451..215fd668754211 100644 --- a/src/app/zap-templates/zcl/data-model/chip/wifi-network-management-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/wifi-network-management-cluster.xml @@ -17,7 +17,7 @@ limitations under the License. - + Network Infrastructure Wi-Fi Network Management 0x0451 diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 2cf8f2799bb6e7..d95830186c5f1f 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -8403,7 +8403,7 @@ cluster RadonConcentrationMeasurement = 1071 { } /** Functionality to retrieve operational information about a managed Wi-Fi network. */ -provisional cluster WiFiNetworkManagement = 1105 { +cluster WiFiNetworkManagement = 1105 { revision 1; readonly attribute nullable octet_string<32> ssid = 0; @@ -8424,19 +8424,19 @@ provisional cluster WiFiNetworkManagement = 1105 { } /** Manage the Thread network of Thread Border Router */ -provisional cluster ThreadBorderRouterManagement = 1106 { +cluster ThreadBorderRouterManagement = 1106 { revision 1; bitmap Feature : bitmap32 { kPANChange = 0x1; } - provisional readonly attribute char_string<63> borderRouterName = 0; - provisional readonly attribute octet_string<254> borderAgentID = 1; - provisional readonly attribute int16u threadVersion = 2; - provisional readonly attribute boolean interfaceEnabled = 3; - provisional readonly attribute nullable int64u activeDatasetTimestamp = 4; - provisional readonly attribute nullable int64u pendingDatasetTimestamp = 5; + readonly attribute char_string<63> borderRouterName = 0; + readonly attribute octet_string<254> borderAgentID = 1; + readonly attribute int16u threadVersion = 2; + readonly attribute boolean interfaceEnabled = 3; + readonly attribute nullable int64u activeDatasetTimestamp = 4; + readonly attribute nullable int64u pendingDatasetTimestamp = 5; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; @@ -8468,7 +8468,7 @@ provisional cluster ThreadBorderRouterManagement = 1106 { } /** Manages the names and credentials of Thread networks visible to the user. */ -provisional cluster ThreadNetworkDirectory = 1107 { +cluster ThreadNetworkDirectory = 1107 { revision 1; struct ThreadNetworkStruct {