Merge branch 'master' of https://github.com/arduino/ARM

shfitz · shfitz · commit ea44e8859d49 · 2012-10-21T17:56:20.000-04:00
diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
@@ -49,9 +49,9 @@
  * files and images, etc) that comes from that.
  */
 public class Base {
-  public static final int REVISION = 101;
+  public static final int REVISION = 150;
   /** This might be replaced by main() if there's a lib/version.txt file. */
-  static String VERSION_NAME = "0101";
+  static String VERSION_NAME = "0150";
   /** Set true if this a proper release rather than a numbered revision. */
   static public boolean RELEASE = false;
 
diff --git a/app/src/processing/app/SerialMonitor.java b/app/src/processing/app/SerialMonitor.java
@@ -139,9 +139,12 @@ public void actionPerformed(ActionEvent event) {
         Preferences.set("serial.debug_rate", rateString);
         closeSerialPort();
         try {
+          Thread.sleep(100); // Wait for serial port to properly close
           openSerialPort();
         } catch (SerialException e) {
           System.err.println(e);
+        } catch (InterruptedException e) {
+          e.printStackTrace();
         }
       }});
       
diff --git a/app/src/processing/app/debug/BasicUploader.java b/app/src/processing/app/debug/BasicUploader.java
@@ -126,24 +126,32 @@ public boolean uploadUsingPreferences(String buildPath, String className,
       throw new RunnerException(e);
     }
     
-    // For Leonardo wait until the bootloader serial port disconnects and the
-    // sketch serial port reconnects (or timeout after a few seconds if the
-    // sketch port never comes back). Doing this saves users from accidentally
-    // opening Serial Monitor on the soon-to-be-orphaned bootloader port.
+    // Remove the magic baud rate (1200bps) to avoid
+    // future unwanted board resets
     try {
-      if (uploadResult && waitForUploadPort) {
-        Thread.sleep(500);
-        long timeout = System.currentTimeMillis() + 2000;
-        while (timeout > System.currentTimeMillis()) {
-          List<String> portList = Serial.list();
-          String uploadPort = Preferences.get("serial.port");
-          if (portList.contains(Preferences.get("serial.port"))) {
-            // Remove the magic baud rate (1200bps) to avoid 
-            // future unwanted board resets
-            Serial.touchPort(uploadPort, 9600);
-            break;
+      if (uploadResult && doTouch) {
+        String uploadPort = Preferences.get("serial.port");
+        if (waitForUploadPort) {
+          // For Due/Leonardo wait until the bootloader serial port disconnects and the
+          // sketch serial port reconnects (or timeout after a few seconds if the
+          // sketch port never comes back). Doing this saves users from accidentally
+          // opening Serial Monitor on the soon-to-be-orphaned bootloader port.
+          Thread.sleep(500);
+          long timeout = System.currentTimeMillis() + 2000;
+          while (timeout > System.currentTimeMillis()) {
+            List<String> portList = Serial.list();
+            if (portList.contains(uploadPort)) {
+              try {
+                Serial.touchPort(uploadPort, 9600);
+                break;
+              } catch (SerialException e) {
+                // Port already in use
+              }
+            }
+            Thread.sleep(250);
           }
-          Thread.sleep(100);
+        } else {
+          Serial.touchPort(uploadPort, 9600);
         }
       }
     } catch (InterruptedException ex) {
diff --git a/todo.txt b/todo.txt
@@ -1,4 +1,4 @@
-0101 arduino
+0150 arduino
 
 Fix Linux make.sh, etc. scripts
 Test on Linux.

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-0101 arduino`
	`1`	`+0150 arduino`
`2`	`2`
`3`	`3`	`Fix Linux make.sh, etc. scripts`
`4`	`4`	`Test on Linux.`