From: Bernhard <bkubicek@x201.(none)>
Date: Thu, 22 Dec 2011 15:11:15 +0000 (+0100)
Subject: starting with sanguino arduino 1.0 compatibility
X-Git-Tag: iwj-success-2012-07-29~135
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8463e39a4a13985ff135a68fd2a8724e801e8545;p=marlin.git

starting with sanguino arduino 1.0 compatibility
---

diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h
index 2a237e0..78739af 100644
--- a/Marlin/Marlin.h
+++ b/Marlin/Marlin.h
@@ -21,19 +21,16 @@
 #include  <avr/interrupt.h>
 
 
-
-
-
-
-
-
-
 #include "fastio.h"
 #include "Configuration.h"
 #include "pins.h"
 
-#if ARDUINO >= 100
-  #include "Arduino.h"
+#if ARDUINO >= 100 
+  #if defined(__AVR_ATmega644P__)
+    #include "WProgram.h"
+  #else
+    #include "Arduino.h"
+  #endif
 #else
    #include "WProgram.h"
 #endif
diff --git a/Marlin/SdFile.cpp b/Marlin/SdFile.cpp
index 5781d10..9c42c00 100644
--- a/Marlin/SdFile.cpp
+++ b/Marlin/SdFile.cpp
@@ -47,13 +47,14 @@ SdFile::SdFile(const char* path, uint8_t oflag) : SdBaseFile(path, oflag) {
 int16_t SdFile::write(const void* buf, uint16_t nbyte) {
   return SdBaseFile::write(buf, nbyte);
 }
+#warning F_CPU
 //------------------------------------------------------------------------------
 /** Write a byte to a file. Required by the Arduino Print class.
  * \param[in] b the byte to be written.
  * Use writeError to check for errors.
  */
 #if ARDUINO >= 100
-  size_t SdFile::write(uint8_t b)
+    size_t SdFile::write(uint8_t b)
 #else
   void SdFile::write(uint8_t b)
 #endif
diff --git a/Marlin/SdFile.h b/Marlin/SdFile.h
index 2fd5755..a9efebc 100644
--- a/Marlin/SdFile.h
+++ b/Marlin/SdFile.h
@@ -21,8 +21,8 @@
  * \file
  * \brief SdFile class
  */
-#include "SdBaseFile.h"
 #include "Marlin.h"
+#include "SdBaseFile.h"
 #include <Print.h>
 #ifndef SdFile_h
 #define SdFile_h
@@ -36,10 +36,10 @@ class SdFile : public SdBaseFile, public Print {
   SdFile() {}
   SdFile(const char* name, uint8_t oflag);
   #if ARDUINO >= 100
-  size_t write(uint8_t b);
-#else
+      size_t write(uint8_t b);
+  #else
    void write(uint8_t b);
-#endif
+  #endif
   
   int16_t write(const void* buf, uint16_t nbyte);
   void write(const char* str);