Skip to content

Test #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 22, 2017
Merged

Test #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee74245
Update ESP8266FS.java
Onno-Dirkzwager Feb 22, 2017
890366b
Update ESP8266FS.java
Onno-Dirkzwager Feb 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/ESP8266FS.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,6 @@ private void createAndUpload(){
String dataPath = dataFolder.getAbsolutePath();
String toolPath = tool.getAbsolutePath();
String sketchName = editor.getSketch().getName();
String sketchFldr = editor.getSketch().getFolder();
String imagePath = getBuildFolderPath(editor.getSketch()) + "\\" + sketchName + ".spiffs.bin";
String resetMethod = BaseNoGui.getBoardPreferences().get("upload.resetmethod");
String uploadSpeed = BaseNoGui.getBoardPreferences().get("upload.speed");
Expand Down Expand Up @@ -304,7 +303,7 @@ private void createAndUpload(){

if(JOptionPane.showOptionDialog(editor, message, title, JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, options[0]) == JOptionPane.YES_OPTION){
File source = new File(imagePath);
File dest = new File(sketchFldr + "\\" + sketchName + ".spiffs.bin");
File dest = new File(editor.getSketch().getFolder(),"\\" + sketchName + ".spiffs.bin");
try {
Files.copy(source.toPath(), dest.toPath(), StandardCopyOption.REPLACE_EXISTING);
System.out.println("Copied SPIFFS image");
Expand Down