Skip to content

Commit 793b139

Browse files
committed
Merge remote-tracking branch 'arduino/master' into ide-1.5.x
2 parents b6fa3c7 + b415903 commit 793b139

File tree

8 files changed

+37
-20
lines changed

8 files changed

+37
-20
lines changed

readme.txt renamed to README.md

+10-5
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,37 @@
1-
Arduino is an open-source physical computing platform based on a simple i/o
1+
Arduino
2+
========
3+
4+
* Arduino is an open-source physical computing platform based on a simple i/o
25
board and a development environment that implements the Processing/Wiring
36
language. Arduino can be used to develop stand-alone interactive objects or
47
can be connected to software on your computer (e.g. Flash, Processing, MaxMSP).
58
The boards can be assembled by hand or purchased preassembled; the open-source
69
IDE can be downloaded for free.
710

8-
For more information, see the website at: http://www.arduino.cc/
11+
* For more information, see the website at: http://www.arduino.cc/
912
or the forums at: http://arduino.cc/forum/
1013

11-
To report a *bug* in the software or to request *a simple enhancement* go to:
14+
* To report a *bug* in the software or to request *a simple enhancement* go to:
1215
http://github.com/arduino/Arduino/issues
1316

14-
More complex requests and technical discussion should go on the Arduino Developers
17+
* More complex requests and technical discussion should go on the Arduino Developers
1518
mailing list:
1619
https://groups.google.com/a/arduino.cc/forum/#!forum/developers
1720

18-
If you're interested in modifying or extending the Arduino software, we strongly
21+
* If you're interested in modifying or extending the Arduino software, we strongly
1922
suggest discussing your ideas on the Developers mailing list *before* starting
2023
to work on them. That way you can coordinate with the Arduino Team and others,
2124
giving your work a higher chance of being integrated into the official release
2225
https://groups.google.com/a/arduino.cc/forum/#!forum/developers
2326

2427
INSTALLATION
28+
------------
2529
Detailed instructions are in reference/Guide_Windows.html and
2630
reference/Guide_MacOSX.html. For Linux, see the Arduino playground:
2731
http://www.arduino.cc/playground/Learning/Linux
2832

2933
CREDITS
34+
--------
3035
Arduino is an open source project, supported by many.
3136

3237
The Arduino team is composed of Massimo Banzi, David Cuartielles, Tom Igoe,

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

+1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ void loop() {
5555
size(256, 150);
5656
5757
println("Available serial ports:");
58+
// if using Processing 2.1 or later, use Serial.printArray()
5859
println(Serial.list());
5960
6061
// Uses the first port in this list (number 0). Change this to

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

+4
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,17 @@ void loop() {
6363
size(400, 300);
6464
6565
// List all the available serial ports
66+
// if using Processing 2.1 or later, use Serial.printArray()
6667
println(Serial.list());
68+
6769
// I know that the first port in the serial list on my mac
6870
// is always my Arduino, so I open Serial.list()[0].
6971
// Open whatever port is the one you're using.
7072
myPort = new Serial(this, Serial.list()[0], 9600);
73+
7174
// don't generate a serialEvent() unless you get a newline character:
7275
myPort.bufferUntil('\n');
76+
7377
// set inital background:
7478
background(0);
7579
}

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

+13-12
Original file line numberDiff line numberDiff line change
@@ -78,18 +78,19 @@ void loop() {
7878
size(200, 200);
7979
boxX = width/2.0;
8080
boxY = height/2.0;
81-
rectMode(RADIUS);
82-
83-
// List all the available serial ports in the output pane.
84-
// You will need to choose the port that the Arduino board is
85-
// connected to from this list. The first port in the list is
86-
// port #0 and the third port in the list is port #2.
87-
println(Serial.list());
88-
89-
// Open the port that the Arduino board is connected to (in this case #0)
90-
// Make sure to open the port at the same speed Arduino is using (9600bps)
91-
port = new Serial(this, Serial.list()[0], 9600);
92-
81+
rectMode(RADIUS);
82+
83+
// List all the available serial ports in the output pane.
84+
// You will need to choose the port that the Arduino board is
85+
// connected to from this list. The first port in the list is
86+
// port #0 and the third port in the list is port #2.
87+
// if using Processing 2.1 or later, use Serial.printArray()
88+
println(Serial.list());
89+
90+
// Open the port that the Arduino board is connected to (in this case #0)
91+
// Make sure to open the port at the same speed Arduino is using (9600bps)
92+
port = new Serial(this, Serial.list()[0], 9600);
93+
9394
}
9495
9596
void draw()

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ void setup() {
9292
xpos = width/2;
9393
ypos = height/2;
9494
95-
// Print a list of the serial ports, for debugging purposes:
95+
// Print a list of the serial ports for debugging purposes
96+
// if using Processing 2.1 or later, use Serial.printArray()
9697
println(Serial.list());
9798
9899
// I know that the first port in the serial list on my mac

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

+1
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ void setup() {
9191
size(640,480);
9292
9393
// List all the available serial ports
94+
// if using Processing 2.1 or later, use Serial.printArray()
9495
println(Serial.list());
9596
9697
// I know that the first port in the serial list on my mac

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

+2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ void loop()
5050
size(200, 200);
5151
5252
// List all the available serial ports
53+
// if using Processing 2.1 or later, use Serial.printArray()
5354
println(Serial.list());
55+
5456
// I know that the first port in the serial list on my mac
5557
// is always my Arduino, so I open Serial.list()[0].
5658
// Open whatever port is the one you're using.

libraries/SD/examples/listfiles/listfiles.ino

+4-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
by David A. Mellis
1616
modified 9 Apr 2012
1717
by Tom Igoe
18-
18+
modified 2 Feb 2014
19+
by Scott Fitzgerald
20+
1921
This example code is in the public domain.
2022
2123
*/
@@ -39,7 +41,7 @@ void setup()
3941
// or the SD library functions will not work.
4042
pinMode(10, OUTPUT);
4143

42-
if (!SD.begin(10)) {
44+
if (!SD.begin(4)) {
4345
Serial.println("initialization failed!");
4446
return;
4547
}

0 commit comments

Comments
 (0)