Skip to content

Fix IDF v6 build (HSPI/VSPI aliases) and extend the CI matrix #249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lovyan03 merged 2 commits into from
Aug 13, 2026
Merged

Fix IDF v6 build (HSPI/VSPI aliases) and extend the CI matrix #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e84795c
Use SPI2_HOST/SPI3_HOST instead of the removed HSPI/VSPI aliases
ainyan03 Aug 13, 2026
506d271
CI: add esp32c5 coverage, IDF 6.0, and run superseding
ainyan03 Aug 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .github/workflows/ArduinoBuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ on:
pull_request:
workflow_dispatch:

# supersede queued/running builds of the same branch or PR
concurrency:
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
build:
name: ${{ matrix.board }} (${{ matrix.esp32_version }})
Expand Down Expand Up @@ -44,6 +49,10 @@ jobs:
- board: esp32:esp32:esp32c3
esp32_version: 3.1.1
board_manager_url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
# ESP32-C5 (v3.3+ only)
- board: esp32:esp32:esp32c5
esp32_version: 3.3.11
board_manager_url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
# ESP32-C6 (v3 only)
- board: esp32:esp32:esp32c6
esp32_version: 3.1.1
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/IDFBuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ on:
pull_request:
workflow_dispatch:

# supersede queued/running builds of the same branch or PR
concurrency:
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
build:
name: ${{ matrix.target }} (IDF ${{ matrix.idf_version }})
Expand All @@ -27,6 +32,8 @@ jobs:
idf_version: "5.3"
- target: esp32
idf_version: "5.1.6"
- target: esp32
idf_version: "6.0.2"
# ESP32-S3
- target: esp32s3
idf_version: "5.3"
Expand All @@ -37,9 +44,14 @@ jobs:
idf_version: "5.3"
- target: esp32c3
idf_version: "5.1.6"
# ESP32-C5 (IDF 5.5+ only)
- target: esp32c5
idf_version: "5.5.2"
# ESP32-C6 (IDF 5.3+ only)
- target: esp32c6
idf_version: "5.3"
- target: esp32c6
idf_version: "5.5.2"
# ESP32-H2
- target: esp32h2
idf_version: "5.3"
Expand Down
2 changes: 1 addition & 1 deletion src/M5AtomDisplay.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ class M5AtomDisplay : public M5GFX
int spi_sclk = GPIO_NUM_7;

#elif !defined (CONFIG_IDF_TARGET) || defined (CONFIG_IDF_TARGET_ESP32)
#define M5GFX_SPI_HOST VSPI_HOST
#define M5GFX_SPI_HOST SPI3_HOST

int i2c_port = 1;
int i2c_sda = GPIO_NUM_25;
Expand Down
10 changes: 5 additions & 5 deletions src/M5GFX.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1153,7 +1153,7 @@ namespace m5gfx

#if !defined (CONFIG_IDF_TARGET) || defined (CONFIG_IDF_TARGET_ESP32)

bus_cfg.spi_host = VSPI_HOST;
bus_cfg.spi_host = SPI3_HOST;
bus_cfg.dma_channel = 1;

std::uint32_t id;
Expand All @@ -1180,7 +1180,7 @@ namespace m5gfx
board = board_t::board_M5StickCPlus;
ESP_LOGI(LIBRARY_NAME, "[Autodetect] M5StickCPlus");
bus_spi->release();
bus_cfg.spi_host = HSPI_HOST;
bus_cfg.spi_host = SPI2_HOST;
bus_cfg.freq_write = 40000000;
bus_cfg.freq_read = 15000000;
bus_spi->config(bus_cfg);
Expand All @@ -1195,7 +1195,7 @@ namespace m5gfx
board = board_t::board_M5StickC;
ESP_LOGI(LIBRARY_NAME, "[Autodetect] M5StickC");
bus_spi->release();
bus_cfg.spi_host = HSPI_HOST;
bus_cfg.spi_host = SPI2_HOST;
bus_cfg.freq_write = 27000000;
bus_cfg.freq_read = 14000000;
bus_spi->config(bus_cfg);
Expand Down Expand Up @@ -1280,7 +1280,7 @@ namespace m5gfx
board = board_t::board_M5StickCPlus2;
ESP_LOGI(LIBRARY_NAME, "[Autodetect] M5StickCPlus2");
bus_spi->release();
bus_cfg.spi_host = HSPI_HOST;
bus_cfg.spi_host = SPI2_HOST;
bus_cfg.freq_write = 40000000;
bus_cfg.freq_read = 15000000;
bus_spi->config(bus_cfg);
Expand Down Expand Up @@ -1350,7 +1350,7 @@ namespace m5gfx
board = board_t::board_M5Station;

bus_spi->release();
bus_cfg.spi_host = HSPI_HOST;
bus_cfg.spi_host = SPI2_HOST;
bus_cfg.freq_write = 40000000;
bus_cfg.freq_read = 15000000;
bus_spi->config(bus_cfg);
Expand Down
2 changes: 1 addition & 1 deletion src/M5ModuleDisplay.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ class M5ModuleDisplay : public M5GFX
int spi_sclk = GPIO_NUM_36;

#elif !defined (CONFIG_IDF_TARGET) || defined (CONFIG_IDF_TARGET_ESP32)
#define M5GFX_SPI_HOST VSPI_HOST
#define M5GFX_SPI_HOST SPI3_HOST

int i2c_port = 1;
int i2c_sda = GPIO_NUM_21;
Expand Down
Loading