ESP32s3: Migrate variants to new structure#7343
Merged
thebentern merged 1 commit intomeshtastic:masterfrom Jul 20, 2025
Merged
Conversation
vidplace7
force-pushed
the
variant-esp32s3
branch
2 times, most recently
from
eef29de to
bc8c12c
Compare
caveman99
approved these changes
Jul 16, 2025
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR migrates ESP32s3 variants to a new directory structure, updating include paths to reflect the reorganized directory layout from flat variant directories to a hierarchical structure under variants/esp32s3/.
- Updates all include paths from
variants/{variant_name}tovariants/esp32s3/{variant_name} - Moves one environment definition from the general DIY section to the ESP32s3 specific location
- Reformats some build flag configurations for better readability
Reviewed Changes
Copilot reviewed 41 out of 127 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| variants/esp32s3/*/platformio.ini | Updates include paths to use new esp32s3 subdirectory structure |
| variants/diy/platformio.ini | Removes t-energy-s3_e22 environment definition |
Comments suppressed due to low confidence (2)
variants/esp32s3/seeed_xiao_s3/platformio.ini:15
- [nitpick] The define name SEEED_XIAO_S3 is inconsistent with the variant name seeed_xiao_s3. Consider using a consistent naming convention.
-D SEEED_XIAO_S3
| -D STATION_G2 | ||
| -I variants/esp32s3/station-g2 | ||
| -DBOARD_HAS_PSRAM | ||
| -DSTATION_G2 |
There was a problem hiding this comment.
The STATION_G2 define is duplicated on lines 17 and 20. Remove the duplicate definition to avoid potential confusion.
Suggested change
| -DSTATION_G2 |
| ${esp32s3_base.build_flags} | ||
| -D SEEED_XIAO_S3 | ||
| -I variants/esp32s3/seeed_xiao_s3 | ||
| -DBOARD_HAS_PSRAM |
There was a problem hiding this comment.
Trailing whitespace should be removed from the line ending.
Suggested change
| -DBOARD_HAS_PSRAM | |
| -DBOARD_HAS_PSRAM |
vidplace7
force-pushed
the
variant-esp32s3
branch
5 times, most recently
from
33629a8 to
a66758e
Compare
vidplace7
force-pushed
the
variant-esp32s3
branch
from
a66758e to
3a44c38
Compare
Member
Author
|
All affected PlatformIO envs have been compile tested. Shipit! |
oscgonfer
pushed a commit
to fablabbcn/smartcitizen-meshtastic
that referenced
this pull request
Jul 22, 2025
oscgonfer
pushed a commit
to fablabbcn/smartcitizen-meshtastic
that referenced
this pull request
Jul 23, 2025
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
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.
Builds upon / relies upon #7340
Migrate ESP32s3 variants to new directory structure.
Draft until #7340 is merged