Update ESP8266FS.java

gnu-emu · web-flow · commit a723fdb6334c · 2019-11-15T12:54:41.000+01:00
May a fix for: esp8266/Arduino#6777
diff --git a/src/ESP8266FS.java b/src/ESP8266FS.java
@@ -219,7 +219,7 @@ private void createAndUpload(){
     }
 
     // Find upload.py, don't fail if not present for backwards compat
-    File uploadPyFile = new File(platform.getFolder()+"/tools", "upload.py");
+    File uploadPyFile = new File(platform.getFolder()+"/tools/esptool", "esptool.py");
     if (uploadPyFile.exists() && uploadPyFile.isFile()) {
       uploadCmd = uploadPyFile.getAbsolutePath();
     }
@@ -331,7 +331,7 @@ private void createAndUpload(){
       }
       System.out.println();
       if (!uploadCmd.isEmpty()) {
-        sysExec(new String[]{pythonCmd, uploadCmd, "--chip", "esp8266", "--port", serialPort, "--baud", uploadSpeed, "write_flash", uploadAddress, imagePath, "--end"});
+        sysExec(new String[]{pythonCmd, uploadCmd, "--chip", "esp8266", "--port", serialPort, "--baud", "460800", "write_flash", uploadAddress, imagePath});
       } else {
         sysExec(new String[]{esptool.getAbsolutePath(), "-cd", resetMethod, "-cb", uploadSpeed, "-cp", serialPort, "-ca", uploadAddress, "-cf", imagePath});
       }

Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ private void createAndUpload(){`
`219`	`219`	`}`
`220`	`220`
`221`	`221`	`// Find upload.py, don't fail if not present for backwards compat`
`222`		`- File uploadPyFile = new File(platform.getFolder()+"/tools", "upload.py");`
	`222`	`+ File uploadPyFile = new File(platform.getFolder()+"/tools/esptool", "esptool.py");`
`223`	`223`	`if (uploadPyFile.exists() && uploadPyFile.isFile()) {`
`224`	`224`	`uploadCmd = uploadPyFile.getAbsolutePath();`
`225`	`225`	`}`
`@@ -331,7 +331,7 @@ private void createAndUpload(){`
`331`	`331`	`}`
`332`	`332`	`System.out.println();`
`333`	`333`	`if (!uploadCmd.isEmpty()) {`
`334`		`- sysExec(new String[]{pythonCmd, uploadCmd, "--chip", "esp8266", "--port", serialPort, "--baud", uploadSpeed, "write_flash", uploadAddress, imagePath, "--end"});`
	`334`	`+ sysExec(new String[]{pythonCmd, uploadCmd, "--chip", "esp8266", "--port", serialPort, "--baud", "460800", "write_flash", uploadAddress, imagePath});`
`335`	`335`	`} else {`
`336`	`336`	`sysExec(new String[]{esptool.getAbsolutePath(), "-cd", resetMethod, "-cb", uploadSpeed, "-cp", serialPort, "-ca", uploadAddress, "-cf", imagePath});`
`337`	`337`	`}`