sample: matter: Door Lock sample uses BT_APP_PASSKEY

BT_FIXED_APPKEY is deprecated.

Signed-off-by: alperen sener <[email protected]>

Author: m-alperen-sener

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

@@ -571,6 +571,7 @@ Matter samples
 
    * Added a callback for the auto-relock feature.
      This resolves the :ref:`known issue <known_issues>` KRKNWK-20691.
+   * Updated to use the :kconfig:option:`CONFIG_BT_APP_PASSKEY` option instead of the deprecated :kconfig:option:`CONFIG_BT_FIXED_PASSKEY` 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 /* CONFIG_BT_APP_PASSKEY */
 };
 bt_conn_auth_info_cb Nrf::NUSService::sConnAuthInfoCallbacks = {
 	.pairing_complete = PairingComplete,
@@ -71,11 +74,6 @@ bool NUSService::Init(uint8_t priority, uint16_t minInterval, uint16_t maxInterv
 		LOG_DBG("NUS BLE advertising stopped");
 	};
 
-#if defined(CONFIG_BT_FIXED_PASSKEY)
-	if (bt_passkey_set(CONFIG_CHIP_NUS_FIXED_PASSKEY) != 0)
-		return false;
-#endif
-
 	return true;
 }
 
@@ -234,6 +232,13 @@ 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 /* 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

@@ -82,6 +82,9 @@ class NUSService {
 	static void RxCallback(struct bt_conn *conn, const uint8_t *const data, uint16_t len);
 	static void AuthPasskeyDisplay(struct bt_conn *conn, unsigned int passkey);
 	static void AuthCancel(struct bt_conn *conn);
+#if defined(CONFIG_BT_APP_PASSKEY)
+	static uint32_t AuthAppPasskey(struct bt_conn *conn);
+#endif /* CONFIG_BT_APP_PASSKEY */
 	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);

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