Final tweaks.

RobertPHeller · RobertPHeller · commit 0df242f51681 · 2019-04-12T10:32:32.000-04:00
diff --git a/src/ESP32FSDL.java b/src/ESP32FSDL.java
@@ -8,7 +8,7 @@
  *  Author        : $Author$
  *  Created By    : Robert Heller
  *  Created       : Thu Apr 11 09:47:34 2019
- *  Last Modified : <190411.1619>
+ *  Last Modified : <190412.1023>
  *
  *  Description	
  *
@@ -303,6 +303,27 @@ private void downloadAndUnpack(){
         }
     
         
+        //load a list of all files
+        int fileCount = 0;
+        File dataFolder = new File(editor.getSketch().getFolder(), "data");
+        if (!dataFolder.exists()) {
+            dataFolder.mkdirs();
+        }
+        
+        Object[] options = { "Yes", "No" }; 
+        String title = "SPIFFS Unpack";
+        String message = "Data directory not empty!\nAre you sure you want to overwrite this directory?";
+        if(dataFolder.exists() && dataFolder.isDirectory()){
+            File[] files = dataFolder.listFiles();
+            if (files.length > 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: unpack canceled!");
+                return;
+            }
+        }
+        
+        String dataPath = dataFolder.getAbsolutePath();
+        
         editor.statusNotice("SPIFFS Downloading Image...");
         System.out.println("[SPIFFS] download : "+imagePath);
         System.out.println("[SPIFFS] address: "+spiStart);
@@ -334,28 +355,6 @@ private void downloadAndUnpack(){
             editor.statusError("SPIFFS Download Failed!");
             return;
         }
-            
-        
-        //load a list of all files
-        int fileCount = 0;
-        File dataFolder = new File(editor.getSketch().getFolder(), "data");
-        if (!dataFolder.exists()) {
-            dataFolder.mkdirs();
-        }
-        
-        Object[] options = { "Yes", "No" }; 
-        String title = "SPIFFS Unpack";
-        String message = "Data directory not empty!\nAre you sure you want to overwrite this directory?";
-        if(dataFolder.exists() && dataFolder.isDirectory()){
-            File[] files = dataFolder.listFiles();
-            if (files.length > 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: unpack canceled!");
-                return;
-            }
-        }
-        
-        String dataPath = dataFolder.getAbsolutePath();
         
         editor.statusNotice("SPIFFS Unpacking Image...");
         System.out.println("[SPIFFS] data   : "+dataPath);
diff --git a/src/MessageSiphonBS.java b/src/MessageSiphonBS.java
@@ -91,12 +91,12 @@ public void run() {
               if (!bsSeen) {
                   c = '\n';
                   bsSeen = true;
-                  System.err.print((char )c);
+                  System.out.print((char )c);
                   beginningOfLine = true;
               }
           } else {
               bsSeen = false;
-              System.err.print((char )c);
+              System.out.print((char )c);
               beginningOfLine = (c == '\n');
           }
 

Original file line number	Diff line number	Diff line change
`@@ -91,12 +91,12 @@ public void run() {`
`91`	`91`	`if (!bsSeen) {`
`92`	`92`	`c = '\n';`
`93`	`93`	`bsSeen = true;`
`94`		`- System.err.print((char )c);`
	`94`	`+ System.out.print((char )c);`
`95`	`95`	`beginningOfLine = true;`
`96`	`96`	`}`
`97`	`97`	`} else {`
`98`	`98`	`bsSeen = false;`
`99`		`- System.err.print((char )c);`
	`99`	`+ System.out.print((char )c);`
`100`	`100`	`beginningOfLine = (c == '\n');`
`101`	`101`	`}`
`102`	`102`