samples: matter: Fixed few configs and docs

kkasperczyk-no · rlubos · commit 02c4d9237121 · 2024-10-28T11:37:17.000+01:00
Going through the configs and docs lead to the introducing
of few fixes:

* Removed enabling DAC migration, as it triggered warning for
Wi-Fi that does not support PSA
* Fixed nrf70eb mentions in docs
* Added info about network commissioning cluster to the
certification page
* Added experimental for few bridge configurations

Signed-off-by: Kamil Kasperczyk &lt;kamil.kasperczyk@nordicsemi.no&gt;
diff --git a/applications/matter_bridge/Kconfig b/applications/matter_bridge/Kconfig
@@ -180,6 +180,12 @@ endchoice
 
 endif # NET_L2_OPENTHREAD
 
+# Dummy Kconfig just to select experimental for some of the configurations.
+config BRIDGE_EXPERIMENTAL
+	bool
+	default y if NET_L2_OPENTHREAD || BRIDGE_SMART_PLUG_SUPPORT
+	select EXPERIMENTAL
+
 source "${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.features"
 source "${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/Kconfig.defaults"
 source "${ZEPHYR_NRF_MODULE_DIR}/samples/matter/common/src/bridge/Kconfig"
diff --git a/applications/matter_bridge/doc/adding_ble_bridged_device_service.rst b/applications/matter_bridge/doc/adding_ble_bridged_device_service.rst
@@ -236,7 +236,6 @@ The following steps show how to add support for a new Bluetooth LE service calle
                mGattSubscribeParams.value = BT_GATT_CCC_NOTIFY;
                mGattSubscribeParams.notify = MyBtServiceDataProvider::GattNotifyCallback;
                mGattSubscribeParams.subscribe = nullptr;
-               mGattSubscribeParams.write = nullptr;
                return bt_gatt_subscribe(mDevice.mConn, &mGattSubscribeParams);
             }
 
diff --git a/applications/matter_bridge/doc/matter_bridge_description.rst b/applications/matter_bridge/doc/matter_bridge_description.rst
@@ -576,7 +576,7 @@ The current maximum number of Bluetooth LE connections that can be selected usin
              .. parsed-literal::
                :class: highlight
 
-               west build -b nrf54h20dk/nrf54h20/cpuapp -p -- -DSB_CONFIG_WIFI_NRF70=y -DCONFIG_CHIP_WIFI=y -Dmatter_bridge_SHIELD=nrf700x_nrf54h20dk -DCONFIG_BRIDGED_DEVICE_BT=y -DEXTRA_CONF_FILE="overlay-bt_max_connections_app.conf" -Dipc_radio_EXTRA_CONF_FILE="overlay-bt_max_connections_net.conf"
+               west build -b nrf54h20dk/nrf54h20/cpuapp -p -- -DSB_CONFIG_WIFI_NRF70=y -DCONFIG_CHIP_WIFI=y -Dmatter_bridge_SHIELD=nrf7002eb_interposer_p1 -DCONFIG_BRIDGED_DEVICE_BT=y -DEXTRA_CONF_FILE="overlay-bt_max_connections_app.conf" -Dipc_radio_EXTRA_CONF_FILE="overlay-bt_max_connections_net.conf"
 
          .. group-tab:: Matter bridge over Thread
 
@@ -719,7 +719,7 @@ Once connected, run the following command to build the sample:
 
    .. code-block:: console
 
-      west build -b nrf54h20dk/nrf54h20/cpuapp -p -- -DSB_CONFIG_WIFI_NRF70=y -DCONFIG_CHIP_WIFI=y -Dmatter_bridge_SHIELD=nrf700x_nrf54h20dk
+      west build -b nrf54h20dk/nrf54h20/cpuapp -p -- -DSB_CONFIG_WIFI_NRF70=y -DCONFIG_CHIP_WIFI=y -Dmatter_bridge_SHIELD=nrf7002eb_interposer_p1
 
 Selecting a configuration
 =========================
