ESP32: Initial sort variants by platform#7340
Merged
thebentern merged 1 commit intomeshtastic:masterfrom Jul 19, 2025
Merged
Conversation
Member
Author
|
I have compiled every variant that was moved: ["chatter2", "meshtastic-diy-v1", "meshtastic-diy-v1_1", "meshtastic-dr-dev", "hydra", "heltec-wireless-bridge", "m5stack-core", "m5stack-coreink", "nano-g1", "nano-g1-explorer", "radiomaster_900_bandit", "radiomaster_900_bandit_micro", "radiomaster_900_bandit_nano", "tbeam", "rak11200", "station-g1", "tlora-v2-1-1_6", "tlora-v3-3-0-tcxo", "trackerd", "wiphone", "betafpv_900_tx_nano", "betafpv_2400_tx_micro", "hackerboxes-esp32-io", "heltec-v1", "heltec-v2_0", "heltec-v2_1", "heltec-wsl-v2_1", "tbeam0_7", "tlora-v1", "tlora_v1_3", "tlora-v2", "tlora-v2-1-1_6-tcxo", "tlora-v2-1-1_8"]All compiled successfully. Ship it so I can do the next batch 🤪 |
This was referenced Jul 14, 2025
Contributor
There was a problem hiding this comment.
Pull Request Overview
Reorganize ESP32 board variants by moving existing base variants into a dedicated variants/esp32 directory (including a new diy subfolder) and updating all include paths and root config patterns accordingly.
- Remove legacy top-level ESP32 variant configs and introduce new subdirectories under
variants/esp32 - Update every
platformio.inito reference the newvariants/esp32/...paths and split combinedbuild_flagslines for clarity - Adjust root
platformio.iniextra_configsto include nested variant directories, including DIY boards
Reviewed Changes
Copilot reviewed 38 out of 72 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| variants/trackerd/platformio.ini | Removed old top-level Trackerd variant |
| variants/tlora_v2_1_16/platformio.ini | Removed old top-level TLORA V2.1.16 variant |
| variants/tlora_v1_3/platformio.ini | Removed old top-level TLORA V1.3 variant |
| variants/esp32/wiphone/platformio.ini | Updated include path and split build_flags |
| variants/esp32/trackerd/platformio.ini | Added relocated Trackerd variant under esp32 |
| variants/esp32/tlora_v3_3_0_tcxo/platformio.ini | Adjusted include path prefix for TLORA V3.3.0-TCXO |
| variants/esp32/tlora_v2_1_18/platformio.ini | Split build_flags and updated include path for TLORA V2.1.18 |
| variants/esp32/tlora_v2_1_16_tcxo/platformio.ini | Updated include path prefix for TLORA V2.1.16-TCXO |
| variants/esp32/tlora_v2_1_16/platformio.ini | Added new TLORA V2.1.16 variant under esp32 |
| variants/esp32/tlora_v2/platformio.ini | Split build_flags and updated include path for TLORA V2 |
| variants/esp32/tlora_v1_3/platformio.ini | Added new TLORA V1.3 variant under esp32 |
| variants/esp32/tlora_v1/platformio.ini | Split build_flags and updated include path for TLORA V1 |
| variants/esp32/tbeam_v07/platformio.ini | Split build_flags and updated include path for TBEAM V0.7 |
| variants/esp32/tbeam/platformio.ini | Split build_flags and updated include path for TBEAM V1.0 |
| variants/esp32/station-g1/platformio.ini | Split build_flags and updated include path for STATION_G1 |
| variants/esp32/rak11200/platformio.ini | Split build_flags and updated include path for RAK11200 |
| variants/esp32/radiomaster_900_bandit_nano/platformio.ini | Fixed casing and updated include path for Bandit Nano variant |
| variants/esp32/radiomaster_900_bandit_micro/platformio.ini | Fixed casing and updated include path for Bandit Micro variant |
| variants/esp32/radiomaster_900_bandit/platformio.ini | Fixed casing and updated include path for Bandit variant |
| variants/esp32/nano-g1/platformio.ini | Split build_flags and updated include path for Nano-G1 variant |
| variants/esp32/nano-g1-explorer/platformio.ini | Split build_flags and updated include path for Nano-G1 Explorer |
| variants/esp32/m5stack_coreink/platformio.ini | Split build_flags and updated include path for CoreInk variant |
| variants/esp32/m5stack_core/platformio.ini | Split build_flags and updated include path for Core variant |
| variants/esp32/heltec_wsl_v2.1/platformio.ini | Split build_flags and updated include path for Heltec WSL v2.1 |
| variants/esp32/heltec_wireless_bridge/platformio.ini | Updated include path for Heltec Wireless Bridge variant |
| variants/esp32/heltec_v2/platformio.ini | Split build_flags and updated include path for Heltec V2.0 |
| variants/esp32/heltec_v2.1/platformio.ini | Split build_flags and updated include path for Heltec V2.1 |
| variants/esp32/heltec_v1/platformio.ini | Split build_flags and updated include path for Heltec V1.0 |
| variants/esp32/hackerboxes_esp32_io/platformio.ini | Updated include path for Hackerboxes ESP32 IO variant |
| variants/esp32/diy/v1_1/platformio.ini | Added new DIY v1.1 variant under esp32/diy |
| variants/esp32/diy/v1/platformio.ini | Added new DIY v1.0 variant under esp32/diy |
| variants/esp32/diy/hydra/platformio.ini | Added new DIY Hydra variant under esp32/diy |
| variants/esp32/diy/dr-dev/platformio.ini | Added new DIY DR-DEV variant under esp32/diy |
| variants/esp32/chatter2/platformio.ini | Updated include path for Chatter2 variant |
| variants/esp32/betafpv_900_tx_nano/platformio.ini | Updated include path for BetaFPV 900 TX-Nano variant |
| variants/esp32/betafpv_2400_tx_micro/platformio.ini | Updated include path for BetaFPV 2400 TX-Micro variant |
| variants/diy/platformio.ini | Removed legacy DIY umbrella config |
| platformio.ini | Expanded extra_configs patterns to include nested ESP32 variants |
8746879 to
3faf827
Compare
caveman99
approved these changes
Jul 16, 2025
c95934a to
08cf452
Compare
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.
This is some housekeeping, our variants directory is getting out of control!
esp32 (base)variants into thevariants/esp32directoryUnder this model, there is a
diydirectory in each top level dir. Ex:variants/esp32/diy,variants/esp32s3/diy, etc.This is the first PR in a series, split by platform to keep everything more manageable.
I intend to submit additional PRs to migrate the other variants.