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

* 'master' of https://github.com/arduino/Arduino:
  Corrected repeated 'less' in checkName's message
  Removed unused code, fixed indentation.
  Local (user installed) libraries have priority over system libraries
  Update README.md
  Added license for Client, IPAddressm and Server (master branch)
  Added license for Arduino.h, binary.h and main.cpp (master branch)
  Added some friendly messages for Arduino Robot include errors on old sketches
  Revert "Changed pins definition in variants from constants to #defines."
  Fixed issue arduino#1478, arduino#1599, arduino#1709, motors being opposite, updated turning algorithm
  If 2 libs have same .h file, use the lib with same dir name
  WiFi Shield examples: added the firmware version check
  Updated Listfiles SD example
  Rename README.mkdn to README.md
  Update and rename readme.txt to README.mkdn
  Update readme.txt
  Minor changes to Communication Examples

Author: oriregev

readme.txt renamed to README.md

@@ -1,39 +1,44 @@
-Arduino is an open-source physical computing platform based on a simple i/o
+Arduino
+========
+
+* Arduino is an open-source physical computing platform based on a simple i/o
 board and a development environment that implements the Processing/Wiring
 language. Arduino can be used to develop stand-alone interactive objects or
 can be connected to software on your computer (e.g. Flash, Processing, MaxMSP).
 The boards can be assembled by hand or purchased preassembled; the open-source
 IDE can be downloaded for free.
 
-For more information, see the website at: http://www.arduino.cc/
+* For more information, see the website at: http://www.arduino.cc/
 or the forums at: http://arduino.cc/forum/
 
-To report a *bug* in the software or to request *a simple enhancement* go to:
+* To report a *bug* in the software or to request *a simple enhancement* go to:
 http://github.com/arduino/Arduino/issues
 
-More complex requests and technical discussion should go on the Arduino Developers
+* More complex requests and technical discussion should go on the Arduino Developers
 mailing list:
 https://groups.google.com/a/arduino.cc/forum/#!forum/developers
 
-If you're interested in modifying or extending the Arduino software, we strongly 
+* If you're interested in modifying or extending the Arduino software, we strongly 
 suggest discussing your ideas on the Developers mailing list *before* starting
 to work on them. That way you can coordinate with the Arduino Team and others,
 giving your work a higher chance of being integrated into the official release
 https://groups.google.com/a/arduino.cc/forum/#!forum/developers
 
-INSTALLATION
+Installation
+------------
 Detailed instructions are in reference/Guide_Windows.html and
 reference/Guide_MacOSX.html.  For Linux, see the Arduino playground:
 http://www.arduino.cc/playground/Learning/Linux
 
-CREDITS
+Credits
+--------
 Arduino is an open source project, supported by many.
 
 The Arduino team is composed of Massimo Banzi, David Cuartielles, Tom Igoe,
 Gianluca Martino, Daniela Antonietti, and David A. Mellis.
 
