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

applications: nrf5340_audio: Hide audio configs when not enabled #19952

Merged
merged 2 commits into from
Jan 22, 2025
Merged

applications: nrf5340_audio: Hide audio configs when not enabled #19952

merged 2 commits into from
Jan 22, 2025

Conversation

rugeGerritsen
Copy link
Contributor

When building non-audio applications the generated .config file previously contained the entries
CONFIG_AUDIO_MODULE_NAME_SIZE
CONFIG_AUDIO_MODULE_LOG_LEVEL
which we do not want to have there.

@rugeGerritsen rugeGerritsen requested a review from a team as a code owner January 16, 2025 13:17
@rugeGerritsen rugeGerritsen requested review from a team, koffes, rick1082, alexsven and gWacey and removed request for a team January 16, 2025 13:18
@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 Jan 16, 2025
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Jan 16, 2025 •
edited
Loading

CI Information

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

Inputs:

Sources:

sdk-nrf: PR head: 99eb08e7135d3571bac5734c020b6910c068b7b0

more details

sdk-nrf:

PR head: 99eb08e7135d3571bac5734c020b6910c068b7b0
merge base: 8b83cf2b4d708062e566d84e2969e4225b307331
target head (main): fcbe2bb36580697a2fecbbe907917bee9646bbaa
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 (1) 
subsys
│  ├── audio_module
│  │  │ Kconfig

Outputs:

Toolchain

Version: 342151af73
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:342151af73_912848a074

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

  • ◻️ Toolchain - Skipped: existing toolchain is used
  • ✅ Build twister
    • sdk-nrf test count: 40
  • ✅ Integration tests
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_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.

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

nordicjm
nordicjm reviewed Jan 17, 2025
View reviewed changes
Copy link
Contributor

@nordicjm nordicjm left a comment

Choose a reason for hiding this comment

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

commit title should be updated, this is modifying an audio subsystem file, not the application

subsys/audio_module/Kconfig
#----------------------------------------------------------------------------#
menu "Log levels"
Copy link
Contributor

Choose a reason for hiding this comment

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

why does this need it's own menu? Which adds to confusion because it will always be displayed even when the module is disabled

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It is probably not needed. Keeping it here for now

subsys/audio_module/Kconfig
@@ -17,14 +17,17 @@ config AUDIO_MODULE_TEST

Copy link
Contributor

Choose a reason for hiding this comment

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

the default n above is not needed

subsys/audio_module/Kconfig Outdated
Comment on lines 26 to 31
if AUDIO_MODULE || AUDIO_MODULE_TEST
module = AUDIO_MODULE
module-str = audio_module
source "subsys/logging/Kconfig.template.log_config"
endif
Copy link
Contributor

Choose a reason for hiding this comment

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

newline gaps before module = line and after source line

@rugeGerritsen
audio_module: Hide audio configs when not enabled
b87aa04 
When building non-audio applications the generated .config
file previously contained the entries
CONFIG_AUDIO_MODULE_NAME_SIZE
CONFIG_AUDIO_MODULE_LOG_LEVEL
which we do not want to have there.

Signed-off-by: Rubin Gerritsen <[email protected]>
@rugeGerritsen
audio_module: Remove redundant 'default n'
99eb08e 
It is not needed.

Signed-off-by: Rubin Gerritsen <[email protected]>
@rugeGerritsen
Copy link
Contributor Author

@nrfconnect/ncs-audio , would you mind having a look at this one? :)

@rugeGerritsen rugeGerritsen merged commit 248fa39 into nrfconnect:main Jan 22, 2025
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nordicjm nordicjm nordicjm approved these changes

@alexsven alexsven alexsven approved these changes

@koffes koffes Awaiting requested review from koffes koffes was automatically assigned from nrfconnect/ncs-audio

@rick1082 rick1082 Awaiting requested review from rick1082 rick1082 was automatically assigned from nrfconnect/ncs-audio

@gWacey gWacey Awaiting requested review from gWacey gWacey was automatically assigned from nrfconnect/ncs-audio

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.
4 participants
@rugeGerritsen @NordicBuilder @alexsven @nordicjm