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

diff --git a/components/spiffs/esp_spiffs.c b/components/spiffs/esp_spiffs.c
index f731f5b0058d25773c1e9114ac31a556b18e775e..3f81b151d56a93726a247c591025d319e4b7c60c 100644 (file)
--- 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 9a1f12c437ee1f4dbb80cdc81a234c304177732c..ae1b9ad430614f6d93415184b32e152f30370fcc 100644 (file)
--- a/components/spiffs/include/esp_spiffs.h
+++ b/components/spiffs/include/esp_spiffs.h
@@ -18,6 +18,10 @@
 #include <stdbool.h>
 #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 e0c9d7f9d2f6b4e53d7fb6268debf635eeef5ce5..e412bfd0cfaa85c0dd2c8fddd3066ca871204350 100755 (executable)
--- 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 794f0478d2aa9c978c3844da6e97f14239a1e061..f5e26c4e933189593a71c6b82cda381a7b21e41c 160000 (submodule)
--- a/components/spiffs/spiffs
+++ b/components/spiffs/spiffs
@@ -1 +1 @@
-Subproject commit 794f0478d2aa9c978c3844da6e97f14239a1e061
+Subproject commit f5e26c4e933189593a71c6b82cda381a7b21e41c