Skip to content

Commit f1abae1

Browse files
peknisnordicjm
authored andcommitted
doc: Matter samples reorganization
Collecting common advanced configuration methods in Matter samples under one title and using toggle. Signed-off-by: Pekka Niskanen <[email protected]>
1 parent 395d52f commit f1abae1

File tree

8 files changed

+84
-161
lines changed

8 files changed

+84
-161
lines changed
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
Advanced configuration options
2+
==============================
3+
4+
This section describes other configuration options for the sample.
5+
6+
Device Firmware Upgrade support
7+
-------------------------------
8+
9+
.. include:: ../lock/README.rst
10+
:start-after: matter_door_lock_sample_build_with_dfu_start
11+
:end-before: matter_door_lock_sample_build_with_dfu_end
12+
13+
FEM support
14+
-----------
15+
16+
.. toggle::
17+
18+
.. include:: /includes/sample_fem_support.txt
19+
20+
Factory data support
21+
--------------------
22+
23+
.. include:: ../lock/README.rst
24+
:start-after: matter_door_lock_sample_factory_data_start
25+
:end-before: matter_door_lock_sample_factory_data_end

samples/matter/light_bulb/README.rst

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -120,26 +120,9 @@ Matter light bulb with Trusted Firmware-M
120120
:start-after: matter_template_build_with_tfm_start
121121
:end-before: matter_template_build_with_tfm_end
122122

123-
Device Firmware Upgrade support
124-
===============================
125-
126123
.. |Bluetooth| replace:: Bluetooth
127124

128-
.. include:: ../lock/README.rst
129-
:start-after: matter_door_lock_sample_build_with_dfu_start
130-
:end-before: matter_door_lock_sample_build_with_dfu_end
131-
132-
FEM support
133-
===========
134-
135-
.. include:: /includes/sample_fem_support.txt
136-
137-
Factory data support
138-
====================
139-
140-
.. include:: ../lock/README.rst
141-
:start-after: matter_door_lock_sample_factory_data_start
142-
:end-before: matter_door_lock_sample_factory_data_end
125+
.. include:: /includes/advanced_conf_matter.txt
143126

144127
.. _matter_light_bulb_aws_iot:
145128

samples/matter/light_switch/README.rst

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -142,26 +142,9 @@ The following snippet is available:
142142

143143
.. include:: /includes/matter_snippets_note.txt
144144

145-
FEM support
146-
===========
147-
148-
.. include:: /includes/sample_fem_support.txt
149-
150-
Device Firmware Upgrade support
151-
===============================
152-
153145
.. |Bluetooth| replace:: Bluetooth®
154146

155-
.. include:: ../lock/README.rst
156-
:start-after: matter_door_lock_sample_build_with_dfu_start
157-
:end-before: matter_door_lock_sample_build_with_dfu_end
158-
159-
Factory data support
160-
====================
161-
162-
.. include:: ../lock/README.rst
163-
:start-after: matter_door_lock_sample_factory_data_start
164-
:end-before: matter_door_lock_sample_factory_data_end
147+
.. include:: /includes/advanced_conf_matter.txt
165148

166149
.. _matter_light_switch_sample_ui:
167150

samples/matter/lock/README.rst

Lines changed: 53 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -277,52 +277,82 @@ The following snippet is available:
277277

278278
.. _matter_lock_sample_configuration_dfu:
279279

280+
Advanced configuration options
281+
==============================
282+
283+
This section describes other configuration options for the sample.
284+
280285
Device Firmware Upgrade support
281-
===============================
286+
-------------------------------
282287

283288
.. |Bluetooth| replace:: Bluetooth
284289

285290
.. matter_door_lock_sample_build_with_dfu_start
286291
287-
.. note::
288-
You can enable over-the-air Device Firmware Upgrade only on hardware platforms that have external flash memory.
289-
Currently only nRF52840 DK, nRF5340 DK, nRF7002 DK and nRF54L15 DK support Device Firmware Upgrade feature.
292+
.. toggle::
290293

291-
The sample supports over-the-air (OTA) device firmware upgrade (DFU) using one of the two following protocols:
294+
.. note::
295+
You can enable over-the-air Device Firmware Upgrade only on hardware platforms that have external flash memory.
296+
Currently only nRF52840 DK, nRF5340 DK, nRF7002 DK and nRF54L15 DK support Device Firmware Upgrade feature.
292297

293-
* Matter OTA update protocol that uses the Matter operational network for querying and downloading a new firmware image.
294-
* Simple Management Protocol (SMP) over |Bluetooth| LE.
295-
In this case, the DFU can be done either using a smartphone application or a PC command line tool.
296-
Note that this protocol is not part of the Matter specification.
298+
The sample supports over-the-air (OTA) device firmware upgrade (DFU) using one of the two following protocols:
297299

298-
In both cases, :ref:`MCUboot <mcuboot:mcuboot_wrapper>` secure bootloader is used to apply the new firmware image.
300+
* Matter OTA update protocol that uses the Matter operational network for querying and downloading a new firmware image.
301+
* Simple Management Protocol (SMP) over |Bluetooth| LE.
302+
In this case, the DFU can be done either using a smartphone application or a PC command line tool.
303+
Note that this protocol is not part of the Matter specification.
299304

300-
The DFU over Matter is enabled by default.
301-
The following configuration arguments are available during the build process for configuring DFU:
305+
In both cases, :ref:`MCUboot <mcuboot:mcuboot_wrapper>` secure bootloader is used to apply the new firmware image.
302306

303-
* To configure the sample to support the DFU over Matter and SMP, use the ``-DCONFIG_CHIP_DFU_OVER_BT_SMP=y`` build flag.
307+
The DFU over Matter is enabled by default.
308+
The following configuration arguments are available during the build process for configuring DFU:
304309

305-
See :ref:`cmake_options` for instructions on how to add these options to your build.
310+
* To configure the sample to support the DFU over Matter and SMP, use the ``-DCONFIG_CHIP_DFU_OVER_BT_SMP=y`` build flag.
306311

307-
When building on the command line, run the following command with *board_target* replaced with the board target name of the hardware platform you are using (see `Requirements`_), and *dfu_build_flag* replaced with the desired DFU build flag:
312+
See :ref:`cmake_options` for instructions on how to add these options to your build.
308313

309-
.. parsed-literal::
310-
:class: highlight
314+
When building on the command line, run the following command with *board_target* replaced with the board target name of the hardware platform you are using (see `Requirements`_), and *dfu_build_flag* replaced with the desired DFU build flag:
311315

312-
west build -b *board_target* -- *dfu_build_flag*
316+
.. parsed-literal::
317+
:class: highlight
313318
314-
For example:
319+
west build -b *board_target* -- *dfu_build_flag*
315320
316-
.. code-block:: console
321+
For example:
322+
323+
.. code-block:: console
317324
318-
west build -b nrf52840dk/nrf52840 -- -DCONFIG_CHIP_DFU_OVER_BT_SMP=y
325+
west build -b nrf52840dk/nrf52840 -- -DCONFIG_CHIP_DFU_OVER_BT_SMP=y
319326
320327
.. matter_door_lock_sample_build_with_dfu_end
321328
329+
.. _matter_lock_sample_configuration_fem:
330+
322331
FEM support
323-
===========
332+
-----------
333+
334+
.. toggle::
335+
336+
.. include:: /includes/sample_fem_support.txt
337+
338+
Factory data support
339+
--------------------
340+
341+
.. matter_door_lock_sample_factory_data_start
342+
343+
.. toggle::
344+
345+
In this sample, the factory data support is enabled by default for all configurations except for the target board nRF21540 DK.
346+
This means that a new factory data set will be automatically generated when building for the target board.
324347

325-
.. include:: /includes/sample_fem_support.txt
348+
To disable factory data support, set the following Kconfig options to ``n``:
349+
350+
* :kconfig:option:`CONFIG_CHIP_FACTORY_DATA`
351+
* ``SB_CONFIG_MATTER_FACTORY_DATA_GENERATE``
352+
353+
To learn more about factory data, read the :doc:`matter:nrfconnect_factory_data_configuration` page in the Matter documentation.
354+
355+
.. matter_door_lock_sample_factory_data_end
326356
327357
.. _matter_lock_sample_configuration_nus:
328358

