diff --git a/.github/workflows/ArduinoBuild.yml b/.github/workflows/ArduinoBuild.yml index 5ce1c8cc..b356df39 100644 --- a/.github/workflows/ArduinoBuild.yml +++ b/.github/workflows/ArduinoBuild.yml @@ -73,7 +73,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} diff --git a/.github/workflows/IDFBuild.yml b/.github/workflows/IDFBuild.yml index 9a6f49dc..f87b3488 100644 --- a/.github/workflows/IDFBuild.yml +++ b/.github/workflows/IDFBuild.yml @@ -1,5 +1,7 @@ name: IDFBuild + + env: REPO_URL: https://github.com/espressif/esp-idf PROJECT_DIR: examples/Test/build_test @@ -33,7 +35,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} @@ -60,7 +62,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} diff --git a/.github/workflows/OpenCVBuild.yml b/.github/workflows/OpenCVBuild.yml index a65ff860..7ac41c6a 100644 --- a/.github/workflows/OpenCVBuild.yml +++ b/.github/workflows/OpenCVBuild.yml @@ -37,7 +37,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: 🪟 📦 Use GNU tar instead BSD tar if: matrix.os == 'windows-latest' diff --git a/.github/workflows/PlatformioBuild.yml b/.github/workflows/PlatformioBuild.yml index 78240006..459ceecd 100644 --- a/.github/workflows/PlatformioBuild.yml +++ b/.github/workflows/PlatformioBuild.yml @@ -68,24 +68,24 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} - name: Cache pip - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} restore-keys: | ${{ runner.os }}-pip- - name: Cache PlatformIO - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.platformio key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }} - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.9' diff --git a/.github/workflows/SDLBuild.yml b/.github/workflows/SDLBuild.yml index 86e80faf..14d731cc 100644 --- a/.github/workflows/SDLBuild.yml +++ b/.github/workflows/SDLBuild.yml @@ -49,12 +49,12 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Cache SDL2 for Windows if: ${{ matrix.os == 'windows-latest' }} - uses: actions/cache@v3 + uses: actions/cache@v4 id: cache-SLD2-windows with: path: contrib @@ -111,7 +111,7 @@ jobs: - name: Upload WASM artifact if: ${{ matrix.os == 'ubuntu-latest' }} - uses: actions/upload-pages-artifact@v2 + uses: actions/upload-pages-artifact@v3 with: path: ${{env.WASM_DIR}}/build/www diff --git a/.github/workflows/pioPkgPublish.yml b/.github/workflows/pioPkgPublish.yml index 5ed95e4e..d2f4249d 100644 --- a/.github/workflows/pioPkgPublish.yml +++ b/.github/workflows/pioPkgPublish.yml @@ -11,7 +11,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 2ea95bef..11c6cc17 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -12,7 +12,7 @@ jobs: env: ACTIONS_STEP_DEBUG: true steps: - - uses: actions/stale@v3.0.14 + - uses: actions/stale@v9.0.0 with: repo-token: ${{ secrets.GITHUB_TOKEN }} stale-issue-message: 'This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.' diff --git a/src/lgfx/v1/platforms/esp32/common.cpp b/src/lgfx/v1/platforms/esp32/common.cpp index 87942a3c..df3dd20d 100644 --- a/src/lgfx/v1/platforms/esp32/common.cpp +++ b/src/lgfx/v1/platforms/esp32/common.cpp @@ -486,7 +486,7 @@ namespace lgfx buscfg.flags = SPICOMMON_BUSFLAG_MASTER; buscfg.intr_flags = 0; #if defined (ESP_IDF_VERSION_VAL) - #if (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)) + #if (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 0)) buscfg.isr_cpu_id = ESP_INTR_CPU_AFFINITY_AUTO; #else #if (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 0)) @@ -830,7 +830,7 @@ namespace lgfx } #if defined (CONFIG_IDF_TARGET_ESP32S3) #if (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 3) && ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 1, 0)) \ - || (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 1) && ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 2, 0)) \ + || (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 1) && ESP_IDF_VERSION <= ESP_IDF_VERSION_VAL(5, 2, 0)) \ || (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)) (&dev->comd[0])[index].val = cmd_val; #else diff --git a/src/lgfx/v1_autodetect/LGFX_AutoDetect_ESP32_all.hpp b/src/lgfx/v1_autodetect/LGFX_AutoDetect_ESP32_all.hpp index aae32e73..deaa6cf6 100644 --- a/src/lgfx/v1_autodetect/LGFX_AutoDetect_ESP32_all.hpp +++ b/src/lgfx/v1_autodetect/LGFX_AutoDetect_ESP32_all.hpp @@ -3325,7 +3325,7 @@ namespace lgfx }; - std::uint32_t pkg_ver = lgfx::get_pkg_ver(); + uint32_t pkg_ver = lgfx::get_pkg_ver(); ESP_LOGV("LGFX", "pkg: %lu", (unsigned long)pkg_ver); switch (pkg_ver)