1
0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-16 11:21:18 +03:00

Merge branch 'new-extension' of https://github.com/arduino/Arduino into new-extension

Conflicts:
	build/macosx/dist/tools-universal.zip
	build/windows/avr_tools.zip
	hardware/arduino/cores/arduino/HardwareSerial.cpp
This commit is contained in:
Zach Eveland
2011-09-05 12:53:45 -04:00
175 changed files with 630 additions and 4538 deletions

View File

@ -228,9 +228,7 @@
</exec>
<copy todir="macosx/working_dir">
<fileset dir="macosx/work">
<exclude name="**/ArduinoTestSuite/**" />
</fileset>
<fileset dir="macosx/work" />
</copy>
<!-- The ant copy command does not preserve permissions. -->

Binary file not shown.

View File

@ -7,11 +7,11 @@
<!-- all these need to change for new releases -->
<key>CFBundleGetInfoString</key>
<string>1.0-beta2</string>
<string>1.0-beta3</string>
<key>CFBundleVersion</key>
<string>0100</string>
<key>CFBundleShortVersionString</key>
<string>1.0-beta2</string>
<string>1.0-beta3</string>
<!-- now stop changing things and get outta here -->
<key>CFBundleAllowMixedLocalizations</key>

View File

@ -11,5 +11,5 @@ void setup() {
void loop() {
int sensorValue = analogRead(A0);
Serial.println(sensorValue, DEC);
Serial.println(sensorValue);
}

View File

@ -12,7 +12,7 @@ void setup() {
void loop() {
int sensorValue = digitalRead(2);
Serial.println(sensorValue, DEC);
Serial.println(sensorValue);
}

View File

@ -16,7 +16,7 @@
created 2005
by DojoDave <http://www.0j0.org>
modified 28 Oct 2010
modified 30 Aug 2011
by Tom Igoe
This example code is in the public domain.

View File

@ -17,7 +17,7 @@
created 21 November 2006
by David A. Mellis
modified 3 Jul 2009
modified 30 Aug 2011
by Limor Fried
This example code is in the public domain.

View File

@ -16,7 +16,7 @@
most Arduino boards)
created 27 Sep 2005
modified 14 Oct 2010
modified 30 Aug 2011
by Tom Igoe
This example code is in the public domain.
@ -57,7 +57,7 @@ void loop() {
buttonPushCounter++;
Serial.println("on");
Serial.print("number of button pushes: ");
Serial.println(buttonPushCounter, DEC);
Serial.println(buttonPushCounter);
}
else {
// if the current state is LOW then the button

View File

@ -9,7 +9,7 @@
* 8-ohm speaker on digital pin 8
created 21 Jan 2010
Modified 4 Sep 2010
modified 30 Aug 2011
by Tom Igoe
This example code is in the public domain.

View File

@ -7,7 +7,7 @@
* 8-ohm speaker on digital pin 8
created 21 Jan 2010
modified 14 Oct 2010
modified 30 Aug 2011
by Tom Igoe
This example code is in the public domain.

View File

@ -9,7 +9,7 @@
* 4.7K resistor on analog 0 to ground
created 21 Jan 2010
Modified 4 Sep 2010
modified 30 Aug 2011
by Tom Igoe
This example code is in the public domain.

View File

@ -12,7 +12,7 @@
* LED connected from digital pin 9 to ground
created 29 Dec. 2008
Modified 4 Sep 2010
modified 30 Aug 2011
by Tom Igoe
This example code is in the public domain.

View File

@ -18,7 +18,7 @@
Created by David Cuartielles
Modified 4 Sep 2010
modified 30 Aug 2011
By Tom Igoe
This example code is in the public domain.

View File

@ -17,7 +17,7 @@
created 29 Oct 2008
By David A Mellis
Modified 4 Sep 2010
modified 30 Aug 2011
By Tom Igoe
http://arduino.cc/en/Tutorial/Calibration

View File

@ -8,7 +8,7 @@
Created 1 Nov 2008
By David A. Mellis
Modified 17 June 2009
modified 30 Aug 2011
By Tom Igoe
http://arduino.cc/en/Tutorial/Fading

View File

@ -10,6 +10,7 @@
* Analog sensor (potentiometer will do) attached to analog input 0
Created 22 April 2007
modified 30 Aug 2011
By David A. Mellis <dam@mellis.org>
http://www.arduino.cc/en/Tutorial/Smoothing
@ -59,8 +60,8 @@ void loop() {
// calculate the average:
average = total / numReadings;
// send it to the computer (as ASCII digits)
Serial.println(average, DEC);
// send it to the computer as ASCII digits
Serial.println(average);
}

View File

@ -11,7 +11,7 @@
created 2006
by Nicholas Zambetti
modified 18 Jan 2009
modified 30 Aug 2011
by Tom Igoe
This example code is in the public domain.

View File

@ -12,7 +12,7 @@
created 2006
by David A. Mellis
modified 14 Apr 2009
modified 30 Aug 2011
by Tom Igoe and Scott Fitzgerald
This example code is in the public domain.

View File

@ -18,7 +18,7 @@
created 2006
by David A. Mellis
modified 14 Apr 2009
modified 30 Aug 2011
by Tom Igoe and Scott Fitzgerald
This example code is in the public domain.

View File

@ -13,7 +13,7 @@
Attach a MIDI cable to the jack, then to a MIDI synth, and play music.
created 13 Jun 2006
modified 2 Jul 2009
modified 30 Aug 2011
by Tom Igoe
This example code is in the public domain.

View File

@ -15,7 +15,7 @@
created 2006
by David A. Mellis
modified 14 Apr 2009
modified 30 Aug 2011
by Tom Igoe and Scott Fitzgerald
This example code is in the public domain.
@ -59,7 +59,7 @@ void loop() {
// created 2003-4
// based on examples by Casey Reas and Hernando Barragan
// modified 18 Jan 2009
// modified 30 Aug 2011
// by Tom Igoe
// This example code is in the public domain.

View File

@ -15,7 +15,7 @@
Created 26 Sept. 2005
by Tom Igoe
Modified 4 Sep 2010
modified 30 Aug 2011
by Tom Igoe and Scott Fitzgerald
This example code is in the public domain.

View File

@ -19,7 +19,7 @@
Created 26 Sept. 2005
by Tom Igoe
Modified 4 Sep 2010
modified 30 Aug 2011
by Tom Igoe and Scott Fitzgerald
This example code is in the public domain.
@ -52,15 +52,15 @@ void loop()
// delay 10ms to let the ADC recover:
delay(10);
// read second analog input, divide by 4 to make the range 0-255:
secondSensor = analogRead(1)/4;
secondSensor = analogRead(A1)/4;
// read switch, map it to 0 or 255L
thirdSensor = map(digitalRead(2), 0, 1, 0, 255);
// send sensor values:
Serial.print(firstSensor, DEC);
Serial.print(firstSensor);
Serial.print(",");
Serial.print(secondSensor, DEC);
Serial.print(secondSensor);
Serial.print(",");
Serial.println(thirdSensor, DEC);
Serial.println(thirdSensor);
}
}

View File

@ -38,20 +38,23 @@ void loop() {
}
/*
SerialEvent occurs whenever a new byte comes in the
hardware serial RX. Don't do complex things here, as the
processor halts the regular program to run this routine:
SerialEvent occurs whenever a new data comes in the
hardware serial RX. This routine is run between each
time loop() runs, so using delay inside loop can delay
response. Multiple bytes of data may be available.
*/
void serialEvent() {
// get the new byte:
char inChar = (char)Serial.read();
// add it to the inputString:
inputString += inChar;
// if the incoming character is a newline, set a flag
// so the main loop can do something about it:
if (inChar == '\n') {
stringComplete = true;
}
while (Serial.available()) {
// get the new byte:
char inChar = (char)Serial.read();
// add it to the inputString:
inputString += inChar;
// if the incoming character is a newline, set a flag
// so the main loop can do something about it:
if (inChar == '\n') {
stringComplete = true;
}
}
}

View File

@ -10,7 +10,7 @@
created 2 Dec 2006
by David A. Mellis
modified 4 Sep 2010
modified 30 Aug 2011
by Tom Igoe and Scott Fitzgerald
This example code is in the public domain.

View File

@ -13,7 +13,7 @@
created 2006
by David A. Mellis
modified 5 Jul 2009
modified 30 Aug 2011
by Tom Igoe
This example code is in the public domain.

View File

@ -9,7 +9,7 @@
created 2006
by David A. Mellis
modified 5 Jul 2009
modified 30 Aug 2011
by Tom Igoe
This example code is in the public domain.

View File

@ -16,7 +16,7 @@
connected to pin 13, so you don't need any extra components for this example.
created 17 Jan 2009
modified 4 Sep 2010
modified 30 Aug 2011
by Tom Igoe
This example code is in the public domain.
@ -50,7 +50,7 @@ void loop() {
}
// print the analog value:
Serial.println(analogValue, DEC);
Serial.println(analogValue);
}

