From 168d02b41499c81ecdc99b75b6d99472ff412a0a Mon Sep 17 00:00:00 2001
From: Me No Dev <me-no-dev@users.noreply.github.com>
Date: Tue, 15 Jan 2019 10:48:26 +0800
Subject: [PATCH 01/26] Change tool from esptool to esptool_py

---
 src/ESP32FS.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ESP32FS.java b/src/ESP32FS.java
index eb75aa9..ce165eb 100644
--- a/src/ESP32FS.java
+++ b/src/ESP32FS.java
@@ -286,9 +286,9 @@ private void createAndUpload(){
       String esptoolCmd = "esptool"+toolExtension;
       esptool = new File(platform.getFolder()+"/tools", esptoolCmd);
       if(!esptool.exists() || !esptool.isFile()){
-        esptool = new File(platform.getFolder()+"/tools/esptool", esptoolCmd);
+        esptool = new File(platform.getFolder()+"/tools/esptool_py", esptoolCmd);
         if(!esptool.exists()){
-          esptool = new File(PreferencesData.get("runtime.tools.esptool.path"), esptoolCmd);
+          esptool = new File(PreferencesData.get("runtime.tools.esptool_py.path"), esptoolCmd);
           if (!esptool.exists()) {
               System.err.println();
               editor.statusError("SPIFFS Error: esptool not found!");

From 7a0de4178b4e9b354c88c7e6150b2e7344024c38 Mon Sep 17 00:00:00 2001
From: lorol <lorolouis@gmail.com>
Date: Fri, 19 Jun 2020 14:15:46 -0400
Subject: [PATCH 02/26] Added LittleFS choice

---
 README.md        |  9 +++--
 src/ESP32FS.java | 90 +++++++++++++++++++++++++++++-------------------
 2 files changed, 62 insertions(+), 37 deletions(-)

diff --git a/README.md b/README.md
index ae1f080..f057205 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,8 @@
 # Arduino ESP32 filesystem uploader 
 
-Arduino plugin which packs sketch data folder into SPIFFS filesystem image,
+Arduino plugin which packs sketch data folder into SPIFFS or LittleFS filesystem image,
 and uploads the image to ESP32 flash memory.
+</br> You can use either LITTLEFS or SPIFFS but not both simultaneously on given Arduino project.
 
 ## Installation
 
@@ -9,8 +10,11 @@ and uploads the image to ESP32 flash memory.
 - Download the tool archive from [releases page](https://github.com/me-no-dev/arduino-esp32fs-plugin/releases/latest).
 - 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```).
+- If not already installed, for LITTLEFS you need an additional [mklittlefs tool](https://github.com/earlephilhower/mklittlefs)  Download the [release](https://github.com/earlephilhower/mklittlefs/releases) and copy it to 
+packages\esp32\tools\mkspiffs\<mklittlefs rev. x.x.x>\ or on checkout (dev) environment to: packages\esp32\hardware\esp32\<release>\tools\mklittlefs\
 - Restart Arduino IDE. 
 
+
 On the OS X create the tools directory in ~/Documents/Arduino/ and unpack the files there
 
 ## Usage
@@ -20,8 +24,9 @@ On the OS X create the tools directory in ~/Documents/Arduino/ and unpack the fi
 - 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.
+- When prompted, select SPIFFS or LITTLEFS image you want to make from your data folder.
 
-  When done, IDE status bar will display SPIFFS Image Uploaded message. Might take a few minutes for large file system sizes.
+  When done, IDE status bar will display SPIFFS or LITTLEFS Image Uploaded message. Might take a few minutes for large file system sizes.
 
 ## Credits and license
 
diff --git a/src/ESP32FS.java b/src/ESP32FS.java
index ce165eb..e6040ab 100644
--- a/src/ESP32FS.java
+++ b/src/ESP32FS.java
@@ -65,6 +65,8 @@ public void init(Editor editor) {
   public String getMenuTitle() {
     return "ESP32 Sketch Data Upload";
   }
+  
+  private String typefs = "SPIFFS";
 
   private int listenOnProcess(String[] arguments){
       try {
@@ -99,12 +101,12 @@ private void sysExec(final String[] arguments){
       public void run() {
         try {
           if(listenOnProcess(arguments) != 0){
-            editor.statusError("SPIFFS Upload failed!");
+            editor.statusError(typefs + " Upload failed!");
           } else {
-            editor.statusNotice("SPIFFS Image Uploaded");
+            editor.statusNotice(typefs + " Image Uploaded");
           }
         } catch (Exception e){
-          editor.statusError("SPIFFS Upload failed!");
+          editor.statusError(typefs + " Upload failed!");
         }
       }
     };
@@ -168,7 +170,7 @@ private void createAndUpload(){
     
     if(!PreferencesData.get("target_platform").contentEquals("esp32")){
       System.err.println();
-      editor.statusError("SPIFFS Not Supported on "+PreferencesData.get("target_platform"));
+      editor.statusError(typefs + " Not Supported on "+PreferencesData.get("target_platform"));
       return;
     }
 
@@ -189,9 +191,11 @@ private void createAndUpload(){
     
     String mkspiffsCmd;
     if(PreferencesData.get("runtime.os").contentEquals("windows"))
-        mkspiffsCmd = "mkspiffs.exe";
+		if (typefs == "LITTLEFS") mkspiffsCmd = "mklittlefs.exe";
+			else mkspiffsCmd = "mkspiffs.exe";
     else
-        mkspiffsCmd = "mkspiffs";
+        if (typefs == "LITTLEFS") mkspiffsCmd = "mklittlefs";
+			else mkspiffsCmd = "mkspiffs";
 
     String espotaCmd = "espota.py";
     if(PreferencesData.get("runtime.os").contentEquals("windows"))
@@ -222,7 +226,7 @@ private void createAndUpload(){
     File partitionsFile = new File(platform.getFolder() + "/tools/partitions", partitions + ".csv");
     if (!partitionsFile.exists() || !partitionsFile.isFile()) {
       System.err.println();
-      editor.statusError("SPIFFS Error: partitions file " + partitions + ".csv not found!");
+      editor.statusError(typefs + " Error: partitions file " + partitions + ".csv not found!");
       return;
     }
 
@@ -245,7 +249,7 @@ private void createAndUpload(){
       }
       if(spiSize == 0){
         System.err.println();
-        editor.statusError("SPIFFS Error: partition size could not be found!");
+        editor.statusError(typefs + " Error: partition size could not be found!");
         return;
       }
     } catch(Exception e){
@@ -255,12 +259,12 @@ private void createAndUpload(){
 
     File tool = new File(platform.getFolder() + "/tools", mkspiffsCmd);
     if (!tool.exists() || !tool.isFile()) {
-      tool = new File(platform.getFolder() + "/tools/mkspiffs", mkspiffsCmd);
+      tool = new File(platform.getFolder() + "/tools/mk" + typefs.toLowerCase(), mkspiffsCmd);
       if (!tool.exists()) {
-        tool = new File(PreferencesData.get("runtime.tools.mkspiffs.path"), mkspiffsCmd);
+        tool = new File(PreferencesData.get("runtime.tools.mk" + typefs.toLowerCase() + ".path"), mkspiffsCmd);
         if (!tool.exists()) {
             System.err.println();
-            editor.statusError("SPIFFS Error: mkspiffs not found!");
+            editor.statusError(typefs + " Error: mk" + typefs.toLowerCase() + "not found!");
             return;
         }
       }
@@ -269,7 +273,7 @@ private void createAndUpload(){
     //make sure the serial port or IP is defined
     if (serialPort == null || serialPort.isEmpty()) {
       System.err.println();
-      editor.statusError("SPIFFS Error: serial port not defined!");
+      editor.statusError(typefs + " Error: serial port not defined!");
       return;
     }
 
@@ -279,7 +283,7 @@ private void createAndUpload(){
       espota = new File(platform.getFolder()+"/tools", espotaCmd);
       if(!espota.exists() || !espota.isFile()){
         System.err.println();
-        editor.statusError("SPIFFS Error: espota not found!");
+        editor.statusError(typefs + " Error: espota not found!");
         return;
       }
     } else {
@@ -291,7 +295,7 @@ private void createAndUpload(){
           esptool = new File(PreferencesData.get("runtime.tools.esptool_py.path"), esptoolCmd);
           if (!esptool.exists()) {
               System.err.println();
-              editor.statusError("SPIFFS Error: esptool not found!");
+              editor.statusError(typefs + " Error: esptool not found!");
               return;
           }
         }
@@ -316,43 +320,43 @@ private void createAndUpload(){
     String dataPath = dataFolder.getAbsolutePath();
     String toolPath = tool.getAbsolutePath();
     String sketchName = editor.getSketch().getName();
-    String imagePath = getBuildFolderPath(editor.getSketch()) + "/" + sketchName + ".spiffs.bin";
+    String imagePath = getBuildFolderPath(editor.getSketch()) + "/" + sketchName + "." + typefs.toLowerCase() + ".bin";
     String uploadSpeed = BaseNoGui.getBoardPreferences().get("upload.speed");
 
     Object[] options = { "Yes", "No" };
-    String title = "SPIFFS Create";
-    String message = "No files have been found in your data folder!\nAre you sure you want to create an empty SPIFFS image?";
+    String title = typefs + " Create";
+    String message = "No files have been found in your data folder!\nAre you sure you want to create an empty " + typefs + " image?";
 
     if(fileCount == 0 && JOptionPane.showOptionDialog(editor, message, title, JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, options[1]) != JOptionPane.YES_OPTION){
       System.err.println();
-      editor.statusError("SPIFFS Warning: mkspiffs canceled!");
+      editor.statusError(typefs + " Warning: mkspiffs canceled!");
       return;
     }
 
-    editor.statusNotice("SPIFFS Creating Image...");
-    System.out.println("[SPIFFS] data   : "+dataPath);
-    System.out.println("[SPIFFS] start  : "+spiStart);
-    System.out.println("[SPIFFS] size   : "+(spiSize/1024));
-    System.out.println("[SPIFFS] page   : "+spiPage);
-    System.out.println("[SPIFFS] block  : "+spiBlock);
+    editor.statusNotice(typefs + " Creating Image...");
+    System.out.println("[" + typefs + "] data   : "+dataPath);
+    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);
 
     try {
       if(listenOnProcess(new String[]{toolPath, "-c", dataPath, "-p", spiPage+"", "-b", spiBlock+"", "-s", spiSize+"", imagePath}) != 0){
         System.err.println();
-        editor.statusError("SPIFFS Create Failed!");
+        editor.statusError(typefs + " Create Failed!");
         return;
       }
     } catch (Exception e){
       editor.statusError(e);
-      editor.statusError("SPIFFS Create Failed!");
+      editor.statusError(typefs + " Create Failed!");
       return;
     }
 
-    editor.statusNotice("SPIFFS Uploading Image...");
-    System.out.println("[SPIFFS] upload : "+imagePath);
+    editor.statusNotice(typefs + " Uploading Image...");
+    System.out.println("[" + typefs + "] upload : "+imagePath);
 
     if(isNetwork){
-      System.out.println("[SPIFFS] IP     : "+serialPort);
+      System.out.println("[" + typefs + "] IP     : "+serialPort);
       System.out.println();
       if(espota.getAbsolutePath().endsWith(".py"))
         sysExec(new String[]{pythonCmd, espota.getAbsolutePath(), "-i", serialPort, "-p", "3232", "-s", "-f", imagePath});
@@ -361,11 +365,11 @@ private void createAndUpload(){
     } else {
       String flashMode = BaseNoGui.getBoardPreferences().get("build.flash_mode");
       String flashFreq = BaseNoGui.getBoardPreferences().get("build.flash_freq");
-      System.out.println("[SPIFFS] address: "+spiStart);
-      System.out.println("[SPIFFS] port   : "+serialPort);
-      System.out.println("[SPIFFS] speed  : "+uploadSpeed);
-      System.out.println("[SPIFFS] mode   : "+flashMode);
-      System.out.println("[SPIFFS] freq   : "+flashFreq);
+      System.out.println("[" + typefs + "] address: "+spiStart);
+      System.out.println("[" + typefs + "] port   : "+serialPort);
+      System.out.println("[" + typefs + "] speed  : "+uploadSpeed);
+      System.out.println("[" + typefs + "] mode   : "+flashMode);
+      System.out.println("[" + typefs + "] freq   : "+flashFreq);
       System.out.println();
       if(esptool.getAbsolutePath().endsWith(".py"))
         sysExec(new String[]{pythonCmd, esptool.getAbsolutePath(), "--chip", "esp32", "--baud", uploadSpeed, "--port", serialPort, "--before", "default_reset", "--after", "hard_reset", "write_flash", "-z", "--flash_mode", flashMode, "--flash_freq", flashFreq, "--flash_size", "detect", ""+spiStart, imagePath});
@@ -375,6 +379,22 @@ private void createAndUpload(){
   }
 
   public void run() {
-    createAndUpload();
+	String sketchName = editor.getSketch().getName();
+    Object[] options = { "LITTLEFS", "SPIFFS",  };
+    int result = JOptionPane.showOptionDialog(editor,
+                                              "What FS you want for " + sketchName +
+                                              " data folder?",
+                                              "Select",
+                                              JOptionPane.YES_NO_OPTION,
+                                              JOptionPane.QUESTION_MESSAGE,
+                                              null,
+                                              options,
+                                              options[1]);
+    if (result == JOptionPane.YES_OPTION) {
+		typefs = "LITTLEFS";
+	} else {
+		typefs = "SPIFFS";
+    } 
+	createAndUpload();  
   }
 }

From 6a327a5e60109d565f1dc84af20c14a42af529ca Mon Sep 17 00:00:00 2001
From: lorol <lorolouis@gmail.com>
Date: Mon, 29 Jun 2020 14:59:32 -0400
Subject: [PATCH 03/26] Added message to show found espota, esptool, mklittlefs
 and mkspiffs binaries path.

---
 src/ESP32FS.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/ESP32FS.java b/src/ESP32FS.java
index e6040ab..a7c0b16 100644
--- a/src/ESP32FS.java
+++ b/src/ESP32FS.java
@@ -269,6 +269,8 @@ private void createAndUpload(){
         }
       }
     }
+	System.out.println("mk" + typefs.toLowerCase() + " : " + tool.getAbsolutePath());
+	System.out.println();
 
     //make sure the serial port or IP is defined
     if (serialPort == null || serialPort.isEmpty()) {
@@ -286,6 +288,8 @@ private void createAndUpload(){
         editor.statusError(typefs + " Error: espota not found!");
         return;
       }
+	  System.out.println("espota : "+espota.getAbsolutePath());
+      System.out.println();	 
     } else {
       String esptoolCmd = "esptool"+toolExtension;
       esptool = new File(platform.getFolder()+"/tools", esptoolCmd);
@@ -300,8 +304,10 @@ private void createAndUpload(){
           }
         }
       }
+      System.out.println("esptool : "+esptool.getAbsolutePath());
+      System.out.println();	  
     }
-    
+	
     //load a list of all files
     int fileCount = 0;
     File dataFolder = new File(editor.getSketch().getFolder(), "data");
@@ -380,7 +386,7 @@ private void createAndUpload(){
 
   public void run() {
 	String sketchName = editor.getSketch().getName();
-    Object[] options = { "LITTLEFS", "SPIFFS",  };
+    Object[] options = { "LittleFS", "SPIFFS",  };
     int result = JOptionPane.showOptionDialog(editor,
                                               "What FS you want for " + sketchName +
                                               " data folder?",

From 90a1724f54fc1d43943a00eab8c6a76b3fa34929 Mon Sep 17 00:00:00 2001
From: lorol <lorolouis@gmail.com>
Date: Wed, 8 Jul 2020 22:50:36 -0400
Subject: [PATCH 04/26] Updated README Added zipped jar binary release

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f057205..06a5882 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ and uploads the image to ESP32 flash memory.
 ## Installation
 
 - Make sure you use one of the supported versions of Arduino IDE and have ESP32 core installed.
-- Download the tool archive from [releases page](https://github.com/me-no-dev/arduino-esp32fs-plugin/releases/latest).
+- Download the tool from [here](https://github.com/lorol/arduino-esp32fs-plugin/releases/download/1.0%2C1/esp32fs.zip)
 - 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```).
 - If not already installed, for LITTLEFS you need an additional [mklittlefs tool](https://github.com/earlephilhower/mklittlefs)  Download the [release](https://github.com/earlephilhower/mklittlefs/releases) and copy it to 

From 07d7a82e005ef3504752bd7c7b15d301f90e6365 Mon Sep 17 00:00:00 2001
From: lorol <lorolouis@gmail.com>
Date: Mon, 13 Jul 2020 23:37:23 -0400
Subject: [PATCH 05/26] Added FatFS Added binaries in release section

---
 README.md        | 33 ++++++++++++++-----
 src/ESP32FS.java | 83 ++++++++++++++++++++++++++++++------------------
 2 files changed, 77 insertions(+), 39 deletions(-)

diff --git a/README.md b/README.md
index 06a5882..8ab9b6a 100644
--- a/README.md
+++ b/README.md
@@ -1,22 +1,39 @@
 # Arduino ESP32 filesystem uploader 
 
-Arduino plugin which packs sketch data folder into SPIFFS or LittleFS 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 use either LITTLEFS or SPIFFS but not both simultaneously on given Arduino project.
+</br> You can have only of three filesystems on given Arduino project.
+
+## Notes for LITTLEFS
+
+- Uses same partition scheme as SPIFFS. 
+- See [LITTLEFS esp32 library](https://github.com/lorol/LITTLEFS)
+
+## 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
+- For same reason, the image 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)
+- 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?");
+```
 
 ## 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/1.0%2C1/esp32fs.zip)
+- Download the tool from [here](https://github.com/lorol/arduino-esp32fs-plugin/releases/download/2.0/esp32fs.zip)
 - 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```).
-- If not already installed, for LITTLEFS you need an additional [mklittlefs tool](https://github.com/earlephilhower/mklittlefs)  Download the [release](https://github.com/earlephilhower/mklittlefs/releases) and copy it to 
-packages\esp32\tools\mkspiffs\<mklittlefs rev. x.x.x>\ or on checkout (dev) environment to: packages\esp32\hardware\esp32\<release>\tools\mklittlefs\
+- For LITTLEFS, you need an additional [mklittlefs tool](https://github.com/earlephilhower/mklittlefs)  Download the [release](https://github.com/earlephilhower/mklittlefs/releases) 
+- 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)
+- 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/download/2.0/) , there are copy of the binaries. You can also use **package_esp32_index.template.json** and run get.py instead
 - Restart Arduino IDE. 
 
 
-On the OS X create the tools directory in ~/Documents/Arduino/ and unpack the files there
-
 ## Usage
 
 - Open a sketch (or create a new one and save it).
@@ -26,7 +43,7 @@ On the OS X create the tools directory in ~/Documents/Arduino/ and unpack the fi
 - Select *Tools > ESP32 Sketch Data Upload* menu item. This should start uploading the files into ESP32 flash file system.
 - When prompted, select SPIFFS or LITTLEFS image you want to make from your data folder.
 
-  When done, IDE status bar will display SPIFFS or LITTLEFS Image Uploaded message. Might take a few minutes for large file system sizes.
+  When done, IDE status bar will display the status of Image Uploaded message. Might take a few minutes for large file system sizes.
 
 ## Credits and license
 
diff --git a/src/ESP32FS.java b/src/ESP32FS.java
index a7c0b16..c594df4 100644
--- a/src/ESP32FS.java
+++ b/src/ESP32FS.java
@@ -165,9 +165,11 @@ private long getIntPref(String name){
   }
 
   private void createAndUpload(){
-    long spiStart = 0, spiSize = 0, spiPage = 256, spiBlock = 4096;
+    long spiStart = 0, spiSize = 0, spiPage = 256, spiBlock = 4096, spiOffset = 0;
     String partitions = "";
     
+    if (typefs == "FATFS") spiOffset = 4096;
+    
     if(!PreferencesData.get("target_platform").contentEquals("esp32")){
       System.err.println();
       editor.statusError(typefs + " Not Supported on "+PreferencesData.get("target_platform"));
@@ -192,10 +194,12 @@ private void createAndUpload(){
     String mkspiffsCmd;
     if(PreferencesData.get("runtime.os").contentEquals("windows"))
 		if (typefs == "LITTLEFS") mkspiffsCmd = "mklittlefs.exe";
-			else mkspiffsCmd = "mkspiffs.exe";
+        else if (typefs == "FATFS") mkspiffsCmd = "mkfatfs.exe";
+		else mkspiffsCmd = "mkspiffs.exe";
     else
         if (typefs == "LITTLEFS") mkspiffsCmd = "mklittlefs";
-			else mkspiffsCmd = "mkspiffs";
+        else if (typefs == "FATFS") mkspiffsCmd = "mkfatfs";
+		else mkspiffsCmd = "mkspiffs";
 
     String espotaCmd = "espota.py";
     if(PreferencesData.get("runtime.os").contentEquals("windows"))
@@ -234,7 +238,7 @@ private void createAndUpload(){
       BufferedReader partitionsReader = new BufferedReader(new FileReader(partitionsFile));
       String partitionsLine = "";
       while ((partitionsLine = partitionsReader.readLine()) != null) {
-        if(partitionsLine.contains("spiffs")) {
+        if(partitionsLine.contains("spiffs") || partitionsLine.contains("ffat")){ 
           partitionsLine = partitionsLine.substring(partitionsLine.indexOf(",")+1);
           partitionsLine = partitionsLine.substring(partitionsLine.indexOf(",")+1);
           partitionsLine = partitionsLine.substring(partitionsLine.indexOf(",")+1);
@@ -243,8 +247,8 @@ private void createAndUpload(){
           partitionsLine = partitionsLine.substring(partitionsLine.indexOf(",")+1);
           while(partitionsLine.startsWith(" ")) partitionsLine = partitionsLine.substring(1);
           String pSize = partitionsLine.substring(0, partitionsLine.indexOf(","));
-          spiStart = parseInt(pStart);
-          spiSize = parseInt(pSize);
+          spiStart = parseInt(pStart) + spiOffset;
+          spiSize = parseInt(pSize) - spiOffset;
         }
       }
       if(spiSize == 0){
@@ -295,18 +299,25 @@ private void createAndUpload(){
       esptool = new File(platform.getFolder()+"/tools", esptoolCmd);
       if(!esptool.exists() || !esptool.isFile()){
         esptool = new File(platform.getFolder()+"/tools/esptool_py", esptoolCmd);
-        if(!esptool.exists()){
-          esptool = new File(PreferencesData.get("runtime.tools.esptool_py.path"), esptoolCmd);
-          if (!esptool.exists()) {
-              System.err.println();
-              editor.statusError(typefs + " Error: esptool not found!");
-              return;
-          }
+        if(!esptool.exists() || !esptool.isFile()){
+            esptool = new File(platform.getFolder()+"/tools/esptool", esptoolCmd);
+            if(!esptool.exists() || !esptool.isFile()){
+              esptool = new File(PreferencesData.get("runtime.tools.esptool_py.path"), esptoolCmd);
+              if(!esptool.exists() || !esptool.isFile()){
+                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!");
+                  return;
+                }
+              }
+            }
         }
       }
-      System.out.println("esptool : "+esptool.getAbsolutePath());
-      System.out.println();	  
     }
+    System.out.println("esptool : "+esptool.getAbsolutePath());
+    System.out.println();	  
+   
 	
     //load a list of all files
     int fileCount = 0;
@@ -335,23 +346,33 @@ private void createAndUpload(){
 
     if(fileCount == 0 && JOptionPane.showOptionDialog(editor, message, title, JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, options[1]) != JOptionPane.YES_OPTION){
       System.err.println();
-      editor.statusError(typefs + " Warning: mkspiffs canceled!");
+      editor.statusError(typefs + " Warning: mktool canceled!");
       return;
     }
 
     editor.statusNotice(typefs + " Creating Image...");
     System.out.println("[" + typefs + "] data   : "+dataPath);
+    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);
 
     try {
-      if(listenOnProcess(new String[]{toolPath, "-c", dataPath, "-p", spiPage+"", "-b", spiBlock+"", "-s", spiSize+"", imagePath}) != 0){
-        System.err.println();
-        editor.statusError(typefs + " Create Failed!");
-        return;
+      if (typefs == "FATFS") {
+        if(listenOnProcess(new String[]{toolPath, "-c", dataPath, "-s", spiSize+"", imagePath}) != 0){  
+           System.err.println();
+           editor.statusError(typefs + " Create Failed!");
+           return; 
+        }
+      } else {   
+         if(listenOnProcess(new String[]{toolPath, "-c", dataPath, "-p", spiPage+"", "-b", spiBlock+"", "-s", spiSize+"", imagePath}) != 0){
+           System.err.println();
+           editor.statusError(typefs + " Create Failed!");
+           return;
+         }
       }
+      
     } catch (Exception e){
       editor.statusError(e);
       editor.statusError(typefs + " Create Failed!");
@@ -386,21 +407,21 @@ private void createAndUpload(){
 
   public void run() {
 	String sketchName = editor.getSketch().getName();
-    Object[] options = { "LittleFS", "SPIFFS",  };
-    int result = JOptionPane.showOptionDialog(editor,
+    Object[] options = { "SPIFFS", "LITTLEFS", "FATFS" };
+    typefs = (String)JOptionPane.showInputDialog(editor,
                                               "What FS you want for " + sketchName +
                                               " data folder?",
                                               "Select",
-                                              JOptionPane.YES_NO_OPTION,
-                                              JOptionPane.QUESTION_MESSAGE,
+                                              JOptionPane.PLAIN_MESSAGE,
                                               null,
                                               options,
-                                              options[1]);
-    if (result == JOptionPane.YES_OPTION) {
-		typefs = "LITTLEFS";
-	} else {
-		typefs = "SPIFFS";
-    } 
-	createAndUpload();  
+                                              "SPIFFS");
+    if ((typefs != null) && (typefs.length() > 0)) {
+        createAndUpload();    
+    } else {
+        System.out.println("Tool Exit.");
+       return; 
+    }
+  
   }
 }

From f49021554bc5176a247ad1994f966d1b0c04b312 Mon Sep 17 00:00:00 2001
From: lorol <lorolouis@gmail.com>
Date: Mon, 13 Jul 2020 23:46:04 -0400
Subject: [PATCH 06/26] Fix README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8ab9b6a..eead4c1 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ if (!FFat.begin(0, "", 1)) die("Fat FS mount failed. Not enough RAM?");
 - For LITTLEFS, you need an additional [mklittlefs tool](https://github.com/earlephilhower/mklittlefs)  Download the [release](https://github.com/earlephilhower/mklittlefs/releases) 
 - 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)
 - 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/download/2.0/) , there are copy of the binaries. You can also use **package_esp32_index.template.json** and run get.py instead
+- 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
 - Restart Arduino IDE. 
 
 

From 2c71408d023c3346d62241ffc8c1e80b08ea0989 Mon Sep 17 00:00:00 2001
From: lorol <lorolouis@gmail.com>
Date: Tue, 14 Jul 2020 07:26:54 -0400
Subject: [PATCH 07/26] Added batch for Windows quick build

---
 README.md           | 16 ++++++++++++----
 src/bin/placeholder |  0
 src/make_win.bat    |  5 +++++
 3 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 src/bin/placeholder
 create mode 100644 src/make_win.bat

diff --git a/README.md b/README.md
index eead4c1..5941407 100644
--- a/README.md
+++ b/README.md
@@ -12,8 +12,7 @@ and uploads the image to ESP32 flash memory.
 ## 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
-- For same reason, the image file is flashed with +4096 bytes (0x1000) offset of partition address csv table entry
+- 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)
 - 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.
@@ -27,7 +26,7 @@ if (!FFat.begin(0, "", 1)) die("Fat FS mount failed. Not enough RAM?");
 - Download the tool from [here](https://github.com/lorol/arduino-esp32fs-plugin/releases/download/2.0/esp32fs.zip)
 - 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) 
+- 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)
 - 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
@@ -41,10 +40,19 @@ if (!FFat.begin(0, "", 1)) die("Fat FS mount failed. Not enough RAM?");
 - 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.
-- When prompted, select SPIFFS or LITTLEFS image you want to make from your data folder.
+- On drop-down list select SPIFFS, LITTLEFS or FATFS you want to make from your data folder.
 
   When done, IDE status bar will display the status of Image Uploaded message. Might take a few minutes for large file system sizes.
 
+## Quick build on Win:
+
+- Install Java JDK 
+- Find the path of javac.exe and jar.exe
+- Edit make_win.bat accordingly
+- Copy files **arduino-core.jar , commons-codec-1.7.jar , pde.jar**  from your Arduino IDE installation to the folder where is located **make_win.bat**
+- Run **make_win.bat**
+- Find the **build jar** in /bin directory 
+
 ## Credits and license
 
 - Copyright (c) 2015 Hristo Gochkov (hristo at espressif dot com)
diff --git a/src/bin/placeholder b/src/bin/placeholder
new file mode 100644
index 0000000..e69de29
diff --git a/src/make_win.bat b/src/make_win.bat
new file mode 100644
index 0000000..cdddbeb
--- /dev/null
+++ b/src/make_win.bat
@@ -0,0 +1,5 @@
+del bin\*.*
+"C:\Program Files (x86)\Java\jdk1.8.0_152\bin\javac.exe" -target 1.8 -cp ".;arduino-core.jar;commons-codec-1.7.jar;pde.jar" -d bin ESP32FS.java
+cd bin
+"C:\Program Files (x86)\Java\jdk1.8.0_152\bin\jar.exe" cvfM esp32fs.jar *
+pause

From d4c0f00ab0a36ecf8f4a3444532a6c607bdef767 Mon Sep 17 00:00:00 2001
From: lorol <lorolouis@gmail.com>
Date: Tue, 14 Jul 2020 14:52:49 -0400
Subject: [PATCH 08/26] Release 2.0.1 Added checkup of partition scheme vs.
 chosen filesystem Typo error fixes and minor changes

---
 README.md        | 41 +++++++++++++++++++++++++----------------
 src/ESP32FS.java | 34 ++++++++++++++++++----------------
 2 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/README.md b/README.md
index 5941407..1c1ab3f 100644
--- a/README.md
+++ b/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 --git a/src/ESP32FS.java b/src/ESP32FS.java
index c594df4..1e43d4e 100644
--- a/src/ESP32FS.java
+++ b/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,

From 97143d059bd555af8c31ae3a7cb1abe28461c8d7 Mon Sep 17 00:00:00 2001
From: lorol <lorolouis@gmail.com>
Date: Wed, 15 Jul 2020 11:10:14 -0400
Subject: [PATCH 09/26] Updated README.md

---
 README.md | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 1c1ab3f..f5788b8 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ if (!FFat.begin(0, "", 1)) die("Fat FS mount failed. Not enough RAM?");
 - 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 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)
+- For **FatFS**, you need additional binary files for Windows or Linux, thanks [@lbernstone](https://github.com/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 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
@@ -52,22 +52,34 @@ if (!FFat.begin(0, "", 1)) die("Fat FS mount failed. Not enough RAM?");
 - 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.
+  
+## Screenshot
+
+![Screenshot](tool.png)
 
 ## Quick build on Win:
 
 - Install Java JDK 
 - Find the path of javac.exe and jar.exe
-- Edit make_win.bat accordingly
+- Edit **make_win.bat** accordingly
 - Copy files **arduino-core.jar , commons-codec-1.7.jar , pde.jar**  from your Arduino IDE installation to the folder where is located **make_win.bat**
 - Run **make_win.bat**
-- Find the **build jar** in /bin directory 
+- Find the **jar** file in /bin directory 
+
+## Credits and license
 
-## Credits and license (of the original tool)
+### The Original Arduino ESP32 filesystem uploader
 
 - Copyright (c) 2015 Hristo Gochkov (hristo at espressif dot com)
 - Licensed under GPL v2 ([text](LICENSE))
 - Maintained by Hristo Gochkov (hristo at espressif dot com)
 
+### Other people, sources and binary files
+
+- https://github.com/earlephilhower
+- https://github.com/labplus-cn/mkfatfs
+- https://github.com/lbernstone
+
 ## Issues and suggestions
 
 File issues here on github, or ask your questions on the [esp32.com forum](http://esp32.com).

From b51ef0733ff71db4cc6c9770433b44947ae79f52 Mon Sep 17 00:00:00 2001
From: lorol <lorolouis@gmail.com>
Date: Fri, 17 Jul 2020 08:02:17 -0400
Subject: [PATCH 10/26] Updated README.md and added a snapshot

---
 README.md |  13 +++++++------
 tool.png  | Bin 0 -> 21979 bytes
 2 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 tool.png

diff --git a/README.md b/README.md
index f5788b8..2288698 100644
--- a/README.md
+++ b/README.md
@@ -9,15 +9,20 @@ and uploads the image to ESP32 flash memory.
 - 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
+- You need an additional [mklittlefs tool](https://github.com/earlephilhower/mklittlefs) . Download the [release](https://github.com/earlephilhower/mklittlefs/releases) or find it [archived at latest release here](https://github.com/lorol/arduino-esp32fs-plugin/releases )
+- Copy **mklittlefs[.exe]** to **/tools** folder of esp32 platform where **espota** and **esptool** (.py or.exe) tools are located
 
 ## Notes for FatFS
 
 - Go to Arduino IDE menu: ***Tools > Partition Scheme*** and select an entry with FAT partition
+- You need additional binary files for Windows or Linux, thanks [@lbernstone](https://github.com/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) or take from [archived at latest release here](https://github.com/lorol/arduino-esp32fs-plugin/releases )
+- Copy **mkfatfs[.exe]** to **/tools** folder of esp32 platform where **espota** and **esptool** (.py or.exe) tools are located
 - 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.
@@ -26,21 +31,17 @@ 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 **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 or Linux, thanks [@lbernstone](https://github.com/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 at [latest release](https://github.com/lorol/arduino-esp32fs-plugin/releases) for copies of archived binaries in question. 
+- Make sure you have **mklittlefs[.exe]** and **mkfatfs[.exe]** available at **/tools** folder or in sub-folder there
+- 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. 
 
-
 ## Usage
 
 - Open a sketch (or create a new one and save it).
diff --git a/tool.png b/tool.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b2efe2ef74bc5578eaa2a82d4cb27b6008b078c
GIT binary patch
literal 21979
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%0DNAm$#q5RaBW1114Oh{%RxP1-w*f6<X_jS
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
GkpBX97Cqkp

literal 0
HcmV?d00001


From fee9640b12e7fc0788785dbd94f3da5369baaa76 Mon Sep 17 00:00:00 2001
From: lorol <lorolouis@gmail.com>
Date: Thu, 30 Jul 2020 20:34:04 -0400
Subject: [PATCH 11/26] Change first choice (default) of drop-down to LittleFS

---
 src/ESP32FS.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ESP32FS.java b/src/ESP32FS.java
index 1e43d4e..34d45e7 100644
--- a/src/ESP32FS.java
+++ b/src/ESP32FS.java
@@ -409,7 +409,7 @@ private void createAndUpload(){
 
   public void run() {
 	String sketchName = editor.getSketch().getName();
-    Object[] options = { "SPIFFS", "LittleFS", "FatFS" };
+    Object[] options = { "LittleFS", "SPIFFS", "FatFS" };
     typefs = (String)JOptionPane.showInputDialog(editor,
                                               "Select FS for " + sketchName +
                                               " /data folder",
@@ -417,7 +417,7 @@ public void run() {
                                               JOptionPane.PLAIN_MESSAGE,
                                               null,
                                               options,
-                                              "SPIFFS");
+                                              "LittleFS");
     if ((typefs != null) && (typefs.length() > 0)) {
         createAndUpload();    
     } else {

From 9efcdb7239d63a1c658a507b1d9fe93c079341e1 Mon Sep 17 00:00:00 2001
From: lorol <lorolouis@gmail.com>
Date: Fri, 9 Oct 2020 19:16:20 +0300
Subject: [PATCH 12/26] Added a choice to "Erase All Flash" at the end of FS
 type selections Updated assets

---
 README.md        |  3 +-
 src/ESP32FS.java | 97 +++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 97 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 2288698..e794a15 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,8 @@
 # Arduino ESP32 filesystem uploader 
 
 - Arduino plugin which packs sketch data folder into SPIFFS, LittleFS or FatFS filesystem image,
-and uploads the image to ESP32 flash memory.
+and uploads the image to ESP32 flash memory. 
+- Added a choice to "Erase all flash"
 - You can have only one of three filesystems on same Arduino project.
 
 ## Notes for SPIFFS
diff --git a/src/ESP32FS.java b/src/ESP32FS.java
index 34d45e7..1a19e3d 100644
--- a/src/ESP32FS.java
+++ b/src/ESP32FS.java
@@ -407,9 +407,98 @@ private void createAndUpload(){
     }
   }
 
+  
+  private void eraseFlash(){
+    
+    if(!PreferencesData.get("target_platform").contentEquals("esp32")){
+      System.err.println();
+      editor.statusError(typefs + " Not Supported on "+PreferencesData.get("target_platform"));
+      return;
+    }
+
+    TargetPlatform platform = BaseNoGui.getTargetPlatform();
+
+    String toolExtension = ".py";
+    if(PreferencesData.get("runtime.os").contentEquals("windows")) {
+      toolExtension = ".exe";
+    } else if(PreferencesData.get("runtime.os").contentEquals("macosx")) {
+      toolExtension = "";
+    }
+
+    String pythonCmd;
+    if(PreferencesData.get("runtime.os").contentEquals("windows"))
+        pythonCmd = "python.exe";
+    else
+        pythonCmd = "python";
+    
+    Boolean isNetwork = false;
+
+    File esptool = new File(platform.getFolder()+"/tools");
+    String serialPort = PreferencesData.get("serial.port");
+
+    //make sure the serial port or IP is defined
+    if (serialPort == null || serialPort.isEmpty()) {
+      System.err.println();
+      editor.statusError(typefs + " Error: serial port not defined!");
+      return;
+    }
+
+    //find port
+    if(serialPort.split("\\.").length == 4){
+      isNetwork = true;
+    } else {
+      String esptoolCmd = "esptool"+toolExtension;
+      esptool = new File(platform.getFolder()+"/tools", esptoolCmd);
+      if(!esptool.exists() || !esptool.isFile()){
+        esptool = new File(platform.getFolder()+"/tools/esptool_py", esptoolCmd);
+        if(!esptool.exists() || !esptool.isFile()){
+            esptool = new File(platform.getFolder()+"/tools/esptool", esptoolCmd);
+            if(!esptool.exists() || !esptool.isFile()){
+              esptool = new File(PreferencesData.get("runtime.tools.esptool_py.path"), esptoolCmd);
+              if(!esptool.exists() || !esptool.isFile()){
+                esptool = new File(PreferencesData.get("runtime.tools.esptool.path"), esptoolCmd);              
+                if(!esptool.exists() || !esptool.isFile()){
+                  System.err.println();
+                  editor.statusError("Error: esptool not found!");
+                  return;
+                }
+              }
+            }
+        }
+      }
+    }
+    System.out.println("esptool : "+esptool.getAbsolutePath());
+    System.out.println();	  
+
+    Object[] options = { "Yes", "No" };
+    String title = "Erase All Flash";
+    String message = "Are you sure?";
+
+    if(JOptionPane.showOptionDialog(editor, message, title, JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, options[1]) != JOptionPane.YES_OPTION){
+      System.err.println();
+      editor.statusError("Warning: Erase All Flash canceled!");
+      return;
+    }
+
+    editor.statusNotice("Erasing all Flash started...");
+    System.out.println("Erasing all Flash started...");
+
+    if(isNetwork){
+      System.out.println("Cannot be done through OTA, IP     : "+serialPort);
+      System.out.println();
+    } else {
+      System.out.println("Port: "+serialPort);
+      System.out.println();
+      if(esptool.getAbsolutePath().endsWith(".py"))
+        sysExec(new String[]{pythonCmd, esptool.getAbsolutePath(), "--chip", "esp32", "--port", serialPort, "--before", "default_reset", "--after", "hard_reset", "erase_flash"});
+      else
+        sysExec(new String[]{esptool.getAbsolutePath(), "--chip", "esp32", "--port", serialPort, "--before", "default_reset", "--after", "hard_reset", "erase_flash"});
+    }
+  }
+
   public void run() {
 	String sketchName = editor.getSketch().getName();
-    Object[] options = { "LittleFS", "SPIFFS", "FatFS" };
+    Object[] options = { "LittleFS", "SPIFFS", "FatFS", "!Erase Flash!" };
     typefs = (String)JOptionPane.showInputDialog(editor,
                                               "Select FS for " + sketchName +
                                               " /data folder",
@@ -419,7 +508,11 @@ public void run() {
                                               options,
                                               "LittleFS");
     if ((typefs != null) && (typefs.length() > 0)) {
-        createAndUpload();    
+        if (typefs == "!Erase Flash!") {
+            eraseFlash();
+        } else {
+            createAndUpload();
+        }        
     } else {
         System.out.println("Tool Exit.");
        return; 

From aaa533576c1a227f6c50342565f89d72732fed69 Mon Sep 17 00:00:00 2001
From: stephane <stephane@privowny.com>
Date: Fri, 23 Oct 2020 13:25:40 +0200
Subject: [PATCH 13/26] add support to esp32s2

---
 src/ESP32FS.java | 260 +++++++++++++++++++++++++++++++++++++----------
 1 file changed, 208 insertions(+), 52 deletions(-)

diff --git a/src/ESP32FS.java b/src/ESP32FS.java
index ce165eb..9108146 100644
--- a/src/ESP32FS.java
+++ b/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)
 
@@ -65,6 +65,8 @@ public void init(Editor editor) {
   public String getMenuTitle() {
     return "ESP32 Sketch Data Upload";
   }
+  
+  private String typefs = "";
 
   private int listenOnProcess(String[] arguments){
       try {
@@ -99,12 +101,12 @@ private void sysExec(final String[] arguments){
       public void run() {
         try {
           if(listenOnProcess(arguments) != 0){
-            editor.statusError("SPIFFS Upload failed!");
+            editor.statusError(typefs + " Upload failed!");
           } else {
-            editor.statusNotice("SPIFFS Image Uploaded");
+            editor.statusNotice(typefs + " Image Uploaded");
           }
         } catch (Exception e){
-          editor.statusError("SPIFFS Upload failed!");
+          editor.statusError(typefs + " Upload failed!");
         }
       }
     };
@@ -163,12 +165,14 @@ private long getIntPref(String name){
   }
 
   private void createAndUpload(){
-    long spiStart = 0, spiSize = 0, spiPage = 256, spiBlock = 4096;
+    long spiStart = 0, spiSize = 0, spiPage = 256, spiBlock = 4096, spiOffset = 0;
     String partitions = "";
     
+    if (typefs == "FatFS") spiOffset = 4096;
+
     if(!PreferencesData.get("target_platform").contentEquals("esp32")){
       System.err.println();
-      editor.statusError("SPIFFS Not Supported on "+PreferencesData.get("target_platform"));
+      editor.statusError(typefs + " Not Supported on "+PreferencesData.get("target_platform"));
       return;
     }
 
@@ -189,9 +193,13 @@ private void createAndUpload(){
     
     String mkspiffsCmd;
     if(PreferencesData.get("runtime.os").contentEquals("windows"))
-        mkspiffsCmd = "mkspiffs.exe";
+		if (typefs == "LittleFS") mkspiffsCmd = "mklittlefs.exe";
+        else if (typefs == "FatFS") mkspiffsCmd = "mkfatfs.exe";
+		else mkspiffsCmd = "mkspiffs.exe";
     else
-        mkspiffsCmd = "mkspiffs";
+        if (typefs == "LittleFS") mkspiffsCmd = "mklittlefs";
+        else if (typefs == "FatFS") mkspiffsCmd = "mkfatfs";
+		else mkspiffsCmd = "mkspiffs";
 
     String espotaCmd = "espota.py";
     if(PreferencesData.get("runtime.os").contentEquals("windows"))
@@ -222,7 +230,7 @@ private void createAndUpload(){
     File partitionsFile = new File(platform.getFolder() + "/tools/partitions", partitions + ".csv");
     if (!partitionsFile.exists() || !partitionsFile.isFile()) {
       System.err.println();
-      editor.statusError("SPIFFS Error: partitions file " + partitions + ".csv not found!");
+      editor.statusError(typefs + " Error: partitions file " + partitions + ".csv not found!");
       return;
     }
 
@@ -230,7 +238,7 @@ private void createAndUpload(){
       BufferedReader partitionsReader = new BufferedReader(new FileReader(partitionsFile));
       String partitionsLine = "";
       while ((partitionsLine = partitionsReader.readLine()) != null) {
-        if(partitionsLine.contains("spiffs")) {
+        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);
@@ -239,13 +247,13 @@ private void createAndUpload(){
           partitionsLine = partitionsLine.substring(partitionsLine.indexOf(",")+1);
           while(partitionsLine.startsWith(" ")) partitionsLine = partitionsLine.substring(1);
           String pSize = partitionsLine.substring(0, partitionsLine.indexOf(","));
-          spiStart = parseInt(pStart);
-          spiSize = parseInt(pSize);
+          spiStart = parseInt(pStart) + spiOffset;
+          spiSize = parseInt(pSize) - spiOffset;
         }
       }
       if(spiSize == 0){
         System.err.println();
-        editor.statusError("SPIFFS Error: partition size could not be found!");
+        editor.statusError(typefs + " Error: partition size could not be found!");
         return;
       }
     } catch(Exception e){
@@ -255,21 +263,23 @@ private void createAndUpload(){
 
     File tool = new File(platform.getFolder() + "/tools", mkspiffsCmd);
     if (!tool.exists() || !tool.isFile()) {
-      tool = new File(platform.getFolder() + "/tools/mkspiffs", mkspiffsCmd);
+      tool = new File(platform.getFolder() + "/tools/mk" + typefs.toLowerCase(), mkspiffsCmd);
       if (!tool.exists()) {
-        tool = new File(PreferencesData.get("runtime.tools.mkspiffs.path"), mkspiffsCmd);
+        tool = new File(PreferencesData.get("runtime.tools.mk" + typefs.toLowerCase() + ".path"), mkspiffsCmd);
         if (!tool.exists()) {
             System.err.println();
-            editor.statusError("SPIFFS Error: mkspiffs not found!");
+            editor.statusError(typefs + " Error: mk" + typefs.toLowerCase() + "not found!");
             return;
         }
       }
     }
+	System.out.println("mk" + typefs.toLowerCase() + " : " + tool.getAbsolutePath());
+	System.out.println();
 
     //make sure the serial port or IP is defined
     if (serialPort == null || serialPort.isEmpty()) {
       System.err.println();
-      editor.statusError("SPIFFS Error: serial port not defined!");
+      editor.statusError(typefs + " Error: serial port not defined!");
       return;
     }
 
@@ -279,25 +289,36 @@ private void createAndUpload(){
       espota = new File(platform.getFolder()+"/tools", espotaCmd);
       if(!espota.exists() || !espota.isFile()){
         System.err.println();
-        editor.statusError("SPIFFS Error: espota not found!");
+        editor.statusError(typefs + " Error: espota not found!");
         return;
       }
+	  System.out.println("espota : "+espota.getAbsolutePath());
+      System.out.println();	 
     } else {
       String esptoolCmd = "esptool"+toolExtension;
       esptool = new File(platform.getFolder()+"/tools", esptoolCmd);
       if(!esptool.exists() || !esptool.isFile()){
         esptool = new File(platform.getFolder()+"/tools/esptool_py", esptoolCmd);
-        if(!esptool.exists()){
-          esptool = new File(PreferencesData.get("runtime.tools.esptool_py.path"), esptoolCmd);
-          if (!esptool.exists()) {
-              System.err.println();
-              editor.statusError("SPIFFS Error: esptool not found!");
-              return;
-          }
+        if(!esptool.exists() || !esptool.isFile()){
+            esptool = new File(platform.getFolder()+"/tools/esptool", esptoolCmd);
+            if(!esptool.exists() || !esptool.isFile()){
+              esptool = new File(PreferencesData.get("runtime.tools.esptool_py.path"), esptoolCmd);
+              if(!esptool.exists() || !esptool.isFile()){
+                esptool = new File(PreferencesData.get("runtime.tools.esptool.path"), esptoolCmd);              
+                if(!esptool.exists() || !esptool.isFile()){
+                  System.err.println();
+                  editor.statusError("Error: esptool not found!");
+                  return;
+                }
+              }
+            }
         }
       }
     }
-    
+    System.out.println("esptool : "+esptool.getAbsolutePath());
+    System.out.println();	  
+   
+	
     //load a list of all files
     int fileCount = 0;
     File dataFolder = new File(editor.getSketch().getFolder(), "data");
@@ -316,43 +337,55 @@ private void createAndUpload(){
     String dataPath = dataFolder.getAbsolutePath();
     String toolPath = tool.getAbsolutePath();
     String sketchName = editor.getSketch().getName();
-    String imagePath = getBuildFolderPath(editor.getSketch()) + "/" + sketchName + ".spiffs.bin";
+    String imagePath = getBuildFolderPath(editor.getSketch()) + "/" + sketchName + "." + typefs.toLowerCase() + ".bin";
     String uploadSpeed = BaseNoGui.getBoardPreferences().get("upload.speed");
 
     Object[] options = { "Yes", "No" };
-    String title = "SPIFFS Create";
-    String message = "No files have been found in your data folder!\nAre you sure you want to create an empty SPIFFS image?";
+    String title = typefs + " Create";
+    String message = "No files have been found in your data folder!\nAre you sure you want to create an empty " + typefs + " image?";
 
     if(fileCount == 0 && JOptionPane.showOptionDialog(editor, message, title, JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, options[1]) != JOptionPane.YES_OPTION){
       System.err.println();
-      editor.statusError("SPIFFS Warning: mkspiffs canceled!");
+      editor.statusError(typefs + " Warning: mktool canceled!");
       return;
     }
 
-    editor.statusNotice("SPIFFS Creating Image...");
-    System.out.println("[SPIFFS] data   : "+dataPath);
-    System.out.println("[SPIFFS] start  : "+spiStart);
-    System.out.println("[SPIFFS] size   : "+(spiSize/1024));
-    System.out.println("[SPIFFS] page   : "+spiPage);
-    System.out.println("[SPIFFS] block  : "+spiBlock);
+    editor.statusNotice(typefs + " Creating Image...");
+    System.out.println("[" + typefs + "] data   : "+dataPath);
+    System.out.println("[" + typefs + "] offset : "+spiOffset);
+    System.out.println("[" + typefs + "] start  : "+spiStart);
+    System.out.println("[" + typefs + "] size   : "+(spiSize/1024));
+    if (typefs != "FatFS") {
+        System.out.println("[" + typefs + "] page   : "+spiPage);
+        System.out.println("[" + typefs + "] block  : "+spiBlock);
+    }
 
     try {
-      if(listenOnProcess(new String[]{toolPath, "-c", dataPath, "-p", spiPage+"", "-b", spiBlock+"", "-s", spiSize+"", imagePath}) != 0){
-        System.err.println();
-        editor.statusError("SPIFFS Create Failed!");
-        return;
+      if (typefs == "FatFS") {
+        if(listenOnProcess(new String[]{toolPath, "-c", dataPath, "-s", spiSize+"", imagePath}) != 0){  
+           System.err.println();
+           editor.statusError(typefs + " Create Failed!");
+           return; 
+        }
+      } else {   
+         if(listenOnProcess(new String[]{toolPath, "-c", dataPath, "-p", spiPage+"", "-b", spiBlock+"", "-s", spiSize+"", imagePath}) != 0){
+           System.err.println();
+           editor.statusError(typefs + " Create Failed!");
+           return;
+         }
       }
+      
     } catch (Exception e){
       editor.statusError(e);
-      editor.statusError("SPIFFS Create Failed!");
+      editor.statusError(typefs + " Create Failed!");
       return;
     }
 
-    editor.statusNotice("SPIFFS Uploading Image...");
-    System.out.println("[SPIFFS] upload : "+imagePath);
+    editor.statusNotice(typefs + " Uploading Image...");
+    System.out.println("[" + typefs + "] upload : "+imagePath);
 
     if(isNetwork){
-      System.out.println("[SPIFFS] IP     : "+serialPort);
+      System.out.println("[" + typefs + "] IP     : "+serialPort);
       System.out.println();
       if(espota.getAbsolutePath().endsWith(".py"))
         sysExec(new String[]{pythonCmd, espota.getAbsolutePath(), "-i", serialPort, "-p", "3232", "-s", "-f", imagePath});
@@ -361,20 +394,143 @@ private void createAndUpload(){
     } else {
       String flashMode = BaseNoGui.getBoardPreferences().get("build.flash_mode");
       String flashFreq = BaseNoGui.getBoardPreferences().get("build.flash_freq");
-      System.out.println("[SPIFFS] address: "+spiStart);
-      System.out.println("[SPIFFS] port   : "+serialPort);
-      System.out.println("[SPIFFS] speed  : "+uploadSpeed);
-      System.out.println("[SPIFFS] mode   : "+flashMode);
-      System.out.println("[SPIFFS] freq   : "+flashFreq);
+      System.out.println("[" + typefs + "] address: "+spiStart);
+      System.out.println("[" + typefs + "] port   : "+serialPort);
+      System.out.println("[" + typefs + "] speed  : "+uploadSpeed);
+      System.out.println("[" + typefs + "] mode   : "+flashMode);
+      System.out.println("[" + typefs + "] freq   : "+flashFreq);
+      System.out.println(); 
+
+      if(esptool.getAbsolutePath().endsWith(".py"))
+        sysExec(new String[]{pythonCmd, esptool.getAbsolutePath(), "--chip", getChip(), "--baud", uploadSpeed, "--port", serialPort, "--before", "default_reset", "--after", "hard_reset", "write_flash", "-z", "--flash_mode", flashMode, "--flash_freq", flashFreq, "--flash_size", "detect", ""+spiStart, imagePath});
+      else
+        sysExec(new String[]{esptool.getAbsolutePath(), "--chip", getChip(), "--baud", uploadSpeed, "--port", serialPort, "--before", "default_reset", "--after", "hard_reset", "write_flash", "-z", "--flash_mode", flashMode, "--flash_freq", flashFreq, "--flash_size", "detect", ""+spiStart, imagePath});
+    }
+  }
+
+  
+  private void eraseFlash(){
+    
+    if(!PreferencesData.get("target_platform").contentEquals("esp32")){
+      System.err.println();
+      editor.statusError(typefs + " Not Supported on "+PreferencesData.get("target_platform"));
+      return;
+    }
+
+    TargetPlatform platform = BaseNoGui.getTargetPlatform();
+
+    String toolExtension = ".py";
+    if(PreferencesData.get("runtime.os").contentEquals("windows")) {
+      toolExtension = ".exe";
+    } else if(PreferencesData.get("runtime.os").contentEquals("macosx")) {
+      toolExtension = "";
+    }
+
+    String pythonCmd;
+    if(PreferencesData.get("runtime.os").contentEquals("windows"))
+        pythonCmd = "python.exe";
+    else
+        pythonCmd = "python";
+    
+    Boolean isNetwork = false;
+
+    File esptool = new File(platform.getFolder()+"/tools");
+    String serialPort = PreferencesData.get("serial.port");
+
+    //make sure the serial port or IP is defined
+    if (serialPort == null || serialPort.isEmpty()) {
+      System.err.println();
+      editor.statusError(typefs + " Error: serial port not defined!");
+      return;
+    }
+
+    //find port
+    if(serialPort.split("\\.").length == 4){
+      isNetwork = true;
+    } else {
+      String esptoolCmd = "esptool"+toolExtension;
+      esptool = new File(platform.getFolder()+"/tools", esptoolCmd);
+      if(!esptool.exists() || !esptool.isFile()){
+        esptool = new File(platform.getFolder()+"/tools/esptool_py", esptoolCmd);
+        if(!esptool.exists() || !esptool.isFile()){
+            esptool = new File(platform.getFolder()+"/tools/esptool", esptoolCmd);
+            if(!esptool.exists() || !esptool.isFile()){
+              esptool = new File(PreferencesData.get("runtime.tools.esptool_py.path"), esptoolCmd);
+              if(!esptool.exists() || !esptool.isFile()){
+                esptool = new File(PreferencesData.get("runtime.tools.esptool.path"), esptoolCmd);              
+                if(!esptool.exists() || !esptool.isFile()){
+                  System.err.println();
+                  editor.statusError("Error: esptool not found!");
+                  return;
+                }
+              }
+            }
+        }
+      }
+    }
+    System.out.println("esptool : "+esptool.getAbsolutePath());
+    System.out.println();	  
+
+    Object[] options = { "Yes", "No" };
+    String title = "Erase All Flash";
+    String message = "Are you sure?";
+
+    if(JOptionPane.showOptionDialog(editor, message, title, JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, options[1]) != JOptionPane.YES_OPTION){
+      System.err.println();
+      editor.statusError("Warning: Erase All Flash canceled!");
+      return;
+    }
+
+    editor.statusNotice("Erasing all Flash started...");
+    System.out.println("Erasing all Flash started...");
+
+    if(isNetwork){
+      System.out.println("Cannot be done through OTA, IP     : "+serialPort);
+      System.out.println();
+    } else {
+      System.out.println("Port: "+serialPort);
       System.out.println();
       if(esptool.getAbsolutePath().endsWith(".py"))
-        sysExec(new String[]{pythonCmd, esptool.getAbsolutePath(), "--chip", "esp32", "--baud", uploadSpeed, "--port", serialPort, "--before", "default_reset", "--after", "hard_reset", "write_flash", "-z", "--flash_mode", flashMode, "--flash_freq", flashFreq, "--flash_size", "detect", ""+spiStart, imagePath});
+        sysExec(new String[]{pythonCmd, esptool.getAbsolutePath(), "--chip", getChip(), "--port", serialPort, "--before", "default_reset", "--after", "hard_reset", "erase_flash"});
       else
-        sysExec(new String[]{esptool.getAbsolutePath(), "--chip", "esp32", "--baud", uploadSpeed, "--port", serialPort, "--before", "default_reset", "--after", "hard_reset", "write_flash", "-z", "--flash_mode", flashMode, "--flash_freq", flashFreq, "--flash_size", "detect", ""+spiStart, imagePath});
+        sysExec(new String[]{esptool.getAbsolutePath(), "--chip", getChip(), "--port", serialPort, "--before", "default_reset", "--after", "hard_reset", "erase_flash"});
     }
   }
 
   public void run() {
-    createAndUpload();
+	String sketchName = editor.getSketch().getName();
+    Object[] options = { "LittleFS", "SPIFFS", "FatFS", "!Erase Flash!" };
+    typefs = (String)JOptionPane.showInputDialog(editor,
+                                              "Select FS for " + sketchName +
+                                              " /data folder",
+                                              "Filesystem",
+                                              JOptionPane.PLAIN_MESSAGE,
+                                              null,
+                                              options,
+                                              "LittleFS");
+    if ((typefs != null) && (typefs.length() > 0)) {
+        if (typefs == "!Erase Flash!") {
+            eraseFlash();
+        } else {
+            createAndUpload();
+        }        
+    } else {
+        System.out.println("Tool Exit.");
+       return; 
+    }
+  
   }
+
+  private String getChip() {
+    String targetBoardId = BaseNoGui.getTargetBoard().getId();
+
+    if (targetBoardId.contains("s2")) {
+      return "esp32s2";
+    }
+    else {
+      return "esp32";
+    }
+
+  }
+
 }

From 92b4956e103e29dce28940b6639c6d8429bda81e Mon Sep 17 00:00:00 2001
From: lorol <lorolouis@gmail.com>
Date: Mon, 9 Nov 2020 23:22:34 -0500
Subject: [PATCH 14/26] Added messages to console about chip type Modified
 README

---
 README.md        | 14 ++++++++------
 src/ESP32FS.java | 40 ++++++++++++++++++++--------------------
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index e794a15..f9b93cb 100644
--- a/README.md
+++ b/README.md
@@ -14,16 +14,17 @@ and uploads the image to ESP32 flash memory.
 ## 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
-- You need an additional [mklittlefs tool](https://github.com/earlephilhower/mklittlefs) . Download the [release](https://github.com/earlephilhower/mklittlefs/releases) or find it [archived at latest release here](https://github.com/lorol/arduino-esp32fs-plugin/releases )
+- Until fully implemented to esp-32 core, it needs an extra library.  
+It is already considered for next core releases. The mklittlefs tool is provided from there.
+- For reference see [LITTLEFS esp32 library](https://github.com/lorol/LITTLEFS) for more details
+- If you need the [mklittlefs tool](https://github.com/earlephilhower/mklittlefs) download the [release](https://github.com/earlephilhower/mklittlefs/releases) or find it [archived at previous releases here](https://github.com/lorol/arduino-esp32fs-plugin/releases )
 - Copy **mklittlefs[.exe]** to **/tools** folder of esp32 platform where **espota** and **esptool** (.py or.exe) tools are located
 
 ## Notes for FatFS
 
 - Go to Arduino IDE menu: ***Tools > Partition Scheme*** and select an entry with FAT partition
-- You need additional binary files for Windows or Linux, thanks [@lbernstone](https://github.com/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) or take from [archived at latest release here](https://github.com/lorol/arduino-esp32fs-plugin/releases )
-- Copy **mkfatfs[.exe]** to **/tools** folder of esp32 platform where **espota** and **esptool** (.py or.exe) tools are located
+- If not provided by the core, you may need additional binary files for Windows or Linux, thanks [@lbernstone](https://github.com/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) or take from [archived previous release here](https://github.com/lorol/arduino-esp32fs-plugin/releases )
+- If missing, you need to copy **mkfatfs[.exe]** to **/tools** folder of esp32 platform where **espota** and **esptool** (.py or.exe) tools are located
 - 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.
@@ -39,7 +40,7 @@ if (!FFat.begin(0, "", 1)) die("Fat FS mount failed. Not enough RAM?");
 - 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```).
 - Make sure you have **mklittlefs[.exe]** and **mkfatfs[.exe]** available at **/tools** folder or in sub-folder there
-- See at [latest release](https://github.com/lorol/arduino-esp32fs-plugin/releases) for copies of archived binaries in question. 
+- For reference, see at [previous releases](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. 
 
@@ -52,6 +53,7 @@ if (!FFat.begin(0, "", 1)) die("Fat FS mount failed. Not enough RAM?");
 - 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.
+- Last entry **!Erase Flash!** allows to clean the entire flash if necessary. 
 
   When done, IDE status bar will display the status of Image Uploaded message. Might take a few minutes for large file system sizes.
   
diff --git a/src/ESP32FS.java b/src/ESP32FS.java
index b3055f7..79bd809 100644
--- a/src/ESP32FS.java
+++ b/src/ESP32FS.java
@@ -170,7 +170,9 @@ private void createAndUpload(){
     
     if (typefs == "FatFS") spiOffset = 4096;
 
-    if(!PreferencesData.get("target_platform").contentEquals("esp32")){
+    System.out.println("Chip : " + getChip());
+
+    if(!PreferencesData.get("target_platform").contains("esp32")){
       System.err.println();
       editor.statusError(typefs + " Not Supported on "+PreferencesData.get("target_platform"));
       return;
@@ -399,8 +401,7 @@ private void createAndUpload(){
       System.out.println("[" + typefs + "] speed  : "+uploadSpeed);
       System.out.println("[" + typefs + "] mode   : "+flashMode);
       System.out.println("[" + typefs + "] freq   : "+flashFreq);
-      System.out.println(); 
-
+      System.out.println();
       if(esptool.getAbsolutePath().endsWith(".py"))
         sysExec(new String[]{pythonCmd, esptool.getAbsolutePath(), "--chip", getChip(), "--baud", uploadSpeed, "--port", serialPort, "--before", "default_reset", "--after", "hard_reset", "write_flash", "-z", "--flash_mode", flashMode, "--flash_freq", flashFreq, "--flash_size", "detect", ""+spiStart, imagePath});
       else
@@ -410,8 +411,8 @@ private void createAndUpload(){
 
   
   private void eraseFlash(){
-    
-    if(!PreferencesData.get("target_platform").contentEquals("esp32")){
+    System.out.println("Chip : " + getChip());
+    if(!PreferencesData.get("target_platform").contains("esp32")){
       System.err.println();
       editor.statusError(typefs + " Not Supported on "+PreferencesData.get("target_platform"));
       return;
@@ -491,12 +492,24 @@ private void eraseFlash(){
       System.out.println("Port: "+serialPort);
       System.out.println();
       if(esptool.getAbsolutePath().endsWith(".py"))
-        sysExec(new String[]{pythonCmd, esptool.getAbsolutePath(), "--chip", "esp32", "--port", serialPort, "--before", "default_reset", "--after", "hard_reset", "erase_flash"});
+        sysExec(new String[]{pythonCmd, esptool.getAbsolutePath(), "--chip", getChip(), "--port", serialPort, "--before", "default_reset", "--after", "hard_reset", "erase_flash"});
       else
-        sysExec(new String[]{esptool.getAbsolutePath(), "--chip", "esp32", "--port", serialPort, "--before", "default_reset", "--after", "hard_reset", "erase_flash"});
+        sysExec(new String[]{esptool.getAbsolutePath(), "--chip", getChip(), "--port", serialPort, "--before", "default_reset", "--after", "hard_reset", "erase_flash"});
     }
   }
 
+  private String getChip() {
+    String targetBoardId = BaseNoGui.getTargetBoard().getId();
+
+    if (targetBoardId.contains("s2")) {
+      return "esp32s2";
+    }
+    else {
+      return "esp32";
+    }
+
+  }
+
   public void run() {
 	String sketchName = editor.getSketch().getName();
     Object[] options = { "LittleFS", "SPIFFS", "FatFS", "!Erase Flash!" };
@@ -520,17 +533,4 @@ public void run() {
     }
   
   }
-
-  private String getChip() {
-    String targetBoardId = BaseNoGui.getTargetBoard().getId();
-
-    if (targetBoardId.contains("s2")) {
-      return "esp32s2";
-    }
-    else {
-      return "esp32";
-    }
-
-  }
-
 }

From 0e20b772318d3a533ebf621de5311ac535a6b5e4 Mon Sep 17 00:00:00 2001
From: lorol <lorolouis@gmail.com>
Date: Fri, 20 Nov 2020 12:54:47 -0500
Subject: [PATCH 15/26] Use partitions.csv from sketch folder

---
 src/ESP32FS.java | 43 ++++++++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/src/ESP32FS.java b/src/ESP32FS.java
index 79bd809..53787f7 100644
--- a/src/ESP32FS.java
+++ b/src/ESP32FS.java
@@ -206,7 +206,7 @@ private void createAndUpload(){
     String espotaCmd = "espota.py";
     if(PreferencesData.get("runtime.os").contentEquals("windows"))
         espotaCmd = "espota.exe";
-    
+
     Boolean isNetwork = false;
     File espota = new File(platform.getFolder()+"/tools");
     File esptool = new File(platform.getFolder()+"/tools");
@@ -217,23 +217,32 @@ private void createAndUpload(){
       editor.statusError("Partitions Not Defined for "+BaseNoGui.getBoardPreferences().get("name"));
       return;
     }
-    
-    try {
-      partitions = BaseNoGui.getBoardPreferences().get("build.partitions");
-      if(partitions == null || partitions.contentEquals("")){
-        editor.statusError("Partitions Not Found for "+BaseNoGui.getBoardPreferences().get("name"));
-        return;
-      }
-    } catch(Exception e){
-      editor.statusError(e);
-      return;
-    }
 
-    File partitionsFile = new File(platform.getFolder() + "/tools/partitions", partitions + ".csv");
-    if (!partitionsFile.exists() || !partitionsFile.isFile()) {
-      System.err.println();
-      editor.statusError(typefs + " Error: partitions file " + partitions + ".csv not found!");
-      return;
+    File partitionsFile = new File(editor.getSketch().getFolder(), "partitions.csv");
+
+    if (partitionsFile.exists() && partitionsFile.isFile()) {
+        System.out.println("Using partitions.csv from sketch folder.");
+
+    } else {
+        System.out.println("Using partition scheme from Arduino IDE.");
+        try {
+          partitions = BaseNoGui.getBoardPreferences().get("build.partitions");
+          if(partitions == null || partitions.contentEquals("")){
+            editor.statusError("Partitions Not Found for "+BaseNoGui.getBoardPreferences().get("name"));
+            return;
+          }
+        } catch(Exception e){
+          editor.statusError(e);
+          return;
+        }
+
+        partitionsFile = new File(platform.getFolder() + "/tools/partitions", partitions + ".csv");
+
+        if (!partitionsFile.exists() || !partitionsFile.isFile()) {
+          System.err.println();
+          editor.statusError(typefs + " Error: partitions file " + partitions + ".csv not found!");
+          return;
+        }
     }
 
     try {

From 83a0e1a0674d07726e8af4320ce6b957497bbf13 Mon Sep 17 00:00:00 2001
From: lorol <lorolouis@gmail.com>
Date: Fri, 20 Nov 2020 21:54:51 -0500
Subject: [PATCH 16/26] Calculating the missing Offset (begining of partition)
 of partition.csv file lines. Minor changes in make.win batch file

---
 README.md        |  8 +++++---
 src/ESP32FS.java | 49 +++++++++++++++++++++++++++++++++++++-----------
 src/make_win.bat |  3 ++-
 3 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index f9b93cb..adfb14f 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,11 @@
 # Arduino ESP32 filesystem uploader 
 
 - Arduino plugin which packs sketch data folder into SPIFFS, LittleFS or FatFS filesystem image,
-and uploads the image to ESP32 flash memory. 
-- Added a choice to "Erase all flash"
-- You can have only one of three filesystems on same Arduino project.
+and uploads the image to ESP32 flash memory.
+- Added custom "partition.csv" file processing if it is located in the sketch folder.
+- Added esp32 / esp32s2 chip detection based on Arduino IDE selection.
+- Added a choice to "Erase all flash".
+- You can have only one of three filesystems on same Arduino project as data partition.
 
 ## Notes for SPIFFS
 
diff --git a/src/ESP32FS.java b/src/ESP32FS.java
index 53787f7..c114bc3 100644
--- a/src/ESP32FS.java
+++ b/src/ESP32FS.java
@@ -248,18 +248,42 @@ private void createAndUpload(){
     try {
       BufferedReader partitionsReader = new BufferedReader(new FileReader(partitionsFile));
       String partitionsLine = "";
+      long spiPrevEnd = 0;
+      boolean isDataLine = false;
       while ((partitionsLine = partitionsReader.readLine()) != null) {
-        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);
-          while(partitionsLine.startsWith(" ")) partitionsLine = partitionsLine.substring(1);
-          String pStart = partitionsLine.substring(0, partitionsLine.indexOf(","));
-          partitionsLine = partitionsLine.substring(partitionsLine.indexOf(",")+1);
-          while(partitionsLine.startsWith(" ")) partitionsLine = partitionsLine.substring(1);
-          String pSize = partitionsLine.substring(0, partitionsLine.indexOf(","));
-          spiStart = parseInt(pStart) + spiOffset;
-          spiSize = parseInt(pSize) - spiOffset;
+          if (!partitionsLine.substring(0, 1).equals("#")) {
+            if( ((typefs != "FatFS") && partitionsLine.contains("spiffs")) || ((typefs == "FatFS") && partitionsLine.contains("ffat"))){
+                isDataLine = true;
+            }
+            partitionsLine = partitionsLine.substring(partitionsLine.indexOf(",")+1);
+            partitionsLine = partitionsLine.substring(partitionsLine.indexOf(",")+1);
+            partitionsLine = partitionsLine.substring(partitionsLine.indexOf(",")+1);
+            while(partitionsLine.startsWith(" ")) partitionsLine = partitionsLine.substring(1);
+            String pStart = partitionsLine.substring(0, partitionsLine.indexOf(","));
+            partitionsLine = partitionsLine.substring(partitionsLine.indexOf(",")+1);
+            while(partitionsLine.startsWith(" ")) partitionsLine = partitionsLine.substring(1);
+            String pSize = partitionsLine.substring(0, partitionsLine.indexOf(","));
+
+            //System.out.println("From CSV, Partition Start: " + pStart + ", Size: " + pSize);
+
+            if (isDataLine) {
+                if (pStart == null || pStart.trim().isEmpty()) {
+                    spiStart = spiPrevEnd + spiOffset;
+                } else {
+                    spiStart = parseInt(pStart) + spiOffset;
+                }
+                spiSize = parseInt(pSize) - spiOffset;
+                break;
+            } else {
+                if (pSize != null && !pSize.trim().isEmpty()) {
+                    if (pStart == null || pStart.trim().isEmpty()) {
+                        spiPrevEnd += parseInt(pSize);
+                    } else {
+                        spiPrevEnd = parseInt(pStart) + parseInt(pSize);
+                    }
+                }
+                spiSize = 0;
+            }
         }
       }
       if(spiSize == 0){
@@ -272,6 +296,9 @@ private void createAndUpload(){
       return;
     }
 
+    System.out.println("Start: 0x" + String.format("%x", spiStart));
+    System.out.println("Size : 0x" + String.format("%x", spiSize));
+
     File tool = new File(platform.getFolder() + "/tools", mkspiffsCmd);
     if (!tool.exists() || !tool.isFile()) {
       tool = new File(platform.getFolder() + "/tools/mk" + typefs.toLowerCase(), mkspiffsCmd);
diff --git a/src/make_win.bat b/src/make_win.bat
index cdddbeb..09a6078 100644
--- a/src/make_win.bat
+++ b/src/make_win.bat
@@ -1,4 +1,5 @@
-del bin\*.*
+del bin\*.jar
+rd /S /Q bin\com
 "C:\Program Files (x86)\Java\jdk1.8.0_152\bin\javac.exe" -target 1.8 -cp ".;arduino-core.jar;commons-codec-1.7.jar;pde.jar" -d bin ESP32FS.java
 cd bin
 "C:\Program Files (x86)\Java\jdk1.8.0_152\bin\jar.exe" cvfM esp32fs.jar *

From cd75923479aff09153a71b99d82c07989ae9b7d3 Mon Sep 17 00:00:00 2001
From: lorol <lorolouis@gmail.com>
Date: Sun, 22 Nov 2020 01:05:45 -0500
Subject: [PATCH 17/26] Parse partition csv file line' Offset(Start address)
 and Size values containing 0x 0X hexadecimal or M,m,K,k bytes as described in
 https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/partition-tables.html#offset-size
 Similarily to gen_esp32part.py

---
 src/ESP32FS.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/ESP32FS.java b/src/ESP32FS.java
index c114bc3..e1240bf 100644
--- a/src/ESP32FS.java
+++ b/src/ESP32FS.java
@@ -154,7 +154,9 @@ private String getBuildFolderPath(Sketch s) {
   }
 
   private long parseInt(String value){
-    if(value.startsWith("0x")) return Long.parseLong(value.substring(2), 16);
+    if(value.endsWith("m") || value.endsWith("M")) return 1024*1024*Long.parseLong(value.substring(0, (value.length() - 1)));
+    else if(value.endsWith("k") || value.endsWith("K")) return 1024*Long.parseLong(value.substring(0, (value.length() - 1)));
+    else if(value.startsWith("0x") || value.startsWith("0X")) return Long.parseLong(value.substring(2), 16);
     else return Integer.parseInt(value);
   }
 

From 810d85c2460e7915254c55850069847a638632ba Mon Sep 17 00:00:00 2001
From: lorol <lorolouis@gmail.com>
Date: Sun, 22 Nov 2020 09:37:56 -0500
Subject: [PATCH 18/26] Improvements and tests before release

---
 src/ESP32FS.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/ESP32FS.java b/src/ESP32FS.java
index e1240bf..2406356 100644
--- a/src/ESP32FS.java
+++ b/src/ESP32FS.java
@@ -154,10 +154,9 @@ private String getBuildFolderPath(Sketch s) {
   }
 
   private long parseInt(String value){
-    if(value.endsWith("m") || value.endsWith("M")) return 1024*1024*Long.parseLong(value.substring(0, (value.length() - 1)));
-    else if(value.endsWith("k") || value.endsWith("K")) return 1024*Long.parseLong(value.substring(0, (value.length() - 1)));
-    else if(value.startsWith("0x") || value.startsWith("0X")) return Long.parseLong(value.substring(2), 16);
-    else return Integer.parseInt(value);
+    if(value.endsWith("m") || value.endsWith("M")) return 1024*1024*Long.decode(value.substring(0, (value.length() - 1)));
+    else if(value.endsWith("k") || value.endsWith("K")) return 1024*Long.decode(value.substring(0, (value.length() - 1)));
+    else return Long.decode(value);
   }
 
   private long getIntPref(String name){

From 22efec661c375199df8f313f1c3503d572711f2e Mon Sep 17 00:00:00 2001
From: lorol <lorolouis@gmail.com>
Date: Tue, 24 Nov 2020 11:31:23 -0500
Subject: [PATCH 19/26] Release 2.0.5 with comment how to build a jar that is
 in esp32fs_no_compress.zip variant

---
 src/ESP32FS.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ESP32FS.java b/src/ESP32FS.java
index 2406356..a862d7b 100644
--- a/src/ESP32FS.java
+++ b/src/ESP32FS.java
@@ -439,6 +439,7 @@ private void createAndUpload(){
       System.out.println("[" + typefs + "] mode   : "+flashMode);
       System.out.println("[" + typefs + "] freq   : "+flashFreq);
       System.out.println();
+      // change after "write_flash" "-z" to "-u" (--no_compress) below to build file for esp32fs_no_compress.zip
       if(esptool.getAbsolutePath().endsWith(".py"))
         sysExec(new String[]{pythonCmd, esptool.getAbsolutePath(), "--chip", getChip(), "--baud", uploadSpeed, "--port", serialPort, "--before", "default_reset", "--after", "hard_reset", "write_flash", "-z", "--flash_mode", flashMode, "--flash_freq", flashFreq, "--flash_size", "detect", ""+spiStart, imagePath});
       else

From a41ef5cf6ce1e25ef79f0c3f9a622ff90f856f5d Mon Sep 17 00:00:00 2001
From: lorol <lorolouis@gmail.com>
Date: Tue, 24 Nov 2020 14:23:20 -0500
Subject: [PATCH 20/26] jar files added to .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index a5d8f72..b889088 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 bin/
 dist/
+src/*.jar

From e4c702fb5b2cc8b247ae40d445989134a02fb535 Mon Sep 17 00:00:00 2001
From: lorol <lorolouis@gmail.com>
Date: Tue, 15 Dec 2020 12:53:33 -0500
Subject: [PATCH 21/26] More universal way to get chip model
 https://github.com/me-no-dev/arduino-esp32fs-plugin/pull/28/files

---
 src/ESP32FS.java | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/ESP32FS.java b/src/ESP32FS.java
index a862d7b..86a8f5a 100644
--- a/src/ESP32FS.java
+++ b/src/ESP32FS.java
@@ -43,6 +43,7 @@
 import processing.app.Sketch;
 import processing.app.tools.Tool;
 import processing.app.helpers.ProcessUtils;
+import processing.app.helpers.PreferencesMap;
 import processing.app.debug.TargetPlatform;
 
 import org.apache.commons.codec.digest.DigestUtils;
@@ -536,16 +537,10 @@ private void eraseFlash(){
     }
   }
 
-  private String getChip() {
-    String targetBoardId = BaseNoGui.getTargetBoard().getId();
-
-    if (targetBoardId.contains("s2")) {
-      return "esp32s2";
-    }
-    else {
-      return "esp32";
-    }
-
+  private String getChip(){
+    PreferencesMap prefs = BaseNoGui.getTargetBoard().getPreferences();
+    String mcu = prefs.get("build.mcu", "esp32");
+    return mcu;
   }
 
   public void run() {

From b97f756142dfb7a2a4d24aa19939bfd90bd280e7 Mon Sep 17 00:00:00 2001
From: lorol <lorolouis@gmail.com>
Date: Mon, 21 Dec 2020 21:57:24 -0500
Subject: [PATCH 22/26] Bugfixes Changed sysExec() to be based on:
 https://www.infoworld.com/article/2071275/when-runtime-exec---won-t.html The
 original way hangs on long uploading.

---
 src/ESP32FS.java    | 98 +++++++++++++++++++++++++++------------------
 src/bin/placeholder |  0
 src/make_win.bat    |  4 +-
 3 files changed, 61 insertions(+), 41 deletions(-)
 delete mode 100644 src/bin/placeholder

diff --git a/src/ESP32FS.java b/src/ESP32FS.java
index 86a8f5a..e7d70a1 100644
--- a/src/ESP32FS.java
+++ b/src/ESP32FS.java
@@ -23,14 +23,10 @@
 
 package com.esp32.mkspiffs;
 
-import java.io.File;
-import java.io.FileReader;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.IOException;
+import java.util.*;
+import java.io.*;
 
 import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import javax.swing.JOptionPane;
@@ -51,6 +47,32 @@
 
 import cc.arduino.files.DeleteFilesOnShutdown;
 
+/**
+ * Taken from https://www.infoworld.com/article/2071275/when-runtime-exec---won-t.html?page=3
+ */
+class StreamGobbler extends Thread {
+    InputStream is;
+    String type;
+
+    StreamGobbler(InputStream is, String type) {
+        this.is = is;
+        this.type = type;
+    }
+
+    public void run() {
+      try {
+            InputStreamReader isr = new InputStreamReader(is);
+            BufferedReader br = new BufferedReader(isr);
+            String line=null;
+            while ( (line = br.readLine()) != null)
+                System.out.println(type + ">" + line);
+      } catch (IOException ioe) {
+            ioe.printStackTrace();
+      }
+    }
+}
+
+
 /**
  * Example Tools menu entry.
  */
@@ -71,31 +93,26 @@ public String getMenuTitle() {
 
   private int listenOnProcess(String[] arguments){
       try {
-        final Process p = ProcessUtils.exec(arguments);
-        Thread thread = new Thread() {
-          public void run() {
-            try {
-              InputStreamReader reader = new InputStreamReader(p.getInputStream());
-              int c;
-              while ((c = reader.read()) != -1)
-                  System.out.print((char) c);
-              reader.close();
-              
-              reader = new InputStreamReader(p.getErrorStream());
-              while ((c = reader.read()) != -1)
-                  System.err.print((char) c);
-              reader.close();
-            } catch (Exception e){}
-          }
-        };
-        thread.start();
-        int res = p.waitFor();
-        thread.join();
-        return res;
+            Runtime rt = Runtime.getRuntime();
+            Process proc = rt.exec(arguments);
+            // any error message?
+            StreamGobbler errorGobbler = new StreamGobbler(proc.getErrorStream(), "E");
+
+            // any output?
+            StreamGobbler outputGobbler = new StreamGobbler(proc.getInputStream(), "O");
+
+            // kick them off
+            errorGobbler.start();
+            outputGobbler.start();
+
+            // any error???
+            int exitVal = proc.waitFor();
+
+        return exitVal;
       } catch (Exception e){
         return -1;
       }
-    }
+  }
 
   private void sysExec(final String[] arguments){
     Thread thread = new Thread() {
@@ -328,9 +345,12 @@ private void createAndUpload(){
       isNetwork = true;
       espota = new File(platform.getFolder()+"/tools", espotaCmd);
       if(!espota.exists() || !espota.isFile()){
-        System.err.println();
-        editor.statusError(typefs + " Error: espota not found!");
-        return;
+		espota = new File(platform.getFolder()+"/tools", "espota.py");   //fall-back to .py
+		if(!espota.exists() || !espota.isFile()){
+			System.err.println();
+			editor.statusError(typefs + " Error: espota not found!");
+			return;
+		}
       }
 	  System.out.println("espota : "+espota.getAbsolutePath());
       System.out.println();	 
@@ -354,11 +374,10 @@ private void createAndUpload(){
             }
         }
       }
+      System.out.println("esptool : "+esptool.getAbsolutePath());
+      System.out.println();
     }
-    System.out.println("esptool : "+esptool.getAbsolutePath());
-    System.out.println();	  
-   
-	
+
     //load a list of all files
     int fileCount = 0;
     File dataFolder = new File(editor.getSketch().getFolder(), "data");
@@ -426,9 +445,10 @@ private void createAndUpload(){
 
     if(isNetwork){
       System.out.println("[" + typefs + "] IP     : "+serialPort);
-      System.out.println();
+	  System.out.println("Running: " + espota.getAbsolutePath() + " -i " + serialPort + " -p 3232 -s -f " + imagePath);
+	  System.out.println();
       if(espota.getAbsolutePath().endsWith(".py"))
-        sysExec(new String[]{pythonCmd, espota.getAbsolutePath(), "-i", serialPort, "-p", "3232", "-s", "-f", imagePath});
+        sysExec(new String[]{pythonCmd, espota.getAbsolutePath(), "-i", serialPort, "-p", "3232", "-s", "-f", imagePath}); // other flags , "-d", "-r", "-t", "50" 
       else
         sysExec(new String[]{espota.getAbsolutePath(), "-i", serialPort, "-p", "3232", "-s", "-f", imagePath});
     } else {
@@ -507,9 +527,9 @@ private void eraseFlash(){
             }
         }
       }
+	  System.out.println("esptool : "+esptool.getAbsolutePath());
+      System.out.println();
     }
-    System.out.println("esptool : "+esptool.getAbsolutePath());
-    System.out.println();	  
 
     Object[] options = { "Yes", "No" };
     String title = "Erase All Flash";
diff --git a/src/bin/placeholder b/src/bin/placeholder
deleted file mode 100644
index e69de29..0000000
diff --git a/src/make_win.bat b/src/make_win.bat
index 09a6078..0333c50 100644
--- a/src/make_win.bat
+++ b/src/make_win.bat
@@ -1,6 +1,6 @@
 del bin\*.jar
 rd /S /Q bin\com
-"C:\Program Files (x86)\Java\jdk1.8.0_152\bin\javac.exe" -target 1.8 -cp ".;arduino-core.jar;commons-codec-1.7.jar;pde.jar" -d bin ESP32FS.java
+javac.exe -target 1.8 -cp ".;arduino-core.jar;commons-codec-1.7.jar;pde.jar" -d bin ESP32FS.java
 cd bin
-"C:\Program Files (x86)\Java\jdk1.8.0_152\bin\jar.exe" cvfM esp32fs.jar *
+jar.exe cvfM esp32fs.jar *
 pause

From 854300087e89e0a636f1d6dee13e727478524806 Mon Sep 17 00:00:00 2001
From: lorol <lorolouis@gmial.com>
Date: Wed, 23 Dec 2020 09:57:18 -0500
Subject: [PATCH 23/26] Better make_win.bat

---
 README.md        |  7 +++----
 make_win.bat     | 12 ++++++++++++
 src/make_win.bat |  6 ------
 3 files changed, 15 insertions(+), 10 deletions(-)
 create mode 100644 make_win.bat
 delete mode 100644 src/make_win.bat

diff --git a/README.md b/README.md
index adfb14f..28f5ac9 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 - Arduino plugin which packs sketch data folder into SPIFFS, LittleFS or FatFS filesystem image,
 and uploads the image to ESP32 flash memory.
-- Added custom "partition.csv" file processing if it is located in the sketch folder.
+- Added custom **"partition.csv"** file processing if it is located in the sketch folder.
 - Added esp32 / esp32s2 chip detection based on Arduino IDE selection.
 - Added a choice to "Erase all flash".
 - You can have only one of three filesystems on same Arduino project as data partition.
@@ -12,7 +12,6 @@ and uploads the image to ESP32 flash memory.
 - 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
@@ -67,8 +66,8 @@ if (!FFat.begin(0, "", 1)) die("Fat FS mount failed. Not enough RAM?");
 
 - Install Java JDK 
 - Find the path of javac.exe and jar.exe
-- Edit **make_win.bat** accordingly
-- Copy files **arduino-core.jar , commons-codec-1.7.jar , pde.jar**  from your Arduino IDE installation to the folder where is located **make_win.bat**
+- Find where files **arduino-core.jar , commons-codec-1.7.jar , pde.jar**  of your Arduino IDE installation are located
+- Edit **make_win.bat** to match "your" paths for **set PATH=your\java\bin;%PATH%** and **set ALP=your\arduino\lib** 
 - Run **make_win.bat**
 - Find the **jar** file in /bin directory 
 
diff --git a/make_win.bat b/make_win.bat
new file mode 100644
index 0000000..424091f
--- /dev/null
+++ b/make_win.bat
@@ -0,0 +1,12 @@
+cd %~dp0\src
+set PATH=your\java\bin;%PATH%
+set ALP=your\arduino\lib
+IF EXIST bin GOTO NOWINDIR
+mkdir bin
+:NOWINDIR
+del bin\*.jar
+rd /S /Q bin\com
+javac.exe -target 1.8 -cp ".;%ALP%\arduino-core.jar;%ALP%\commons-codec-1.7.jar;%ALP%\pde.jar" -d bin ESP32FS.java
+cd bin
+jar.exe cvfM esp32fs.jar *
+pause
diff --git a/src/make_win.bat b/src/make_win.bat
deleted file mode 100644
index 0333c50..0000000
--- a/src/make_win.bat
+++ /dev/null
@@ -1,6 +0,0 @@
-del bin\*.jar
-rd /S /Q bin\com
-javac.exe -target 1.8 -cp ".;arduino-core.jar;commons-codec-1.7.jar;pde.jar" -d bin ESP32FS.java
-cd bin
-jar.exe cvfM esp32fs.jar *
-pause

From b2268aa6e85cfe751cde84b59bdd0a4232875809 Mon Sep 17 00:00:00 2001
From: lorol <lorolouis@gmail.com>
Date: Wed, 23 Dec 2020 11:26:42 -0500
Subject: [PATCH 24/26] Update Readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 28f5ac9..73ab510 100644
--- a/README.md
+++ b/README.md
@@ -69,7 +69,7 @@ if (!FFat.begin(0, "", 1)) die("Fat FS mount failed. Not enough RAM?");
 - Find where files **arduino-core.jar , commons-codec-1.7.jar , pde.jar**  of your Arduino IDE installation are located
 - Edit **make_win.bat** to match "your" paths for **set PATH=your\java\bin;%PATH%** and **set ALP=your\arduino\lib** 
 - Run **make_win.bat**
-- Find the **jar** file in /bin directory 
+- Find the **jar** file in src/bin directory 
 
 ## Credits and license
 

From e9953089744d968b3d47edcfd4155d3332866db8 Mon Sep 17 00:00:00 2001
From: lorol <lorolouis@gmail.com>
Date: Wed, 23 Dec 2020 12:08:06 -0500
Subject: [PATCH 25/26] Update ESP32FS.java

Changed line beginnings of transferred OUTPUT and ERROR from exec to console to look clieaner
---
 src/ESP32FS.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ESP32FS.java b/src/ESP32FS.java
index e7d70a1..e1bb586 100644
--- a/src/ESP32FS.java
+++ b/src/ESP32FS.java
@@ -96,10 +96,10 @@ private int listenOnProcess(String[] arguments){
             Runtime rt = Runtime.getRuntime();
             Process proc = rt.exec(arguments);
             // any error message?
-            StreamGobbler errorGobbler = new StreamGobbler(proc.getErrorStream(), "E");
+            StreamGobbler errorGobbler = new StreamGobbler(proc.getErrorStream(), "_");
 
             // any output?
-            StreamGobbler outputGobbler = new StreamGobbler(proc.getInputStream(), "O");
+            StreamGobbler outputGobbler = new StreamGobbler(proc.getInputStream(), "-");
 
             // kick them off
             errorGobbler.start();

From 310e9d0594b35f04f8b9d5a0d9b6ee82d9922db0 Mon Sep 17 00:00:00 2001
From: lorol <lorolouis@gmail.com>
Date: Wed, 23 Dec 2020 12:09:57 -0500
Subject: [PATCH 26/26] Update make_win.bat

---
 make_win.bat | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/make_win.bat b/make_win.bat
index 424091f..390b3b3 100644
--- a/make_win.bat
+++ b/make_win.bat
@@ -1,9 +1,9 @@
 cd %~dp0\src
 set PATH=your\java\bin;%PATH%
 set ALP=your\arduino\lib
-IF EXIST bin GOTO NOWINDIR
+IF EXIST bin GOTO NODIR
 mkdir bin
-:NOWINDIR
+:NODIR
 del bin\*.jar
 rd /S /Q bin\com
 javac.exe -target 1.8 -cp ".;%ALP%\arduino-core.jar;%ALP%\commons-codec-1.7.jar;%ALP%\pde.jar" -d bin ESP32FS.java