@@ -734,19 +734,10 @@ Configure the functionality of the Matter-Bridge device
 
 To enable the Matter smart plugin functionality, run the following command with *board_target* replaced with the board target name:
 
-.. tabs::
-
-   .. group-tab:: nRF54 DKs
-
-      .. code-block:: console
-
-         west build -b nrf54h20dk/nrf54h20/cpuapp -p -- -DSB_CONFIG_WIFI_NRF70=y -DCONFIG_CHIP_WIFI=y -Dmatter_bridge_SHIELD=nrf700x_nrf54h20dk -DCONFIG_BRIDGED_DEVICE_BT=y -Dmatter_bridge_SNIPPET=onoff_plug
-
-   .. group-tab:: nRF70 DKs
-
-      .. code-block:: console
+.. parsed-literal::
+   :class: highlight
 
-         west build -b nrf7002dk/nrf5340/cpuapp -p -- -DCONFIG_BRIDGED_DEVICE_BT=y -Dmatter_bridge_SNIPPET=onoff_plug
+   west build -b *board_target* -p -- -Dmatter_bridge_SNIPPET=onoff_plug
 
 .. _matter_bridge_testing:
 
diff --git a/applications/matter_bridge/prj.conf b/applications/matter_bridge/prj.conf
@@ -51,6 +51,3 @@ CONFIG_CHIP_FACTORY_DATA_BUILD=y
 # Enable LTO to decrease the flash usage.
 CONFIG_LTO=y
 CONFIG_ISR_TABLES_LOCAL_DECLARATION=y
-
-# DAC Migration
-CONFIG_CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY=y
diff --git a/applications/matter_bridge/prj_release.conf b/applications/matter_bridge/prj_release.conf
@@ -55,6 +55,3 @@ CONFIG_CHIP_ENABLE_READ_CLIENT=y
 
 # Enable Watchdog
 CONFIG_NCS_SAMPLE_MATTER_WATCHDOG=y
-
-# DAC Migration
-CONFIG_CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY=y
diff --git a/applications/matter_weather_station/prj.conf b/applications/matter_weather_station/prj.conf
@@ -90,6 +90,3 @@ CONFIG_NCS_SAMPLE_MATTER_DIAGNOSTIC_LOGS_TEST=y
 
 # Set the NVS sector count to match the settings partition size that is 64 kB for this application.
 CONFIG_SETTINGS_NVS_SECTOR_COUNT=16
-
-# DAC Migration
-CONFIG_CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY=y
diff --git a/applications/matter_weather_station/prj_release.conf b/applications/matter_weather_station/prj_release.conf
@@ -84,6 +84,3 @@ CONFIG_NCS_SAMPLE_MATTER_DIAGNOSTIC_LOGS_TEST=y
 
 # Set the NVS sector count to match the settings partition size that is 64 kB for this application.
 CONFIG_SETTINGS_NVS_SECTOR_COUNT=16
-
-# DAC Migration
-CONFIG_CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY=y
diff --git a/doc/nrf/protocols/matter/end_product/certification.rst b/doc/nrf/protocols/matter/end_product/certification.rst
@@ -357,7 +357,7 @@ Especially, make sure that:
 * ``ClusterRevision`` attributes for all clusters match the value of the Matter stack version that you want to use for your application certification.
 * ``Attribute List``, ``Accepted Command List`` and ``Generated Command List`` attributes for all clusters contain all the values that need to be there and nothing more.
 * Only the clusters, attributes and commands required by your application are enabled.
-  For example, the default configurations for the samples use both Thread Network Diagnostics and Wi-Fi Network Diagnostics clusters.
+  For example, the default configurations for the samples use both Thread Network Diagnostics and Wi-Fi Network Diagnostics clusters, and the Network Commissioning cluster has attributes for both Thread and Wi-Fi protocols enabled.
   This is done due to the Thread and Wi-Fi platforms common maintenance reasons, but should not be used in the final product.
 
 See the :ref:`ug_matter_creating_accessory` page for how to configure your application using the ZAP Tool.
