Commit Graph

21 Commits

Author SHA1 Message Date
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
David A. Mellis 5ba38fa9bd Applying adafruit SD updates (available() overful fix).
http://code.google.com/p/arduino/issues/detail?id=595
2011-09-09 16:57:00 -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 42039ecd19 changed CS pin on CardInfo example to make it consistent with other SD examples 2011-05-12 17:02:47 -04:00
David A. Mellis 059bc5f022 Incorporating ladyada's SD changes (multifile & directories).
Grabbed a patch from this repository: https://github.com/adafruit/SD and updated it for Arduino 1.0 (using Arduino.h instead of WProgram.h).
2011-04-18 17:58:54 -04:00
Tom Igoe df00d3e5f3 changed CS pin on CardInfo example to make it consistent with other SD examples 2011-03-16 13:53:39 -04:00
Tom Igoe fe8af70c61 Added CardInfo example to SD libary examples 2011-03-01 07:13:18 -05:00
David A. Mellis b0b909ed2b Adding warning about multiple open files. 2010-12-22 17:04:34 -06:00
David A. Mellis a7a8f3fa10 Trying to fix seek() / peek() interactions. 2010-12-22 16:37:48 -06:00
David A. Mellis 4742739d6e Adding position() function to File class and replacing FILE_TRUNCATE and FILE_APPEND with FILE_WRITE (SD library). Updating examples and keywords.txt accordingly. 2010-12-22 15:52:09 -06:00
Tom Igoe 4d3b263738 bug fixes to SD library examples 2010-12-03 15:29:56 -05:00
Tom Igoe 86e3d4ad7a updated SD examples with new constants, and commented them 2010-12-03 10:35:17 -05:00
David A. Mellis d98d31eb1a Redoing 448222e4b6 without all the extra files.
Adds toInt() to String, WCharacter.h (from Wiring), and an SD Datalogger example.
2010-11-29 15:20:30 -05:00
David A. Mellis 920212ee05 Revert "added toInt() function to WString".
This reverts commit 448222e4b6.
2010-11-29 15:14:10 -05:00
Tom Igoe 448222e4b6 added toInt() function to WString 2010-11-29 11:31:00 -05:00
David A. Mellis 012b4b0f0f Adding warning about leaving the hardware SS pin as an output. 2010-11-21 17:11:17 -05:00
David A. Mellis d05a57af19 Using sdfatlib CS pin defaults. SD.begin() returns success or failure. 2010-11-20 13:50:45 -05:00
David A. Mellis 6f0ea10600 Adding SD.remove(file) and another example. 2010-11-20 13:07:59 -05:00
David A. Mellis 5af5619df4 SD library updates. Renaming makeDir() to mkdir(). Replacing example. Adding keywords.txt. 2010-11-20 12:31:49 -05:00
David A. Mellis 6e449d7f5b Combining MemoryCard and SdFat libraries into SD library.
Defaulting to CS pin 4 (for Arduino Ethernet Shield).  Holding the SS pin high (for disabling W5100 on the Ethernet Shield).
2010-11-13 14:01:37 -05:00