From 9c65cc55dee78ce776b17e92b3b9a8b3c5542596 Mon Sep 17 00:00:00 2001 From: Brian Pugh Date: Thu, 10 Nov 2022 21:03:56 -0800 Subject: [PATCH 1/4] Add release-v5.0 to CI --- .github/workflows/pr.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 7704787..ef9bc53 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -23,6 +23,7 @@ jobs: "release-v4.2", "release-v4.3", "release-v4.4", + "release-v5.0", "latest", ] idf_target: ["esp32"] From 8603d88f9fda9615dc4e8868fabadcc9bb492d68 Mon Sep 17 00:00:00 2001 From: Brian Pugh Date: Thu, 10 Nov 2022 21:08:42 -0800 Subject: [PATCH 2/4] add esp_partition to priv_requires --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 82f1403..f97c7e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ idf_component_register( SRCS ${SOURCES} INCLUDE_DIRS include PRIV_INCLUDE_DIRS src - PRIV_REQUIRES esptool_py spi_flash vfs + PRIV_REQUIRES esp_partition esptool_py spi_flash vfs ) set_source_files_properties( From 65f9eb4979817129830ff63c2c4bcec7d362fecf Mon Sep 17 00:00:00 2001 From: Brian Pugh Date: Thu, 10 Nov 2022 21:45:54 -0800 Subject: [PATCH 3/4] add esp_partition only if the major version >=5 --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f97c7e4..78bacc1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,11 +3,15 @@ cmake_minimum_required(VERSION 3.10) file(GLOB SOURCES src/littlefs/*.c) list(APPEND SOURCES src/esp_littlefs.c src/littlefs_api.c src/lfs_config.c) +if(IDF_VERSION_MAJOR GREATER_EQUAL 5) + list(APPEND pr esp_partition) +endif() + idf_component_register( SRCS ${SOURCES} INCLUDE_DIRS include PRIV_INCLUDE_DIRS src - PRIV_REQUIRES esp_partition esptool_py spi_flash vfs + PRIV_REQUIRES ${pr} esptool_py spi_flash vfs ) set_source_files_properties( From 2326288f2633e9b5599a2062239362322fb2c2b6 Mon Sep 17 00:00:00 2001 From: Brian Pugh Date: Thu, 10 Nov 2022 21:47:58 -0800 Subject: [PATCH 4/4] =?UTF-8?q?Bump=20version:=201.5.0=20=E2=86=92=201.5.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- README.md | 2 +- idf_component.yml | 2 +- include/esp_littlefs.h | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 99b8508..2594738 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.5.0 +current_version = 1.5.1 commit = True tag = True diff --git a/README.md b/README.md index 29ec783..0d97bba 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ There are two ways to add this component to your project 1. As a ESP-IDF managed component: In your project directory run ``` -idf.py add-dependency joltwallet/littlefs==1.5.0 +idf.py add-dependency joltwallet/littlefs==1.5.1 ``` 2. As a submodule: In your project, add this as a submodule to your `components/` directory. diff --git a/idf_component.yml b/idf_component.yml index 9b08c5c..15cdffa 100644 --- a/idf_component.yml +++ b/idf_component.yml @@ -1,4 +1,4 @@ -version: "1.5.0" +version: "1.5.1" description: LittleFS is a small fail-safe filesystem for micro-controllers. url: https://github.com/joltwallet/esp_littlefs dependencies: diff --git a/include/esp_littlefs.h b/include/esp_littlefs.h index 6337f7b..60409b1 100644 --- a/include/esp_littlefs.h +++ b/include/esp_littlefs.h @@ -8,10 +8,10 @@ extern "C" { #endif -#define ESP_LITTLEFS_VERSION_NUMBER "1.5.0" +#define ESP_LITTLEFS_VERSION_NUMBER "1.5.1" #define ESP_LITTLEFS_VERSION_MAJOR 1 #define ESP_LITTLEFS_VERSION_MINOR 5 -#define ESP_LITTLEFS_VERSION_PATCH 0 +#define ESP_LITTLEFS_VERSION_PATCH 1 /** *Configuration structure for esp_vfs_littlefs_register.