RP2040/RP2350: Migrate variants to new structure#7345
RP2040/RP2350: Migrate variants to new structure#7345thebentern merged 1 commit intomeshtastic:masterfrom
Conversation
vidplace7
force-pushed
the
variant-rp2xx0
branch
12 times, most recently
from
0e45872 to
8ce8f55
Compare
There was a problem hiding this comment.
Pull Request Overview
This PR migrates RP2040 and RP2350 board variants to a new hierarchical directory structure, organizing them under chip-specific subdirectories (variants/rp2040/ and variants/rp2350/) instead of the flat structure previously used.
Key changes:
- Updates include paths in platformio.ini files to reflect the new directory structure
- Standardizes build_flags formatting across all variants
- Updates build_src_filter references for affected variants
Reviewed Changes
Copilot reviewed 11 out of 25 changed files in this pull request and generated 9 comments.
Show a summary per file
| File | Description |
|---|---|
| variants/rp2350/rpipico2w/platformio.ini | Updates include path and reformats build_flags |
| variants/rp2350/rpipico2/platformio.ini | Updates include path and reformats build_flags |
| variants/rp2040/senselora_rp2040/platformio.ini | Updates include path to new directory structure |
| variants/rp2040/rpipicow/platformio.ini | Updates include path and reformats build_flags |
| variants/rp2040/rpipico/platformio.ini | Updates include path and reformats build_flags |
| variants/rp2040/rpipico-slowclock/platformio.ini | Updates include path and reformats build_flags |
| variants/rp2040/rp2040-lora/platformio.ini | Updates include path and reformats build_flags |
| variants/rp2040/rak11310/platformio.ini | Updates include path, build_src_filter, and reformats build_flags |
| variants/rp2040/nibble_rp2040/platformio.ini | Updates include path and reformats build_flags |
| variants/rp2040/feather_rp2040_rfm95/platformio.ini | Updates include path and reformats build_flags |
| variants/rp2040/ec_catsniffer/platformio.ini | Updates include path, reformats build_flags, and converts comment style |
| build_flags = | ||
| ${rp2350_base.build_flags} | ||
| -D RPI_PICO2 | ||
| -I variants/rp2350/rpipico2 |
There was a problem hiding this comment.
[nitpick] Inconsistent spacing in include flag. Should be '-Ivariants/rp2350/rpipico2' (no space after -I) to match the pattern used in other variants.
| -DDEBUG_RP2040_PORT=Serial | ||
| build_flags = ${rp2040_base.build_flags} | ||
| -D SENSELORA_RP2040 | ||
| -I variants/rp2040/senselora_rp2040 |
There was a problem hiding this comment.
[nitpick] Inconsistent spacing in include flag. Should be '-Ivariants/rp2040/senselora_rp2040' (no space after -I) to match the pattern used in other variants.
| build_flags = | ||
| ${rp2040_base.build_flags} | ||
| -D RPI_PICO | ||
| -I variants/rp2040/rpipicow |
There was a problem hiding this comment.
[nitpick] Inconsistent spacing in include flag. Should be '-Ivariants/rp2040/rpipicow' (no space after -I) to match the pattern used in other variants.
| build_flags = | ||
| ${rp2040_base.build_flags} | ||
| -D RPI_PICO | ||
| -I variants/rp2040/rpipico |
There was a problem hiding this comment.
[nitpick] Inconsistent spacing in include flag. Should be '-Ivariants/rp2040/rpipico' (no space after -I) to match the pattern used in other variants.
| build_flags = | ||
| ${rp2040_base.build_flags} | ||
| -D RP2040_LORA | ||
| -I variants/rp2040/rp2040-lora |
There was a problem hiding this comment.
[nitpick] Inconsistent spacing in include flag. Should be '-Ivariants/rp2040/rp2040-lora' (no space after -I) to match the pattern used in other variants.
| build_flags = | ||
| ${rp2040_base.build_flags} | ||
| -D RAK11310 | ||
| -I variants/rp2040/rak11310 |
There was a problem hiding this comment.
[nitpick] Inconsistent spacing in include flag. Should be '-Ivariants/rp2040/rak11310' (no space after -I) to match the pattern used in other variants.
| build_flags = | ||
| ${rp2040_base.build_flags} | ||
| -D PRIVATE_HW | ||
| -I variants/rp2040/nibble_rp2040 |
There was a problem hiding this comment.
[nitpick] Inconsistent spacing in include flag. Should be '-Ivariants/rp2040/nibble_rp2040' (no space after -I) to match the pattern used in other variants.
| build_flags = | ||
| ${rp2040_base.build_flags} | ||
| -D RP2040_FEATHER_RFM95 | ||
| -I variants/rp2040/feather_rp2040_rfm95 |
There was a problem hiding this comment.
[nitpick] Inconsistent spacing in include flag. Should be '-Ivariants/rp2040/feather_rp2040_rfm95' (no space after -I) to match the pattern used in other variants.
| build_flags = | ||
| ${rp2040_base.build_flags} | ||
| -D RPI_PICO | ||
| -I variants/rp2040/ec_catsniffer |
There was a problem hiding this comment.
[nitpick] Inconsistent spacing in include flag. Should be '-Ivariants/rp2040/ec_catsniffer' (no space after -I) to match the pattern used in other variants.
vidplace7
force-pushed
the
variant-rp2xx0
branch
3 times, most recently
from
8ee8f48 to
99e7d8f
Compare
vidplace7
force-pushed
the
variant-rp2xx0
branch
from
99e7d8f to
411e952
Compare
|
All PlatformIO envs in this PR are building correctly (fixed a small issue that was preventing Ready to merge! |
Builds upon / relies upon #7340
Migrate RP2040 and RP2350 variants to new directory structure.
Draft until #7340 is merged