applications: nrf_desktop: define dts file for each build type #19033

kapi-no · 2024-11-22T14:11:51Z

Defined a dedicated DTS overlay file for each build type in the nRF Desktop application.

Ref: NCSDK-13953

NordicBuilder · 2024-11-22T14:29:37Z

You can find the documentation preview for this PR at this link. It will be updated about 10 minutes after the documentation build succeeds.

Note: This comment is automatically posted by the Documentation Publish GitHub Action.

NordicBuilder · 2024-11-22T14:31:17Z

CI Information

^{To view the history of this post, clich the 'edited' button above}
Build number: 3

Inputs:

Sources:

sdk-nrf: PR head: 6a966bce64fe0351559783a5a263d73dcc2d98ef

more details

sdk-nrf:

PR head: 6a966bce64fe0351559783a5a263d73dcc2d98ef
merge base: a07b87c923420fdbfbdbff3698a3d30f5c1c33ee
target head (main): 00af3492cfd4eedb30f89f5b816eea115d1878f6
Diff

Github labels

Enabled	Name	Description
	ci-disabled	Disable the ci execution
	ci-all-test	Run all of ci, no test spec filtering will be done
	ci-force-downstream	Force execution of downstream even if twister fails
	ci-run-twister	Force run twister
	ci-run-zephyr-twister	Force run zephyr twister

List of changed files detected by CI (17)

applications
│  ├── nrf_desktop
│  │  ├── configuration
│  │  │  ├── nrf52840dk_nrf52840
│  │  │  │  ├── app.overlay
│  │  │  │  ├── app_common.dtsi
│  │  │  │  ├── app_dongle.overlay
│  │  │  │  ├── app_keyboard.overlay
│  │  │  │  │ app_mcuboot_qspi.overlay
│  │  │  ├── nrf52840dongle_nrf52840
│  │  │  │  ├── app.overlay
│  │  │  │  ├── app_3bleconn.overlay
│  │  │  │  ├── app_4llpmconn.overlay
│  │  │  │  ├── app_common.dtsi
│  │  │  │  │ app_release_4llpmconn.overlay
│  │  │  ├── nrf54h20dk_nrf54h20_cpuapp
│  │  │  │  ├── app.overlay
│  │  │  │  ├── app_common.dtsi
│  │  │  │  │ app_release.overlay
│  │  │  ├── nrf54l15dk_nrf54l15_cpuapp
│  │  │  │  ├── app.overlay
│  │  │  │  ├── app_common.dtsi
│  │  │  │  │ app_release.overlay
doc
│  ├── nrf
│  │  ├── releases_and_maturity
│  │  │  ├── releases
│  │  │  │  │ release-notes-changelog.rst

Outputs:

Toolchain

Version: b77d8c1312
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:b77d8c1312_912848a074

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

◻️ Toolchain - Skipped: existing toolchain is used
✅ Build twister
- sdk-nrf test count: 84
✅ Integration tests
- ✅ desktop52_verification

Disabled integration tests

- doc-internal
- test_ble_nrf_config
- test-fw-nrfconnect-apps
- test-fw-nrfconnect-ble_mesh
- test-fw-nrfconnect-ble_samples
- test-fw-nrfconnect-boot
- test-fw-nrfconnect-chip
- test-fw-nrfconnect-fem
- test-fw-nrfconnect-nfc
- test-fw-nrfconnect-nrf-iot_libmodem-nrf
- test-fw-nrfconnect-nrf-iot_lwm2m
- test-fw-nrfconnect-nrf-iot_mosh
- test-fw-nrfconnect-nrf-iot_nrf_provisioning
- test-fw-nrfconnect-nrf-iot_positioning
- test-fw-nrfconnect-nrf-iot_samples
- test-fw-nrfconnect-nrf-iot_serial_lte_modem
- test-fw-nrfconnect-nrf-iot_thingy91
- test-fw-nrfconnect-nrf-iot_zephyr_lwm2m
- test-fw-nrfconnect-nrf_crypto
- test-fw-nrfconnect-ps
- test-fw-nrfconnect-rpc
- test-fw-nrfconnect-rs
- test-fw-nrfconnect-tfm
- test-fw-nrfconnect-thread
- test-fw-nrfconnect-zigbee
- test-low-level
- test-sdk-audio
- test-sdk-dfu
- test-sdk-find-my
- test-sdk-mcuboot
- test-sdk-pmic-samples
- test-sdk-sidewalk
- test-sdk-wifi
- test-secdom-samples-public

Note: This message is automatically posted and updated by the CI

peknis · 2024-11-26T13:48:50Z

doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst

@@ -209,6 +209,13 @@ nRF Desktop
    As a result, all :ref:`zephyr:nrf54h20dk_nrf54h20` configurations were migrated from the NVS settings backend to the ZMS settings backend.
  * The :ref:`zephyr:nrf54h20dk_nrf54h20` release configuration to enable the :ref:`nrf_desktop_watchdog`.
  * The configuration files of the :ref:`nrf_desktop_click_detector` (:file:`click_detector_def.h`) to allow using them also when Bluetooth LE peer control using a dedicated button (:ref:`CONFIG_DESKTOP_BLE_PEER_CONTROL <config_desktop_app_options>`) is disabled.
