1
0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-01 12:24:14 +01:00
Commit Graph

8 Commits

Author SHA1 Message Date
Cristian Maglie
5d92c1ba8e Merge remote-tracking branch 'arduino/master' into ide-1.5.x
Conflicts:
	build/shared/examples/01.Basics/Blink/Blink.ino
	build/shared/examples/09.USB/Keyboard/KeyboardReprogram/KeyboardReprogram.ino
	build/shared/examples/10.StarterKit/p02_SpaceshipInterface/p02_SpaceshipInterface.ino
	hardware/arduino/cores/arduino/HardwareSerial.cpp
2014-05-23 21:04:47 +02:00
Scott Fitzgerald
9ad8748d40 Updated Blink
removed the variable “led” and added some additional descriptive text
2014-05-08 23:05:53 +04:00
Federico Fissore
b4c68b3dff Run new astyle formatter against all the examples 2013-10-21 09:58:40 +02:00
Tom Igoe
e997530b49 renamed USB examples folder to make web formatting easier 2012-05-01 14:05:42 -04:00
Zach Eveland
59f7f988d7 added a slight delay to loop in DigitalReadSerial example so we don't overload Serial Monitor 2012-04-19 10:39:34 -04:00
Zach Eveland
c44329d732 Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader
Conflicts:
	build/shared/examples/01.Basics/DigitalReadSerial/DigitalReadSerial.ino
2012-04-19 10:34:53 -04:00
Tom Igoe
0cdc7e59c6 More delays in serial examples to avoid crashing serial monitor 2012-04-09 10:48:40 -04:00
Tom Igoe
f5093b064a Renumbered examples 2012-03-19 19:44:06 -04:00