Skip to content

Commit c3c2a0e

Browse files
OlivierGrebzbarsky-applerestyled-commitsandy31415
authored
Renaming prior to the delivery of the work about "NFC Commissioning". (#36801)
* Renaming prior to the delivery of the work about "NFC Commissioning". In current code, "NFC Commissioning" was used for Onboarding Payload data put into an NFC Tag. This naming will create confusion with the new "NFC Commissioning" feature where NFC is used as the commissioning channel. We propose to use the folllowing names: - "NFC onboarding payload" when an NFC Tag is used to store the onboarding payload data (as an alternate solution to QRCode) - "NFC commissioning" when an NFC Tag is used to perform the first commissioning phase (as an alternate solution to BLE) Defines, variables and files have been renamed to reflect this. The following renaming have been done: - CHIP_DEVICE_CONFIG_ENABLE_NFC -> CHIP_DEVICE_CONFIG_ENABLE_NFC_ONBOARDING_PAYLOAD - CONFIG_CHIP_NFC_COMMISSIONING -> CONFIG_CHIP_NFC_ONBOARDING_PAYLOAD - chip_enable_nfc -> chip_enable_nfc_onboarding_payload - NFCManager -> NFCOnboardingPayloadManager - NFCManagerImpl -> NFCOnboardingPayloadManagerImpl - NFCMgr -> NFCOnboardingMgr - NFCMgrImpl -> NFCOnboardingPayloadMgrImpl The following files have been renamed for the platforms Zephyr, nrfconnect, nxp/k32w0 and telink: NFCManagerImpl.cpp -> NFCOnboardingPayloadManagerImpl.cpp NFCManagerImpl.h -> NFCOnboardingPayloadManagerImpl.h NFCManager.h -> NFCOnboardingPayloadManager.h * Changes suggested by Damian from Nordic. * Update docs/platforms/nrf/nrfconnect_examples_configuration.md Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * Update docs/platforms/nrf/nrfconnect_examples_configuration.md Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * Update docs/platforms/nrf/nrfconnect_examples_configuration.md Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * Update examples/contact-sensor-app/nxp/mcxw71/include/config/CHIPProjectConfig.h Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * Update examples/lock-app/nxp/k32w1/include/config/CHIPProjectConfig.h Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * Update examples/contact-sensor-app/nxp/k32w1/include/config/CHIPProjectConfig.h Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * Update src/platform/stm32/args.gni Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * Update src/include/platform/internal/GenericPlatformManagerImpl.ipp Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * Update src/include/platform/NFCOnboardingPayloadManager.h Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * Update examples/lock-app/nxp/mcxw71/include/config/CHIPProjectConfig.h Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * Update examples/lighting-app/nxp/k32w1/include/config/CHIPProjectConfig.h Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * Update examples/lighting-app/nxp/mcxw71/include/config/CHIPProjectConfig.h Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * Changes suggested by Alex Tsitsiura [Telink] * Restyled by clang-format * Restyled by prettier-markdown * Renamed CHIP_NFC_COMMISSIONING in nrfconnect config file. --------- Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> Co-authored-by: Restyled.io <commits@restyled.io> Co-authored-by: Andrei Litvin <andy314@gmail.com>
1 parent 972d541 commit c3c2a0e

File tree

51 files changed

+207
-205
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+207
-205
lines changed

‎config/nrfconnect/chip-module/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ matter_add_cxxflags(${ZEPHYR_GNU_CPP_STD})
8888
# Set up custom OpenThread configuration
8989

9090
if (CONFIG_CHIP_OPENTHREAD_CONFIG)
91-
get_filename_component(CHIP_OPENTHREAD_CONFIG
91+
get_filename_component(CHIP_OPENTHREAD_CONFIG
9292
${CONFIG_CHIP_OPENTHREAD_CONFIG}
9393
REALPATH
9494
BASE_DIR ${CMAKE_SOURCE_DIR}
@@ -125,7 +125,7 @@ matter_add_gn_arg_bool ("chip_enable_openthread" CONFIG_NET_L2_
125125
matter_add_gn_arg_bool ("chip_openthread_ftd" CONFIG_OPENTHREAD_FTD)
126126
matter_add_gn_arg_bool ("chip_config_network_layer_ble" CONFIG_BT)
127127
matter_add_gn_arg_bool ("chip_inet_config_enable_ipv4" CONFIG_CHIP_IPV4)
128-
matter_add_gn_arg_bool ("chip_enable_nfc" CONFIG_CHIP_NFC_COMMISSIONING)
128+
matter_add_gn_arg_bool ("chip_enable_nfc_onboarding_payload" CONFIG_CHIP_NFC_ONBOARDING_PAYLOAD)
129129
matter_add_gn_arg_bool ("chip_enable_ota_requestor" CONFIG_CHIP_OTA_REQUESTOR)
130130
matter_add_gn_arg_bool ("chip_persist_subscriptions" CONFIG_CHIP_PERSISTENT_SUBSCRIPTIONS)
131131
matter_add_gn_arg_bool ("chip_monolithic_tests" CONFIG_CHIP_BUILD_TESTS)

‎config/nrfconnect/chip-module/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ config CHIP_NRF_PLATFORM
3434
config CHIP_DEVICE_VENDOR_NAME
3535
default "Nordic Semiconductor ASA"
3636

37-
config CHIP_NFC_COMMISSIONING
37+
config CHIP_NFC_ONBOARDING_PAYLOAD
3838
bool "Share onboarding payload in NFC tag"
3939
default n
4040
imply NFC_T2T_NRFXLIB

‎config/nrfconnect/chip-module/Kconfig.defaults

+2-2
Original file line numberDiff line numberDiff line change
@@ -178,10 +178,10 @@ config MPSL_FEM_NRF21540_RUNTIME_PA_GAIN_CONTROL
178178
default y if MPSL_FEM
179179

180180
# ==============================================================================
181-
# NFC configuration
181+
# NFC Onboarding Payload configuration
182182
# ==============================================================================
183183

184-
config CHIP_NFC_COMMISSIONING
184+
config CHIP_NFC_ONBOARDING_PAYLOAD
185185
default y
186186

187187
# Disable not needed NFC callback to save flash

‎config/qpg/chip-gn/args.gni

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ lwip_debug = false
2424
chip_enable_openthread = true
2525
chip_config_network_layer_ble = true
2626
chip_inet_config_enable_ipv4 = false
27-
chip_enable_nfc = false
27+
chip_enable_nfc_onboarding_payload = false
2828
chip_build_tests = false
2929
chip_monolithic_tests = false
3030
chip_inet_config_enable_tcp_endpoint = false

‎config/telink/chip-module/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ matter_add_flags(-DMBEDTLS_USER_CONFIG_FILE=<telink-mbedtls-config.h>)
6969
# Set up custom OpenThread configuration
7070

7171
if (CONFIG_CHIP_OPENTHREAD_CONFIG)
72-
get_filename_component(CHIP_OPENTHREAD_CONFIG
72+
get_filename_component(CHIP_OPENTHREAD_CONFIG
7373
${CONFIG_CHIP_OPENTHREAD_CONFIG}
7474
REALPATH
7575
BASE_DIR ${CMAKE_SOURCE_DIR}
@@ -96,7 +96,7 @@ matter_add_gn_arg_bool ("chip_enable_openthread" CONFIG_NET_L2_
9696
matter_add_gn_arg_bool ("chip_openthread_ftd" CONFIG_OPENTHREAD_FTD)
9797
matter_add_gn_arg_bool ("chip_config_network_layer_ble" CONFIG_BT)
9898
matter_add_gn_arg_bool ("chip_inet_config_enable_ipv4" CONFIG_CHIP_IPV4)
99-
matter_add_gn_arg_bool ("chip_enable_nfc" CONFIG_CHIP_NFC_COMMISSIONING)
99+
matter_add_gn_arg_bool ("chip_enable_nfc_onboarding_payload" CONFIG_CHIP_NFC_ONBOARDING_PAYLOAD)
100100
matter_add_gn_arg_bool ("chip_enable_ota_requestor" CONFIG_CHIP_OTA_REQUESTOR)
101101
matter_add_gn_arg_bool ("chip_inet_config_enable_tcp_endpoint" FALSE)
102102
matter_add_gn_arg_bool ("chip_error_logging" CONFIG_MATTER_LOG_LEVEL GREATER_EQUAL 1)

‎config/telink/chip-module/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ if CHIP
2222
config CHIP_DEVICE_VENDOR_NAME
2323
default "Telink Semiconductor"
2424

25-
config CHIP_NFC_COMMISSIONING
25+
config CHIP_NFC_ONBOARDING_PAYLOAD
2626
bool "Share onboarding payload in NFC tag"
2727
default n
2828
imply I2C

‎docs/platforms/nrf/nrfconnect_examples_configuration.md

+6-5
Original file line numberDiff line numberDiff line change
@@ -194,13 +194,14 @@ intervals:
194194
- `CONFIG_CHIP_ICD_SLOW_POLL_INTERVAL`
195195
- `CONFIG_CHIP_ICD_FAST_POLLING_INTERVAL`
196196
197-
#### Commissioning with NFC support
197+
#### Onboarding payload delivered over NFC
198198
199-
You can configure the Matter protocol to use an NFC tag for commissioning,
200-
instead of using a QR code, which is the default configuration.
199+
You can configure the Matter protocol to use an NFC tag for delivering the
200+
onboarding payload, instead of using a QR code, which is the default
201+
configuration.
201202
202-
To enable NFC for commissioning and share the onboarding payload in an NFC tag,
203-
set the `CONFIG_CHIP_NFC_COMMISSIONING` option.
203+
To enable sharing the onboarding payload in an NFC tag, set the
204+
`CONFIG_CHIP_NFC_ONBOARDING_PAYLOAD` option.
204205
205206
#### Factory reset behavior
206207

‎examples/all-clusters-app/nrfconnect/main/AppTask.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -489,10 +489,10 @@ void AppTask::ChipEventHandler(const ChipDeviceEvent * event, intptr_t /* arg */
489489
switch (event->Type)
490490
{
491491
case DeviceEventType::kCHIPoBLEAdvertisingChange:
492-
#ifdef CONFIG_CHIP_NFC_COMMISSIONING
492+
#ifdef CONFIG_CHIP_NFC_ONBOARDING_PAYLOAD
493493
if (event->CHIPoBLEAdvertisingChange.Result == kActivity_Started)
494494
{
495-
if (NFCMgr().IsTagEmulationStarted())
495+
if (NFCOnboardingPayloadMgr().IsTagEmulationStarted())
496496
{
497497
LOG_INF("NFC Tag emulation is already started");
498498
}
@@ -503,7 +503,7 @@ void AppTask::ChipEventHandler(const ChipDeviceEvent * event, intptr_t /* arg */
503503
}
504504
else if (event->CHIPoBLEAdvertisingChange.Result == kActivity_Stopped)
505505
{
506-
NFCMgr().StopTagEmulation();
506+
NFCOnboardingPayloadMgr().StopTagEmulation();
507507
}
508508
#endif
509509
sHaveBLEConnections = ConnectivityMgr().NumBLEConnections() != 0;

‎examples/all-clusters-minimal-app/nrfconnect/main/AppTask.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -408,10 +408,10 @@ void AppTask::ChipEventHandler(const ChipDeviceEvent * event, intptr_t /* arg */
408408
switch (event->Type)
409409
{
410410
case DeviceEventType::kCHIPoBLEAdvertisingChange:
411-
#ifdef CONFIG_CHIP_NFC_COMMISSIONING
411+
#ifdef CONFIG_CHIP_NFC_ONBOARDING_PAYLOAD
412412
if (event->CHIPoBLEAdvertisingChange.Result == kActivity_Started)
413413
{
414-
if (NFCMgr().IsTagEmulationStarted())
414+
if (NFCOnboardingPayloadMgr().IsTagEmulationStarted())
415415
{
416416
LOG_INF("NFC Tag emulation is already started");
417417
}
@@ -422,7 +422,7 @@ void AppTask::ChipEventHandler(const ChipDeviceEvent * event, intptr_t /* arg */
422422
}
423423
else if (event->CHIPoBLEAdvertisingChange.Result == kActivity_Stopped)
424424
{
425-
NFCMgr().StopTagEmulation();
425+
NFCOnboardingPayloadMgr().StopTagEmulation();
426426
}
427427
#endif
428428
sHaveBLEConnections = ConnectivityMgr().NumBLEConnections() != 0;

‎examples/contact-sensor-app/nxp/k32w0/main/AppTask.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -781,23 +781,23 @@ void AppTask::MatterEventHandler(const ChipDeviceEvent * event, intptr_t)
781781
}
782782
#endif
783783

784-
#if CONFIG_CHIP_NFC_COMMISSIONING
784+
#if CONFIG_CHIP_NFC_ONBOARDING_PAYLOAD
785785
if (event->Type == DeviceEventType::kCHIPoBLEAdvertisingChange && event->CHIPoBLEAdvertisingChange.Result == kActivity_Stopped)
786786
{
787-
if (!NFCMgr().IsTagEmulationStarted())
787+
if (!NFCOnboardingPayloadMgr().IsTagEmulationStarted())
788788
{
789789
K32W_LOG("NFC Tag emulation is already stopped!");
790790
}
791791
else
792792
{
793-
NFCMgr().StopTagEmulation();
793+
NFCOnboardingPayloadMgr().StopTagEmulation();
794794
K32W_LOG("Stopped NFC Tag Emulation!");
795795
}
796796
}
797797
else if (event->Type == DeviceEventType::kCHIPoBLEAdvertisingChange &&
798798
event->CHIPoBLEAdvertisingChange.Result == kActivity_Started)
799799
{
800-
if (NFCMgr().IsTagEmulationStarted())
800+
if (NFCOnboardingPayloadMgr().IsTagEmulationStarted())
801801
{
802802
K32W_LOG("NFC Tag emulation is already started!");
803803
}

‎examples/contact-sensor-app/nxp/k32w1/include/config/CHIPProjectConfig.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -173,12 +173,12 @@
173173
#define CHIP_DEVICE_CONFIG_BLE_ADVERTISING_TIMEOUT (15 * 60 * 1000)
174174

175175
/**
176-
* CONFIG_CHIP_NFC_COMMISSIONING, CHIP_DEVICE_CONFIG_ENABLE_NFC
176+
* CONFIG_CHIP_NFC_ONBOARDING_PAYLOAD, CHIP_DEVICE_CONFIG_ENABLE_NFC_ONBOARDING_PAYLOAD
177177
*
178-
* NFC commissioning is not supported on K32W1
178+
* NFC onboarding payload is not supported on K32W1
179179
*/
180-
#define CONFIG_CHIP_NFC_COMMISSIONING 0
181-
#define CHIP_DEVICE_CONFIG_ENABLE_NFC 0
180+
#define CONFIG_CHIP_NFC_ONBOARDING_PAYLOAD 0
181+
#define CHIP_DEVICE_CONFIG_ENABLE_NFC_ONBOARDING_PAYLOAD 0
182182

183183
/**
184184
* @def CHIP_CONFIG_MAX_FABRICS

‎examples/contact-sensor-app/nxp/mcxw71/include/config/CHIPProjectConfig.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -172,12 +172,12 @@
172172
#define CHIP_DEVICE_CONFIG_BLE_ADVERTISING_TIMEOUT (15 * 60 * 1000)
173173

174174
/**
175-
* CONFIG_CHIP_NFC_COMMISSIONING, CHIP_DEVICE_CONFIG_ENABLE_NFC
175+
* CONFIG_CHIP_NFC_ONBOARDING_PAYLOAD, CHIP_DEVICE_CONFIG_ENABLE_NFC_ONBOARDING_PAYLOAD
176176
*
177-
* NFC commissioning is not supported on K32W1
177+
* NFC onboarding payload is not supported on K32W1
178178
*/
179-
#define CONFIG_CHIP_NFC_COMMISSIONING 0
180-
#define CHIP_DEVICE_CONFIG_ENABLE_NFC 0
179+
#define CONFIG_CHIP_NFC_ONBOARDING_PAYLOAD 0
180+
#define CHIP_DEVICE_CONFIG_ENABLE_NFC_ONBOARDING_PAYLOAD 0
181181

182182
/**
183183
* @def CHIP_CONFIG_MAX_FABRICS

‎examples/light-switch-app/nrfconnect/main/AppTask.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -468,10 +468,10 @@ void AppTask::ChipEventHandler(const ChipDeviceEvent * event, intptr_t /* arg */
468468
{
469469
case DeviceEventType::kCHIPoBLEAdvertisingChange:
470470
UpdateStatusLED();
471-
#ifdef CONFIG_CHIP_NFC_COMMISSIONING
471+
#ifdef CONFIG_CHIP_NFC_ONBOARDING_PAYLOAD
472472
if (event->CHIPoBLEAdvertisingChange.Result == kActivity_Started)
473473
{
474-
if (NFCMgr().IsTagEmulationStarted())
474+
if (NFCOnboardingPayloadMgr().IsTagEmulationStarted())
475475
{
476476
LOG_INF("NFC Tag emulation is already started");
477477
}
@@ -482,7 +482,7 @@ void AppTask::ChipEventHandler(const ChipDeviceEvent * event, intptr_t /* arg */
482482
}
483483
else if (event->CHIPoBLEAdvertisingChange.Result == kActivity_Stopped)
484484
{
485-
NFCMgr().StopTagEmulation();
485+
NFCOnboardingPayloadMgr().StopTagEmulation();
486486
}
487487
#endif
488488
sHaveBLEConnections = ConnectivityMgr().NumBLEConnections() != 0;

‎examples/lighting-app/nrfconnect/main/AppTask.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -601,10 +601,10 @@ void AppTask::ChipEventHandler(const ChipDeviceEvent * event, intptr_t /* arg */
601601
switch (event->Type)
602602
{
603603
case DeviceEventType::kCHIPoBLEAdvertisingChange:
604-
#ifdef CONFIG_CHIP_NFC_COMMISSIONING
604+
#ifdef CONFIG_CHIP_NFC_ONBOARDING_PAYLOAD
605605
if (event->CHIPoBLEAdvertisingChange.Result == kActivity_Started)
606606
{
607-
if (NFCMgr().IsTagEmulationStarted())
607+
if (NFCOnboardingPayloadMgr().IsTagEmulationStarted())
608608
{
609609
LOG_INF("NFC Tag emulation is already started");
610610
}
@@ -615,7 +615,7 @@ void AppTask::ChipEventHandler(const ChipDeviceEvent * event, intptr_t /* arg */
615615
}
616616
else if (event->CHIPoBLEAdvertisingChange.Result == kActivity_Stopped)
617617
{
618-
NFCMgr().StopTagEmulation();
618+
NFCOnboardingPayloadMgr().StopTagEmulation();
619619
}
620620
#endif
621621
sHaveBLEConnections = ConnectivityMgr().NumBLEConnections() != 0;

‎examples/lighting-app/nxp/k32w0/main/AppTask.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -680,23 +680,23 @@ void AppTask::MatterEventHandler(const ChipDeviceEvent * event, intptr_t)
680680
}
681681
#endif
682682

683-
#if CONFIG_CHIP_NFC_COMMISSIONING
683+
#if CONFIG_CHIP_NFC_ONBOARDING_PAYLOAD
684684
if (event->Type == DeviceEventType::kCHIPoBLEAdvertisingChange && event->CHIPoBLEAdvertisingChange.Result == kActivity_Stopped)
685685
{
686-
if (!NFCMgr().IsTagEmulationStarted())
686+
if (!NFCOnboardingPayloadMgr().IsTagEmulationStarted())
687687
{
688688
K32W_LOG("NFC Tag emulation is already stopped!");
689689
}
690690
else
691691
{
692-
NFCMgr().StopTagEmulation();
692+
NFCOnboardingPayloadMgr().StopTagEmulation();
693693
K32W_LOG("Stopped NFC Tag Emulation!");
694694
}
695695
}
696696
else if (event->Type == DeviceEventType::kCHIPoBLEAdvertisingChange &&
697697
event->CHIPoBLEAdvertisingChange.Result == kActivity_Started)
698698
{
699-
if (NFCMgr().IsTagEmulationStarted())
699+
if (NFCOnboardingPayloadMgr().IsTagEmulationStarted())
700700
{
701701
K32W_LOG("NFC Tag emulation is already started!");
702702
}

‎examples/lighting-app/nxp/k32w1/include/config/CHIPProjectConfig.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -188,12 +188,12 @@
188188
#define CHIP_DEVICE_CONFIG_BLE_ADVERTISING_TIMEOUT (15 * 60 * 1000)
189189

190190
/**
191-
* CONFIG_CHIP_NFC_COMMISSIONING, CHIP_DEVICE_CONFIG_ENABLE_NFC
191+
* CONFIG_CHIP_NFC_ONBOARDING_PAYLOAD, CHIP_DEVICE_CONFIG_ENABLE_NFC_ONBOARDING_PAYLOAD
192192
*
193-
* NFC commissioning is not supported on K32W1
193+
* NFC onboarding payload is not supported on K32W1
194194
*/
195-
#define CONFIG_CHIP_NFC_COMMISSIONING 0
196-
#define CHIP_DEVICE_CONFIG_ENABLE_NFC 0
195+
#define CONFIG_CHIP_NFC_ONBOARDING_PAYLOAD 0
196+
#define CHIP_DEVICE_CONFIG_ENABLE_NFC_ONBOARDING_PAYLOAD 0
197197

198198
/**
199199
* @def CHIP_CONFIG_MAX_FABRICS

‎examples/lighting-app/nxp/mcxw71/include/config/CHIPProjectConfig.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -188,12 +188,12 @@
188188
#define CHIP_DEVICE_CONFIG_BLE_ADVERTISING_TIMEOUT (15 * 60 * 1000)
189189

190190
/**
191-
* CONFIG_CHIP_NFC_COMMISSIONING, CHIP_DEVICE_CONFIG_ENABLE_NFC
191+
* CONFIG_CHIP_NFC_ONBOARDING_PAYLOAD, CHIP_DEVICE_CONFIG_ENABLE_NFC_ONBOARDING_PAYLOAD
192192
*
193-
* NFC commissioning is not supported on K32W1
193+
* NFC onboarding payload is not supported on K32W1
194194
*/
195-
#define CONFIG_CHIP_NFC_COMMISSIONING 0
196-
#define CHIP_DEVICE_CONFIG_ENABLE_NFC 0
195+
#define CONFIG_CHIP_NFC_ONBOARDING_PAYLOAD 0
196+
#define CHIP_DEVICE_CONFIG_ENABLE_NFC_ONBOARDING_PAYLOAD 0
197197

198198
/**
199199
* @def CHIP_CONFIG_MAX_FABRICS

‎examples/lighting-app/telink/prj.conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ CONFIG_TELINK_OTA_BUTTON_TEST=n
3636
# Disable CHIP shell support
3737
CONFIG_CHIP_LIB_SHELL=n
3838

39-
# Disable CHIP NFC for commissioning
40-
CONFIG_CHIP_NFC_COMMISSIONING=n
39+
# Disable CHIP NFC Onboarding Payload
40+
CONFIG_CHIP_NFC_ONBOARDING_PAYLOAD=n
4141

4242
# Disable factory data support
4343
CONFIG_CHIP_FACTORY_DATA=n

‎examples/lit-icd-app/nrfconnect/main/AppTask.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -489,10 +489,10 @@ void AppTask::ChipEventHandler(const ChipDeviceEvent * event, intptr_t /* arg */
489489
switch (event->Type)
490490
{
491491
case DeviceEventType::kCHIPoBLEAdvertisingChange:
492-
#ifdef CONFIG_CHIP_NFC_COMMISSIONING
492+
#ifdef CONFIG_CHIP_NFC_ONBOARDING_PAYLOAD
493493
if (event->CHIPoBLEAdvertisingChange.Result == kActivity_Started)
494494
{
495-
if (NFCMgr().IsTagEmulationStarted())
495+
if (NFCOnboardingPayloadMgr().IsTagEmulationStarted())
496496
{
497497
LOG_INF("NFC Tag emulation is already started");
498498
}
@@ -503,7 +503,7 @@ void AppTask::ChipEventHandler(const ChipDeviceEvent * event, intptr_t /* arg */
503503
}
504504
else if (event->CHIPoBLEAdvertisingChange.Result == kActivity_Stopped)
505505
{
506-
NFCMgr().StopTagEmulation();
506+
NFCOnboardingPayloadMgr().StopTagEmulation();
507507
}
508508
#endif
509509
sHaveBLEConnections = ConnectivityMgr().NumBLEConnections() != 0;

‎examples/lock-app/nrfconnect/main/AppTask.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -549,10 +549,10 @@ void AppTask::ChipEventHandler(const ChipDeviceEvent * event, intptr_t /* arg */
549549
switch (event->Type)
550550
{
551551
case DeviceEventType::kCHIPoBLEAdvertisingChange:
552-
#ifdef CONFIG_CHIP_NFC_COMMISSIONING
552+
#ifdef CONFIG_CHIP_NFC_ONBOARDING_PAYLOAD
553553
if (event->CHIPoBLEAdvertisingChange.Result == kActivity_Started)
554554
{
555-
if (NFCMgr().IsTagEmulationStarted())
555+
if (NFCOnboardingPayloadMgr().IsTagEmulationStarted())
556556
{
557557
LOG_INF("NFC Tag emulation is already started");
558558
}
@@ -563,7 +563,7 @@ void AppTask::ChipEventHandler(const ChipDeviceEvent * event, intptr_t /* arg */
563563
}
564564
else if (event->CHIPoBLEAdvertisingChange.Result == kActivity_Stopped)
565565
{
566-
NFCMgr().StopTagEmulation();
566+
NFCOnboardingPayloadMgr().StopTagEmulation();
567567
}
568568
#endif
569569
sHaveBLEConnections = ConnectivityMgr().NumBLEConnections() != 0;

‎examples/lock-app/nxp/k32w/k32w0/main/AppTask.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -610,23 +610,23 @@ void AppTask::MatterEventHandler(const ChipDeviceEvent * event, intptr_t)
610610
}
611611
}
612612

613-
#if CONFIG_CHIP_NFC_COMMISSIONING
613+
#if CONFIG_CHIP_NFC_ONBOARDING_PAYLOAD
614614
if (event->Type == DeviceEventType::kCHIPoBLEAdvertisingChange && event->CHIPoBLEAdvertisingChange.Result == kActivity_Stopped)
615615
{
616-
if (!NFCMgr().IsTagEmulationStarted())
616+
if (!NFCOnboardingPayloadMgr().IsTagEmulationStarted())
617617
{
618618
K32W_LOG("NFC Tag emulation is already stopped!");
619619
}
620620
else
621621
{
622-
NFCMgr().StopTagEmulation();
622+
NFCOnboardingPayloadMgr().StopTagEmulation();
623623
K32W_LOG("Stopped NFC Tag Emulation!");
624624
}
625625
}
626626
else if (event->Type == DeviceEventType::kCHIPoBLEAdvertisingChange &&
627627
event->CHIPoBLEAdvertisingChange.Result == kActivity_Started)
628628
{
629-
if (NFCMgr().IsTagEmulationStarted())
629+
if (NFCOnboardingPayloadMgr().IsTagEmulationStarted())
630630
{
631631
K32W_LOG("NFC Tag emulation is already started!");
632632
}

0 commit comments

Comments
 (0)