Update example PIDs.

Please see documentation in docs/examples.
cecille · Feb 7, 2022 · cdf4eaf · cdf4eaf
1 parent d0c0a93
commit cdf4eaf
Show file tree

Hide file tree

Showing 40 changed files with 152 additions and 114 deletions.
diff --git a/config/esp32/components/chip/Kconfig b/config/esp32/components/chip/Kconfig
@@ -257,15 +257,15 @@ menu "CHIP Device Layer"
         config DEVICE_VENDOR_ID
             hex "Device Vendor Id"
             range 1 0xFFFE
-            default 0x235A
+            default 0xFFF1
             help
                 The device vendor id (in hex). This a CHIP-assigned id for the organization responsible for producing the device.
-                Defaults to CHIP (0x235A).
+                Defaults to test VID 0xFFF1.
 
         config DEVICE_PRODUCT_ID
             hex "Device Product Id"
             range 1 0xFFFE
-            default 0xFEFF
+            default 0x8000
             help
                 The device product id (in hex).  This is a unique id assigned by the device vendor to identify the product or device type.
                 Defaults to a CHIP-assigned id designating a non-production or test "product".

diff --git a/config/zephyr/Kconfig b/config/zephyr/Kconfig
@@ -36,7 +36,7 @@ if CHIP
 
 config CHIP_DEVICE_VENDOR_ID
 	int "Device vendor ID"
-	default 9050 # 0x235A
+	default 65521 # 0xFFF1
 	range 0 65535
 	help
 	  Identifier of the device manufacturer, assigned by Connectivity Standards
@@ -45,7 +45,7 @@ config CHIP_DEVICE_VENDOR_ID
 
 config CHIP_DEVICE_PRODUCT_ID
 	int "Device product ID"
-	default 0
+	default 32768 # 0x8000
 	range 0 65535
 	help
 	  Identifier of the product, assigned by the device manufacturer. It is used

diff --git a/docs/examples/discussion/PID_allocation_for_example_apps.md b/docs/examples/discussion/PID_allocation_for_example_apps.md
@@ -0,0 +1,35 @@
+# PID allocation for example apps
+
+Unless specifically overridden by the platform, example apps in this SDK use the
+Example credentials implementation in DeviceAttestationCredsExample.cpp.
+
+The SDK holds example certificates for VID 0xFFF1 and PIDs 0x8000-0x801F. The
+device VID and PID supplied by the basic information cluster must correspond to
+the VID/PID given in the certificate for the device to pass verification.
+
+Certificates are selected using the value in
+CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID. The vendor ID for every example app is the
+same because they are all signed by the same PAI (vendor id 0xFFF1).
+
+In order to allow some differentiation between the various example apps, each
+app is assigned a PID from the list below:
+
+| App                     | PID    |
+| ----------------------- | ------ |
+| All Clusters            | 0x8001 |
+| Bridge                  | 0x8002 |
+| Door Lock               | 0x8003 |
+| Light switch            | 0x8004 |
+| Lighting                | 0x8005 |
+| Lock                    | 0x8006 |
+| OTA provider            | 0x8007 |
+| OTA requestor           | 0x8008 |
+| Persistant Storage      | 0x8009 |
+| Pigweed                 | 0x800B |
+| Pump                    | 0x800A |
+| Pump Controller         | 0x8011 |
+| Shell                   | 0x8012 |
+| Temperature measurement | 0x800D |
+| Thermostat              | 0x800E |
+| TV                      | 0x800F |
+| Window                  | 0x8010 |
diff --git a/docs/guides/nrfconnect_examples_cli.md b/docs/guides/nrfconnect_examples_cli.md
@@ -170,8 +170,8 @@ information. You can use this command without any subcommand to print all
 available configuration data or to add a specific subcommand.
 
 ```shell
-VendorId:        9050 (0x235A)
-ProductId:       20043 (0x4E4B)
+VendorId:        65521 (0xFFF1)
+ProductId:       32768 (0x8000)
 HardwareVersion: 1 (0x1)
 FabricId:
 PinCode:         020202021
@@ -205,7 +205,7 @@ Prints the vendor ID of the device. Takes no arguments.
 
 ```shell
 uart:~$ matter config vendorid
