Upgrade to littleFS v2 and esptool.py

Author: earlephilhower

make.sh

@@ -19,7 +19,7 @@ echo "lib_path: $lib_path"
 set -e
 
 mkdir -p bin
-javac -target 1.8 -cp "$pde_path:$core_path:$lib_path" \
+javac -target 1.8 -source 1.8 -cp "$pde_path:$core_path:$lib_path" \
       -d bin src/ESP8266LittleFS.java
 
 pushd bin

src/ESP8266LittleFS.java

@@ -209,6 +209,8 @@ private void createAndUpload(){
     File espota = new File(platform.getFolder()+"/tools");
     File esptool = new File(platform.getFolder()+"/tools");
     String serialPort = PreferencesData.get("serial.port");
+    String pythonCmd = PreferencesData.get("runtime.os").contentEquals("windows") ? "python.exe" : "python";
+    String uploadCmd = "";
 
     //make sure the serial port or IP is defined
     if (serialPort == null || serialPort.isEmpty()) {
@@ -217,6 +219,22 @@ private void createAndUpload(){
       return;
     }
 
+    // Find upload.py, don't fail if not present for backwards compat
+    File uploadPyFile = new File(platform.getFolder()+"/tools", "upload.py");
+    if (uploadPyFile.exists() && uploadPyFile.isFile()) {
+      uploadCmd = uploadPyFile.getAbsolutePath();
+    }
+    // Find python.exe if present, don't fail if not found for backwards compat
+    String[] paths = { platform.getFolder()+"/tools", platform.getFolder()+"/tools/python", PreferencesData.get("runtime.tools.python.path") };
+    for (String s: paths) {
+      File toolPyFile = new File(s, pythonCmd);
+      if (toolPyFile.exists() && toolPyFile.isFile() && toolPyFile.canExecute()) {
+        pythonCmd = toolPyFile.getAbsolutePath();
+        break;
+      }
+    }
+    // pythonCmd now points to either an installed exe with full path or just plain "python(.exe)"
+
     //find espota if IP else find esptool
     if(serialPort.split("\\.").length == 4){
       isNetwork = true;
@@ -234,7 +252,7 @@ private void createAndUpload(){
         esptool = new File(platform.getFolder()+"/tools/esptool", esptoolCmd);
         if(!esptool.exists()){
           esptool = new File(PreferencesData.get("runtime.tools.esptool.path"), esptoolCmd);
-          if (!esptool.exists()) {
+          if (!esptool.exists() && uploadCmd.isEmpty()) {
               System.err.println();
               editor.statusError("LittleFS Error: esptool not found!");
               return;
@@ -279,10 +297,10 @@ private void createAndUpload(){
     }
 
     editor.statusNotice("LittleFS Creating Image...");
-    System.out.println("[LittleFS] data   : "+dataPath);
-    System.out.println("[LittleFS] size   : "+((spiEnd - spiStart)/1024));
-    System.out.println("[LittleFS] page   : "+spiPage);
-    System.out.println("[LittleFS] block  : "+spiBlock);
+    System.out.println("[LittleFS] data    : "+dataPath);
+    System.out.println("[LittleFS] size    : "+((spiEnd - spiStart)/1024));
+    System.out.println("[LittleFS] page    : "+spiPage);
+    System.out.println("[LittleFS] block   : "+spiBlock);
 
     try {
       if(listenOnProcess(new String[]{toolPath, "-c", dataPath, "-p", spiPage+"", "-b", spiBlock+"", "-s", (spiEnd - spiStart)+"", imagePath}) != 0) {
@@ -297,25 +315,28 @@ private void createAndUpload(){
     }
 
     editor.statusNotice("LittleFS Uploading Image...");
-    System.out.println("[LittleFS] upload : "+imagePath);
+    System.out.println("[LittleFS] upload  : "+imagePath);
 
     if(isNetwork){
-      String pythonCmd;
-      if(PreferencesData.get("runtime.os").contentEquals("windows"))
-          pythonCmd = "python.exe";
-      else
-          pythonCmd = "python";
-      
-      System.out.println("[LittleFS] IP     : "+serialPort);
+      System.out.println("[LittleFS] IP      : "+serialPort);
       System.out.println();
       sysExec(new String[]{pythonCmd, espota.getAbsolutePath(), "-i", serialPort, "-s", "-f", imagePath});
     } else {
-      System.out.println("[LittleFS] address: "+uploadAddress);
-      System.out.println("[LittleFS] reset  : "+resetMethod);
-      System.out.println("[LittleFS] port   : "+serialPort);
-      System.out.println("[LittleFS] speed  : "+uploadSpeed);
+      System.out.println("[LittleFS] address : "+uploadAddress);
+      System.out.println("[LittleFS] reset   : "+resetMethod);
+      System.out.println("[LittleFS] port    : "+serialPort);
+      System.out.println("[LittleFS] speed   : "+uploadSpeed);
+      if (!uploadCmd.isEmpty()) {
+        System.out.println("[SPIFFS] python   : "+pythonCmd);
+        System.out.println("[SPIFFS] uploader : "+uploadCmd);
+      }
+
       System.out.println();
-      sysExec(new String[]{esptool.getAbsolutePath(), "-cd", resetMethod, "-cb", uploadSpeed, "-cp", serialPort, "-ca", uploadAddress, "-cf", imagePath});
+      if (!uploadCmd.isEmpty()) {
+        sysExec(new String[]{pythonCmd, uploadCmd, "--chip", "esp8266", "--port", serialPort, "--baud", uploadSpeed, "write_flash", uploadAddress, imagePath, "--end"});
+      } else {
+        sysExec(new String[]{esptool.getAbsolutePath(), "-cd", resetMethod, "-cb", uploadSpeed, "-cp", serialPort, "-ca", uploadAddress, "-cf", imagePath});
+      }
     }
   }