samples: matter: Align Matter NUS to APP_PASSKEY

CONFIG_BT_FIXED_PASSKEY has been deprecated. We switched to
CONFIG_BT_APP_PASSKEY and added a migration guide entry.

Signed-off-by: Arkadiusz Balys <[email protected]>

Author: ArekBalysNordic

doc/nrf/releases_and_maturity/migration/migration_guide_3.2.rst

@@ -89,6 +89,24 @@ Matter
 
       To build your custom board with Wi-Fi support, set both the :kconfig:option:`CONFIG_CHIP_WIFI` and :kconfig:option:`CONFIG_WIFI_NRF70` Kconfig options to ``y``.
 
+    * :ref:`matter_lock_sample` sample:
+
+      * The :kconfig:option:`CONFIG_BT_FIXED_PASSKEY` kconfig option has been deprecated, replace it with the :kconfig:option:`CONFIG_BT_APP_PASSKEY` kconfig option.
+        Now, if you want to use a fixed passkey for the Matter Lock NUS service, register the ``app_passkey`` callback in the ``bt_conn_auth_cb`` structure.
+
+        For example:
+
+       .. code-block:: c
+
+          static uint32_t AuthAppPasskey(struct bt_conn *conn)
+          {
+              return 123456;
+          }
+
+          static struct bt_conn_auth_cb sConnAuthCallbacks = {
+              .app_passkey = AuthAppPasskey,
+          };
+
 Serial LTE modem
 ----------------
 

doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst

@@ -575,6 +575,7 @@ Matter samples
 
    * Added a callback for the auto-relock feature.
      This resolves the :ref:`known issue <known_issues>` KRKNWK-20691.
+   * Updated the NUS service to use the :kconfig:option:`CONFIG_BT_APP_PASSKEY` Kconfig option instead of the deprecated :kconfig:option:`CONFIG_BT_FIXED_PASSKEY` Kconfig option.
 
 Networking samples
 ------------------

samples/matter/common/src/bt_nus/bt_nus_service.cpp

@@ -31,6 +31,9 @@ BT_CONN_CB_DEFINE(conn_callbacks) = {
 bt_conn_auth_cb Nrf::NUSService::sConnAuthCallbacks = {
 	.passkey_display = AuthPasskeyDisplay,
 	.cancel = AuthCancel,
+#if defined(CONFIG_BT_APP_PASSKEY)
+	.app_passkey = AuthAppPasskey,
+#endif /* defined(CONFIG_BT_APP_PASSKEY) */
 };
 bt_conn_auth_info_cb Nrf::NUSService::sConnAuthInfoCallbacks = {
 	.pairing_complete = PairingComplete,
@@ -40,7 +43,8 @@ bt_nus_cb Nrf::NUSService::sNusCallbacks = {
 	.received = RxCallback,
 };
 
-namespace Nrf {
+namespace Nrf
+{
 
 NUSService NUSService::sInstance;
 
@@ -234,6 +238,14 @@ void NUSService::AuthPasskeyDisplay(bt_conn *conn, unsigned int passkey)
 	LOG_INF("PROVIDE THE FOLLOWING CODE IN YOUR MOBILE APP: %d", passkey);
 }
 
+#if defined(CONFIG_BT_APP_PASSKEY)
+uint32_t NUSService::AuthAppPasskey(bt_conn *conn)
+{
+	return CONFIG_CHIP_NUS_FIXED_PASSKEY;
+}
+#endif /* defined(CONFIG_BT_APP_PASSKEY) */
+
+
 void NUSService::AuthCancel(bt_conn *conn)
 {
 	LOG_INF("NUS BT Pairing cancelled: %s", LogAddress(conn));

samples/matter/common/src/bt_nus/bt_nus_service.h

@@ -85,6 +85,9 @@ class NUSService {
 	static void PairingComplete(struct bt_conn *conn, bool bonded);
 	static void PairingFailed(struct bt_conn *conn, enum bt_security_err reason);
 	static char* LogAddress(struct bt_conn *conn);
+#if defined(CONFIG_BT_APP_PASSKEY)
+	static uint32_t AuthAppPasskey(struct bt_conn *conn);
+#endif /* defined(CONFIG_BT_APP_PASSKEY) */
 
 	static struct bt_conn_auth_cb sConnAuthCallbacks;
 	static struct bt_conn_auth_info_cb sConnAuthInfoCallbacks;

samples/matter/lock/sample.yaml

@@ -124,7 +124,7 @@ tests:
     build_only: true
     extra_args:
       - CONFIG_CHIP_NUS=y
-      - CONFIG_BT_FIXED_PASSKEY=y
+      - CONFIG_BT_APP_PASSKEY=y
       - CONFIG_CHIP_NUS_FIXED_PASSKEY=112233
     integration_platforms:
       - nrf52840dk/nrf52840

west.yml

@@ -156,7 +156,7 @@ manifest:
     - name: matter
       repo-path: sdk-connectedhomeip
       path: modules/lib/matter
-      revision: e5f2a2ff99493d9862a3aa5e370681287cf53cf0
+      revision: pull/653/head
       west-commands: scripts/west/west-commands.yml
       submodules:
         - name: nlio