Skip to content

ESP32: Initial sort variants by platform#7340

Merged
thebentern merged 1 commit intomeshtastic:masterfrom
vidplace7:variant-dirs
Jul 19, 2025
Merged

ESP32: Initial sort variants by platform#7340
thebentern merged 1 commit intomeshtastic:masterfrom
vidplace7:variant-dirs

Conversation

@vidplace7
Copy link
Member

This is some housekeeping, our variants directory is getting out of control!

  • Move all esp32 (base) variants into the variants/esp32 directory
  • Include esp32 DIY boards defined in the same manner as normal boards (seperate platformio.ini files, in the same dir with variant.h)

Under this model, there is a diy directory 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.

variants
|- esp32
    |- diy
        |- hydra
            |- platformio.ini
            |- variant.h
    |- heltec-v3
        |- platformio.ini
        |- variant.h
|- esp32s3
|- esp32c3
|- esp32c6
|- nrf52840
|- nrf52832
|- rp2040
|- rp2350
|- stm32wl
|- linux

@vidplace7
Copy link
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 🤪

Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.ini to reference the new variants/esp32/... paths and split combined build_flags lines for clarity
  • Adjust root platformio.ini extra_configs to 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

@vidplace7 vidplace7 added the github_actions Pull requests that update GitHub Actions code label Jul 18, 2025
@vidplace7 vidplace7 force-pushed the variant-dirs branch 2 times, most recently from c95934a to 08cf452 Compare July 19, 2025 15:55
@thebentern thebentern merged commit 974741a into meshtastic:master Jul 19, 2025
53 checks passed
@vidplace7 vidplace7 deleted the variant-dirs branch July 20, 2025 00:22
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

github_actions Pull requests that update GitHub Actions code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants