arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-30 16:24:09 +03:00
Code Activity

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

Browse Source
This commit is contained in:
Cristian Maglie
2013-06-01 23:16:02 +02:00
parent 2e05fbe7c8 3394f61276
commit 22a84c69d3
168 changed files with 26202 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
build/shared/examples/02.Digital/toneMultiple/toneMultiple.ino
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);
}

9
build/shared/revisions.txt
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]

BIN
build/windows/dist/drivers/arduino.cat vendored
View File

Binary file not shown.

16
build/windows/dist/drivers/arduino.inf vendored
View File

@ -22,6 +22,10 @@ micro.sketch.name="Arduino Micro"
uno.name="Arduino Uno"
unoR3.name="Arduino Uno"
usbserial.name="Arduino USB Serial Light Adapter"
robotControl.bootloader.name="Arduino Robot Control bootloader"
robotControl.sketch.name="Arduino Robot"
robotMotor.bootloader.name="Arduino Robot Motor bootloader"
robotMotor.sketch.name="Arduino Robot"
[DefaultInstall]
CopyINF=arduino.inf
@ -61,6 +65,10 @@ DefaultDestDir=12
%uno.name%=DriverInstall, USB\VID_2341&PID_0001
%unoR3.name%=DriverInstall, USB\VID_2341&PID_0043
%usbserial.name%=DriverInstall, USB\VID_2341&PID_003B
%robotControl.bootloader.name%=DriverInstall, USB\VID_2341&PID_0038
%robotControl.sketch.name%=DriverInstall, USB\VID_2341&PID_8038&MI_00
%robotMotor.bootloader.name%=DriverInstall, USB\VID_2341&PID_0039
%robotMotor.sketch.name%=DriverInstall, USB\VID_2341&PID_8039&MI_00
[DeviceList.NTamd64]
%due.bossa.name%=DriverInstall, USB\VID_03EB&PID_6124
@ -81,6 +89,10 @@ DefaultDestDir=12
%uno.name%=DriverInstall, USB\VID_2341&PID_0001
%unoR3.name%=DriverInstall, USB\VID_2341&PID_0043
%usbserial.name%=DriverInstall, USB\VID_2341&PID_003B
%robotControl.bootloader.name%=DriverInstall, USB\VID_2341&PID_0038
%robotControl.sketch.name%=DriverInstall, USB\VID_2341&PID_8038&MI_00
%robotMotor.bootloader.name%=DriverInstall, USB\VID_2341&PID_0039
%robotMotor.sketch.name%=DriverInstall, USB\VID_2341&PID_8039&MI_00
[DeviceList.NTia64]
%esplora.bootloader.name%=DriverInstall, USB\VID_2341&PID_003C
@ -98,6 +110,10 @@ DefaultDestDir=12
%uno.name%=DriverInstall, USB\VID_2341&PID_0001
%unoR3.name%=DriverInstall, USB\VID_2341&PID_0043
%usbserial.name%=DriverInstall, USB\VID_2341&PID_003B
%robotControl.bootloader.name%=DriverInstall, USB\VID_2341&PID_0038
%robotControl.sketch.name%=DriverInstall, USB\VID_2341&PID_8038&MI_00
%robotMotor.bootloader.name%=DriverInstall, USB\VID_2341&PID_0039
%robotMotor.sketch.name%=DriverInstall, USB\VID_2341&PID_8039&MI_00
[DriverInstall]
include=mdmcpq.inf,usb.inf