1
0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-17 22:23:10 +03:00
Commit Graph

11 Commits

Author SHA1 Message Date
a0727ac862 Merge branch 'master' into ide-1.5.x
Conflicts:
	build/shared/examples/02.Digital/BlinkWithoutDelay/BlinkWithoutDelay.ino
	build/shared/examples/09.USB/Keyboard/KeyboardMessage/KeyboardMessage.ino
	libraries/LiquidCrystal/examples/CustomCharacter/CustomCharacter.ino
	libraries/SD/examples/listfiles/listfiles.ino
2013-11-12 09:45:56 +01:00
b332904ee1 Modified LCD custom character example
moved lcd.begin() to the beginnng of the setup() and fixed an issue
that prevented the example from compiling. When calling lcd.write()
with an argument of 0, the 0 must be cast a s a byte.
2013-11-11 16:41:12 +04:00
0732d5afcd Fixed compilation errors with some examples 2013-10-21 13:16:51 +02:00
b4c68b3dff Run new astyle formatter against all the examples 2013-10-21 09:58:40 +02:00
9b027224a0 LiquidCrystal library is already multiplatform compliant, moved into libraries folder 2012-09-03 16:13:28 +02:00
57b8713cab Moved libraries folder inside platform folder. Now libraries and examples are searched per board/platform 2012-01-04 15:14:51 +01:00
a6a59f1783 Revert "Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot"
This reverts commit df9835efaf, reversing
changes made to ec45af8bfa.

Conflicts:

	hardware/arduino/variants/mega/pins_arduino.h
	libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino
2011-10-27 11:45:13 -04:00
df9835efaf Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot
Conflicts:
	app/src/processing/app/Editor.java
	app/src/processing/app/Sketch.java
	build/shared/examples/4.Communication/SerialCallResponse/SerialCallResponse.pde
	build/shared/lib/theme/theme.txt
	hardware/arduino/cores/arduino/HardwareSerial.h
	hardware/arduino/cores/arduino/Print.cpp
	hardware/arduino/cores/arduino/WString.h
	hardware/arduino/variants/mega/pins_arduino.h
	libraries/Ethernet/examples/PachubeClient/PachubeClient.ino
	libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino
	libraries/Firmata/examples/EchoString/EchoString.ino
	libraries/SD/File.cpp
	libraries/SoftwareSerial/SoftwareSerial.cpp
	libraries/SoftwareSerial/SoftwareSerial.h
	libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino
	libraries/SoftwareSerial/keywords.txt
2011-10-27 09:32:27 -04:00
35777612c0 Changed all .pde examples to .ino
All examples in /build/shared/examples/ and /libraries/ have had their
extensions changed to .ino
2011-08-30 15:33:32 -04:00
381e62e550 Added example to demonstrate LiquidCrystal chreateChar() function 2011-05-12 17:03:07 -04:00
fcb66ddccd Added example to demonstrate LiquidCrystal chreateChar() function 2011-03-21 12:27:18 -04:00