Updates for esp32s2 builds #3693
Merged
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
caveman99
requested changes
Apr 21, 2024
src/modules/AdminModule.cpp
Outdated
| @@ -721,7 +721,7 @@ void AdminModule::handleGetDeviceConnectionStatus(const meshtastic_MeshPacket &r | |||
| #if HAS_BLUETOOTH | |||
| conn.has_bluetooth = true; | |||
| conn.bluetooth.pin = config.bluetooth.fixed_pin; | |||
| #ifdef ARCH_ESP32 | |||
| #if defined(ARCH_ESP32) && !defined(CONFIG_IDF_TARGET_ESP32S2) | |||
There was a problem hiding this comment.
Is this really neccessary? ESP32-S2 should not have HAS_BLUETOOTH defined.
There was a problem hiding this comment.
Updated as suggested.
Following updates were needed:
- change to
PaxCounterModule.cppis needed as the build will still pull in the cpp file regardless if the define is set - change to
sleep.cppto exclude pulling in nimble ifMESHTASTIC_EXCLUDE_BLUETOOTHis defined.
There was a problem hiding this comment.
Excellent - this way we can dodge the dreaded CONFIG_IDF macros ... :-)
caveman99
force-pushed
the
updates_for_esp32s2_build
branch
from
2c902aa to
16b2161
Compare
titan098
force-pushed
the
updates_for_esp32s2_build
branch
from
f496b03 to
f434f62
Compare
titan098
force-pushed
the
updates_for_esp32s2_build
branch
from
f434f62 to
30d4c3a
Compare
caveman99
approved these changes
Apr 22, 2024
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.
Minor update to allow builds for
esp32s2modules to succeed. The esp32s2 doesn't have Bluetooth so exclude various Bluetooth related components to allow for a successful build if the target platform is anesp32s2.