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 --- examples/PIO_TestPatterns/src/main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'examples/PIO_TestPatterns/src') 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 0f62898bae25753937e4479e525182bd38dc14c9 Mon Sep 17 00:00:00 2001 From: Elliot Matson Date: Sun, 29 Jan 2023 21:09:10 -0600 Subject: fix includes --- examples/PIO_TestPatterns/src/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'examples/PIO_TestPatterns/src') diff --git a/examples/PIO_TestPatterns/src/main.cpp b/examples/PIO_TestPatterns/src/main.cpp index ef43fe3..cb132e3 100644 --- a/examples/PIO_TestPatterns/src/main.cpp +++ b/examples/PIO_TestPatterns/src/main.cpp @@ -1,14 +1,14 @@ // How to use this library with a FM6126 panel, thanks goes to: // https://github.com/hzeller/rpi-rgb-led-matrix/issues/746 -/* + // IDF #include #include #include #include #include "sdkconfig.h" -*/ + #include #include "xtensa/core-macros.h" #ifdef VIRTUAL_PANE -- cgit v1.3.1 From 6378731cbcb39da81fdb94aacebe6e99c3f310b6 Mon Sep 17 00:00:00 2001 From: Elliot Matson Date: Sun, 29 Jan 2023 21:20:47 -0600 Subject: Fix sdkconfig --- .github/workflows/pio_build.yml | 2 +- examples/PIO_TestPatterns/sdkconfig.defaults | 3 ++- examples/PIO_TestPatterns/src/main.cpp | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'examples/PIO_TestPatterns/src') diff --git a/.github/workflows/pio_build.yml b/.github/workflows/pio_build.yml index edc157c..ed37c86 100644 --- a/.github/workflows/pio_build.yml +++ b/.github/workflows/pio_build.yml @@ -13,7 +13,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-latest continue-on-error: true strategy: matrix: diff --git a/examples/PIO_TestPatterns/sdkconfig.defaults b/examples/PIO_TestPatterns/sdkconfig.defaults index 909461e..ee16cd3 100644 --- a/examples/PIO_TestPatterns/sdkconfig.defaults +++ b/examples/PIO_TestPatterns/sdkconfig.defaults @@ -15,4 +15,5 @@ CONFIG_ARDUHAL_PARTITION_SCHEME="default" CONFIG_AUTOCONNECT_WIFI=y CONFIG_ARDUINO_SELECTIVE_WiFi=y CONFIG_MBEDTLS_PSK_MODES=y -CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y \ No newline at end of file +CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y +CONFIG_FREERTOS_HZ=1000 \ No newline at end of file diff --git a/examples/PIO_TestPatterns/src/main.cpp b/examples/PIO_TestPatterns/src/main.cpp index cb132e3..e8611ae 100644 --- a/examples/PIO_TestPatterns/src/main.cpp +++ b/examples/PIO_TestPatterns/src/main.cpp @@ -8,6 +8,7 @@ #include #include #include "sdkconfig.h" +// IDF #include #include "xtensa/core-macros.h" -- cgit v1.3.1 From 2c86ceee73a45193e7c31c1f6d6558c77c95c085 Mon Sep 17 00:00:00 2001 From: Elliot Matson Date: Sun, 29 Jan 2023 21:25:24 -0600 Subject: does CI work now? --- .github/workflows/pio_build.yml | 5 +++-- examples/PIO_TestPatterns/src/main.cpp | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'examples/PIO_TestPatterns/src') diff --git a/.github/workflows/pio_build.yml b/.github/workflows/pio_build.yml index ed37c86..1df24f3 100644 --- a/.github/workflows/pio_build.yml +++ b/.github/workflows/pio_build.yml @@ -46,6 +46,7 @@ jobs: - name: Run PlatformIO env: PLATFORMIO_BUILD_FLAGS: ${{ matrix.no_gfx }} ${{ matrix.no_fast_functions }} ${{ matrix.no_cie1931 }} ${{ matrix.virtual_panel }} -# PLATFORMIO_CI_SRC: ${{ matrix.example }} + PLATFORMIO_CI_SRC: ${{ matrix.example }} # run: pio ci -e esp32 -c ${{ matrix.example }}/platformio.ini - run: pio run -d ${{ matrix.example }} -e esp32idf -c ${{ matrix.example }}/platformio.ini \ No newline at end of file + run: pio ci -e esp32idf -c ${{ matrix.example }}/platformio.ini +# run: pio run -d ${{ matrix.example }} -e esp32idf -c ${{ matrix.example }}/platformio.ini \ No newline at end of file diff --git a/examples/PIO_TestPatterns/src/main.cpp b/examples/PIO_TestPatterns/src/main.cpp index e8611ae..83abcc3 100644 --- a/examples/PIO_TestPatterns/src/main.cpp +++ b/examples/PIO_TestPatterns/src/main.cpp @@ -1,14 +1,13 @@ // How to use this library with a FM6126 panel, thanks goes to: // https://github.com/hzeller/rpi-rgb-led-matrix/issues/746 - -// IDF +//#ifdef IDF_BUILD #include #include #include #include #include "sdkconfig.h" -// IDF +//#endif #include #include "xtensa/core-macros.h" -- cgit v1.3.1 From fda92b77af1a341c8f55ee04100b099222cb898a Mon Sep 17 00:00:00 2001 From: Elliot Matson Date: Sun, 29 Jan 2023 21:53:57 -0600 Subject: Add final switch to IDF --- .github/workflows/pio_build.yml | 14 ++++++++++---- examples/PIO_TestPatterns/src/main.cpp | 4 ++-- 2 files changed, 12 insertions(+), 6 deletions(-) (limited to 'examples/PIO_TestPatterns/src') diff --git a/.github/workflows/pio_build.yml b/.github/workflows/pio_build.yml index a2e9190..af4cb29 100644 --- a/.github/workflows/pio_build.yml +++ b/.github/workflows/pio_build.yml @@ -23,6 +23,7 @@ jobs: no_fast_functions: ["", -DNO_FAST_FUNCTIONS] no_cie1931: ["", -DNO_CIE1931] virtual_panel: ["", -DVIRTUAL_PANE] + idf: [true, false] exclude: - no_fast_functions: "" virtual_panel: -DVIRTUAL_PANE @@ -43,10 +44,15 @@ jobs: python-version: '3.x' - name: Install Platformio run: pip install --upgrade platformio - - name: Run PlatformIO + - name: Run PlatformIO CI (Arduino) + if: ${{ !matrix.idf}} 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 - run: pio ci -v -e esp32idf -c ${{ matrix.example }}/platformio.ini -# run: pio run -d ${{ matrix.example }} -e esp32idf -c ${{ matrix.example }}/platformio.ini \ No newline at end of file + run: pio ci -e esp32 -c ${{ matrix.example }}/platformio.ini + - name: Run PlatformIO CI (ESP-IDF) + if: ${{ matrix.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 + run: pio run -d ${{ matrix.example }} -e esp32idf -c ${{ matrix.example }}/platformio.ini diff --git a/examples/PIO_TestPatterns/src/main.cpp b/examples/PIO_TestPatterns/src/main.cpp index 83abcc3..40d077e 100644 --- a/examples/PIO_TestPatterns/src/main.cpp +++ b/examples/PIO_TestPatterns/src/main.cpp @@ -1,13 +1,13 @@ // How to use this library with a FM6126 panel, thanks goes to: // https://github.com/hzeller/rpi-rgb-led-matrix/issues/746 -//#ifdef IDF_BUILD +#ifdef IDF_BUILD #include #include #include #include #include "sdkconfig.h" -//#endif +#endif #include #include "xtensa/core-macros.h" -- cgit v1.3.1