-9050 (0x235A)
+65521 (0xFFFF1)
 ```
 
 #### productid
@@ -214,7 +214,7 @@ Prints the product ID of the device. Takes no arguments.
 
 ```shell
 uart:~$ matter config productid
-20043 (0x4E4B)
+32768 (0x8000)
 ```
 
 #### hardwarever

diff --git a/docs/guides/python_chip_controller_building.md b/docs/guides/python_chip_controller_building.md
@@ -202,8 +202,8 @@ terminal of the device (for example, UART). For example:
 ```
 I: 254 [DL]Device Configuration:
 I: 257 [DL] Serial Number: TEST_SN
-I: 260 [DL] Vendor Id: 9050 (0x235A)
-I: 263 [DL] Product Id: 20043 (0x4E4B)
+I: 260 [DL] Vendor Id: 65521 (0xFFF1)
+I: 263 [DL] Product Id: 32768 (0x8000)
 I: 267 [DL] Hardware Version: 1
 I: 270 [DL] Setup Pin Code: 20202021
 I: 273 [DL] Setup Discriminator: 3840 (0xF00)

diff --git a/examples/all-clusters-app/esp32/sdkconfig.defaults b/examples/all-clusters-app/esp32/sdkconfig.defaults
@@ -39,8 +39,8 @@ CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 
 # Vendor and product id
-CONFIG_DEVICE_VENDOR_ID=0x235A
-CONFIG_DEVICE_PRODUCT_ID=0x4541
+CONFIG_DEVICE_VENDOR_ID=0xFFF1
+CONFIG_DEVICE_PRODUCT_ID=0x8001
 CONFIG_DEVICE_FIRMWARE_REVISION="prerelease"
 
 #enable debug shell

diff --git a/examples/all-clusters-app/esp32/sdkconfig_m5stack.defaults b/examples/all-clusters-app/esp32/sdkconfig_m5stack.defaults
@@ -41,8 +41,8 @@ CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 
 # Vendor and product id
-CONFIG_DEVICE_VENDOR_ID=0x235A
-CONFIG_DEVICE_PRODUCT_ID=0x4541
+CONFIG_DEVICE_VENDOR_ID=0xFFF1
+CONFIG_DEVICE_PRODUCT_ID=0x8001
 
 # Main task needs a bit more stack than the default
 # default is 3584, bump this up to 5k.
@@ -58,4 +58,3 @@ CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y
 # Serial Flasher config
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
 CONFIG_ESPTOOLPY_FLASHSIZE="4MB"
-
diff --git a/examples/all-clusters-app/esp32/sdkconfig_m5stack_rpc.defaults b/examples/all-clusters-app/esp32/sdkconfig_m5stack_rpc.defaults
@@ -41,8 +41,8 @@ CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 
 # Vendor and product id
-CONFIG_DEVICE_VENDOR_ID=0x235A
-CONFIG_DEVICE_PRODUCT_ID=0x4541
+CONFIG_DEVICE_VENDOR_ID=0xFFF1
+CONFIG_DEVICE_PRODUCT_ID=0x8001
 
 # Main task needs a bit more stack than the default
 # default is 3584, bump this up to 5k.

diff --git a/examples/light-switch-app/efr32/include/CHIPProjectConfig.h b/examples/light-switch-app/efr32/include/CHIPProjectConfig.h
@@ -49,16 +49,16 @@
 /**
  * CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID
  *
- * 0x235A: Chip's Vendor Id.
+ * 0xFFF1: Test vendor
  */
-#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0x235A
+#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0xFFF1
 
 /**
  * CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID
  *
- * 0x534C: EFR32 lighting-app
+ * 0x8005: example lighting app
  */
