Fix IDF v6 build (HSPI/VSPI aliases) and extend the CI matrix - #249
Merged
Conversation
ESP-IDF v6 drops the ESP32-classic HSPI_HOST/VSPI_HOST aliases, which broke the autodetect path and the Atom/Module display headers when building against it. SPI2_HOST/SPI3_HOST are the canonical names since IDF v4, so this stays compatible with every Arduino core and IDF version the CI floor covers.
- The IDF matrix gains esp32c5 (5.5.2), esp32c6 on 5.5.2 so the low power peripheral paths compile, and esp32 on 6.0.2 to surface next major deprecations early. - The Arduino matrix gains esp32c5 on arduino-esp32 3.3.11 (C5 support landed in the 3.3 series). - Both workflows now cancel superseded runs of the same branch or pull request, keyed by event name and PR number.
There was a problem hiding this comment.
Pull request overview
This pull request updates ESP32-classic SPI host selection to remain compatible with ESP-IDF v6 (which removed HSPI_HOST/VSPI_HOST aliases) and expands CI coverage to include newer ESP-IDF / Arduino core combinations while preventing redundant concurrent runs.
Changes:
- Replace
HSPI_HOST/VSPI_HOSTwith canonicalSPI2_HOST/SPI3_HOSTin ESP32-classic autodetect and display configuration paths. - Extend the ESP-IDF CI matrix to add
esp32 @ 6.0.2,esp32c5 @ 5.5.2, andesp32c6 @ 5.5.2. - Extend the Arduino CI matrix to add
esp32c5 @ arduino-esp32 3.3.11, and add concurrency cancellation to both workflows.
Reviewed changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
src/M5ModuleDisplay.h |
Switches ESP32-classic SPI host define to SPI3_HOST to avoid removed IDF v6 aliases. |
src/M5GFX.cpp |
Updates ESP32-classic autodetect SPI host assignments to SPI3_HOST / SPI2_HOST. |
src/M5AtomDisplay.h |
Switches ESP32-classic SPI host define to SPI3_HOST to avoid removed IDF v6 aliases. |
.github/workflows/IDFBuild.yml |
Adds IDF build matrix coverage (esp32 v6, esp32c5/c6 v5.5.2) and concurrency cancellation. |
.github/workflows/ArduinoBuild.yml |
Adds Arduino esp32c5 build coverage and concurrency cancellation. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
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.
Summary
Two related changes, validated together on a fork run of the extended matrix:
Use
SPI2_HOST/SPI3_HOSTinstead of the removedHSPI_HOST/VSPI_HOSTaliases.ESP-IDF v6 drops the ESP32-classic aliases, which broke the board autodetect path (
M5GFX.cpp) and the Atom/Module display headers when building against it.SPI2_HOST/SPI3_HOSTare the canonical names since IDF v4, so every Arduino core and IDF version already covered by CI keeps building (the sharedlgfxlayer was unaffected — it guards these aliases with#if defined).CI matrix additions:
esp32c5 @ 5.5.2(a supported product chip that had no IDF-side coverage),esp32c6 @ 5.5.2(compiles the low-power peripheral paths that 5.3 leaves out), andesp32 @ 6.0.2(surfaces next-major deprecations early — it is what caught the alias removal above).esp32c5 @ arduino-esp32 3.3.11(C5 support landed in the 3.3 series).Testing
esp32 @ 6.0.2,esp32c5 @ 5.5.2,esp32c6 @ 5.5.2) and all Arduino jobs green (includingesp32c5 @ 3.3.11).