-Arduino uses the GNU avr-gcc toolchain, avrdude, avr-libc, and code from
-Processing and Wiring.
+Arduino uses the [GNU avr-gcc toolchain](http://gcc.gnu.org/wiki/avr-gcc), [avrdude](http://www.nongnu.org/avrdude/), [avr-libc](http://www.nongnu.org/avr-libc/), and code from
+[Processing](http://www.processing.org) and [Wiring](http://wiring.org.co).
 
 Icon and about image designed by ToDo: http://www.todo.to.it/
 

app/src/processing/app/Base.java

@@ -1211,62 +1211,51 @@ public void actionPerformed(ActionEvent event) {
     boolean ifound = false;
 
     for (String potentialName : list) {
-      File subfolder = new File(folder, potentialName);
-//      File libraryFolder = new File(subfolder, "library");
-//      File libraryJar = new File(libraryFolder, potentialName + ".jar");
-//      // If a .jar file of the same prefix as the folder exists
-//      // inside the 'library' subfolder of the sketch
-//      if (libraryJar.exists()) {
-        String sanityCheck = Sketch.sanitizeName(potentialName);
-        if (!sanityCheck.equals(potentialName)) {
-          String mess = I18n.format(
-            _("The library \"{0}\" cannot be used.\n" +
-              "Library names must contain only basic letters and numbers.\n" +
-              "(ASCII only and no spaces, and it cannot start with a number)"),
-	    potentialName
-	  );
-          Base.showMessage(_("Ignoring bad library name"), mess);
-          continue;
-        }
+      File libFolder = new File(folder, potentialName);
+      String sanityCheck = Sketch.sanitizeName(potentialName);
+      if (!sanityCheck.equals(potentialName)) {
+        String mess = I18n.format(_("The library \"{0}\" cannot be used.\n"
+            + "Library names must contain only basic letters and numbers.\n"
+            + "(ASCII only and no spaces, and it cannot start with a number)"),
+            potentialName);
+        Base.showMessage(_("Ignoring bad library name"), mess);
+        continue;
+      }
 
-        String libraryName = potentialName;
-//        // get the path for all .jar files in this code folder
-//        String libraryClassPath =
-//          Compiler.contentsToClassPath(libraryFolder);
-//        // grab all jars and classes from this folder,
-//        // and append them to the library classpath
-//        librariesClassPath +=
-//          File.pathSeparatorChar + libraryClassPath;
-//        // need to associate each import with a library folder
-//        String packages[] =
-//          Compiler.packageListFromClassPath(libraryClassPath);
-        libraries.add(subfolder);
+      String libraryName = potentialName;
+      libraries.add(libFolder);
+      String libFolderPath = libFolder.getAbsolutePath();
       try {
-        String packages[] =
-          Compiler.headerListFromIncludePath(subfolder.getAbsolutePath());
-        for (String pkg : packages) {
-          importToLibraryTable.put(pkg, subfolder);
+        String headers[] = Compiler.headerListFromIncludePath(libFolderPath);
+        for (String header : headers) {
+          // Extract file name (without extension ".h")
+          String name = header.substring(0, header.length() - 2);
+
+          // If the header name equals to the current library folder use it
+          if (libFolderPath.endsWith(name)) {
+            importToLibraryTable.put(header, libFolder);
+            continue;
+          }
+
+          // If a library was already found with this header, keep it if
+          // the library's directory name matches the header name.
+          File old = importToLibraryTable.get(header);
+          if (old != null) {
+            if (old.getPath().endsWith(name))
+              continue;
+          }
+          importToLibraryTable.put(header, libFolder);
         }
       } catch (IOException e) {
-        showWarning(_("Error"), I18n.format("Unable to list header files in {0}", subfolder), e);
+        showWarning(_("Error"), I18n.format(
+            "Unable to list header files in {0}", libFolder), e);
       }
 
-        JMenuItem item = new JMenuItem(libraryName);
-        item.addActionListener(listener);
-        item.setActionCommand(subfolder.getAbsolutePath());
-        menu.add(item);
-        ifound = true;
-
-// XXX: DAM: should recurse here so that library folders can be nested
-//      } else {  // not a library, but is still a folder, so recurse
-//        JMenu submenu = new JMenu(libraryName);
-//        // needs to be separate var, otherwise would set ifound to false
-//        boolean found = addLibraries(submenu, subfolder);
-//        if (found) {
-//          menu.add(submenu);
-//          ifound = true;
-//        }
-//      }
+      JMenuItem item = new JMenuItem(libraryName);
+      item.addActionListener(listener);
+      item.setActionCommand(libFolderPath);
+      menu.add(item);
+      ifound = true;
     }
     return ifound;
   }

app/src/processing/app/Sketch.java

@@ -2024,7 +2024,7 @@ static public String checkName(String origName) {
       String msg =
         _("The sketch name had to be modified. Sketch names can only consist\n" +
           "of ASCII characters and numbers (but cannot start with a number).\n" +
-          "They should also be less less than 64 characters long.");
+          "They should also be less than 64 characters long.");
       System.out.println(msg);
     }
     return newName;

app/src/processing/app/debug/Compiler.java

@@ -536,6 +536,18 @@ public void message(String s) {
       }      
     }
 
+		if (s.contains("undefined reference to `SPIClass::begin()'")
+				&& s.contains("libraries/Robot_Control")) {
+			String error = _("Please import the SPI library from the Sketch > Import Library menu.");
+			exception = new RunnerException(error);
+		}
+    
+		if (s.contains("undefined reference to `Wire'")
+				&& s.contains("libraries/Robot_Control")) {
+			String error = _("Please import the Wire library from the Sketch > Import Library menu.");
+			exception = new RunnerException(error);
+		}
+		
     System.err.print(s);
   }
 

