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

README.md

@@ -1,32 +1,37 @@
-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
+------------
 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
+--------
 Arduino is an open source project, supported by many.
 
 The Arduino team is composed of Massimo Banzi, David Cuartielles, Tom Igoe,

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

@@ -78,18 +78,19 @@ void loop() {
  size(200, 200);
  boxX = width/2.0;
  boxY = height/2.0;
- rectMode(RADIUS);
-
- // List all the available serial ports in the output pane.
- // 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.
- println(Serial.list());
-
- // Open the port that the Arduino board is connected to (in this case #0)
- // Make sure to open the port at the same speed Arduino is using (9600bps)
- port = new Serial(this, Serial.list()[0], 9600);
-
+ rectMode(RADIUS); 
+ 
+ // List all the available serial ports in the output pane. 
+ // 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) 
+ // Make sure to open the port at the same speed Arduino is using (9600bps) 
+ port = new Serial(this, Serial.list()[0], 9600); 
+ 
  }
 
  void draw()

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.

libraries/SD/examples/listfiles/listfiles.ino

@@ -15,7 +15,9 @@
  by David A. Mellis
  modified 9 Apr 2012
  by Tom Igoe
-
+ modified 2 Feb 2014
+ by Scott Fitzgerald
+ 
  This example code is in the public domain.
 
  */
@@ -39,7 +41,7 @@ void setup()
   // or the SD library functions will not work.
   pinMode(10, OUTPUT);
 
-  if (!SD.begin(10)) {
+  if (!SD.begin(4)) {
     Serial.println("initialization failed!");
     return;
   }