Fix a esp32-hal-misc.c compilation error if Bluetooth not enabled #2172
Conversation
This file contains 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
|
Ahh nice catch :) I should maybe figure out how to test such cases. Arduino is tested only with the IDE as of now and BT is enabled for it |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The file
cores/esp32/esp32-hal-misc.cattempts to#include "esp_bt.h"regardless if Bluetooth is enabled or not (typically via sdkconfig) which causes a compilation error. The actual logic inesp32-hal-misc.cis guarded by theCONFIG_BT_ENABLEDflag so all we have to do is wrap the include with the same flag.Currently
Config with
CONFIG_BT_ENABLEDnot set to true will fail compilation with the following error:This is because
esp_bt.hisn't added to the CMake includes unless theCONFIG_BT_ENABLEDflag is set to true. https://github.com/espressif/esp-idf/blob/ae5df5d6ce7c9abd9c8c4731ced96031c29f7fc1/components/bt/CMakeLists.txt#L1-L4After the fix
Successful compilation with the
CONFIG_BT_ENABLEDflag set to a falsey value