-#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x534D
+#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x8004
 
 /**
  * CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION

diff --git a/examples/lighting-app/cyw30739/include/CHIPProjectConfig.h b/examples/lighting-app/cyw30739/include/CHIPProjectConfig.h
@@ -34,13 +34,13 @@
 #define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_NAME "Infineon"
 
 /* The VendorID attribute of the Basic cluster. */
-#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0x0009
+#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0xFFF1
 
 /* The ProductName attribute of the Basic cluster. */
 #define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_NAME "CYW30739 Lighting App"
 
 /* The ProductID attribute of the Basic cluster. */
-#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x154c
+#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x8005
 
 /* The HardwareVersionString attribute of the Basic cluster. */
 #define CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION_STRING "30739"

diff --git a/examples/lighting-app/efr32/include/CHIPProjectConfig.h b/examples/lighting-app/efr32/include/CHIPProjectConfig.h
@@ -49,16 +49,16 @@
 /**
  * CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID
  *
- * 0x235A: Chip's Vendor Id.
+ * 0xFFF1: Test vendor
  */
-#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0x235A
+#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0xFFF1
 
 /**
  * CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID
  *
- * 0x534C: EFR32 lighting-app
+ * 0x8005: example lighitng app
  */
-#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x534C
+#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x8005
 
 /**
  * CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION

diff --git a/examples/lighting-app/nrfconnect/main/include/CHIPProjectConfig.h b/examples/lighting-app/nrfconnect/main/include/CHIPProjectConfig.h
@@ -30,9 +30,9 @@
 /**
  * CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID
  *
- * 0x4E4C: nrfconnect lighting-app
+ * 0x8005: example lighting-app
  */
-#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x4E4C
+#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

diff --git a/examples/lighting-app/nxp/k32w/k32w0/include/CHIPProjectConfig.h b/examples/lighting-app/nxp/k32w/k32w0/include/CHIPProjectConfig.h
@@ -53,16 +53,16 @@
 /**
  * CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID
  *
- * 0x235A: Chip's Vendor Id.
+ * 0xFFF1: Test vendor.
  */
-#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0x235A
+#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0xFFF1
 
 /**
  * CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID
  *
- * 0x4B4C: K32W lighting-app
+ * 0x8005: example lighting-app
  */
-#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x4B4C
+#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x8005
 
 /**
  * CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION

diff --git a/examples/lock-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h b/examples/lock-app/cc13x2x7_26x2x7/main/include/CHIPProjectConfig.h
@@ -50,16 +50,16 @@
 /**
  * CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID
  *
- * 0x235A: Chip's Vendor Id.
+ * 0xFFF1: Test vendor
  */
-#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0x235A
+#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0xFFF1
 
 /**
  * CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID
  *
- * 0x434B: cc13x2x7_26x2x7 lock-app
+ * 0x8006: example lock app
  */
-#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x434B
+#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x8006
 
 /**
  * CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION

diff --git a/examples/lock-app/cyw30739/include/CHIPProjectConfig.h b/examples/lock-app/cyw30739/include/CHIPProjectConfig.h
@@ -34,13 +34,13 @@
 #define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_NAME "Infineon"
 
 /* The VendorID attribute of the Basic cluster. */
-#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0x0009
+#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0xFFF1
 
 /* The ProductName attribute of the Basic cluster. */
 #define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_NAME "CYW30739 Lock App"
 
 /* The ProductID attribute of the Basic cluster. */
-#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x154c
+#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x8006
 
 /* The HardwareVersionString attribute of the Basic cluster. */
 #define CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION_STRING "30739"

diff --git a/examples/lock-app/efr32/include/CHIPProjectConfig.h b/examples/lock-app/efr32/include/CHIPProjectConfig.h
@@ -46,16 +46,16 @@
 /**
  * CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID
  *
- * 0x235A: Chip's Vendor Id.
+ * 0xFFF1: Test vendor.
  */
-#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0x235A
+#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0xFFF1
 
 /**
  * CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID
  *
- * 0x534B: EFR32 lock-app
+ * 0x8006: example lock-app
  */
