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

13 Commits

Author SHA1 Message Date
Fede85
38c3bbbd3c SoftwareSerial library to the new format 2013-07-03 23:18:21 +02:00
Cristian Maglie
57b8713cab Moved libraries folder inside platform folder. Now libraries and examples are searched per board/platform 2012-01-04 15:14:51 +01:00
Zach Eveland
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
Zach Eveland
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
Tom Igoe
e42691d0f4 Deleted Software Serial TwoPortRXExample because it was a duplicate of TwoPortReceive example 2011-09-14 18:26:04 -04:00
Tom Igoe
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
Tom Igoe
665ae33e88 removing new-extension branch examples from master branch 2011-05-24 13:35:36 -04:00
Tom Igoe
4805fea3b2 Moving recent commits to new-extension branch 2011-05-21 13:22:43 -04:00
Tom Igoe
1110407690 Added SoftwareSerial Two Port Receive example 2011-05-21 10:00:12 -04:00
Tom Igoe
c8eabc1cf9 Restored and updated SoftwareSerialExample -- really this time! 2011-05-03 13:14:50 -04:00
Tom Igoe
5019566593 Changed #include <WConstants.h> in EEPROM library to #include <Arduino.h> for 1.0 2011-05-02 21:47:28 -04:00
David A. Mellis
896b1a48a1 Revert "Merge branch 'new-extension' of git@github.com:arduino/Arduino"
This reverts commit 42fa932ceb, reversing
changes made to a7352b894f.

See: http://www.kernel.org/pub/software/scm/git/docs/howto/revert-a-faulty-merge.txt for information on how to merge the branch in later.
2011-02-25 18:23:34 -05:00
David A. Mellis
80bb16db8c Adding new SoftwareSerial (NewSoftSerial by Mikal Hart). 2011-01-09 12:45:46 -05:00