diff --git a/libraries/FSTools/FSTools.cpp b/libraries/FSTools/FSTools.cpp index c281b374f..d71fe1cb2 100644 --- a/libraries/FSTools/FSTools.cpp +++ b/libraries/FSTools/FSTools.cpp @@ -138,7 +138,7 @@ bool FSTools::moveFS(fs::FS & destinationFS) if (f) { sourceFileCount++; sourceByteTotal += f.size(); - _dumpFileInfo(f); + //_dumpFileInfo(f); } }); @@ -207,12 +207,12 @@ uint32_t FSTools::_getSize(const FST::layout & layout) } -void FSTools::_dumpFileInfo(File & f) -{ - if (f) { - //Serial.printf_P(PSTR(" File: %-30s [%8uB]\n"), f.fullName(), f.size() ); - } -} +// void FSTools::_dumpFileInfo(File & f) +// { +// if (f) { +// Serial.printf_P(PSTR(" File: %-30s [%8uB]\n"), f.fullName(), f.size() ); +// } +// } bool FSTools::_copyFS(FS & sourceFS, FS & destFS) { diff --git a/libraries/FSTools/FSTools.h b/libraries/FSTools/FSTools.h index 2cca0b0e8..8d48e5cd7 100644 --- a/libraries/FSTools/FSTools.h +++ b/libraries/FSTools/FSTools.h @@ -55,7 +55,6 @@ extern const layout layout_8m7m; extern const layout layout_16m14m; extern const layout layout_16m15m; - typedef std::function FileCb; @@ -63,15 +62,9 @@ typedef std::function FileCb; -//376884 -//376452 - - class FSTools { public: - - FSTools(); ~FSTools(); bool attemptToMountFS(fs::FS & fs); @@ -84,7 +77,7 @@ public: private: uint32_t _getStartAddr(const FST::layout & layout); uint32_t _getSize(const FST::layout & layout); - void _dumpFileInfo(File & f); +// void _dumpFileInfo(File & f); bool _copyFS(FS & sourceFS, FS & destFS); std::unique_ptr _pFS; diff --git a/libraries/FSTools/examples/Basic_example/Basic_example.ino b/libraries/FSTools/examples/Basic_example/Basic_example.ino index b5a7d3279..6feca9ea6 100644 --- a/libraries/FSTools/examples/Basic_example/Basic_example.ino +++ b/libraries/FSTools/examples/Basic_example/Basic_example.ino @@ -2,19 +2,19 @@ This sketch will convert SPIFFS partitions to LittleFS on ESP8266 - Change the `TARGET_FS_LAYOUT` to the partition layout that you want target + Change the `TARGET_FS_LAYOUT` to the partition layout that you want target ie what you are trying to copy from. - Include in the sketch whatever you want the destination to be, in this case LittleFS, - but it could be SPIFFS to convert back if need be. + Include in the sketch whatever you want the destination to be, in this case LittleFS, + but it could be SPIFFS to convert back if need be. - How it works: It creates a LittleFS partition between the end of the sketch and the - start of whatever filesystem you set as target. This has IMPORTANT implications for the - amount of data you can move!!! eg a 4Mb flash module with a 3Mb SPIFFS partition only leaves - about 450k for the temp file system, so if you have more data than that on your 3Mb SPIFFS it - will fail. + How it works: It creates a LittleFS partition between the end of the sketch and the + start of whatever filesystem you set as target. This has IMPORTANT implications for the + amount of data you can move!!! eg a 4Mb flash module with a 3Mb SPIFFS partition only leaves + about 450k for the temp file system, so if you have more data than that on your 3Mb SPIFFS it + will fail. - */ +*/ @@ -28,7 +28,7 @@ #define TARGET_FS_LAYOUT FST::layout_4m3m -FSTools fstools; +FSTools fstools; #ifndef STASSID #define STASSID "xxxx" @@ -39,27 +39,25 @@ const char* ssid = STASSID; const char* password = STAPSK; -bool migrateFS() -{ - if (!fstools.attemptToMountFS(LittleFS)) { // Attempts to mount LittleFS without autoformat... - Serial.println(F("Default FS not found")); - if (fstools.mountAlternativeFS( FST::SPIFFS /* FST::LITTLEFS */ , TARGET_FS_LAYOUT , true )) { - Serial.println(F("Alternative found")); - if (fstools.moveFS(LittleFS)) { +bool migrateFS() { + if (!fstools.attemptToMountFS(LittleFS)) { // Attempts to mount LittleFS without autoformat... + Serial.println(F("Default FS not found")); + if (fstools.mountAlternativeFS(FST::SPIFFS /* FST::LITTLEFS */, TARGET_FS_LAYOUT, true)) { + Serial.println(F("Alternative found")); + if (fstools.moveFS(LittleFS)) { Serial.println(F("FileSystem Moved New FS contents:")); fstools.fileListIterator(LittleFS, "/", [](File & f) { - Serial.printf_P(PSTR(" File: %-30s [%8uB]\n"), f.fullName(), f.size() ); + Serial.printf_P(PSTR(" File: %-30s [%8uB]\n"), f.fullName(), f.size()); }); - return true; + return true; } } } - return false; + return false; } -void initWiFiOTA() -{ +void initWiFiOTA() { WiFi.mode(WIFI_STA); WiFi.begin(ssid, password); while (WiFi.waitForConnectResult() != WL_CONNECTED) { @@ -107,20 +105,20 @@ void setup() { WiFi.persistent(false); WiFi.disconnect(true); Serial.begin(115200); - - Serial.println(); - Serial.printf("SDK Version: %s\n", ESP.getSdkVersion() ); - Serial.println("Core Version: " + ESP.getCoreVersion() ); - Serial.println("Full Version: " + ESP.getFullVersion() ); + + Serial.println(); + Serial.printf("SDK Version: %s\n", ESP.getSdkVersion()); + Serial.println("Core Version: " + ESP.getCoreVersion()); + Serial.println("Full Version: " + ESP.getFullVersion()); Serial.printf("Sketch size: %u\n", ESP.getSketchSize()); Serial.printf("Free size: %u\n", ESP.getFreeSketchSpace()); - + Serial.println("Booting"); - migrateFS(); // MUST call this before calling your own begin(); + migrateFS(); // MUST call this before calling your own begin(); - initWiFiOTA(); + initWiFiOTA(); Serial.println("Ready"); Serial.print("IP address: "); diff --git a/libraries/FSTools/examples/custom_FS_example/custom_FS_example.ino b/libraries/FSTools/examples/custom_FS_example/custom_FS_example.ino index 41c5ecb36..6ca8d8c9b 100644 --- a/libraries/FSTools/examples/custom_FS_example/custom_FS_example.ino +++ b/libraries/FSTools/examples/custom_FS_example/custom_FS_example.ino @@ -2,20 +2,20 @@ This sketch will convert SPIFFS partitions to a custom FS on ESP8266 - Change the `TARGET_FS_LAYOUT` to the partition layout that you want target + Change the `TARGET_FS_LAYOUT` to the partition layout that you want target ie what you are trying to copy from. - This ksetch shows how to create a FS different to the one provided for by the sketch defaults. - This is useful if you need to use an intermediate sketch to move the FS but need to maintain the - sketch size limit of say 512kb. + This ksetch shows how to create a FS different to the one provided for by the sketch defaults. + This is useful if you need to use an intermediate sketch to move the FS but need to maintain the + sketch size limit of say 512kb. - How it works: It creates a LittleFS partition between the end of the sketch and the - start of whatever filesystem you set as target. This has IMPORTANT implications for the - amount of data you can move!!! eg a 4Mb flash module with a 3Mb SPIFFS partition only leaves - about 450k for the temp file system, so if you have more data than that on your 3Mb SPIFFS it - will fail. + How it works: It creates a LittleFS partition between the end of the sketch and the + start of whatever filesystem you set as target. This has IMPORTANT implications for the + amount of data you can move!!! eg a 4Mb flash module with a 3Mb SPIFFS partition only leaves + about 450k for the temp file system, so if you have more data than that on your 3Mb SPIFFS it + will fail. - */ +*/ @@ -29,13 +29,13 @@ #define TARGET_FS_LAYOUT FST::layout_4m3m -const uint32_t startSector = FST::layout_4m1m.startAddr - 0x40200000; -const uint32_t tempFSsize = FST::layout_4m1m.endAddr - FST::layout_4m1m.startAddr; +const uint32_t startSector = FST::layout_4m1m.startAddr - 0x40200000; +const uint32_t tempFSsize = FST::layout_4m1m.endAddr - FST::layout_4m1m.startAddr; fs::FS LittleFS_Different = FS(FSImplPtr(new littlefs_impl::LittleFSImpl(startSector, tempFSsize, FS_PHYS_PAGE, FS_PHYS_BLOCK, 5))); -FSTools fstools; +FSTools fstools; #ifndef STASSID #define STASSID "xxxx" @@ -46,27 +46,25 @@ const char* ssid = STASSID; const char* password = STAPSK; -bool migrateFS() -{ - if (!fstools.attemptToMountFS(LittleFS_Different)) { // Attempts to mount LittleFS without autoformat... - Serial.println(F("Default FS not found")); - if (fstools.mountAlternativeFS( FST::SPIFFS /* FST::LITTLEFS */ , TARGET_FS_LAYOUT , true )) { - Serial.println(F("Alternative found")); - if (fstools.moveFS(LittleFS_Different)) { +bool migrateFS() { + if (!fstools.attemptToMountFS(LittleFS_Different)) { // Attempts to mount LittleFS without autoformat... + Serial.println(F("Default FS not found")); + if (fstools.mountAlternativeFS(FST::SPIFFS /* FST::LITTLEFS */, TARGET_FS_LAYOUT, true)) { + Serial.println(F("Alternative found")); + if (fstools.moveFS(LittleFS_Different)) { Serial.println(F("FileSystem Moved New FS contents:")); fstools.fileListIterator(LittleFS_Different, "/", [](File & f) { - Serial.printf_P(PSTR(" File: %-30s [%8uB]\n"), f.fullName(), f.size() ); + Serial.printf_P(PSTR(" File: %-30s [%8uB]\n"), f.fullName(), f.size()); }); - return true; + return true; } } } - return false; + return false; } -void initWiFiOTA() -{ +void initWiFiOTA() { WiFi.mode(WIFI_STA); WiFi.begin(ssid, password); while (WiFi.waitForConnectResult() != WL_CONNECTED) { @@ -114,20 +112,20 @@ void setup() { WiFi.persistent(false); WiFi.disconnect(true); Serial.begin(115200); - - Serial.println(); - Serial.printf("SDK Version: %s\n", ESP.getSdkVersion() ); - Serial.println("Core Version: " + ESP.getCoreVersion() ); - Serial.println("Full Version: " + ESP.getFullVersion() ); + + Serial.println(); + Serial.printf("SDK Version: %s\n", ESP.getSdkVersion()); + Serial.println("Core Version: " + ESP.getCoreVersion()); + Serial.println("Full Version: " + ESP.getFullVersion()); Serial.printf("Sketch size: %u\n", ESP.getSketchSize()); Serial.printf("Free size: %u\n", ESP.getFreeSketchSpace()); - + Serial.println("Booting"); - migrateFS(); // MUST call this before calling your own begin(); + migrateFS(); // MUST call this before calling your own begin(); - initWiFiOTA(); + initWiFiOTA(); Serial.println("Ready"); Serial.print("IP address: ");