diff --git a/samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf b/samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf
@@ -17,9 +17,6 @@ CONFIG_CHIP_NFC_COMMISSIONING=n
 CONFIG_CHIP_MALLOC_SYS_HEAP_SIZE=10240
 CONFIG_MPSL_WORK_STACK_SIZE=2048
 
-# Enable DAC key migration by default for ns build
-CONFIG_CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY=y
-
 # Set the ZMS sector count to match the settings partition size that is 40 kB for this application.
 CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10
 # Workaround required as Zephyr L2 implies usage of NVS backend for settings.
diff --git a/samples/matter/light_bulb/prj.conf b/samples/matter/light_bulb/prj.conf
@@ -38,6 +38,3 @@ CONFIG_USE_SEGGER_RTT=n
 # Enable Factory Data feature
 CONFIG_CHIP_FACTORY_DATA=y
 CONFIG_CHIP_FACTORY_DATA_BUILD=y
-
-# DAC Migration
-CONFIG_CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY=y
diff --git a/samples/matter/light_bulb/prj_release.conf b/samples/matter/light_bulb/prj_release.conf
@@ -50,6 +50,3 @@ CONFIG_CHIP_FACTORY_DATA_BUILD=y
 
 # Enable Watchdog
 CONFIG_NCS_SAMPLE_MATTER_WATCHDOG=y
-
-# DAC Migration
-CONFIG_CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY=y
diff --git a/samples/matter/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf b/samples/matter/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf
@@ -17,9 +17,6 @@ CONFIG_CHIP_NFC_COMMISSIONING=n
 CONFIG_CHIP_MALLOC_SYS_HEAP_SIZE=10240
 CONFIG_MPSL_WORK_STACK_SIZE=2048
 
-# Enable DAC key migration by default for ns build
-CONFIG_CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY=y
-
 # Set the ZMS sector count to match the settings partition size that is 40 kB for this application.
 CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10
 # Workaround required as Zephyr L2 implies usage of NVS backend for settings.
diff --git a/samples/matter/light_switch/prj.conf b/samples/matter/light_switch/prj.conf
@@ -40,6 +40,3 @@ CONFIG_USE_SEGGER_RTT=n
 # Enable Factory Data feature
 CONFIG_CHIP_FACTORY_DATA=y
 CONFIG_CHIP_FACTORY_DATA_BUILD=y
-
-# DAC Migration
-CONFIG_CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY=y
diff --git a/samples/matter/light_switch/prj_release.conf b/samples/matter/light_switch/prj_release.conf
@@ -52,6 +52,3 @@ CONFIG_CHIP_FACTORY_DATA_BUILD=y
 
 # Enable Watchdog
 CONFIG_NCS_SAMPLE_MATTER_WATCHDOG=y
-
-# DAC Migration
-CONFIG_CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY=y
diff --git a/samples/matter/lock/README.rst b/samples/matter/lock/README.rst
@@ -441,7 +441,7 @@ See `Configuration`_ for information about building the sample with the DFU supp
 
 .. code-block:: console
 
-    west build -b nrf54h20dk/nrf54h20/cpuapp -p -- -DSB_CONFIG_WIFI_NRF70=y -DCONFIG_CHIP_WIFI=y -Dlock_SHIELD=nrf700x_nrf54h20dk
+    west build -b nrf54h20dk/nrf54h20/cpuapp -p -- -DSB_CONFIG_WIFI_NRF70=y -DCONFIG_CHIP_WIFI=y -Dlock_SHIELD=nrf7002eb_interposer_p1
 
 Selecting a configuration
 =========================
diff --git a/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf b/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf
@@ -17,9 +17,6 @@ CONFIG_CHIP_NFC_COMMISSIONING=n
 CONFIG_CHIP_MALLOC_SYS_HEAP_SIZE=10240
 CONFIG_MPSL_WORK_STACK_SIZE=2048
 
