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

Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery

Conflicts:
	app/src/cc/arduino/packages/uploaders/SerialUploader.java
	app/src/processing/app/Editor.java
	app/src/processing/app/Sketch.java
	app/src/processing/app/debug/Uploader.java
This commit is contained in:
Cristian Maglie
2013-07-14 12:01:03 +02:00
11 changed files with 80 additions and 35 deletions

View File

@ -4,7 +4,7 @@
Plays a pitch that changes based on a changing analog input
circuit:
* 8-ohm speaker on digital pin 8
* 8-ohm speaker on digital pin 9
* photoresistor on analog 0 to 5V
* 4.7K resistor on analog 0 to ground

View File

@ -17,6 +17,7 @@ ARDUINO 1.5.3 BETA
* avr: Added support for Flash strings on String class (Jantje)
* Added support for floating point numbers in String class (Tevin Zhang, SebiTimeWaster)
* sam: Fixed String buffer overflows (Paul Stoffregen)
* avr: Added recipe for assembly files (C. A. Church)
[libraries]
* sam: Added CAN library (still in early stage of development) (Palliser)