supervisor: include settings.h when only the BLE serial service is enabled - #11147
Open
annejan wants to merge 1 commit into
Open
supervisor: include settings.h when only the BLE serial service is enabled#11147annejan wants to merge 1 commit into
annejan wants to merge 1 commit into
Conversation
…abled
supervisor_bluetooth_init() calls settings_get_bool() under
#if (CIRCUITPY_BLE_FILE_SERVICE || CIRCUITPY_BLE_SERIAL_SERVICE)
#if CIRCUITPY_SETTINGS_TOML
but the include of settings.h is guarded by a condition that leaves
CIRCUITPY_BLE_SERIAL_SERVICE out. Building with the serial service enabled and
the file service disabled therefore fails:
error: implicit declaration of function 'settings_get_bool'
error: nested extern declaration of 'settings_get_bool'
Add the missing symbol to the include condition so the two agree.
No board in tree currently selects that combination, so nothing is broken
today; this only bites when enabling the BLE serial service on its own.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
supervisor_bluetooth_init()callssettings_get_bool()under:but the include of
settings.his guarded by a condition that omitsCIRCUITPY_BLE_SERIAL_SERVICE:Building with the serial service enabled and the file service disabled fails:
This adds the missing symbol so the two conditions agree.
Scope
Latent. No board in tree selects
CIRCUITPY_BLE_SERIAL_SERVICE = 1withCIRCUITPY_BLE_FILE_SERVICE = 0, so nothing is broken today. I hit it while enabling the BLE serial service on its own for a board, which is what surfaced the mismatch.