diff options
| author | kliment <kliment.yanev@gmail.com> | 2012-05-27 08:13:02 -0700 |
|---|---|---|
| committer | kliment <kliment.yanev@gmail.com> | 2012-05-27 08:13:02 -0700 |
| commit | 9af0980080a97e572c21ad6ab2278116f78aec48 (patch) | |
| tree | f8a88ddd69a59abbd5adb24a8ca8e154a627f2c2 | |
| parent | c17bbb3296e562c48d2f8182c1b0e1669299d0ad (diff) | |
| parent | a295b6147eececb124f785d234602e4e7fd69ca3 (diff) | |
Merge pull request #174 from changwoo/experimental-arduino-1.0-compatibility
Experimental arduino 1.0 compatibility
| -rw-r--r-- | Sprinter/Sd2Card.cpp | 4 | ||||
| -rw-r--r-- | Sprinter/SdFatUtil.h | 4 | ||||
| -rw-r--r-- | Sprinter/SdFile.cpp | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/Sprinter/Sd2Card.cpp b/Sprinter/Sd2Card.cpp index 8222cfd..05832e7 100644 --- a/Sprinter/Sd2Card.cpp +++ b/Sprinter/Sd2Card.cpp @@ -17,7 +17,11 @@ * along with the Arduino Sd2Card Library. If not, see
* <http://www.gnu.org/licenses/>.
*/
+#if defined(ARDUINO) && ARDUINO >= 100
+#include <Arduino.h>
+#else
#include <WProgram.h>
+#endif
#include "Sd2Card.h"
//------------------------------------------------------------------------------
#ifndef SOFTWARE_SPI
diff --git a/Sprinter/SdFatUtil.h b/Sprinter/SdFatUtil.h index de3fee3..361a5a2 100644 --- a/Sprinter/SdFatUtil.h +++ b/Sprinter/SdFatUtil.h @@ -23,7 +23,11 @@ * \file
* Useful utility functions.
*/
+#if defined(ARDUINO) && ARDUINO >= 100
+#include <Arduino.h>
+#else
#include <WProgram.h>
+#endif
#include <avr/pgmspace.h>
/** Store and print a string in flash memory.*/
#define PgmPrint(x) SerialPrint_P(PSTR(x))
diff --git a/Sprinter/SdFile.cpp b/Sprinter/SdFile.cpp index 13f4c6a..c847e01 100644 --- a/Sprinter/SdFile.cpp +++ b/Sprinter/SdFile.cpp @@ -19,7 +19,11 @@ */ #include "SdFat.h" #include <avr/pgmspace.h> +#if defined(ARDUINO) && ARDUINO >= 100 +#include <Arduino.h> +#else #include <WProgram.h> +#endif //------------------------------------------------------------------------------ // callback function for date/time void (*SdFile::dateTime_)(uint16_t* date, uint16_t* time) = NULL; |