-#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x534B
+#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x8006
 
 /**
  * CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION

diff --git a/examples/lock-app/esp32/sdkconfig.defaults b/examples/lock-app/esp32/sdkconfig.defaults
@@ -40,3 +40,6 @@ CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
 #enable lwIP route hooks
 CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT=y
 CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y
+
+#Lock app PID
+CONFIG_DEVICE_PRODUCT_ID=0x8006
diff --git a/examples/lock-app/nrfconnect/main/include/CHIPProjectConfig.h b/examples/lock-app/nrfconnect/main/include/CHIPProjectConfig.h
@@ -30,9 +30,9 @@
 /**
  * CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID
  *
- * 0x4E4B: nrfconnect lock-app
+ * 0x4E4B: example lock-app
  */
-#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x4E4B
+#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

diff --git a/examples/lock-app/nxp/k32w/k32w0/include/CHIPProjectConfig.h b/examples/lock-app/nxp/k32w/k32w0/include/CHIPProjectConfig.h
@@ -53,16 +53,16 @@
 /**
  * CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID
  *
- * 0x235A: Chip's Vendor Id.
+ * 0xFFF1: Test vendor.
  */
-#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0x235A
+#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0xFFF1
 
 /**
  * CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID
  *
- * 0x4B4C: K32W lighting-app
+ * 0x8006: example lock-app
  */
-#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x4B4C
+#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x8006
 
 /**
  * CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION

diff --git a/examples/ota-provider-app/esp32/sdkconfig.defaults b/examples/ota-provider-app/esp32/sdkconfig.defaults
@@ -42,8 +42,8 @@ CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
 CONFIG_ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP=y
 
 # Product id
-CONFIG_DEVICE_VENDOR_ID=0x235A
-CONFIG_DEVICE_PRODUCT_ID=0x4591
+CONFIG_DEVICE_VENDOR_ID=0xFFF1
+CONFIG_DEVICE_PRODUCT_ID=0x8007
 
 # Main task needs a bit more stack than the default
 # default is 3584, bump this up to 6k.

diff --git a/examples/ota-requestor-app/cyw30739/include/CHIPProjectConfig.h b/examples/ota-requestor-app/cyw30739/include/CHIPProjectConfig.h
@@ -34,13 +34,13 @@
 #define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_NAME "Infineon"
 
 /* The VendorID attribute of the Basic cluster. */
-#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0x0009
+#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0xFFF1
 
 /* The ProductName attribute of the Basic cluster. */
 #define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_NAME "CYW30739 OTA Requestor App"
 
 /* The ProductID attribute of the Basic cluster. */
-#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x154c
+#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x8008
 
 /* The HardwareVersionString attribute of the Basic cluster. */
 #define CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION_STRING "30739"

diff --git a/examples/ota-requestor-app/efr32/include/CHIPProjectConfig.h b/examples/ota-requestor-app/efr32/include/CHIPProjectConfig.h
@@ -49,16 +49,16 @@
 /**
  * CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID
  *
- * 0x235A: Chip's Vendor Id.
+ * 0xFFF1: Test vendor.
  */
-#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0x235A
+#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 0xFFF1
 
 /**
  * CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID
  *
- * 0x534C: EFR32 lighting-app
+ * 0x8008: example ota-requestor
  */
-#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x534C
+#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 0x8008
 
 /**
  * CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION

diff --git a/examples/ota-requestor-app/esp32/sdkconfig.defaults b/examples/ota-requestor-app/esp32/sdkconfig.defaults
@@ -42,8 +42,8 @@ CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
 CONFIG_ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP=y
 
 # Product id
-CONFIG_DEVICE_VENDOR_ID=0x235A
-CONFIG_DEVICE_PRODUCT_ID=0x4590
+CONFIG_DEVICE_VENDOR_ID=0xFFF1
+CONFIG_DEVICE_PRODUCT_ID=0x8008
 
 # Main task needs a bit more stack than the default
 # default is 3584, bump this up to 4k.