Manual merge

Author: Federico Fissore

.gitignore

@@ -35,4 +35,3 @@ test-bin
 .DS_Store
 hardware/arduino/avr/libraries/Bridge/examples/XivelyClient/passwords.h
 avr-toolchain-*.zip
-

app/src/cc/arduino/packages/uploaders/SerialUploader.java

@@ -125,8 +125,6 @@ public boolean uploadUsingPreferences(File sourcePath, String buildPath, String
       throw new RunnerException(e);
     }
 
-    // Remove the magic baud rate (1200bps) to avoid
-    // future unwanted board resets
     try {
       if (uploadResult && doTouch) {
         String uploadPort = Preferences.get("serial.port");
@@ -136,25 +134,13 @@ public boolean uploadUsingPreferences(File sourcePath, String buildPath, String
           // sketch port never comes back). Doing this saves users from accidentally
           // opening Serial Monitor on the soon-to-be-orphaned bootloader port.
           Thread.sleep(1000);
-          long timeout = System.currentTimeMillis() + 2000;
-          while (timeout > System.currentTimeMillis()) {
+          long started = System.currentTimeMillis();
+          while (System.currentTimeMillis() - started < 2000) {
             List<String> portList = Serial.list();
-            if (portList.contains(uploadPort)) {
-              try {
-                Serial.touchPort(uploadPort, 9600);
-                break;
-              } catch (SerialException e) {
-                // Port already in use
-              }
-            }
+            if (portList.contains(uploadPort))
+              break;
             Thread.sleep(250);
           }
-        } else {
-          try {
-            Serial.touchPort(uploadPort, 9600);
-          } catch (SerialException e) {
-            throw new RunnerException(e);
-          }
         }
       }
     } catch (InterruptedException ex) {

app/src/processing/app/Sketch.java

@@ -2066,9 +2066,10 @@ static public String sanitizeName(String origName) {
     for (int i = 0; i < c.length; i++) {
       if (((c[i] >= '0') && (c[i] <= '9')) ||
           ((c[i] >= 'a') && (c[i] <= 'z')) ||
-          ((c[i] >= 'A') && (c[i] <= 'Z'))) {
+          ((c[i] >= 'A') && (c[i] <= 'Z')) ||
+          ((i > 0) && (c[i] == '-')) ||
+          ((i > 0) && (c[i] == '.'))) {
         buffer.append(c[i]);
-
       } else {
         buffer.append('_');
       }

app/src/processing/app/SketchCode.java

@@ -87,7 +87,7 @@ public SketchCode(File file, String extension) {
 
   protected void makePrettyName() {
     prettyName = file.getName();
-    int dot = prettyName.indexOf('.');
+    int dot = prettyName.lastIndexOf('.');
     prettyName = prettyName.substring(0, dot);
   }
 

app/src/processing/app/packages/Library.java

@@ -65,7 +65,8 @@ private static Library createLibrary(File libFolder) throws IOException {
 
     // Compatibility with 1.5 rev.1 libraries:
     // "email" field changed to "maintainer"
-    if (!properties.containsKey("maintainer"))
+    if (!properties.containsKey("maintainer") &&
+        properties.containsKey("email"))
       properties.put("maintainer", properties.get("email"));
 
     // Compatibility with 1.5 rev.1 libraries:
@@ -121,8 +122,11 @@ private static Library createLibrary(File libFolder) throws IOException {
     String category = properties.get("category");
     if (category == null)
       category = "Uncategorized";
-    if (!CATEGORIES.contains(category))
+    if (!CATEGORIES.contains(category)) {
       category = "Uncategorized";
+      System.out.println("WARNING: Category '" + category + "' in library " +
+          properties.get("name") + " is not valid. Setting to 'Uncategorized'");
+    }
 
     String license = properties.get("license");
     if (license == null)

build/build.xml

@@ -37,6 +37,9 @@
     <equals arg1="${platform}" arg2="linux64"/>
   </condition>
 
+  <condition property="launch4j-download-unpack-target-name" value="launch4j-windows"><os family="windows" /></condition>
+  <property name="launch4j-download-unpack-target-name" value="launch4j-linux"/>
+
   <!-- Libraries required for running arduino -->
   <fileset dir=".." id="runtime.jars">
     <include name="core/core.jar" />

libraries/Esplora/examples/Beginners/EsploraJoystickMouse/EsploraJoystickMouse.ino

@@ -17,6 +17,10 @@
 
  Created on 22 Dec 2012
  by Tom Igoe
+ Updated 8 March 2014
+ by Scott Fitzgerald
+ 
+ http://arduino.cc/en/Reference/EsploraReadJoystickSwitch
 
  This example is in the public domain.
  */
@@ -41,10 +45,16 @@ void loop()
   Serial.print("\tButton: ");                  // print a tab character and a label for the button
   Serial.print(button);                        // print the button value
 
-  int mouseX = map( xValue, -512, 512, 10, -10); // map the X value to a range of movement for the mouse X
-  int mouseY = map( yValue, -512, 512, -10, 10); // map the Y value to a range of movement for the mouse Y
+  int mouseX = map(xValue, -512, 512, 10, -10);  // map the X value to a range of movement for the mouse X
+  int mouseY = map(yValue, -512, 512, -10, 10);  // map the Y value to a range of movement for the mouse Y
   Mouse.move(mouseX, mouseY, 0);                 // move the mouse
 
+  if (button == 0) {                           // if the joystick button is pressed
+    Mouse.press();                             // send a mouse click
+  } else {
+    Mouse.release();                           // if it's not pressed, release the mouse button 
+  }
+
   delay(10);                                  // a short delay before moving again
 }