From 57a965dcee1e09ff58157bb641b28e9ea34b38f3 Mon Sep 17 00:00:00 2001 From: Luc Date: Mon, 7 Oct 2019 20:47:36 +0800 Subject: [PATCH] rearange FS files location --- esp3d/src/modules/{sd => filesystem}/esp_sd.cpp | 0 esp3d/src/modules/{sd => filesystem}/esp_sd.h | 0 .../filesystem/{ => flash}/fat_esp32_filesystem.cpp | 8 ++++---- .../{ => flash}/littlefs_esp8266_filesystem .cpp | 8 ++++---- .../filesystem/{ => flash}/spiffs_esp32_filesystem.cpp | 6 +++--- .../filesystem/{ => flash}/spiffs_esp8266_filesystem.cpp | 6 +++--- esp3d/src/modules/{ => filesystem}/sd/sd_esp32.cpp | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) rename esp3d/src/modules/{sd => filesystem}/esp_sd.cpp (100%) rename esp3d/src/modules/{sd => filesystem}/esp_sd.h (100%) rename esp3d/src/modules/filesystem/{ => flash}/fat_esp32_filesystem.cpp (97%) rename esp3d/src/modules/filesystem/{ => flash}/littlefs_esp8266_filesystem .cpp (97%) rename esp3d/src/modules/filesystem/{ => flash}/spiffs_esp32_filesystem.cpp (98%) rename esp3d/src/modules/filesystem/{ => flash}/spiffs_esp8266_filesystem.cpp (98%) rename esp3d/src/modules/{ => filesystem}/sd/sd_esp32.cpp (99%) diff --git a/esp3d/src/modules/sd/esp_sd.cpp b/esp3d/src/modules/filesystem/esp_sd.cpp similarity index 100% rename from esp3d/src/modules/sd/esp_sd.cpp rename to esp3d/src/modules/filesystem/esp_sd.cpp diff --git a/esp3d/src/modules/sd/esp_sd.h b/esp3d/src/modules/filesystem/esp_sd.h similarity index 100% rename from esp3d/src/modules/sd/esp_sd.h rename to esp3d/src/modules/filesystem/esp_sd.h diff --git a/esp3d/src/modules/filesystem/fat_esp32_filesystem.cpp b/esp3d/src/modules/filesystem/flash/fat_esp32_filesystem.cpp similarity index 97% rename from esp3d/src/modules/filesystem/fat_esp32_filesystem.cpp rename to esp3d/src/modules/filesystem/flash/fat_esp32_filesystem.cpp index 31d4d153..4863e971 100644 --- a/esp3d/src/modules/filesystem/fat_esp32_filesystem.cpp +++ b/esp3d/src/modules/filesystem/flash/fat_esp32_filesystem.cpp @@ -1,5 +1,5 @@ /* -fat_filesystem.cpp - ESP3D fat filesystem configuration class +fat_esp32_filesystem.cpp - ESP3D fat filesystem configuration class Copyright (c) 2014 Luc Lebosse. All rights reserved. @@ -17,10 +17,10 @@ fat_filesystem.cpp - ESP3D fat filesystem configuration class License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "../../include/esp3d_config.h" +#include "../../../include/esp3d_config.h" #if (FILESYSTEM_FEATURE == ESP_FAT_FILESYSTEM) -#include "esp_filesystem.h" -#include "../../core/genLinkedList.h" +#include "../esp_filesystem.h" +#include "../../../core/genLinkedList.h" #include #include "FFat.h" diff --git a/esp3d/src/modules/filesystem/littlefs_esp8266_filesystem .cpp b/esp3d/src/modules/filesystem/flash/littlefs_esp8266_filesystem .cpp similarity index 97% rename from esp3d/src/modules/filesystem/littlefs_esp8266_filesystem .cpp rename to esp3d/src/modules/filesystem/flash/littlefs_esp8266_filesystem .cpp index 946c1fb2..26b309cc 100644 --- a/esp3d/src/modules/filesystem/littlefs_esp8266_filesystem .cpp +++ b/esp3d/src/modules/filesystem/flash/littlefs_esp8266_filesystem .cpp @@ -1,5 +1,5 @@ /* -littlefs_filesystem.cpp - ESP3D littlefs filesystem configuration class +littlefs_esp8266_filesystem.cpp - ESP3D littlefs filesystem configuration class Copyright (c) 2014 Luc Lebosse. All rights reserved. @@ -17,10 +17,10 @@ littlefs_filesystem.cpp - ESP3D littlefs filesystem configuration class License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "../../include/esp3d_config.h" +#include "../../../include/esp3d_config.h" #if (FILESYSTEM_FEATURE == ESP_LITTLEFS_FILESYSTEM) -#include "esp_filesystem.h" -#include "../../core/genLinkedList.h" +#include "../esp_filesystem.h" +#include "../../../core/genLinkedList.h" #include #include diff --git a/esp3d/src/modules/filesystem/spiffs_esp32_filesystem.cpp b/esp3d/src/modules/filesystem/flash/spiffs_esp32_filesystem.cpp similarity index 98% rename from esp3d/src/modules/filesystem/spiffs_esp32_filesystem.cpp rename to esp3d/src/modules/filesystem/flash/spiffs_esp32_filesystem.cpp index 336cf1ca..1945d09b 100644 --- a/esp3d/src/modules/filesystem/spiffs_esp32_filesystem.cpp +++ b/esp3d/src/modules/filesystem/flash/spiffs_esp32_filesystem.cpp @@ -17,10 +17,10 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "../../include/esp3d_config.h" +#include "../../../include/esp3d_config.h" #if (FILESYSTEM_FEATURE == ESP_SPIFFS_FILESYSTEM) && defined(ARDUINO_ARCH_ESP32) -#include "esp_filesystem.h" -#include "../../core/genLinkedList.h" +#include "../esp_filesystem.h" +#include "../../../core/genLinkedList.h" #include #include extern File tFile_handle[ESP_MAX_OPENHANDLE]; diff --git a/esp3d/src/modules/filesystem/spiffs_esp8266_filesystem.cpp b/esp3d/src/modules/filesystem/flash/spiffs_esp8266_filesystem.cpp similarity index 98% rename from esp3d/src/modules/filesystem/spiffs_esp8266_filesystem.cpp rename to esp3d/src/modules/filesystem/flash/spiffs_esp8266_filesystem.cpp index eabb8385..0c925c37 100644 --- a/esp3d/src/modules/filesystem/spiffs_esp8266_filesystem.cpp +++ b/esp3d/src/modules/filesystem/flash/spiffs_esp8266_filesystem.cpp @@ -17,10 +17,10 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "../../include/esp3d_config.h" +#include "../../../include/esp3d_config.h" #if (FILESYSTEM_FEATURE == ESP_SPIFFS_FILESYSTEM) && defined (ARDUINO_ARCH_ESP8266) -#include "esp_filesystem.h" -#include "../../core/genLinkedList.h" +#include "../esp_filesystem.h" +#include "../../../core/genLinkedList.h" #include Dir tDir_handle[ESP_MAX_OPENHANDLE]; extern File tFile_handle[ESP_MAX_OPENHANDLE]; diff --git a/esp3d/src/modules/sd/sd_esp32.cpp b/esp3d/src/modules/filesystem/sd/sd_esp32.cpp similarity index 99% rename from esp3d/src/modules/sd/sd_esp32.cpp rename to esp3d/src/modules/filesystem/sd/sd_esp32.cpp index eb4162b7..f053ba26 100644 --- a/esp3d/src/modules/sd/sd_esp32.cpp +++ b/esp3d/src/modules/filesystem/sd/sd_esp32.cpp @@ -17,10 +17,10 @@ sd_native_esp32.cpp - ESP3D sd support class License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "../../include/esp3d_config.h" +#include "../../../include/esp3d_config.h" #if defined (ARCH_ESP32) && defined(SD_FEATURE) #if (SD_FEATURE == ESP_SD_NATIVE) -#include "esp_sd.h" +#include "../esp_sd.h" #include "FS.h" #include "SD.h"