View File

@ -17,7 +17,7 @@
* 10K resistor attached from pin 2 to ground
created 17 Jan 2009
modified 4 Sep 2010
modified 30 Aug 2011
by Tom Igoe
This example code is in the public domain.

View File

@ -14,7 +14,7 @@
* 10K resistor from analog in 0 to ground
created 1 Jul 2009
modified 4 Sep 2010
modified 30 Aug 2011
by Tom Igoe
This example code is in the public domain.

View File

@ -19,7 +19,7 @@
created 2 Jul 2008
by David A. Mellis
modified 4 Sep 2010
modified 30 Aug 2011
by Tom Igoe
This example code is in the public domain.

View File

@ -14,7 +14,7 @@
created 25 Mar 2007
by David Cuartielles <http://www.0j0.org>
modified 4 Sep 2010
modified 30 Aug 2011
by Tom Igoe
This example code is in the public domain.

View File

@ -16,7 +16,7 @@
created 6 Nov 2008
by David A. Mellis
modified 30 Jun 2009
modified 30 Aug 2011
by Tom Igoe
This example code is in the public domain.

View File

@ -15,7 +15,7 @@
created 3 Nov 2008
by David A. Mellis
modified 30 Jun 2009
modified 30 Aug 2011
by Tom Igoe
This example code is in the public domain.

