From bd8ba4644bfdc04cb3e177cbc5903746d1adca28 Mon Sep 17 00:00:00 2001 From: William Emfinger Date: Fri, 31 Jan 2025 16:50:13 -0600 Subject: [PATCH 1/2] chore: Update CI to use ESP-IDF 5.4 --- .github/workflows/build.yml | 2 +- .github/workflows/static_analysis.yml | 4 ++-- README.md | 6 +++++- .../file_system/example/main/file_system_example.cpp | 7 ++++++- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a56cfcfaf..578d95a87 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -159,6 +159,6 @@ jobs: - name: Build Examples uses: espressif/esp-idf-ci-action@v1 with: - esp_idf_version: release-v5.2 + esp_idf_version: release-v5.4 target: ${{ matrix.test.target }} path: ${{ matrix.test.path }} diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml index 3842c6006..c9852fb8a 100644 --- a/.github/workflows/static_analysis.yml +++ b/.github/workflows/static_analysis.yml @@ -23,8 +23,8 @@ jobs: # Do not build the project and do not use cmake to generate compile_commands.json use_cmake: false - # Use the 5.2 release version since it's what we build with - esp_idf_version: release/v5.2 + # Use the 5.4 release version since it's what we build with + esp_idf_version: release/v5.4 # (Optional) cppcheck args cppcheck_args: -i$GITHUB_WORKSPACE/lib -i$GITHUB_WORKSPACE/external -i$GITHUB_WORKSPACE/components/binary-log/detail -i$GITHUB_WORKSPACE/components/esp_littlefs -i$GITHUB_WORKSPACE/components/esp-nimble-cpp -i$GITHUB_WORKSPACE/components/hid-rp/include/hid -i$GITHUB_WORKSPACE/components/lvgl -i$GITHUB_WORKSPACE/components/esp-dsp --force --enable=all --inline-suppr --inconclusive --platform=mips32 --suppressions-list=$GITHUB_WORKSPACE/suppressions.txt diff --git a/README.md b/README.md index b63020821..6bf521b89 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,11 @@ # Espressif++ (ESPP) This is the repository for some c++ components developed for the -[ESP-IDF](https://github.com/espressif/esp-idf) framework. +[ESP-IDF](https://github.com/espressif/esp-idf) framework. Specifically we are +targeting `ESP-IDF 5.4` currently. + +> NOTE: This repo attempts to stay up to date with ESP-IDF. This means that the +> code within may not be supported on older ESP-IDF targets. Each component has an `example` folder which contains c++ code showing how to use the component and which has a README including instructions for how to run diff --git a/components/file_system/example/main/file_system_example.cpp b/components/file_system/example/main/file_system_example.cpp index 99b335885..450d1fe52 100644 --- a/components/file_system/example/main/file_system_example.cpp +++ b/components/file_system/example/main/file_system_example.cpp @@ -269,9 +269,14 @@ extern "C" void app_main(void) { logger.info("Wrote '{}' to {}", file_contents, sub_file.string()); // list files in a directory + // NOTE: if we're using ESP-IDF < 5.4, we can't use directory_iterator +#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 0) logger.info("Directory iterator:"); +#else logger.warn( - "NOTE: directory_iterator is not implemented in esp-idf right now :( (as of v5.2.2)"); + "NOTE: directory_iterator is not implemented in esp-idf less than 5.4, the following " + "listing will not work."); +#endif // NOTE: directory_iterator is not implemented in esp-idf right now :( // directory_iterator can be iterated using a range-for loop for (auto const &dir_entry : fs::recursive_directory_iterator{sandbox, ec}) { From dea1021f3c1e0411b6b96f31f0230d3afc193e05 Mon Sep 17 00:00:00 2001 From: William Emfinger Date: Fri, 31 Jan 2025 17:08:38 -0600 Subject: [PATCH 2/2] update binarylog submodule --- components/binary-log/detail | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/binary-log/detail b/components/binary-log/detail index 7d8ba9094..b8b9f5cff 160000 --- a/components/binary-log/detail +++ b/components/binary-log/detail @@ -1 +1 @@ -Subproject commit 7d8ba90941d6d7be208d8f7a758579cc6b468e01 +Subproject commit b8b9f5cffc84272c52849150451ce6f786238f29