Release 2.0.1

Added checkup of partition scheme vs. chosen filesystem
Typo error fixes and minor changes

Author: lorol

Diff for: README.md

@@ -1,35 +1,43 @@
 # Arduino ESP32 filesystem uploader 
 
-Arduino plugin which packs sketch data folder into SPIFFS, LITTLEFS or FATFS filesystem image,
+- Arduino plugin which packs sketch data folder into SPIFFS, LittleFS or FatFS filesystem image,
 and uploads the image to ESP32 flash memory.
-</br> You can have only of three filesystems on given Arduino project.
+- You can have only one of three filesystems on same Arduino project.
 
-## Notes for LITTLEFS
+## Notes for SPIFFS
 
-- Uses same partition scheme as SPIFFS. 
-- See [LITTLEFS esp32 library](https://github.com/lorol/LITTLEFS)
+- This is the default filesystem implemented in esp-32 core for /data folder
+- Go to Arduino IDE menu: ***Tools > Partition Scheme*** and select an entry with SPIFFS partition
+
+## Notes for LittleFS
+
+- Same partition scheme as SPIFFS
+- Until implemented to esp-32 core needs extra library
+- See [LITTLEFS esp32 library](https://github.com/lorol/LITTLEFS) for more details
 
 ## Notes for FatFS
 
-- On Arduino IDE menu: *Tools > Partition Scheme* select one with FAT partition
-- The usable size of FAT partition is reduced with 1 sector of 4096 bytes (0x1000) to resolve wear leveling space requirement. Also file is flashed with +4096 bytes (0x1000) offset of partition address csv table entry
-- To flash the data folder as FAT partition by network port (uses espota), replace your esp32-core Update library with the [modified files here](https://github.com/lorol/arduino-esp32fatfs-plugin/tree/master/extra/esp32-modified-Update-lib-ffat-espota.zip)
+- Go to Arduino IDE menu: ***Tools > Partition Scheme*** and select an entry with FAT partition
+- The usable size of FAT partition is reduced with 1 sector of 4096 bytes (0x1000) to resolve wear leveling space requirement. The image file is flashed with +4096 bytes (0x1000) offset of partition address of csv table entry
 - You may need to decrease **maxOpenFiles** at FFat.begin() of your sketch , [see this note](http://marc.merlins.org/perso/arduino/post_2019-03-30_Using-FatFS-FFat-on-ESP32-Flash-With-Arduino.html) 
 >The FFAT module uses 8KB plus 4KB per concurrent file that can be opened. By default, it allows 10 files to be opened, which means it uses 48KB. IF you want to reduce its memory use, you can tell it to only support one file, and you will save 36KB, leaving you with only 12KB used.
 ```
 if (!FFat.begin(0, "", 1)) die("Fat FS mount failed. Not enough RAM?");
 ```
+- To flash the data folder as FAT partition by **network port (uses espota)**, replace your esp32-core Update library with the [modified files here](https://github.com/lorol/arduino-esp32fatfs-plugin/tree/master/extra/esp32-modified-Update-lib-ffat-espota.zip)
+
 
 ## Installation
 
 - Make sure you use one of the supported versions of Arduino IDE and have ESP32 core installed.
-- Download the tool from [here](https://github.com/lorol/arduino-esp32fs-plugin/releases/download/2.0/esp32fs.zip)
+- Download **esp32fs.zip** zipped tool from [latest release](https://github.com/lorol/arduino-esp32fs-plugin/releases)
 - In your Arduino sketchbook directory, create tools directory if it doesn't exist yet.
 - Unpack the tool into tools directory (the path will look like ```<home_dir>/Arduino/tools/ESP32FS/tool/esp32fs.jar```).
-- For LITTLEFS, you need an additional [mklittlefs tool](https://github.com/earlephilhower/mklittlefs)  Download the [release](https://github.com/earlephilhower/mklittlefs/releases) or see below
-- For FatFS, you need additional binary files for Windows and Linux (thanks @lbernstone for compiling) or take it from the author [here - mkfatfs tool](https://github.com/labplus-cn/mkfatfs/releases/tag/v1.0)  Thanks to [labplus-cn](https://github.com/labplus-cn/mkfatfs)
+- For **LittleFS**, you need an additional [mklittlefs tool](https://github.com/earlephilhower/mklittlefs)  Download the [release](https://github.com/earlephilhower/mklittlefs/releases) or see below
+- For **FatFS**, you need additional binary files for Windows or Linux (thanks @lbernstone for compiling) or take them from the author [here - mkfatfs tool](https://github.com/labplus-cn/mkfatfs/releases/tag/v1.0)  Thanks to [labplus-cn](https://github.com/labplus-cn/mkfatfs)
 - Copy **mklittlefs[.exe]** and **mkfatfs[.exe]** to **/tools** folder of esp32 platform where **espota** and **esptool** (.py or.exe) tools are located
-- Alternatively see [here](https://github.com/lorol/arduino-esp32fs-plugin/releases/tag/2.0) , there are copy of the binaries. You can also use **package_esp32_index.template.json** and run get.py instead
+- Alternatively see at [latest release](https://github.com/lorol/arduino-esp32fs-plugin/releases) for copies of archived binaries in question. 
+- You can also use provided **package_esp32_index.template.json** to run **get.py** with it and download the missing binary files
 - Restart Arduino IDE. 
 
 
@@ -38,9 +46,10 @@ if (!FFat.begin(0, "", 1)) die("Fat FS mount failed. Not enough RAM?");
 - Open a sketch (or create a new one and save it).
 - Go to sketch directory (choose Sketch > Show Sketch Folder).
 - Create a directory named `data` and any files you want in the file system there.
-- Make sure you have selected a board, port, and closed Serial Monitor.
-- Select *Tools > ESP32 Sketch Data Upload* menu item. This should start uploading the files into ESP32 flash file system.
-- On drop-down list select SPIFFS, LITTLEFS or FATFS you want to make from your data folder.
+- Make sure you have selected a board, port, partition scheme and closed Serial Monitor.
+- Select ***Tools > ESP32 Sketch Data Upload*** menu item. 
+- On drop-down list, select SPIFFS, LittleFS or FatFS you want to make from your /data folder.
+- Clicking OK should start uploading the files into ESP32 flash file system.
 
   When done, IDE status bar will display the status of Image Uploaded message. Might take a few minutes for large file system sizes.
 
@@ -53,7 +62,7 @@ if (!FFat.begin(0, "", 1)) die("Fat FS mount failed. Not enough RAM?");
 - Run **make_win.bat**
 - Find the **build jar** in /bin directory 
 
-## Credits and license
+## Credits and license (of the original tool)
 
 - Copyright (c) 2015 Hristo Gochkov (hristo at espressif dot com)
 - Licensed under GPL v2 ([text](LICENSE))

Diff for: src/ESP32FS.java

@@ -2,7 +2,7 @@
 
 /*
   Tool to put the contents of the sketch's "data" subfolder
-  into an SPIFFS partition image and upload it to an ESP32 MCU
+  into an SPIFFS, LittleFS or FatFS partition image and upload it to an ESP32 MCU
 
   Copyright (c) 2015 Hristo Gochkov (hristo at espressif dot com)
 
@@ -66,7 +66,7 @@ public String getMenuTitle() {
     return "ESP32 Sketch Data Upload";
   }
 
-  private String typefs = "SPIFFS";
+  private String typefs = "";
 
   private int listenOnProcess(String[] arguments){
       try {
@@ -168,7 +168,7 @@ private void createAndUpload(){
     long spiStart = 0, spiSize = 0, spiPage = 256, spiBlock = 4096, spiOffset = 0;
     String partitions = "";
 
-    if (typefs == "FATFS") spiOffset = 4096;
+    if (typefs == "FatFS") spiOffset = 4096;
 
     if(!PreferencesData.get("target_platform").contentEquals("esp32")){
       System.err.println();
@@ -193,12 +193,12 @@ private void createAndUpload(){
 
     String mkspiffsCmd;
     if(PreferencesData.get("runtime.os").contentEquals("windows"))
-		if (typefs == "LITTLEFS") mkspiffsCmd = "mklittlefs.exe";
-        else if (typefs == "FATFS") mkspiffsCmd = "mkfatfs.exe";
+		if (typefs == "LittleFS") mkspiffsCmd = "mklittlefs.exe";
+        else if (typefs == "FatFS") mkspiffsCmd = "mkfatfs.exe";
 		else mkspiffsCmd = "mkspiffs.exe";
     else
-        if (typefs == "LITTLEFS") mkspiffsCmd = "mklittlefs";
-        else if (typefs == "FATFS") mkspiffsCmd = "mkfatfs";
+        if (typefs == "LittleFS") mkspiffsCmd = "mklittlefs";
+        else if (typefs == "FatFS") mkspiffsCmd = "mkfatfs";
 		else mkspiffsCmd = "mkspiffs";
 
     String espotaCmd = "espota.py";
@@ -238,7 +238,7 @@ private void createAndUpload(){
       BufferedReader partitionsReader = new BufferedReader(new FileReader(partitionsFile));
       String partitionsLine = "";
       while ((partitionsLine = partitionsReader.readLine()) != null) {
-        if(partitionsLine.contains("spiffs") || partitionsLine.contains("ffat")){ 
+        if( ((typefs != "FatFS") && partitionsLine.contains("spiffs")) || ((typefs == "FatFS") && partitionsLine.contains("ffat"))){ 
           partitionsLine = partitionsLine.substring(partitionsLine.indexOf(",")+1);
           partitionsLine = partitionsLine.substring(partitionsLine.indexOf(",")+1);
           partitionsLine = partitionsLine.substring(partitionsLine.indexOf(",")+1);
@@ -307,7 +307,7 @@ private void createAndUpload(){
                 esptool = new File(PreferencesData.get("runtime.tools.esptool.path"), esptoolCmd);              
                 if(!esptool.exists() || !esptool.isFile()){
                   System.err.println();
-                  editor.statusError("SPIFFS Error: esptool not found!");
+                  editor.statusError("Error: esptool not found!");
                   return;
                 }
               }
@@ -355,11 +355,13 @@ private void createAndUpload(){
     System.out.println("[" + typefs + "] offset : "+spiOffset);
     System.out.println("[" + typefs + "] start  : "+spiStart);
     System.out.println("[" + typefs + "] size   : "+(spiSize/1024));
-    System.out.println("[" + typefs + "] page   : "+spiPage);
-    System.out.println("[" + typefs + "] block  : "+spiBlock);
+    if (typefs != "FatFS") {
+        System.out.println("[" + typefs + "] page   : "+spiPage);
+        System.out.println("[" + typefs + "] block  : "+spiBlock);
+    }
 
     try {
-      if (typefs == "FATFS") {
+      if (typefs == "FatFS") {
         if(listenOnProcess(new String[]{toolPath, "-c", dataPath, "-s", spiSize+"", imagePath}) != 0){  
            System.err.println();
            editor.statusError(typefs + " Create Failed!");
@@ -407,11 +409,11 @@ private void createAndUpload(){
 
   public void run() {
 	String sketchName = editor.getSketch().getName();
-    Object[] options = { "SPIFFS", "LITTLEFS", "FATFS" };
+    Object[] options = { "SPIFFS", "LittleFS", "FatFS" };
     typefs = (String)JOptionPane.showInputDialog(editor,
-                                              "What FS you want for " + sketchName +
-                                              " data folder?",
-                                              "Select",
+                                              "Select FS for " + sketchName +
+                                              " /data folder",
+                                              "Filesystem",
                                               JOptionPane.PLAIN_MESSAGE,
                                               null,
                                               options,