Fix NFC enabling (#17373)

* Fix NFC enabling Set all the defines required for NFC if chip_enable_nfc is true. Signed-off-by: Doru Gucea <[email protected]> * Restyled by gn Co-authored-by: Restyled.io <[email protected]>
project-chip · Apr 14, 2022 · 01e54b2 · 01e54b2
1 parent 21024aa
commit 01e54b2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 25 deletions.
diff --git a/examples/lighting-app/nxp/k32w/k32w0/include/CHIPProjectConfig.h b/examples/lighting-app/nxp/k32w/k32w0/include/CHIPProjectConfig.h
@@ -128,14 +128,6 @@
  */
 #define CHIP_DEVICE_CONFIG_BLE_ADVERTISING_TIMEOUT (15 * 60 * 1000)
 
-/**
- * CONFIG_CHIP_NFC_COMMISSIONING, CHIP_DEVICE_CONFIG_ENABLE_NFC
- *
- * Set these defines to 1 if NFC Commissioning is needed
- */
-#define CONFIG_CHIP_NFC_COMMISSIONING 1
-#define CHIP_DEVICE_CONFIG_ENABLE_NFC 1
-
 /**
  *  @def CHIP_CONFIG_MAX_FABRICS
  *

diff --git a/examples/lock-app/nxp/k32w/k32w0/include/CHIPProjectConfig.h b/examples/lock-app/nxp/k32w/k32w0/include/CHIPProjectConfig.h
@@ -128,14 +128,6 @@
  */
 #define CHIP_DEVICE_CONFIG_BLE_ADVERTISING_TIMEOUT (15 * 60 * 1000)
 
-/**
- * CONFIG_CHIP_NFC_COMMISSIONING, CHIP_DEVICE_CONFIG_ENABLE_NFC
- *
- * Set these defines to 1 if NFC Commissioning is needed
- */
-#define CONFIG_CHIP_NFC_COMMISSIONING 1
-#define CHIP_DEVICE_CONFIG_ENABLE_NFC 1
-
 /**
  *  @def CHIP_CONFIG_MAX_FABRICS
  *

diff --git a/examples/shell/nxp/k32w/k32w0/include/CHIPProjectConfig.h b/examples/shell/nxp/k32w/k32w0/include/CHIPProjectConfig.h
@@ -135,14 +135,6 @@
  */
 #define CHIP_DEVICE_CONFIG_BLE_ADVERTISING_TIMEOUT (15 * 60 * 1000)
 
-/**
- * CONFIG_CHIP_NFC_COMMISSIONING, CHIP_DEVICE_CONFIG_ENABLE_NFC
- *
- * Set these defines to 1 if NFC Commissioning is needed
- */
-#define CONFIG_CHIP_NFC_COMMISSIONING 0
-#define CHIP_DEVICE_CONFIG_ENABLE_NFC 0
-
 /**
  *  @def CHIP_CONFIG_MAX_FABRICS
  *

diff --git a/src/platform/BUILD.gn b/src/platform/BUILD.gn
@@ -117,7 +117,10 @@ if (chip_device_platform != "none" && chip_device_platform != "external") {
     }
 
     if (chip_enable_nfc) {
-      defines += [ "CHIP_DEVICE_CONFIG_ENABLE_NFC=1" ]
+      defines += [
+        "CHIP_DEVICE_CONFIG_ENABLE_NFC=1",
+        "CONFIG_CHIP_NFC_COMMISSIONING=1",
+      ]
     }
 
     if (chip_enable_ota_requestor) {