Merge remote-tracking branch 'arduino/master' into ide-1.5.x

Author: Federico Fissore

app/src/processing/app/Base.java

@@ -1187,6 +1187,7 @@ public void actionPerformed(ActionEvent actionevent) {
           Action subAction = new AbstractAction(_(boardCustomMenu.get(customMenuOption))) {
             public void actionPerformed(ActionEvent e) {
               Preferences.set("custom_" + menuId, ((TargetBoard)getValue("board")).getId() + "_" + getValue("custom_menu_option"));
+              onBoardOrPortChange();
             }
           };
           subAction.putValue("board", board);

app/src/processing/app/Editor.java

@@ -26,6 +26,7 @@
 
 import com.jcraft.jsch.JSchException;
 
+import jssc.SerialPortException;
 import processing.app.debug.*;
 import processing.app.forms.PasswordAuthorizationDialog;
 import processing.app.helpers.OSUtils;
@@ -2572,6 +2573,12 @@ public void handleSerial() {
         statusError(_("Unable to connect: is the sketch using the bridge?"));
       } catch (JSchException e) {
         statusError(_("Unable to connect: wrong password?"));
+      } catch (SerialException e) {
+        String errorMessage = e.getMessage();
+        if (e.getCause() != null && e.getCause() instanceof SerialPortException) {
+          errorMessage += " (" + ((SerialPortException) e.getCause()).getExceptionType() + ")";
+        }
+        statusError(errorMessage);
       } catch (Exception e) {
         statusError(e);
       } finally {

arduino-core/src/cc/arduino/packages/discoverers/NetworkDiscovery.java

@@ -58,19 +58,32 @@ public NetworkDiscovery() {
 
   @Override
   public List<BoardPort> discovery() {
-    List<BoardPort> ports = clonePortsList();
-    Iterator<BoardPort> iterator = ports.iterator();
-    while (iterator.hasNext()) {
+    List<BoardPort> boardPorts = clonePortsList();
+    Iterator<BoardPort> boardPortIterator = boardPorts.iterator();
+    while (boardPortIterator.hasNext()) {
       try {
-        BoardPort board = iterator.next();
-        if (!NetUtils.isReachable(InetAddress.getByName(board.getAddress()), Integer.parseInt(board.getPrefs().get("port")))) {
-          iterator.remove();
+        BoardPort board = boardPortIterator.next();
+
+        InetAddress inetAddress = InetAddress.getByName(board.getAddress());
+        int broadcastedPort = Integer.valueOf(board.getPrefs().get("port"));
+
+        List<Integer> ports = new LinkedList<Integer>();
+        ports.add(broadcastedPort);
+
+        //dirty code: allows non up to date yuns to be discovered. Newer yuns will broadcast port 22
+        if (broadcastedPort == 80) {
+          ports.add(0, 22);
+        }
+
+        boolean reachable = NetUtils.isReachable(inetAddress, ports);
+        if (!reachable) {
+          boardPortIterator.remove();
         }
       } catch (UnknownHostException e) {
-        iterator.remove();
+        boardPortIterator.remove();
       }
     }
-    return ports;
+    return boardPorts;
   }
 
   private List<BoardPort> clonePortsList() {

arduino-core/src/processing/app/BaseNoGui.java

@@ -37,9 +37,9 @@
 public class BaseNoGui {
 
   /** Version string to be used for build */
-  public static final int REVISION = 10600;
+  public static final int REVISION = 10601;
   /** Extended version string displayed on GUI */
-  static String VERSION_NAME = "1.6.0";
+  static String VERSION_NAME = "1.6.1";
 
   static File buildFolder;
 

arduino-core/src/processing/app/helpers/NetUtils.java

@@ -4,14 +4,41 @@
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.Socket;
+import java.util.Arrays;
+import java.util.List;
 
 public abstract class NetUtils {
 
+  private static boolean isReachableByEcho(InetAddress address) {
+    try {
+      return address.isReachable(100);
+    } catch (IOException e) {
+      return false;
+    }
+  }
+
   public static boolean isReachable(InetAddress address, int port) {
+    return isReachable(address, Arrays.asList(port));
+  }
+
+  public static boolean isReachable(InetAddress address, List<Integer> ports) {
+    if (isReachableByEcho(address)) {
+      return true;
+    }
+
+    boolean reachable = false;
+    for (Integer port : ports) {
+      reachable = reachable || isPortOpen(address, port);
+    }
+
+    return reachable;
+  }
+
+  private static boolean isPortOpen(InetAddress address, int port) {
     Socket socket = null;
     try {
       socket = new Socket();
-      socket.connect(new InetSocketAddress(address, port), 100);
+      socket.connect(new InetSocketAddress(address, port), 300);
       return true;
     } catch (IOException e) {
       return false;

build/shared/revisions.txt

@@ -1,4 +1,14 @@
 
+ARDUINO 1.6.1
+
+[ide]
+* Improved Yun detection for upload via network (Ron Guest)
+* In platforms.txt "objcopy" recipe is no more tied to the "hex" format (Arnav Gupta)
+* /dev/cu.* serial ports are now filtered from the port list on MacOSX
+* Ports in ports list are now grouped by type
+* Upgraded avr-gcc toolchains to 3.4.5
+* Fixed wrong parsing of boards.txt when using submenu and boards id with underscores
+
 ARDUINO 1.6.0 - 2015.02.09
 
 [ide]

hardware/arduino/avr/platform.txt

@@ -6,7 +6,7 @@
 # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
 
 name=Arduino AVR Boards
-version=1.6.0
+version=1.6.1
 
 # AVR compile variables
 # --------------------- 

hardware/arduino/sam/platform.txt

@@ -5,7 +5,7 @@
 # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
 
 name=Arduino ARM (32-bits) Boards
-version=1.6.0
+version=1.6.1
 
 # SAM3 compile variables
 # ----------------------

libraries/Bridge/examples/Bridge/Bridge.ino

@@ -26,8 +26,8 @@
 #include <YunServer.h>
 #include <YunClient.h>
 
-// Listen on default port 5555, the webserver on the Yún
-// will forward there all the HTTP requests for us.
+// Listen to the default port 5555, the Yún webserver
+// will forward there all the HTTP requests you send
 YunServer server;
 
 void setup() {

libraries/Ethernet/src/EthernetClient.h

@@ -24,6 +24,8 @@ class EthernetClient : public Client {
   virtual void stop();
   virtual uint8_t connected();
   virtual operator bool();
+  virtual bool operator==(const bool value) { return bool() == value; }
+  virtual bool operator!=(const bool value) { return bool() != value; }
   virtual bool operator==(const EthernetClient&);
   virtual bool operator!=(const EthernetClient& rhs) { return !this->operator==(rhs); };