View File

@ -4,7 +4,7 @@
This example controls an 8x8 LED matrix using two analog inputs
created 27 May 2009
modified 4 Sep 2010
modified 30 Aug 2011
by Tom Igoe
This example works for the Lumex LDM-24488NI Matrix. See

View File

@ -5,7 +5,7 @@
You can also add several different data types to string, as shown here:
created 27 July 2010
modified 4 Sep 2010
modified 30 Aug 2011
by Tom Igoe
http://arduino.cc/en/Tutorial/StringAdditionOperator

View File

@ -4,7 +4,7 @@
Examples of how to append different data types to strings
created 27 July 2010
modified 4 Sep 2010
modified 30 Aug 2011
by Tom Igoe
http://arduino.cc/en/Tutorial/StringAppendOperator

View File

@ -4,7 +4,7 @@
Examples of how to compare strings using the comparison operators
created 27 July 2010
modified 4 Sep 2010
modified 30 Aug 2011
by Tom Igoe
http://arduino.cc/en/Tutorial/StringComparisonOperators

View File

@ -4,7 +4,7 @@
Examples of how to create strings from other data types
created 27 July 2010
modified 4 Sep 2010
modified 30 Aug 2011
by Tom Igoe
http://arduino.cc/en/Tutorial/StringConstructors

View File

@ -4,7 +4,7 @@
Examples of how to use startsWith() and endsWith() in a String
created 27 July 2010
modified 4 Sep 2010
modified 30 Aug 2011
by Tom Igoe
http://arduino.cc/en/Tutorial/StringStartsWithEndsWith

Binary file not shown.