[NXP] Add TBRM and wifi connect support

.github/.wordlist.txt

@@ -1628,3 +1628,4 @@ Zigbee
 zigbeealliance
 zigbeethread
 zsdk
+TBR

.github/workflows/examples-nxp.yaml

@@ -242,7 +242,6 @@ jobs:
                       ./scripts/build/build_examples.py \
                       --target nxp-rw61x-freertos-all-clusters-wifi \
                       --target nxp-rw61x-freertos-all-clusters-thread \
-                      --target nxp-rw61x-freertos-all-clusters-thread-wifi \
                       --target nxp-rw61x-freertos-all-clusters-wifi-ota-cmake \
                       build \
                       --copy-artifacts-to out/artifacts \
@@ -265,7 +264,6 @@ jobs:
                       ./scripts/build/build_examples.py \
                       --target nxp-rw61x-freertos-laundry-washer-wifi \
                       --target nxp-rw61x-freertos-laundry-washer-thread \
-                      --target nxp-rw61x-freertos-laundry-washer-thread-wifi \
                       build \
                       --copy-artifacts-to out/artifacts \
                   "

docs/guides/nxp/nxp_otbr_guide.md

@@ -0,0 +1,107 @@
+# Thread Border Router usage
+
+This document describes the use of the Thread Border router and secondary
+network interface for a Matter application
+
+<hr>
+
+-   [Thread Border Router usage](#thread-border-router-usage)
+    -   [Thread Border Router overview](#thread-border-router-overview)
+    -   [Using the Thread Border Router management cluster](#using-the-thread-border-router-management-cluster)
+    -   [Using the Secondary Network commissioning interface](#using-the-secondary-network-commissioning-interface)
+    -   [Using the Thread credential sharing mechanism](#using-the-thread-credential-sharing-mechanism)
+
+<hr>
+
+<a name="thread-border-router-overview"></a>
+
+## Thread Border Router overview
+
+This section contains an overview of the Border Router architecture and
+describes the general use cases.
+
+<a name="using-the-thread-border-router-management-cluster"></a>
+
+## Using the Thread Border Router management cluster
+
+The Thread Border Router management cluster allows provisioning of the Thread
+interface using a Matter commissioner.
+
+After the device has been provisioned over WIFI the set active dataset command
+can be used to configure the Thread active dataset on the border router. Once
+the dataset is set successfully the Thread network interface will be enabled and
+the device will create a new PAN or join an existing one if already present.
+Note that this command cannot be used on a device that already has an active
+dataset configured. In this situation the set pending dataset command must be
+used instead.
+
+Before using the set active dataset command a fail-safe timer must be armed
+(recommend using a timeout of 120 seconds):
+
+```
+ubuntu@ubuntu:~$ ./chip-tool generalcommissioning arm-fail-safe timeout-seconds 1 node-id 0
+```
+
+Then an active dataset in HEX TLV format (the same type used to provision a
+Matter over Thread device using the `ble-thread` command) can be used to
+provision the Border Router. What the active dataset should be is outside the
+scope of this README but as an example one can be obtained from the OpenThread
+cli on an already provisioned device using the `dataset active -x` command.
+
+Note that the Thread Border Router management cluster has been set to endpoint 2
+in the zap file.
+
+```
+ubuntu@ubuntu:~$ ./chip-tool threadborderroutermanagement set-active-dataset-request hex:<active-dataset> node id 2
+```
+
+If the active dataset command is successful, a commissioning complete command
+must be send to disarm the fail-safe timer and commit the configuration to
+non-volatile storage.
+
+```
+ubuntu@ubuntu:~$ ./chip-tool-19-jul generalcommissioning commissioning-complete node-id 0
+```
+
+Note that this command cannot be used on a device that already has an active
+dataset configured. In this situation the set pending dataset command must be
+used instead.
+
+```
+ubuntu@ubuntu:~$ ./chip-tool threadborderroutermanagement set-pending-dataset-request hex:<active-dataset> node id 2
+```
+
+To read the active dataset of an already provisioned device, for example to make
+a joining Border Router use the same Thread network as an already configured
+one, the get active dataset command can be used:
+
+```
+ubuntu@ubuntu:~$ ./chip-tool-19-jul threadborderroutermanagement get-active-dataset-request node-id 2
+```
+
+<a name="using-the-secondary-network-commissioning-interface"></a>
+
+## Using the Secondary Network commissioning interface
+
+To use the secondary network commissioning interface over Thread the device must
+not be provisioned over WIFI. The regular `ble-thread` pairing is used as for
+any other Matter over Thread device. The chip-tool will read all the endpoints
+of the device and discover Thread network commissioning cluster on endpoint 3
+and use that to provision the device. As for any other Matter over Thread device
+a Thread Border Router is required in this case.
+
+```
+ubuntu@ubuntu:~$ ./chip-tool pairing ble-thread node-id hex:<active-dataset> 20202021 3840
+```
+
+<a name="using-the-thread-credential-sharing-mechanism"></a>
+
+## Using the Thread credential sharing mechanism
+
+The details about using the credential sharing mechanism are in the ot-nxp repo
+border router application
+[readme](https://github.com/NXP/ot-nxp/blob/v1.4.0-pvw1/examples/br/README-OTBR.md).
+See `Ephemeral Key functionality` section.
+
+Note that all OpenThread commands executed from then Matter CLI must have
+`otcli` added before the command.

examples/all-clusters-app/nxp/rt/rw61x/BUILD.gn

@@ -35,15 +35,10 @@ assert(target_os == "freertos")
 assert(nxp_platform == "rt/rw61x")
 
 declare_args() {
-  # Allows to start the tcp download test app
-  tcp_download = false
-
-  # Allows to start the wifi connect test app
-  wifi_connect = false
-
-  # The 2 params below are used only if tcp_download or wifi_connect are true, otherwise they're unused.
-  wifi_ssid = ""
-  wifi_password = ""
+  # Allows to connect to a predefine Wi-Fi network at boot
+  wifi_auto_connect_at_boot = false
+  wifi_auto_connect_at_boot_ssid = ""
+  wifi_auto_connect_at_boot_password = ""
 
   # Setup discriminator as argument
   setup_discriminator = 3840
@@ -53,10 +48,6 @@ example_platform_dir =
     "${nxp_sdk_matter_support_root}/examples/platform/${nxp_platform}"
 common_example_dir = "${chip_root}/examples/platform/nxp/common"
 
-if (tcp_download == true && wifi_connect == true) {
-  assert("Cannot enable tcp_download and wifi_connect at the same time!")
-}
-
 app_common_folder = "all-clusters-app/all-clusters-common"
 
 # Create here the SDK instance.
@@ -213,42 +204,21 @@ rt_executable("all_cluster_app") {
     ]
   }
 
-  if (wifi_connect) {
+  if (wifi_auto_connect_at_boot) {
+    assert(wifi_auto_connect_at_boot_ssid != "" &&
+               wifi_auto_connect_at_boot_password != "",
+           "WiFi SSID and password must be specified at build time!")
+
     defines += [
-      "WIFI_CONNECT_TASK=1",
-      "WIFI_CONNECT=1",
+      "CONFIG_CHIP_APP_WIFI_CONNECT_AT_BOOT=1",
+      "CONFIG_CHIP_APP_WIFI_SSID=\"${wifi_auto_connect_at_boot_ssid}\"",
+      "CONFIG_CHIP_APP_WIFI_PASSWORD=\"${wifi_auto_connect_at_boot_password}\"",
     ]
 
-    if (!chip_enable_matter_cli) {
-      assert(wifi_ssid != "" && wifi_password != "",
-             "WiFi SSID and password must be specified at build time!")
-    }
-
-    if (wifi_ssid != "") {
-      defines += [ "WIFI_SSID=\"${wifi_ssid}\"" ]
-    }
-
-    if (wifi_password != "") {
-      defines += [ "WIFI_PASSWORD=\"${wifi_password}\"" ]
-    }
-
     include_dirs += [ "${common_example_dir}/wifi_connect/include" ]
     sources += [ "${common_example_dir}/wifi_connect/source/WifiConnect.cpp" ]
   }
 
-  if (tcp_download) {
-    defines += [ "CONFIG_CHIP_TCP_DOWNLOAD=1" ]
-    defines += [
-      "WIFI_CONNECT=1",
-      "WIFI_SSID=\"${wifi_ssid}\"",
-      "WIFI_PASSWORD=\"${wifi_password}\"",
-    ]
-
-    include_dirs += [ "${common_example_dir}/tcp_download_test/include" ]
-    sources +=
-        [ "${common_example_dir}/tcp_download_test/source/TcpDownload.cpp" ]
-  }
-
   # In case a dedicated assert function needs to be supported the flag sdk_fsl_assert_support should be set to false
   # The would add to the build a dedicated application assert implementation.
   if (!sdk_fsl_assert_support) {

examples/all-clusters-app/nxp/rt/rw61x/README.md

@@ -16,6 +16,7 @@ commissioning and different cluster control.
 -   [Testing the example](#testing-the-example)
 -   [Matter Shell](#testing-the-all-clusters-application-with-matter-cli-enabled)
 -   [OTA Software Update](#ota-software-update)
+-   [Thread Border Router overview](#thread-border-router-overview)
 
 <hr>
 
@@ -124,8 +125,13 @@ user@ubuntu:~/Desktop/git/connectedhomeip/examples/all-clusters-app/nxp/rt/rw61x
 
 #### Building with Matter over Wifi + OpenThread Border Router configuration on RW612
 
-This configuration requires enabling the Matter CLI in order to control the
-Thread network on the Border Router.
+This configuration supports the Thread Border Router management cluster to
+provision the Thread credentials. Enabling the Matter CLI in order to control
+the Thread network on the Border Router is optional but recommended for other
+features like the Thread credential sharing.
+
+Note that the Thread Border Router management cluster is only supported on the
+thermostat application for now.
 
 -   Build Matter with Border Router configuration with BLE commissioning
     (ble-wifi) :
@@ -142,6 +148,13 @@ out/debug/chip-rw61x-all-cluster-example.
 
 Optional GN options that can be added when building an application:
 
+-   To enable the
+    [secondary network commissioning interface](../../../../../docs/guides/nxp/nxp_otbr_guide.md#using-the-secondary-network-commissioning-interface),
+    the arguments `chip_enable_secondary_nwk_if=true` and
+    `chip_device_config_thread_network_endpoint_id=2` must be added to the _gn
+    gen_ command. Note that this is only supported when building the Matter over
+    Wifi + OpenThread Border Router configuration. Note that is only supported
+    on the on the thermostat application for now.
 -   To enable the
     [matter CLI](README.md#testing-the-all-clusters-application-with-matter-cli-enabled),
     the argument `chip_enable_matter_cli=true` must be added to the _gn gen_
@@ -265,9 +278,11 @@ The "ble-thread" pairing method can be used in order to commission the device.
 
 #### Matter over wifi with openthread border router configuration :
 
-In order to create or join a Thread network on the Matter Border Router, the
-`otcli` commands from the matter CLI can be used. For more information about
-using the matter shell, follow instructions from
+In order to create or join a Thread network on the Matter Border Router, the TBR
+management cluster or the `otcli` commands from the matter CLI can be used. For
+more information about using the TBR management cluster follow instructions from
+['Using the TBR management cluster'](../../../../../docs/guides/nxp/nxp_otbr_guide.md#using-the-thread-border-router-management-cluster).
+For more information about using the matter shell, follow instructions from
 ['Testing the all-clusters application with Matter CLI'](#testing-the-all-clusters-application-with-matter-cli-enabled).
 
 In this configuration, the device can be commissioned over Wi-Fi with the
@@ -393,3 +408,13 @@ Over-The-Air software updates are supported with the RW61x all-clusters example.
 The process to follow in order to perform a software update is described in the
 dedicated guide
 ['Matter Over-The-Air Software Update with NXP RW61x example applications'](../../../../../docs/guides/nxp/nxp_rw61x_ota_software_update.md).
+
+<a name="thread-border-router-overview"></a>
+
+## Thread Border Router overview
+
+To enable Thread Border Router support see the [build](README.md#building)
+section.
+
+The complete Border Router guide is located
+[here](../../../../../docs/guides/nxp/nxp_otbr_guide.md).

examples/laundry-washer-app/nxp/rt/rw61x/BUILD.gn

@@ -35,15 +35,10 @@ assert(target_os == "freertos")
 assert(nxp_platform == "rt/rw61x")
 
 declare_args() {
-  # Allows to start the tcp download test app
-  tcp_download = false
-
-  # Allows to start the wifi connect test app
-  wifi_connect = false
-
-  # The 2 params below are used only if tcp_download or wifi_connect are true, otherwise they're unused.
-  wifi_ssid = ""
-  wifi_password = ""
+  # Allows to connect to a predefine Wi-Fi network at boot
+  wifi_auto_connect_at_boot = false
+  wifi_auto_connect_at_boot_ssid = ""
+  wifi_auto_connect_at_boot_password = ""
 
   # Setup discriminator as argument
   setup_discriminator = 3840
@@ -53,10 +48,6 @@ example_platform_dir =
     "${nxp_sdk_matter_support_root}/examples/platform/${nxp_platform}"
 common_example_dir = "${chip_root}/examples/platform/nxp/common"
 
-if (tcp_download == true && wifi_connect == true) {
-  assert("Cannot enable tcp_download and wifi_connect at the same time!")
-}
-
 # Use NXP custom zap files for laundry-washer device-type
 app_common_folder = "laundry-washer-app/nxp/zap"
 
@@ -218,42 +209,21 @@ rt_executable("laundry-washer") {
     ]
   }
 
-  if (wifi_connect) {
+  if (wifi_auto_connect_at_boot) {
+    assert(wifi_auto_connect_at_boot_ssid != "" &&
+               wifi_auto_connect_at_boot_password != "",
+           "WiFi SSID and password must be specified at build time!")
+
     defines += [
-      "WIFI_CONNECT_TASK=1",
-      "WIFI_CONNECT=1",
+      "CONFIG_CHIP_APP_WIFI_CONNECT_AT_BOOT=1",
+      "CONFIG_CHIP_APP_WIFI_SSID=\"${wifi_auto_connect_at_boot_ssid}\"",
+      "CONFIG_CHIP_APP_WIFI_PASSWORD=\"${wifi_auto_connect_at_boot_password}\"",
     ]
 
-    if (!chip_enable_matter_cli) {
-      assert(wifi_ssid != "" && wifi_password != "",
-             "WiFi SSID and password must be specified at build time!")
-    }
-
-    if (wifi_ssid != "") {
-      defines += [ "WIFI_SSID=\"${wifi_ssid}\"" ]
-    }
-
-    if (wifi_password != "") {
-      defines += [ "WIFI_PASSWORD=\"${wifi_password}\"" ]
-    }
-
     include_dirs += [ "${common_example_dir}/wifi_connect/include" ]
     sources += [ "${common_example_dir}/wifi_connect/source/WifiConnect.cpp" ]
   }
 
-  if (tcp_download) {
-    defines += [ "CONFIG_CHIP_TCP_DOWNLOAD=1" ]
-    defines += [
-      "WIFI_CONNECT=1",
-      "WIFI_SSID=\"${wifi_ssid}\"",
-      "WIFI_PASSWORD=\"${wifi_password}\"",
-    ]
-
-    include_dirs += [ "${common_example_dir}/tcp_download_test/include" ]
-    sources +=
-        [ "${common_example_dir}/tcp_download_test/source/TcpDownload.cpp" ]
-  }
-
   # In case a dedicated assert function needs to be supported the flag sdk_fsl_assert_support should be set to false
   # The would add to the build a dedicated application assert implementation.
   if (!sdk_fsl_assert_support) {

examples/platform/nxp/common/app_task/include/AppTaskBase.h

@@ -169,6 +169,17 @@ class AppTaskBase
      */
     static void InitServer(intptr_t arg);
 
+#if CHIP_DEVICE_CONFIG_ENABLE_TBR
+    /**
+     * \brief Initialize the Thread Border Router management cluster.
+     *
+     * Called when the border router function is up and running. This cluster stays disabled
+     * when the application is used as a Matter over Thread device.
+     *
+     */
+    void EnableTbrManagementCluster();
+#endif
+
     /**
      * Commissioning handlers
      * Generic implementation is provided within this class