1
0
mirror of https://github.com/esp8266/Arduino.git synced 2025-08-07 00:04:36 +03:00

Merge branch 'merge-1.0.5' into ide-1.5.x-discovery

This commit is contained in:
Cristian Maglie
2013-06-01 23:16:02 +02:00
168 changed files with 26202 additions and 20 deletions

View File

@@ -4,7 +4,7 @@
Plays multiple tones on multiple pins in sequence
circuit:
* 3 8-ohm speaker on digital pins 6, 7, and 11
* 3 8-ohm speaker on digital pins 6, 7, and 8
created 8 March 2010
by Tom Igoe
@@ -21,8 +21,8 @@ void setup() {
}
void loop() {
// turn off tone function for pin 11:
noTone(11);
// turn off tone function for pin 8:
noTone(8);
// play a note on pin 6 for 200 ms:
tone(6, 440, 200);
delay(200);
@@ -35,8 +35,7 @@ void loop() {
// turn off tone function for pin 7:
noTone(7);
// play a note on pin 11 for 500 ms:
tone(11, 523, 300);
// play a note on pin 8 for 500 ms:
tone(8, 523, 300);
delay(300);
}

View File

@@ -21,6 +21,9 @@ ARDUINO 1.5.3 BETA
[firmwares]
* Arduino Due: fixed USB2Serial garbage at startup (https://github.com/arduino/Arduino/pull/1267)
[other]
* Merged all improvements made in Arduino IDE 1.0.5
ARDUINO 1.5.2 BETA - 2013.02.06
[ide]
@@ -56,7 +59,7 @@ ARDUINO 1.5.2 BETA - 2013.02.06
[other]
* Merged all improvements made in Arduino IDE 1.0.3
* Merged all improvements made in Arduino IDE 1.0.4 (not yet released)
* Merged all improvements made in Arduino IDE 1.0.4
ARDUINO 1.5.1r2 BETA - 2012.11.06
@@ -112,6 +115,8 @@ ARDUINO 1.0.5 - 2013.05.15
* Upgrades to WiFi library
* Fixed a bunch of examples
* Added Arduino Robot libraries
* Added TFT display library
[firmwares]
@@ -120,7 +125,6 @@ ARDUINO 1.0.5 - 2013.05.15
[ide]
* Backport from 1.5: install Library from .zip file or folder
* Added button "Copy error to clipboard" (Paul Stoffregen)
* Updated windows drivers
* Added Windows installer
@@ -129,6 +133,7 @@ ARDUINO 1.0.4 - 2013.03.11
[core]
* Fixed malloc bug (Paul Stoffregen)
* Added INT6 support for Leonardo (Federico Vanzati)
[libraries]