From 734816f5f39a2111d68246a85b416873b9f1757e Mon Sep 17 00:00:00 2001 From: Elliot Matson Date: Sun, 29 Jan 2023 20:11:02 -0600 Subject: test with new deps --- examples/PIO_TestPatterns/platformio.ini | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) (limited to 'examples/PIO_TestPatterns/platformio.ini') diff --git a/examples/PIO_TestPatterns/platformio.ini b/examples/PIO_TestPatterns/platformio.ini index 3505b2d..d30d57f 100644 --- a/examples/PIO_TestPatterns/platformio.ini +++ b/examples/PIO_TestPatterns/platformio.ini @@ -9,6 +9,9 @@ platform = espressif32 board = wemos_d1_mini32 lib_deps = fastled/FastLED + Wire + adafruit/Adafruit BusIO + adafruit/Adafruit GFX Library https://github.com/mrfaptastic/ESP32-HUB75-MatrixPanel-I2S-DMA.git build_flags = upload_speed = 460800 @@ -19,22 +22,12 @@ monitor_filters = esp32_exception_decoder build_flags = ${env.build_flags} -DTEST_FASTLINES -lib_deps = - ${env.lib_deps} - Wire - adafruit/Adafruit BusIO - adafruit/Adafruit GFX Library [env:debug] build_flags = ${env.build_flags} -DTEST_FASTLINES -DSERIAL_DEBUG -lib_deps = - ${env.lib_deps} - Wire - adafruit/Adafruit BusIO - adafruit/Adafruit GFX Library ; build without GFX functions [env:minimal] @@ -43,8 +36,6 @@ build_flags = -DNO_GFX -DNO_FAST_FUNCTIONS -DNO_CIE1931 -lib_deps = - ${env.lib_deps} ; Virtual Panel test [env:vpane] @@ -52,11 +43,6 @@ build_flags = ${env.build_flags} -DNO_FAST_FUNCTIONS -DVIRTUAL_PANE -lib_deps = - ${env.lib_deps} - Wire - adafruit/Adafruit BusIO - adafruit/Adafruit GFX Library ; Virtual Panel test [env:vpane_minimal] @@ -66,11 +52,6 @@ build_flags = -DNO_GFX -DNO_FAST_FUNCTIONS -DNO_CIE1931 -lib_deps = - ${env.lib_deps} - Wire - adafruit/Adafruit BusIO - adafruit/Adafruit GFX Library ; PIO CI can't handle IDF git modules properly (yet) ;[env:idfarduino] -- cgit v1.3.1 From f6ac9357c90a5f32b1732723a621e22a59076052 Mon Sep 17 00:00:00 2001 From: Elliot Matson Date: Sun, 29 Jan 2023 20:25:59 -0600 Subject: Use proper ci matrix --- .github/workflows/pio_build.yml | 6 ++++++ examples/PIO_TestPatterns/platformio.ini | 35 -------------------------------- examples/PIO_TestPatterns/src/main.cpp | 6 +++--- 3 files changed, 9 insertions(+), 38 deletions(-) (limited to 'examples/PIO_TestPatterns/platformio.ini') diff --git a/.github/workflows/pio_build.yml b/.github/workflows/pio_build.yml index 39901f9..6258798 100644 --- a/.github/workflows/pio_build.yml +++ b/.github/workflows/pio_build.yml @@ -18,7 +18,13 @@ jobs: matrix: example: - "examples/PIO_TestPatterns" + no_gfx: ["", -DNO_GFX] + no_fast_functions: ["", -DFAST_FUNCTIONS] + no_cie1931: ["", -DNO_CIE1931] + virtual_panel: ["", -DVIRTUAL_PANEL] + env: + PLATFORMIO_BUILD_FLAGS: ${{ matrix.no_gfx }} ${{ matrix.no_fast_functions }} ${{ matrix.no_cie1931 }} ${{ matrix.virtual_panel steps: - uses: actions/checkout@v2 - name: Cache pip diff --git a/examples/PIO_TestPatterns/platformio.ini b/examples/PIO_TestPatterns/platformio.ini index d30d57f..379d2bb 100644 --- a/examples/PIO_TestPatterns/platformio.ini +++ b/examples/PIO_TestPatterns/platformio.ini @@ -18,41 +18,6 @@ upload_speed = 460800 monitor_speed = 115200 monitor_filters = esp32_exception_decoder -[env:esp32] -build_flags = - ${env.build_flags} - -DTEST_FASTLINES - -[env:debug] -build_flags = - ${env.build_flags} - -DTEST_FASTLINES - -DSERIAL_DEBUG - -; build without GFX functions -[env:minimal] -build_flags = - ${env.build_flags} - -DNO_GFX - -DNO_FAST_FUNCTIONS - -DNO_CIE1931 - -; Virtual Panel test -[env:vpane] -build_flags = - ${env.build_flags} - -DNO_FAST_FUNCTIONS - -DVIRTUAL_PANE - -; Virtual Panel test -[env:vpane_minimal] -build_flags = - ${env.build_flags} - -DVIRTUAL_PANE - -DNO_GFX - -DNO_FAST_FUNCTIONS - -DNO_CIE1931 - ; PIO CI can't handle IDF git modules properly (yet) ;[env:idfarduino] ;platform = espressif32 diff --git a/examples/PIO_TestPatterns/src/main.cpp b/examples/PIO_TestPatterns/src/main.cpp index 6325b63..ef43fe3 100644 --- a/examples/PIO_TestPatterns/src/main.cpp +++ b/examples/PIO_TestPatterns/src/main.cpp @@ -241,7 +241,7 @@ void loop(){ delay(PATTERN_DELAY); // -#ifdef TEST_FASTLINES +#ifndef NO_FAST_FUNCTIONS // Fillrate for fillRect() function Serial.print("Estimating fullscreen fillrate with fillRect() time: "); t1 = micros(); @@ -293,7 +293,7 @@ void loop(){ Serial.printf("%lu us, %u ticks\n", t2, ccount1); delay(PATTERN_DELAY); -#ifdef TEST_FASTLINES +#ifndef NO_FAST_FUNCTIONS Serial.println("Estimating V-lines with vlineDMA(): "); // matrix->fillScreen(0); color2 = random8(); @@ -347,7 +347,7 @@ void loop(){ Serial.printf("%lu us, %u ticks\n", t2, ccount1); delay(PATTERN_DELAY); -#ifdef TEST_FASTLINES +#ifndef NO_FAST_FUNCTIONS Serial.println("Estimating H-lines with hlineDMA(): "); matrix->fillScreen(0); color2 = random8(); -- cgit v1.3.1 From 0323b728aed9d542de75f5f6b0bf67070f616bbb Mon Sep 17 00:00:00 2001 From: Elliot Matson Date: Sun, 29 Jan 2023 20:28:31 -0600 Subject: Fix env's --- examples/PIO_TestPatterns/platformio.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'examples/PIO_TestPatterns/platformio.ini') diff --git a/examples/PIO_TestPatterns/platformio.ini b/examples/PIO_TestPatterns/platformio.ini index 379d2bb..7150f4c 100644 --- a/examples/PIO_TestPatterns/platformio.ini +++ b/examples/PIO_TestPatterns/platformio.ini @@ -1,9 +1,9 @@ [platformio] -;default_envs = esp32 +default_envs = esp32 description = HUB75 ESP32 I2S DMA test patterns example ;src_dir = src -[env] +[env:esp32] framework = arduino platform = espressif32 board = wemos_d1_mini32 -- cgit v1.3.1 From 035e0e0d2f772e92ecec49ffc0484e5e910a7fb6 Mon Sep 17 00:00:00 2001 From: Elliot Matson Date: Sun, 29 Jan 2023 21:03:19 -0600 Subject: restructure for esp-idf --- .github/workflows/pio_build.yml | 2 +- examples/PIO_TestPatterns/platformio.ini | 15 ++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) (limited to 'examples/PIO_TestPatterns/platformio.ini') diff --git a/.github/workflows/pio_build.yml b/.github/workflows/pio_build.yml index e15bf15..252febe 100644 --- a/.github/workflows/pio_build.yml +++ b/.github/workflows/pio_build.yml @@ -47,4 +47,4 @@ jobs: env: PLATFORMIO_BUILD_FLAGS: ${{ matrix.no_gfx }} ${{ matrix.no_fast_functions }} ${{ matrix.no_cie1931 }} ${{ matrix.virtual_panel }} PLATFORMIO_CI_SRC: ${{ matrix.example }} - run: pio ci -c ${{ matrix.example }}/platformio.ini \ No newline at end of file + run: pio ci -e esp32 -c ${{ matrix.example }}/platformio.ini \ No newline at end of file diff --git a/examples/PIO_TestPatterns/platformio.ini b/examples/PIO_TestPatterns/platformio.ini index 7150f4c..6d154a2 100644 --- a/examples/PIO_TestPatterns/platformio.ini +++ b/examples/PIO_TestPatterns/platformio.ini @@ -3,8 +3,7 @@ default_envs = esp32 description = HUB75 ESP32 I2S DMA test patterns example ;src_dir = src -[env:esp32] -framework = arduino +[env] platform = espressif32 board = wemos_d1_mini32 lib_deps = @@ -13,24 +12,22 @@ lib_deps = adafruit/Adafruit BusIO adafruit/Adafruit GFX Library https://github.com/mrfaptastic/ESP32-HUB75-MatrixPanel-I2S-DMA.git -build_flags = upload_speed = 460800 monitor_speed = 115200 monitor_filters = esp32_exception_decoder +[env:esp32] +framework = arduino + ; PIO CI can't handle IDF git modules properly (yet) -;[env:idfarduino] -;platform = espressif32 +[env:esp32idf] ;platform_packages = ; ; use a special branch ; framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#idf-release/v4.4 -;framework = arduino, espidf +framework = arduino, espidf ;build_flags = ; ${env.build_flags} ; -DARDUINO=200 ; -DESP32 ; ;-DUSE_FASTLINES ; -DNO_GFX -;lib_deps = -; ${env.lib_deps} -; https://github.com/mrfaptastic/ESP32-HUB75-MatrixPanel-I2S-DMA.git -- cgit v1.3.1 From a85b0e649ffa9da618b1610cecd212b72800d3bc Mon Sep 17 00:00:00 2001 From: Elliot Matson Date: Sun, 29 Jan 2023 22:02:30 -0600 Subject: A bit of cleanup and re-ordering --- .github/workflows/pio_build.yml | 11 +++++------ examples/PIO_TestPatterns/platformio.ini | 10 ---------- 2 files changed, 5 insertions(+), 16 deletions(-) (limited to 'examples/PIO_TestPatterns/platformio.ini') diff --git a/.github/workflows/pio_build.yml b/.github/workflows/pio_build.yml index af4cb29..d64bda4 100644 --- a/.github/workflows/pio_build.yml +++ b/.github/workflows/pio_build.yml @@ -14,16 +14,15 @@ jobs: build: runs-on: ubuntu-latest - continue-on-error: true strategy: matrix: - example: - - "examples/PIO_TestPatterns" + framework: ["Arduino", "IDF"] no_gfx: ["", -DNO_GFX] no_fast_functions: ["", -DNO_FAST_FUNCTIONS] no_cie1931: ["", -DNO_CIE1931] virtual_panel: ["", -DVIRTUAL_PANE] - idf: [true, false] + example: + - "examples/PIO_TestPatterns" exclude: - no_fast_functions: "" virtual_panel: -DVIRTUAL_PANE @@ -45,13 +44,13 @@ jobs: - name: Install Platformio run: pip install --upgrade platformio - name: Run PlatformIO CI (Arduino) - if: ${{ !matrix.idf}} + if: ${{ matrix.framework == 'Arduino'}} env: PLATFORMIO_BUILD_FLAGS: ${{ matrix.no_gfx }} ${{ matrix.no_fast_functions }} ${{ matrix.no_cie1931 }} ${{ matrix.virtual_panel }} PLATFORMIO_CI_SRC: ${{ matrix.example }} run: pio ci -e esp32 -c ${{ matrix.example }}/platformio.ini - name: Run PlatformIO CI (ESP-IDF) - if: ${{ matrix.idf }} + if: ${{ matrix.framework == 'IDF'}} env: PLATFORMIO_BUILD_FLAGS: -DIDF_BUILD ${{ matrix.no_gfx }} ${{ matrix.no_fast_functions }} ${{ matrix.no_cie1931 }} ${{ matrix.virtual_panel }} # pio ci doesn't use our sdkconfig, so we have to use pio run diff --git a/examples/PIO_TestPatterns/platformio.ini b/examples/PIO_TestPatterns/platformio.ini index 6d154a2..185513a 100644 --- a/examples/PIO_TestPatterns/platformio.ini +++ b/examples/PIO_TestPatterns/platformio.ini @@ -19,15 +19,5 @@ monitor_filters = esp32_exception_decoder [env:esp32] framework = arduino -; PIO CI can't handle IDF git modules properly (yet) [env:esp32idf] -;platform_packages = -; ; use a special branch -; framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#idf-release/v4.4 framework = arduino, espidf -;build_flags = -; ${env.build_flags} -; -DARDUINO=200 -; -DESP32 -; ;-DUSE_FASTLINES -; -DNO_GFX -- cgit v1.3.1