build/shared/examples/04.Communication/Dimmer/Dimmer.ino

@@ -55,6 +55,7 @@ void loop() {
  size(256, 150);
  
  println("Available serial ports:");
+ // if using Processing 2.1 or later, use Serial.printArray()
  println(Serial.list());
  
  // Uses the first port in this list (number 0).  Change this to

build/shared/examples/04.Communication/Graph/Graph.ino

@@ -63,13 +63,17 @@ void loop() {
  size(400, 300);        
  
  // List all the available serial ports
+ // if using Processing 2.1 or later, use Serial.printArray()
  println(Serial.list());
+ 
  // I know that the first port in the serial list on my mac
  // is always my  Arduino, so I open Serial.list()[0].
  // Open whatever port is the one you're using.
  myPort = new Serial(this, Serial.list()[0], 9600);
+ 
  // don't generate a serialEvent() unless you get a newline character:
  myPort.bufferUntil('\n');
+ 
  // set inital background:
  background(0);
  }

build/shared/examples/04.Communication/PhysicalPixel/PhysicalPixel.ino

@@ -84,6 +84,7 @@ void loop() {
  // You will need to choose the port that the Arduino board is 
  // connected to from this list. The first port in the list is 
  // port #0 and the third port in the list is port #2. 
+ // if using Processing 2.1 or later, use Serial.printArray()
  println(Serial.list()); 
  
  // Open the port that the Arduino board is connected to (in this case #0) 

build/shared/examples/04.Communication/SerialCallResponse/SerialCallResponse.ino

@@ -92,7 +92,8 @@ void setup() {
   xpos = width/2;
   ypos = height/2;
 
-  // Print a list of the serial ports, for debugging purposes:
+  // Print a list of the serial ports for debugging purposes
+  // if using Processing 2.1 or later, use Serial.printArray()
   println(Serial.list());
 
   // I know that the first port in the serial list on my mac

build/shared/examples/04.Communication/SerialCallResponseASCII/SerialCallResponseASCII.ino

@@ -91,6 +91,7 @@ void setup() {
   size(640,480);
 
   // List all the available serial ports
+ // if using Processing 2.1 or later, use Serial.printArray()
   println(Serial.list());
 
   // I know that the first port in the serial list on my mac

build/shared/examples/04.Communication/VirtualColorMixer/VirtualColorMixer.ino

@@ -50,7 +50,9 @@ void loop()
  size(200, 200);
  
  // List all the available serial ports
+ // if using Processing 2.1 or later, use Serial.printArray()
  println(Serial.list());
+ 
  // I know that the first port in the serial list on my mac
  // is always my  Arduino, so I open Serial.list()[0].
  // Open whatever port is the one you're using.

hardware/arduino/cores/arduino/Arduino.h

@@ -1,3 +1,22 @@
+/*
+  Arduino.h - Main include file for the Arduino SDK
+  Copyright (c) 2005-2013 Arduino Team.  All right reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
 #ifndef Arduino_h
 #define Arduino_h
 

hardware/arduino/cores/arduino/Client.h

@@ -1,3 +1,22 @@
+/*
+  Client.h - Base class that provides Client
+  Copyright (c) 2011 Adrian McEwen.  All right reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
 #ifndef client_h
 #define client_h
 #include "Print.h"

hardware/arduino/cores/arduino/IPAddress.cpp

@@ -1,3 +1,21 @@
+/*
+  IPAddress.cpp - Base class that provides IPAddress
+  Copyright (c) 2011 Adrian McEwen.  All right reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
 #include <Arduino.h>
 #include <IPAddress.h>

hardware/arduino/cores/arduino/IPAddress.h

@@ -1,27 +1,21 @@
 /*
- *
- * MIT License:
- * Copyright (c) 2011 Adrian McEwen
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * [email protected] 1/1/2011
- */
+  IPAddress.h - Base class that provides IPAddress
+  Copyright (c) 2011 Adrian McEwen.  All right reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
 #ifndef IPAddress_h
 #define IPAddress_h

hardware/arduino/cores/arduino/Server.h

@@ -1,3 +1,22 @@
+/*
+  Server.h - Base class that provides Server
+  Copyright (c) 2011 Adrian McEwen.  All right reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
 #ifndef server_h
 #define server_h