docs: matter: light swithc: fixed descriminator change note

Fixed an outdated discriminator update note

Signed-off-by: Adam Maciuga <[email protected]>

Author: Adam-Maciuga

applications/matter_bridge/doc/matter_bridge_description.rst

@@ -136,6 +136,9 @@ If the Bluetooth LE advertising times out, you can re-enable it manually (see th
 Additionally, the controller must get the `Onboarding information`_ from the Matter accessory device and provision the device into the network.
 For details, see the `Testing`_ section.
 
+.. note::
+   |matter_unique_discriminator_note|
+
 .. _matter_bridge_app_ui:
 
 User interface

applications/matter_weather_station/README.rst

@@ -56,6 +56,9 @@ If the Bluetooth LE advertising times out, you can re-enable it manually using *
 Additionally, the controller must get the `Onboarding information`_ from the Matter accessory device and provision the device into the network.
 For details, see the `Testing`_ section.
 
+.. note::
+   |matter_unique_discriminator_note|
+
 Requirements
 ************
 

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

@@ -181,6 +181,11 @@ Some of these can be configured using the Kconfig options listed below:
   This allows filtering of the discovery results to find the nodes that match the device type.
 * :kconfig:option:`CONFIG_CHIP_ROTATING_DEVICE_ID` enables an optional rotating device identifier feature that provides an additional unique identifier for each device.
   This identifier is similar to the serial number, but it additionally changes at predefined times to protect against long-term tracking of the device.
+* :kconfig:option:`CONFIG_CHIP_DEVICE_DISCRIMINATOR` sets the Bluetooth LE discriminator of the device.
+  In each sample, it is set to the same value by default (hexadecimal: ``0xF00``; decimal: ``3840``).
+  Without changing the discriminator only one uncommissioned device can be powered up at the same time.
+  If multiple devices with the same discriminator are powered simultaneously, the Matter controller will commission a random device.
+  To avoid confusion, keep only a single uncommissioned device powered up, or assign a unique discriminator to each device.
 
 .. _ug_matter_configuring_ffs:
 

doc/nrf/shortcuts.txt

@@ -178,6 +178,8 @@
 .. |matter_cd_definition| replace:: a cryptographic document created by the CSA for each device type, used to confirm that a given type of device was certified
 .. |matter_cd_info_note_for_samples| replace:: This data payload also includes test Device Attestation, with test Certification Declaration, Product ID, and Vendor ID.
    These are used for :ref:`ug_matter_device_attestation_commissioning_info`, and you can generate your own test Certification Declaration when you :ref:`work on Matter end product <ug_matter_device_attestation_testing_da>`.
+.. |matter_unique_discriminator_note| replace:: If you are working with multiple devices, set a unique discriminator for each one, or commission them one at a time.
+   See :ref:`ug_matter_configuring_device_identification` for more information.
 
 .. ### Other shortcuts
 

samples/matter/closure/README.rst

@@ -202,6 +202,9 @@ Testing in a network
 
 To test the sample in a Matter-enabled Thread network, complete the following steps:
 
+.. note::
+   |matter_unique_discriminator_note|
+
 .. tabs::
 
    .. group-tab:: nRF52, nRF53 DKs

samples/matter/contact_sensor/README.rst

@@ -173,6 +173,9 @@ Testing
 
 After building the sample and programming it to your development kit, complete the following steps to test its basic features.
 
+.. note::
+   |matter_unique_discriminator_note|
+
 .. note::
    The following steps use the CHIP Tool controller as an example.
 

samples/matter/light_bulb/README.rst

@@ -379,6 +379,9 @@ Enabling remote control
 
 Remote control allows you to control the Matter light bulb device from an IPv6 network.
 
+.. note::
+   |matter_unique_discriminator_note|
+
 .. include:: ../lock/README.rst
     :start-after: matter_door_lock_sample_remote_control_start
     :end-before: matter_door_lock_sample_remote_control_end

samples/matter/light_switch/README.rst

@@ -344,13 +344,7 @@ Prepare for testing
 After building this and the :ref:`Matter Light Bulb <matter_light_bulb_sample>` samples, and programming them to the development kits, complete the following steps:
 
 .. note::
-   In both samples (light switch and light bulb), a Bluetooth LE discriminator is set with the same value by default (hexadecimal: ``0xF00``; decimal: ``3840``).
-   This means that only one uncommissioned device can be powered up before commissioning.
-   If both are powered up at the same time, the CHIP Tool can commission a random device and the node ID assignment is also random.
-   When one device is commissioned, power up the next device and perform the commissioning.
-
-   To avoid this unclear situation, you can set up your unique discriminator in the :file:`src/chip_project_config.h` file by changing the :kconfig:option:`CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR` value.
-   Then build an example and commission with your unique discriminator.
+   |matter_unique_discriminator_note|
 
 .. matter_light_switch_sample_prepare_to_testing_start
 

samples/matter/lock/README.rst

@@ -536,6 +536,9 @@ Enabling remote control
 
 Remote control allows you to control the Matter door lock device from a Thread or a Wi-Fi network.
 
+.. note::
+   |matter_unique_discriminator_note|
+
 .. matter_door_lock_sample_remote_control_start
 
 `Commissioning the device`_ allows you to set up a testing environment and remotely control the sample over a Matter-enabled Thread or Wi-Fi network.

samples/matter/manufacturer_specific/README.rst

@@ -186,6 +186,9 @@ Enabling remote control
 
 Remote control allows you to control the Matter manufacturer-specific device from an IPv6 network.
 
+.. note::
+   |matter_unique_discriminator_note|
+
 `Commissioning the device`_ allows you to set up a testing environment and remotely control the sample over a Matter-enabled Thread network.
 
 .. _matter_manufacturer_specific_sample_remote_control_commissioning: