rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-18 07:52:14 +01:00
Code Issues Releases Activity

Merge branch 'master' into ide-1.5.x

Browse Source 
Conflicts:
	hardware/arduino/cores/arduino/wiring.c
	libraries/Ethernet/src/utility/util.h
	libraries/Ethernet/src/utility/w5100.cpp
	libraries/Ethernet/src/utility/w5100.h
	libraries/Ethernet/util.h
	libraries/Ethernet/utility/util.h
	libraries/SPI/SPI.cpp
	libraries/SPI/SPI.h
This commit is contained in:
Cristian Maglie 2014-12-02 22:35:17 +01:00
commit 6c4f7dc293
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/shared/examples/05.Control/IfStatementConditional/IfStatementConditional.ino
View File

@ -3,7 +3,7 @@
This example demonstrates the use of if() statements.
It reads the state of a potentiometer (an analog input) and turns on an LED
only if the LED goes above a certain threshold level. It prints the analog value
only if the potentiometer goes above a certain threshold level. It prints the analog value
regardless of the level.
The circuit:

10
build/shared/revisions.txt
View File

@ -368,12 +368,16 @@ ARDUINO 1.5 BETA - 2012.10.22
ARDUINO 1.0.7
[libraries]
* Backported GSM from IDE 1.5.x
* EthernetClien: use IANA recommended ephemeral port range, 49152-65535 (Jack Christensen, cifer-lee)
* Backported SPI Transaction API from IDE 1.5.x (Paul Stoffregen)
* Backported GSM from IDE 1.5.x: fix build regression
* Backported Ethernet from IDE 1.5.x
* Backported SD from IDE 1.5.x
* Backported SPI from IDE 1.5.x
* EthernetClient: use IANA recommended ephemeral port range, 49152-65535 (Jack Christensen, cifer-lee)
[core]
* Fixed missing NOT_AN_INTERRUPT constant in digitalPinToInterrupt() macro
* Fixed regression in HardwareSerial::available() introduced with https://github.com/arduino/Arduino/pull/2057
* Fixed performance regression in HardwareSerial::available() introduced with https://github.com/arduino/Arduino/pull/2057
ARDUINO 1.0.6 - 2014.09.16