-# Enable DAC key migration by default for ns build
-CONFIG_CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY=y
-
 # Set the ZMS sector count to match the settings partition size that is 40 kB for this application.
 CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10
 # Workaround required as Zephyr L2 implies usage of NVS backend for settings.
diff --git a/samples/matter/lock/prj.conf b/samples/matter/lock/prj.conf
@@ -43,6 +43,3 @@ CONFIG_CHIP_APP_LOG_LEVEL=3
 # Enable Factory Data feature
 CONFIG_CHIP_FACTORY_DATA=y
 CONFIG_CHIP_FACTORY_DATA_BUILD=y
-
-# DAC Migration
-CONFIG_CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY=y
diff --git a/samples/matter/lock/prj_release.conf b/samples/matter/lock/prj_release.conf
@@ -53,6 +53,3 @@ CONFIG_CHIP_FACTORY_DATA_BUILD=y
 
 # Enable Watchdog
 CONFIG_NCS_SAMPLE_MATTER_WATCHDOG=y
-
-# DAC Migration
-CONFIG_CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY=y
diff --git a/samples/matter/lock/prj_thread_wifi_switched.conf b/samples/matter/lock/prj_thread_wifi_switched.conf
@@ -49,9 +49,6 @@ CONFIG_BOOT_BANNER=n
 CONFIG_CHIP_FACTORY_DATA=y
 CONFIG_CHIP_FACTORY_DATA_BUILD=y
 
-# DAC Migration
-CONFIG_CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY=y
-
 # Enable LTO
 CONFIG_LTO=y
 CONFIG_ISR_TABLES_LOCAL_DECLARATION=y
diff --git a/samples/matter/template/README.rst b/samples/matter/template/README.rst
@@ -202,7 +202,7 @@ To use nrf54H20 DK with the ``nrf7002ek`` shield attached (2.4 GHz or 5 GHz), fo
 
 .. code-block:: console
 
-    west build -b nrf54h20dk/nrf54h20/cpuapp -p -- -DSB_CONFIG_WIFI_NRF70=y -DCONFIG_CHIP_WIFI=y -Dtemplate_SHIELD=nrf700x_nrf54h20dk
+    west build -b nrf54h20dk/nrf54h20/cpuapp -p -- -DSB_CONFIG_WIFI_NRF70=y -DCONFIG_CHIP_WIFI=y -Dtemplate_SHIELD=nrf7002eb_interposer_p1
 
 Selecting a configuration
 =========================
diff --git a/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf b/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf
@@ -14,9 +14,6 @@ CONFIG_CHIP_FACTORY_DATA_WRITE_PROTECT=n
 CONFIG_CHIP_MALLOC_SYS_HEAP_SIZE=10240
 CONFIG_MPSL_WORK_STACK_SIZE=2048
 
-# Enable DAC key migration by default for ns build
-CONFIG_CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY=y
-
 # Set the ZMS sector count to match the settings partition size that is 40 kB for this application.
 CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10
 # Workaround required as Zephyr L2 implies usage of NVS backend for settings.
diff --git a/samples/matter/template/prj.conf b/samples/matter/template/prj.conf
@@ -46,6 +46,3 @@ CONFIG_USE_SEGGER_RTT=n
 # Enable Factory Data feature
 CONFIG_CHIP_FACTORY_DATA=y
 CONFIG_CHIP_FACTORY_DATA_BUILD=y
-
-# DAC Migration
-CONFIG_CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY=y
diff --git a/samples/matter/template/prj_release.conf b/samples/matter/template/prj_release.conf
@@ -58,6 +58,3 @@ CONFIG_CHIP_FACTORY_DATA_BUILD=y
 
 # Enable Watchdog
 CONFIG_NCS_SAMPLE_MATTER_WATCHDOG=y
