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

Bluetooth: define BT_COMPANY_ID_NORDIC #12447

Merged
merged 1 commit into from
Nov 23, 2023
Merged

Bluetooth: define BT_COMPANY_ID_NORDIC #12447

merged 1 commit into from
Nov 23, 2023

Conversation

jori-nordic
Copy link
Contributor

Also set BT_COMPANY_ID to BT_COMPANY_ID_NORDIC.

Making a kconfig option makes it also usable outside sdk-nrf.

@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 Sep 27, 2023
@jori-nordic jori-nordic added ble mesh Label for ble mesh PRbot. Add this if PR is related to ble mesh and you need to get review. and removed changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Sep 27, 2023
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Sep 27, 2023 •
edited
Loading

Test specification

CI/Jenkins/NRF

  • Integration Platforms

CI/Jenkins/integration

Test Module File based changes Manually selected West overwrite
desktop52_verification X
test-fw-nrfconnect-apps X
test-fw-nrfconnect-ble X X
test-fw-nrfconnect-ble_mesh X
test-fw-nrfconnect-ble_samples X X
test-fw-nrfconnect-fem X
test-fw-nrfconnect-nrf-iot_mosh X
test-fw-nrfconnect-nrf-iot_samples X
test-fw-nrfconnect-rs X
test-sdk-find-my X

Detailed information of selected test modules

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 Publishing GitHub Action.

tokangas
tokangas approved these changes Sep 27, 2023
View reviewed changes
Copy link
Contributor

@tokangas tokangas left a comment

Choose a reason for hiding this comment

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

Ok for modem_shell.

KAGA164
KAGA164 approved these changes Oct 3, 2023
View reviewed changes
Copy link
Contributor

@KAGA164 KAGA164 left a comment

Choose a reason for hiding this comment

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

LGTM. I would consider changing CONFIG_BT_COMPANY_ID_NORDIC->CONFIG_BT_COMPANY_ID in C language related files

omkar3141
omkar3141 requested changes Oct 3, 2023
View reviewed changes
samples/bluetooth/mesh/chat/include/chat_cli.h Outdated Show resolved Hide resolved
include/bluetooth/mesh/vnd/dm_common.h Show resolved Hide resolved
subsys/bluetooth/mesh/shell/shell_dm_cli.c Outdated Show resolved Hide resolved
@omkar3141 omkar3141 added the DNM label Oct 4, 2023
@omkar3141
Copy link
Contributor

Added DNM so that this does not get accidentally merged since there are already three approvals.

@github-actions github-actions bot added changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. and removed ble mesh Label for ble mesh PRbot. Add this if PR is related to ble mesh and you need to get review. labels Oct 12, 2023
omkar3141
omkar3141 requested changes Oct 12, 2023
View reviewed changes
samples/bluetooth/mesh/chat/include/chat_cli.h Outdated Show resolved Hide resolved
samples/bluetooth/nrf_dm/src/main.c Outdated Show resolved Hide resolved
@omkar3141 omkar3141 removed the DNM label Oct 18, 2023
@jori-nordic jori-nordic force-pushed the nordic-company-id-kconfig branch 2 times, most recently from 261b475 to d056698 Compare November 23, 2023 07:48
@jori-nordic
Bluetooth: define BT_COMPANY_ID_NORDIC
d056698 
Also set BT_COMPANY_ID to BT_COMPANY_ID_NORDIC.

Making a kconfig option makes it also usable outside sdk-nrf.

Signed-off-by: Jonathan Rico <jonathan.rico@nordicsemi.no>
@nordicjm nordicjm merged commit f56190f into nrfconnect:main Nov 23, 2023
23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alwa-nordic alwa-nordic alwa-nordic approved these changes

@KAGA164 KAGA164 KAGA164 approved these changes

@omkar3141 omkar3141 omkar3141 approved these changes

@tokangas tokangas tokangas approved these changes

@ludvigsj ludvigsj Awaiting requested review from ludvigsj

@carlescufi carlescufi Awaiting requested review from carlescufi

@trantanen trantanen Awaiting requested review from trantanen trantanen is a code owner

@jhirsi jhirsi Awaiting requested review from jhirsi jhirsi is a code owner

Assignees
No one assigned
Labels
changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@jori-nordic @NordicBuilder @omkar3141 @tokangas @KAGA164 @alwa-nordic @nordicjm