Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nRF Desktop: common DTS HID/USBD improvements #19239

Merged
merged 2 commits into from
Dec 6, 2024
Merged

nRF Desktop: common DTS HID/USBD improvements #19239

merged 2 commits into from
Dec 6, 2024

Conversation

kapi-no
Copy link
Contributor

@kapi-no kapi-no commented Dec 4, 2024 •
edited
Loading

Improvements for post-merge review items from the following PR:

#19033

@kapi-no
applications: nrf_desktop: remove HID DTS nodes from common file
5d0caca 
Removed the HID DTS descriptions from the common DTS file in the
nRF54H20 DK configuration. This is done to improve consistency between
configurations.

Signed-off-by: Kamil Piszczek <[email protected]>
@kapi-no
applications: nrf_desktop: remove USBD DTS node from common file
99401b0 
Removed USBD DTS node from the common DTS file in the nRF52840 dongle
configuration.

Signed-off-by: Kamil Piszczek <[email protected]>
@kapi-no kapi-no requested a review from a team as a code owner December 4, 2024 08:33
@github-actions github-actions bot added the changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. label Dec 4, 2024
@kapi-no kapi-no mentioned this pull request Dec 4, 2024
Merged
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Dec 4, 2024 •
edited
Loading

CI Information

To view the history of this post, clich the 'edited' button above
Build number: 1

Inputs:

Sources:

sdk-nrf: PR head: 99401b005f157dbc7814afc201aa3e794cc12a53

more details

sdk-nrf:

PR head: 99401b005f157dbc7814afc201aa3e794cc12a53
merge base: 94fa39ed52d3a5146ea385ed71c87560f8b6aa12
target head (main): 94fa39ed52d3a5146ea385ed71c87560f8b6aa12
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 (8) 
applications
│  ├── nrf_desktop
│  │  ├── configuration
│  │  │  ├── 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

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

@NordicBuilder
Copy link
Contributor

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.

MarekPieta
MarekPieta requested changes Dec 6, 2024
View reviewed changes
applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app.overlay
compatible = "nordic,nrf-usbd";
status = "okay";
num-bidir-endpoints = <0>;
num-in-endpoints = <7>;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The common configuration had to handle the worst possible use-case (with 4 USB HID class instances).

Together with changing approach, it would be reasonable to tailor the number of endpoints to needs of a given build type: https://github.com/nrfconnect/sdk-nrf/blob/main/applications/nrf_desktop/src/modules/usb_state.c#L125. We should also take into account additional USB endpoints used by the BLE QoS's USB CDC ACM class (to make it work without need to updating DTS manually).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was just a restructure of the DTS definitions. Your suggestion changes the DTS descriptions for each build type, which requires runtime tests. We can consider creating a follow-up ticket to optimize the USB part of DTS.

Copy link
Contributor

@MarekPieta MarekPieta Dec 6, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A follow-up ticket should be ok. Please link it here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://nordicsemi.atlassian.net/browse/NCSDK-30853

@kapi-no kapi-no added backport v2.9-branch auto-create a PR with same commits to v2.9-branch and removed changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Dec 6, 2024
@kapi-no kapi-no removed the backport v2.9-branch auto-create a PR with same commits to v2.9-branch label Dec 6, 2024
@nordicjm nordicjm merged commit 47ac578 into nrfconnect:main Dec 6, 2024
18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mkapala-nordic mkapala-nordic mkapala-nordic approved these changes

@MarekPieta MarekPieta MarekPieta approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@kapi-no @NordicBuilder @MarekPieta @mkapala-nordic @nordicjm