From 14b12a27cf8072f38bda7c5dbdc8ed1e5c40583d Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Tue, 19 Sep 2017 17:09:20 +0800 Subject: [PATCH] Fix typo in spiffs config and update submodule Fixes github issues #1012 and #1013 https://github.com/espressif/esp-idf/issues/1012 https://github.com/espressif/esp-idf/issues/1013 --- components/spiffs/esp_spiffs.c | 2 +- components/spiffs/include/esp_spiffs.h | 8 ++++++++ components/spiffs/include/spiffs_config.h | 10 +++++----- components/spiffs/spiffs | 2 +- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/components/spiffs/esp_spiffs.c b/components/spiffs/esp_spiffs.c index f731f5b00..3f81b151d 100644 --- a/components/spiffs/esp_spiffs.c +++ b/components/spiffs/esp_spiffs.c @@ -498,7 +498,7 @@ static int spiffs_mode_conv(int m) } else if ((m & O_CREAT) && (m & O_TRUNC)) { res |= SPIFFS_O_CREAT | SPIFFS_O_TRUNC; } else if (m & O_APPEND) { - res |= SPIFFS_O_APPEND; + res |= SPIFFS_O_CREAT | SPIFFS_O_APPEND; } return res; } diff --git a/components/spiffs/include/esp_spiffs.h b/components/spiffs/include/esp_spiffs.h index 9a1f12c43..ae1b9ad43 100644 --- a/components/spiffs/include/esp_spiffs.h +++ b/components/spiffs/include/esp_spiffs.h @@ -18,6 +18,10 @@ #include #include "esp_err.h" +#ifdef __cplusplus +extern "C" { +#endif + /** * @brief Configuration structure for esp_vfs_spiffs_register */ @@ -91,4 +95,8 @@ esp_err_t esp_spiffs_format(const char* partition_label); */ esp_err_t esp_spiffs_info(const char* partition_label, size_t *total_bytes, size_t *used_bytes); +#ifdef __cplusplus +} +#endif + #endif /* _ESP_SPIFFS_H_ */ diff --git a/components/spiffs/include/spiffs_config.h b/components/spiffs/include/spiffs_config.h index e0c9d7f9d..e412bfd0c 100755 --- a/components/spiffs/include/spiffs_config.h +++ b/components/spiffs/include/spiffs_config.h @@ -24,27 +24,27 @@ #define SPIFFS_TAG "SPIFFS" // Set generic spiffs debug output call. -#if CONGIG_SPIFFS_DBG +#if CONFIG_SPIFFS_DBG #define SPIFFS_DBG(...) ESP_LOGD(SPIFFS_TAG, __VA_ARGS__) #else #define SPIFFS_DBG(...) #endif -#if CONGIG_SPIFFS_API_DBG +#if CONFIG_SPIFFS_API_DBG #define SPIFFS_API_DBG(...) ESP_LOGD(SPIFFS_TAG, __VA_ARGS__) #else #define SPIFFS_API_DBG(...) #endif -#if CONGIG_SPIFFS_DBG +#if CONFIG_SPIFFS_DBG #define SPIFFS_GC_DBG(...) ESP_LOGD(SPIFFS_TAG, __VA_ARGS__) #else #define SPIFFS_GC_DBG(...) #endif -#if CONGIG_SPIFFS_CACHE_DBG +#if CONFIG_SPIFFS_CACHE_DBG #define SPIFFS_CACHE_DBG(...) ESP_LOGD(SPIFFS_TAG, __VA_ARGS__) #else #define SPIFFS_CACHE_DBG(...) #endif -#if CONGIG_SPIFFS_CHECK_DBG +#if CONFIG_SPIFFS_CHECK_DBG #define SPIFFS_CHECK_DBG(...) ESP_LOGD(SPIFFS_TAG, __VA_ARGS__) #else #define SPIFFS_CHECK_DBG(...) diff --git a/components/spiffs/spiffs b/components/spiffs/spiffs index 794f0478d..f5e26c4e9 160000 --- a/components/spiffs/spiffs +++ b/components/spiffs/spiffs @@ -1 +1 @@ -Subproject commit 794f0478d2aa9c978c3844da6e97f14239a1e061 +Subproject commit f5e26c4e933189593a71c6b82cda381a7b21e41c