Skip to content

Commit 0e8622d

Browse files
kkasperczyk-norlubos
authored andcommitted
samples: matter: Renamed NFC onboarding config name
The NFC config name was changed from commissioning to onboarding. Signed-off-by: Kamil Kasperczyk <[email protected]>
1 parent 4b7f2dd commit 0e8622d

File tree

10 files changed

+21
-21
lines changed

10 files changed

+21
-21
lines changed

applications/matter_bridge/prj.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ CONFIG_NCS_SAMPLE_MATTER_TEST_SHELL=y
4242
# Reduce assert verbosity to save flash space.
4343
CONFIG_ASSERT_NO_FILE_INFO=y
4444

45-
# Disable NFC commissioning
46-
CONFIG_CHIP_NFC_COMMISSIONING=n
45+
# Disable NFC onboarding
46+
CONFIG_CHIP_NFC_ONBOARDING_PAYLOAD=n
4747

4848
# Reduce application size
4949
CONFIG_USE_SEGGER_RTT=n

applications/matter_bridge/prj_release.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ CONFIG_PRINTK_SYNC=n
4747
CONFIG_THREAD_NAME=n
4848
CONFIG_BOOT_BANNER=n
4949

50-
# Disable NFC commissioning
51-
CONFIG_CHIP_NFC_COMMISSIONING=n
50+
# Disable NFC onboarding
51+
CONFIG_CHIP_NFC_ONBOARDING_PAYLOAD=n
5252

5353
# Enable Factory Data feature
5454
CONFIG_CHIP_FACTORY_DATA=y

doc/nrf/protocols/matter/getting_started/advanced_kconfigs.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Commissioning with NFC
3939

4040
You can configure the Matter protocol to use NFC tag for commissioning, instead of the default QR code.
4141

42-
To enable NFC for commissioning and share the onboarding payload in an NFC tag, set the :kconfig:option:`CONFIG_CHIP_NFC_COMMISSIONING` Kconfig option.
42+
To enable NFC for sharing the onboarding payload in an NFC tag, set the :kconfig:option:`CONFIG_CHIP_NFC_ONBOARDING_PAYLOAD` Kconfig option.
4343

4444
.. _ug_matter_configuring_optional_persistent_subscriptions:
4545

samples/matter/common/src/app/matter_event_handler.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
#include <platform/ConnectivityManager.h>
1515

16-
#ifdef CONFIG_CHIP_NFC_COMMISSIONING
17-
#include <platform/NFCManager.h>
16+
#ifdef CONFIG_CHIP_NFC_ONBOARDING_PAYLOAD
17+
#include <platform/NFCOnboardingPayloadManager.h>
1818
#include <setup_payload/OnboardingCodesUtil.h>
1919
#endif
2020

@@ -42,16 +42,16 @@ void DefaultEventHandler(const ChipDeviceEvent *event, intptr_t /* unused */)
4242
{
4343
switch (event->Type) {
4444
case DeviceEventType::kCHIPoBLEAdvertisingChange:
45-
#ifdef CONFIG_CHIP_NFC_COMMISSIONING
45+
#ifdef CONFIG_CHIP_NFC_ONBOARDING_PAYLOAD
4646
if (event->CHIPoBLEAdvertisingChange.Result == kActivity_Started) {
47-
if (NFCMgr().IsTagEmulationStarted()) {
47+
if (NFCOnboardingPayloadMgr().IsTagEmulationStarted()) {
4848
LOG_INF("NFC Tag emulation is already started");
4949
} else {
5050
ShareQRCodeOverNFC(
5151
chip::RendezvousInformationFlags(chip::RendezvousInformationFlag::kBLE));
5252
}
5353
} else if (event->CHIPoBLEAdvertisingChange.Result == kActivity_Stopped) {
54-
NFCMgr().StopTagEmulation();
54+
NFCOnboardingPayloadMgr().StopTagEmulation();
5555
}
5656
#endif
5757
break;

samples/matter/lock/prj_thread_wifi_switched.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ CONFIG_CHIP_FACTORY_RESET_ERASE_SETTINGS=n # Do not restore initial transport on
4343
# Reduce application size
4444
CONFIG_USE_SEGGER_RTT=n
4545
CONFIG_WIFI_NM_WPA_SUPPLICANT_ADVANCED_FEATURES=n
46-
CONFIG_CHIP_NFC_COMMISSIONING=n
46+
CONFIG_CHIP_NFC_ONBOARDING_PAYLOAD=n
4747
CONFIG_MATTER_LOG_LEVEL_INF=y
4848
CONFIG_CHIP_APP_LOG_LEVEL=3
4949
CONFIG_THREAD_NAME=n

samples/matter/manufacturer_specific/prj.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ CONFIG_RESET_ON_FATAL_ERROR=n
4444
CONFIG_CHIP_LIB_SHELL=y
4545
CONFIG_NCS_SAMPLE_MATTER_TEST_SHELL=y
4646

47-
# Disable NFC commissioning
48-
CONFIG_CHIP_NFC_COMMISSIONING=n
47+
# Disable NFC onboarding
48+
CONFIG_CHIP_NFC_ONBOARDING_PAYLOAD=n
4949

5050
# Reduce application size
5151
CONFIG_USE_SEGGER_RTT=n

samples/matter/template/prj.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ CONFIG_RESET_ON_FATAL_ERROR=n
4141
CONFIG_CHIP_LIB_SHELL=y
4242
CONFIG_NCS_SAMPLE_MATTER_TEST_SHELL=y
4343

44-
# Disable NFC commissioning
45-
CONFIG_CHIP_NFC_COMMISSIONING=n
44+
# Disable NFC onboarding
45+
CONFIG_CHIP_NFC_ONBOARDING_PAYLOAD=n
4646

4747
# Reduce application size
4848
CONFIG_USE_SEGGER_RTT=n

samples/matter/template/prj_release.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ CONFIG_PRINTK_SYNC=n
5454
CONFIG_THREAD_NAME=n
5555
CONFIG_BOOT_BANNER=n
5656

57-
# Disable NFC commissioning
58-
CONFIG_CHIP_NFC_COMMISSIONING=n
57+
# Disable NFC onboarding
58+
CONFIG_CHIP_NFC_ONBOARDING_PAYLOAD=n
5959

6060
# Enable Factory Data feature
6161
CONFIG_CHIP_FACTORY_DATA=y

samples/matter/thermostat/prj.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ CONFIG_RESET_ON_FATAL_ERROR=n
3939
CONFIG_CHIP_LIB_SHELL=y
4040
CONFIG_NCS_SAMPLE_MATTER_TEST_SHELL=y
4141

42-
# Disable NFC commissioning
43-
CONFIG_CHIP_NFC_COMMISSIONING=y
42+
# Disable NFC onboarding
43+
CONFIG_CHIP_NFC_ONBOARDING_PAYLOAD=y
4444

4545
# Reduce application size
4646
CONFIG_USE_SEGGER_RTT=n

samples/matter/thermostat/prj_release.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ CONFIG_PRINTK=n
5050
CONFIG_PRINTK_SYNC=n
5151
CONFIG_THREAD_NAME=n
5252

53-
# Disable NFC commissioning
54-
CONFIG_CHIP_NFC_COMMISSIONING=n
53+
# Disable NFC onboarding
54+
CONFIG_CHIP_NFC_ONBOARDING_PAYLOAD=n
5555

5656
# Enable Factory Data feature
5757
CONFIG_CHIP_FACTORY_DATA=y

0 commit comments

Comments
 (0)