[nrfconnect] Move VID & PID configuration to Kconfig (project-chip#15195

) Move vendor and product IDs in nRF Connect examples from CHIPProjectConfig.h to Kconfig. Kconfig values set both the CHIP defines and are additionally passed to the OTA image generation script.
jamesluo11 · Apr 26, 2022 · 86a6b8e · 86a6b8e
1 parent ab42201
commit 86a6b8e
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 23 deletions.
diff --git a/examples/lighting-app/nrfconnect/main/include/CHIPProjectConfig.h b/examples/lighting-app/nrfconnect/main/include/CHIPProjectConfig.h
@@ -27,13 +27,6 @@
 
 #pragma once
 
-/**
- * CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID
- *
- * 0x8005: example lighting-app
- */
-#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x8005
-
 // Use a default pairing code if one hasn't been provisioned in flash.
 #define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
 #define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
diff --git a/examples/lighting-app/nrfconnect/prj.conf b/examples/lighting-app/nrfconnect/prj.conf
@@ -37,8 +37,8 @@ CONFIG_MPU_STACK_GUARD=y
 
 # CHIP configuration
 CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h"
-# 20044 == 0x4E4C - "[N]ordic [L]ight"
-CONFIG_CHIP_DEVICE_PRODUCT_ID=20044
+# 32773 == 0x8005 (example lighting-app)
+CONFIG_CHIP_DEVICE_PRODUCT_ID=32773
 
 # Enable CHIP pairing automatically on application start.
 CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART=y
diff --git a/examples/lock-app/nrfconnect/main/include/CHIPProjectConfig.h b/examples/lock-app/nrfconnect/main/include/CHIPProjectConfig.h
@@ -27,13 +27,6 @@
 
 #pragma once
 
-/**
- * CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID
- *
- * 0x4E4B: example lock-app
- */
-#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x8006
-
 // Use a default pairing code if one hasn't been provisioned in flash.
 #define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
 #define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00

diff --git a/examples/lock-app/nrfconnect/prj.conf b/examples/lock-app/nrfconnect/prj.conf
@@ -36,3 +36,5 @@ CONFIG_MPU_STACK_GUARD=y
 
 # CHIP configuration
 CONFIG_CHIP_PROJECT_CONFIG="main/include/CHIPProjectConfig.h"
+# 32774 == 0x8006 (example lock-app)
+CONFIG_CHIP_DEVICE_PRODUCT_ID=32774
diff --git a/examples/shell/nrfconnect/CHIPProjectConfig.h b/examples/shell/nrfconnect/CHIPProjectConfig.h
@@ -36,13 +36,6 @@
 
 #define CHIP_DEVICE_CONFIG_DISABLE_SHELL_PING 1
 
-/**
- * CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID
- *
- * 0x8012: example shell
- */
-#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x8012
-
 // shell app uses openthread but does not have the NETWORK_COMMISSIONING cluster or zap config
 // Do not instantiate the NETWORK_COMMISSIONING thread driver
 #define _NO_NETWORK_COMMISSIONING_DRIVER_
diff --git a/examples/shell/nrfconnect/prj.conf b/examples/shell/nrfconnect/prj.conf
@@ -35,4 +35,6 @@ CONFIG_MPU_STACK_GUARD=y
 
 # CHIP configuration
 CONFIG_CHIP_PROJECT_CONFIG="CHIPProjectConfig.h"
+# 32786 == 0x8012 (example shell-app)
+CONFIG_CHIP_DEVICE_PRODUCT_ID=32786
 CONFIG_CHIP_NFC_COMMISSIONING=n