Calculating the missing Offset (begining of partition) of partition.csv file lines.

Minor changes in make.win batch file

Author: lorol

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
 

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);

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 *