+  * DTS description for board targets with a different DTS overlay file per build type to isolate the common configuration that is now defined in the :file:`app_common.dtsi` file.


Suggested change

* DTS description for board targets with a different DTS overlay file per build type to isolate the common configuration that is now defined in the :file:`app_common.dtsi` file.

* The DTS description for board targets with a different DTS overlay file for each build type to isolate the common configuration that is now defined in the :file:`app_common.dtsi` file.

Defined a dedicated DTS overlay file for each build type in the nRF Desktop application. Ref: NCSDK-13953 Signed-off-by: Kamil Piszczek <[email protected]>

MarekPieta · 2024-11-28T08:14:12Z

applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_common.dtsi

+	};
+};
+
+&usbd {


btw. This one could be defined per build type (you could align number of USB endpoints to needs of a given configuration). It would also be more consistent with the current approach - USB configuration is defined per build type.

Yes, this could be improved in subsequent PRs. I just made sure that the generated zephyr.dts file is exactly the same after this change

Improved in the following PR:

#19239

MarekPieta · 2024-11-28T08:17:26Z

applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/app_common.dtsi

+		};
+	};
+
+	hid_dev_0: hid_dev_0 {


Do we want to define USB HID instances in common file or per build type?

Well, I started from nRF54H20 and changed the approach for other targets. I forgot to align this as well, so I would say we can move it the build-type file.

This is up to discussion. We can easily imagine that the common part for each board target is different.

Improved in the following PR:

#19239

kapi-no requested a review from a team as a code owner November 22, 2024 14:11

github-actions bot added the changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. label Nov 22, 2024

zycz approved these changes Nov 22, 2024

View reviewed changes

kapi-no requested a review from mkapala-nordic November 25, 2024 11:06

mkapala-nordic approved these changes Nov 25, 2024

View reviewed changes

kapi-no force-pushed the nrf_desktop_dts_with_file_suffix branch from ec488e7 to 9223c3b Compare November 26, 2024 13:45

kapi-no requested a review from a team as a code owner November 26, 2024 13:45

kapi-no requested review from mkapala-nordic and zycz November 26, 2024 13:45

github-actions bot added doc-required PR must not be merged without tech writer approval. and removed changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Nov 26, 2024

peknis requested changes Nov 26, 2024

View reviewed changes

mkapala-nordic approved these changes Nov 26, 2024

View reviewed changes

applications: nrf_desktop: define dts file for each build type

6a966bc

Defined a dedicated DTS overlay file for each build type in the nRF Desktop application. Ref: NCSDK-13953 Signed-off-by: Kamil Piszczek <[email protected]>

kapi-no force-pushed the nrf_desktop_dts_with_file_suffix branch from 9223c3b to 6a966bc Compare November 26, 2024 14:45

kapi-no requested a review from peknis November 26, 2024 14:45

zycz approved these changes Nov 26, 2024

View reviewed changes

peknis approved these changes Nov 27, 2024

View reviewed changes

kapi-no merged commit 2a8a247 into nrfconnect:main Nov 27, 2024
13 checks passed

MarekPieta reviewed Nov 28, 2024

View reviewed changes

kapi-no mentioned this pull request Dec 4, 2024

nRF Desktop: common DTS HID/USBD improvements #19239

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

applications: nrf_desktop: define dts file for each build type #19033

applications: nrf_desktop: define dts file for each build type #19033

kapi-no commented Nov 22, 2024

NordicBuilder commented Nov 22, 2024

NordicBuilder commented Nov 22, 2024 •

edited

Loading

peknis Nov 26, 2024

kapi-no Nov 26, 2024

MarekPieta Nov 28, 2024

kapi-no Nov 28, 2024

kapi-no Dec 4, 2024

MarekPieta Nov 28, 2024 •

edited

Loading

kapi-no Nov 28, 2024

kapi-no Dec 4, 2024

	* DTS description for board targets with a different DTS overlay file per build type to isolate the common configuration that is now defined in the :file:`app_common.dtsi` file.
	* The DTS description for board targets with a different DTS overlay file for each build type to isolate the common configuration that is now defined in the :file:`app_common.dtsi` file.

+              	};
+              };
+              &usbd {

applications: nrf_desktop: define dts file for each build type #19033

applications: nrf_desktop: define dts file for each build type #19033

Conversation

kapi-no commented Nov 22, 2024

NordicBuilder commented Nov 22, 2024

NordicBuilder commented Nov 22, 2024 • edited Loading

CI Information

Inputs:

Sources:

Github labels

Outputs:

Toolchain

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

peknis Nov 26, 2024

Choose a reason for hiding this comment

kapi-no Nov 26, 2024

Choose a reason for hiding this comment

MarekPieta Nov 28, 2024

Choose a reason for hiding this comment

kapi-no Nov 28, 2024

Choose a reason for hiding this comment

kapi-no Dec 4, 2024

Choose a reason for hiding this comment

MarekPieta Nov 28, 2024 • edited Loading

Choose a reason for hiding this comment

kapi-no Nov 28, 2024

Choose a reason for hiding this comment

kapi-no Dec 4, 2024

Choose a reason for hiding this comment

NordicBuilder commented Nov 22, 2024 •

edited

Loading

MarekPieta Nov 28, 2024 •

edited

Loading