@@ -348,23 +378,6 @@ The PIN code is different depending on the :ref:`configuration <matter_lock_samp
348378

349379
See `Testing door lock using Bluetooth LE with Nordic UART Service`_ for more information about how to test this feature.
350380

351-
Factory data support
352-
====================
353-
354-
.. matter_door_lock_sample_factory_data_start
355-
356-
In this sample, the factory data support is enabled by default for all configurations except for the target board nRF21540 DK.
357-
This means that a new factory data set will be automatically generated when building for the target board.
358-
359-
To disable factory data support, set the following Kconfig options to ``n``:
360-
361-
* :kconfig:option:`CONFIG_CHIP_FACTORY_DATA`
362-
* ``SB_CONFIG_MATTER_FACTORY_DATA_GENERATE``
363-
364-
To learn more about factory data, read the :doc:`matter:nrfconnect_factory_data_configuration` page in the Matter documentation.
365-
366-
.. matter_door_lock_sample_factory_data_end
367-
368381
User interface
369382
**************
370383

samples/matter/smoke_co_alarm/README.rst

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -109,26 +109,9 @@ Matter smoke CO alarm custom configurations
109109
:start-after: matter_light_bulb_sample_configuration_file_types_start
110110
:end-before: matter_light_bulb_sample_configuration_file_types_end
111111

112-
Device Firmware Upgrade support
113-
===============================
114-
115112
.. |Bluetooth| replace:: Bluetooth
116113

117-
.. include:: ../lock/README.rst
118-
:start-after: matter_door_lock_sample_build_with_dfu_start
119-
:end-before: matter_door_lock_sample_build_with_dfu_end
120-
121-
FEM support
122-
===========
123-
124-
.. include:: /includes/sample_fem_support.txt
125-
126-
Factory data support
127-
====================
128-
129-
.. include:: ../lock/README.rst
130-
:start-after: matter_door_lock_sample_factory_data_start
131-
:end-before: matter_door_lock_sample_factory_data_end
114+
.. include:: /includes/advanced_conf_matter.txt
132115

133116
User interface
134117
**************

samples/matter/template/README.rst

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -126,44 +126,9 @@ For example:
126126
127127
.. matter_template_build_with_tfm_end
128128
129-
Device Firmware Upgrade support
130-
===============================
131-
132129
.. |Bluetooth| replace:: Bluetooth
133130

134-
.. include:: ../lock/README.rst
135-
:start-after: matter_door_lock_sample_build_with_dfu_start
136-
:end-before: matter_door_lock_sample_build_with_dfu_end
137-
138-
Alternatively, for the nRF54L15 DK, the DFU can be configured to only use the internal MRAM for storage.
139-
This means that both the currently running firmware and the new firmware to be updated will be stored within the device's internal flash memory.
140-
This configuration is enabled by default for the :ref:`debug configuration <matter_template_custom_configs>`.
141-
142-
The following is an example command to build the sample on the nRF54L15 DK with support for Matter OTA DFU and DFU over Bluetooth SMP, and using internal MRAM only:
143-
144-
.. code-block:: console
145-
146-
west build -p -b nrf54l15dk/nrf54l15/cpuapp -- -DCONFIG_CHIP_DFU_OVER_BT_SMP=y -DFILE_SUFFIX=internal
147-
148-
To build the sample for the same purpose, but in the ``release`` configuration, use the following command:
149-
150-
.. code-block:: console
151-
152-
west build -p -b nrf54l15dk/nrf54l15/cpuapp -- -DCONFIG_CHIP_DFU_OVER_BT_SMP=y -DFILE_SUFFIX=internal -Dtemplate_EXTRA_CONF_FILE=prj_release.conf
153-
154-
Note that in this case, the size of the application partition is half of what it would be when using a configuration with external flash memory support.
155-
156-
FEM support
157-
===========
158-
159-
.. include:: /includes/sample_fem_support.txt
160-
161-
Factory data support
162-
====================
163-
164-
.. include:: ../lock/README.rst
165-
:start-after: matter_door_lock_sample_factory_data_start
166-
:end-before: matter_door_lock_sample_factory_data_end
131+
.. include:: /includes/advanced_conf_matter.txt
167132

168133
User interface
169134
**************

samples/matter/thermostat/README.rst

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -119,14 +119,9 @@ Matter thermostat with Trusted Firmware-M
119119
:start-after: matter_template_build_with_tfm_start
120120
:end-before: matter_template_build_with_tfm_end
121121

122-
Device Firmware Upgrade support
123-
===============================
124-
125122
.. |Bluetooth| replace:: Bluetooth
126123

127-
.. include:: ../lock/README.rst
128-
:start-after: matter_door_lock_sample_build_with_dfu_start
129-
:end-before: matter_door_lock_sample_build_with_dfu_end
124+
.. include:: /includes/advanced_conf_matter.txt
130125

131126
.. _matter_thermostat_network_mode:
132127

@@ -140,12 +135,6 @@ Remote testing in a network
140135
:start-after: matter_light_bulb_sample_remote_testing_start
141136
:end-before: matter_light_bulb_sample_remote_testing_end
142137

143-
Factory data support
144-
====================
145-
146-
.. include:: ../lock/README.rst
147-
:start-after: matter_door_lock_sample_factory_data_start
148-
:end-before: matter_door_lock_sample_factory_data_end
149138

150139
User interface
151140
**************

samples/matter/window_covering/README.rst

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -103,27 +103,9 @@ Matter window covering with Trusted Firmware-M
103103
:start-after: matter_template_build_with_tfm_start
104104
:end-before: matter_template_build_with_tfm_end
105105

106-
107-
Device Firmware Upgrade support
108-
===============================
109-
110106
.. |Bluetooth| replace:: Bluetooth
111107

112-
.. include:: ../lock/README.rst
113-
:start-after: matter_door_lock_sample_build_with_dfu_start
114-
:end-before: matter_door_lock_sample_build_with_dfu_end
115-
116-
FEM support
117-
===========
118-
119-
.. include:: /includes/sample_fem_support.txt
120-
121-
Factory data support
122-
====================
123-
124-
.. include:: ../lock/README.rst
125-
:start-after: matter_door_lock_sample_factory_data_start
126-
:end-before: matter_door_lock_sample_factory_data_end
108+
.. include:: /includes/advanced_conf_matter.txt
127109

128110
User interface
129111
**************

0 commit comments

Comments
 (0)