-
-# DAC Migration
-CONFIG_CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY=y
diff --git a/samples/matter/thermostat/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf b/samples/matter/thermostat/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf
@@ -17,9 +17,6 @@ CONFIG_CHIP_NFC_COMMISSIONING=n
 CONFIG_CHIP_MALLOC_SYS_HEAP_SIZE=10240
 CONFIG_MPSL_WORK_STACK_SIZE=2048
 
-# Enable DAC key migration by default for ns build
-CONFIG_CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY=y
-
 # Set the ZMS sector count to match the settings partition size that is 40 kB for this application.
 CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10
 # Workaround required as Zephyr L2 implies usage of NVS backend for settings.
diff --git a/samples/matter/thermostat/prj.conf b/samples/matter/thermostat/prj.conf
@@ -44,6 +44,3 @@ CONFIG_USE_SEGGER_RTT=n
 # Enable Factory Data feature
 CONFIG_CHIP_FACTORY_DATA=y
 CONFIG_CHIP_FACTORY_DATA_BUILD=y
-
-# DAC Migration
-CONFIG_CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY=y
diff --git a/samples/matter/thermostat/prj_release.conf b/samples/matter/thermostat/prj_release.conf
@@ -55,6 +55,3 @@ CONFIG_CHIP_FACTORY_DATA_BUILD=y
 
 # Enable Watchdog
 CONFIG_NCS_SAMPLE_MATTER_WATCHDOG=y
-
-# DAC Migration
-CONFIG_CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY=y
diff --git a/samples/matter/window_covering/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf b/samples/matter/window_covering/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf
@@ -17,9 +17,6 @@ CONFIG_CHIP_NFC_COMMISSIONING=n
 CONFIG_CHIP_MALLOC_SYS_HEAP_SIZE=10240
 CONFIG_MPSL_WORK_STACK_SIZE=2048
 
-# Enable DAC key migration by default for ns build
-CONFIG_CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY=y
-
 # Set the ZMS sector count to match the settings partition size that is 40 kB for this application.
 CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10
 # Workaround required as Zephyr L2 implies usage of NVS backend for settings.
diff --git a/samples/matter/window_covering/prj.conf b/samples/matter/window_covering/prj.conf
@@ -59,6 +59,3 @@ CONFIG_USE_SEGGER_RTT=n
 # Enable Factory Data feature
 CONFIG_CHIP_FACTORY_DATA=y
 CONFIG_CHIP_FACTORY_DATA_BUILD=y
-
-# DAC Migration
-CONFIG_CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY=y
diff --git a/samples/matter/window_covering/prj_release.conf b/samples/matter/window_covering/prj_release.conf
@@ -71,6 +71,3 @@ CONFIG_CHIP_FACTORY_DATA_BUILD=y
 
 # Enable Watchdog
 CONFIG_NCS_SAMPLE_MATTER_WATCHDOG=y
-
-# DAC Migration
-CONFIG_CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY=y
diff --git a/west.yml b/west.yml
@@ -161,7 +161,7 @@ manifest:
     - name: matter
       repo-path: sdk-connectedhomeip
       path: modules/lib/matter
-      revision: v2.8.0-rc1
+      revision: 700233bea1168d8822c4c7d1553e09592f9c6c48
       west-commands: scripts/west/west-commands.yml
       submodules:
         - name: nlio

Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,6 @@ The following steps show how to add support for a new Bluetooth LE service calle`
`236`	`236`	`mGattSubscribeParams.value = BT_GATT_CCC_NOTIFY;`
`237`	`237`	`mGattSubscribeParams.notify = MyBtServiceDataProvider::GattNotifyCallback;`
`238`	`238`	`mGattSubscribeParams.subscribe = nullptr;`
`239`		`- mGattSubscribeParams.write = nullptr;`
`240`	`239`	`return bt_gatt_subscribe(mDevice.mConn, &mGattSubscribeParams);`
`241`	`240`	`}`
`242`	`241`