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.

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

samples: cellular: fixes and cleanup for new BT HCI driver #20637

Merged
merged 5 commits into from
Mar 4, 2025

Conversation

mniestroj
Copy link
Contributor

Update thingy91 to new HCI driver, so that Bluetooth driver is registered correctly during init.

Cleanup devicetree leftovers from old HCI driver, which are no longer used.

Update to new HCI driver, so that Bluetooth driver is registered
correctly during init.

This is a followup to commit 7a5d1c6 ("samples: cellular:
lte_ble_gateway: Update to use new HCI driver").

Signed-off-by: Marcin Niestroj <m.niestroj@emb.dev>
This chosen property is no longer used by Zephyr, as there is
'zephyr,bt-hci' instead. Drop it.

Signed-off-by: Marcin Niestroj <m.niestroj@emb.dev>
CONFIG_BT_H4 is selected automatically whenever there is devicetree node
enabled with "zephyr,bt-hci-uart" compatible.

Signed-off-by: Marcin Niestroj <m.niestroj@emb.dev>
This chosen property is no longer used by Zephyr, as there is
'zephyr,bt-hci' instead. Drop it.

Signed-off-by: Marcin Niestroj <m.niestroj@emb.dev>
CONFIG_BT_H4 is selected automatically whenever there is devicetree node
enabled with "zephyr,bt-hci-uart" compatible.

Signed-off-by: Marcin Niestroj <m.niestroj@emb.dev>
@mniestroj mniestroj requested review from trantanen, jhirsi, tokangas and a team as code owners February 26, 2025 18:21
@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 Feb 26, 2025
@NordicBuilder
Copy link
Contributor

Thank you for your contribution!
It seems you are not a member of the nrfconnect GitHub organization. External contributions are handled as follows:
Large contributions, affecting multiple subsystems for example, may be rejected if they are complex, may introduce regressions due to lack of test coverage, or if they are not consistent with the architecture of nRF Connect SDK.
PRs will be run in our continuous integration (CI) test system.
If CI passes, PRs will be tagged for review and merged on successful completion of review. You may be asked to make some modifications to your contribution during review.
If CI fails, PRs may be rejected or may be tagged for review and rework.
PRs that become outdated due to other changes in the repository may be rejected or rework requested.
External contributions will be prioritized for review based on the relevance to current development efforts in nRF Connect SDK. Bug fix PRs will be prioritized.
You may raise issues or ask for help from our Technical Support team by visiting https://devzone.nordicsemi.com/.

Note: This comment is automatically posted and updated by the Contribs GitHub Action.

@NordicBuilder NordicBuilder added the external External contribution label Feb 26, 2025
@rlubos rlubos added the CI-trusted-author The author of the PR is trusted. All future commits will be tested in PR. label Feb 27, 2025
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Feb 27, 2025

CI Information

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

Inputs:

Sources:

sdk-nrf: PR head: 012392d4c5d9c0dd739d2f3471026f255c1bbfe8

more details

sdk-nrf:

PR head: 012392d4c5d9c0dd739d2f3471026f255c1bbfe8
merge base: bde6b19b00b74b47ce37a09f75e815064a0d4827
target head (main): db3aa5c59e10a3c14f3a6e66dfdffdae8ac7d658
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 (5)
samples
│  ├── cellular
│  │  ├── lte_ble_gateway
│  │  │  ├── boards
│  │  │  │  ├── nrf9160dk_nrf9160_ns.overlay
│  │  │  │  │ thingy91_nrf9160_ns.overlay
│  │  │  │ prj.conf
│  │  ├── modem_shell
│  │  │  ├── bt.overlay
│  │  │  │ overlay-bt.conf

Outputs:

Toolchain

Version: aedb4c0245
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:aedb4c0245_bece0367df

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

  • ◻️ Toolchain - Skipped: existing toolchain is used
  • ✅ Build twister
    • sdk-nrf test count: 223
  • ✅ Integration tests
    • ✅ test-fw-nrfconnect-nrf-iot_samples
    • ✅ test-fw-nrfconnect-nrf-iot_mosh
Disabled integration tests
    • desktop52_verification
    • 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_positioning
    • 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-proprietary_esb
    • 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

@rlubos
Copy link
Contributor

rlubos commented Mar 3, 2025

@jhirsi @tokangas @trantanen Ping, please review

@tokangas
Copy link
Contributor

tokangas commented Mar 4, 2025

I'm not familiar with this modem_shell feature, but I followed the instructions and tried it. It does not seem to work. The bt init command causes a timeout after 10 seconds and asserts.

mosh:~$ bt init
mosh:~$ ASSERTION FAIL [success] @ WEST_TOPDIR/zephyr/subsys/bluetooth/host/hci_core.c:429
        command opcode 0x0c03 timeout

I also tried the lte_ble_gateway sample and looks like it works, so there might be something wrong with the modem_shell configuration. I did not reflash nRF52 between lte_ble_gateway and modem_shell trials, so it should be ok.

@mniestroj Did you try modem_shell? It is quite possible that this has been broken in modem_shell already earlier.

@tokangas
Copy link
Contributor

tokangas commented Mar 4, 2025

Ok, I also needed to include the change in #20651. Now it works also with modem_shell. Thanks, @mniestroj!

Copy link
Contributor

@trantanen trantanen left a comment

Choose a reason for hiding this comment

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

Thanks for the updates!
I'd probably combine the changes into two commits (one for each sample) but not a big deal unless @rlubos has an opinion on that.

@rlubos rlubos merged commit 5ba7bdf into nrfconnect:main Mar 4, 2025
24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. CI-trusted-author The author of the PR is trusted. All future commits will be tested in PR. external External contribution
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants