Browse Source

Merge pull request #1357 from odewdney/SDlib

Move Sd library out into library
pull/1/head
Bo Herrmannsen 10 years ago
parent
commit
4b51b5a46d
  1. 3
      .travis.yml
  2. 5
      ArduinoAddons/Arduino_1.0.x/libraries/SdFat/Sd2Card.cpp
  3. 6
      ArduinoAddons/Arduino_1.0.x/libraries/SdFat/Sd2Card.h
  4. 6
      ArduinoAddons/Arduino_1.0.x/libraries/SdFat/Sd2PinMap.h
  5. 49
      ArduinoAddons/Arduino_1.0.x/libraries/SdFat/SdBaseFile.cpp
  6. 19
      ArduinoAddons/Arduino_1.0.x/libraries/SdFat/SdBaseFile.h
  7. 5
      ArduinoAddons/Arduino_1.0.x/libraries/SdFat/SdFat.h
  8. 6
      ArduinoAddons/Arduino_1.0.x/libraries/SdFat/SdFatConfig.h
  9. 6
      ArduinoAddons/Arduino_1.0.x/libraries/SdFat/SdFatStructs.h
  10. 22
      ArduinoAddons/Arduino_1.0.x/libraries/SdFat/SdFatUtil.cpp
  11. 21
      ArduinoAddons/Arduino_1.0.x/libraries/SdFat/SdFatUtil.h
  12. 6
      ArduinoAddons/Arduino_1.0.x/libraries/SdFat/SdFile.cpp
  13. 6
      ArduinoAddons/Arduino_1.0.x/libraries/SdFat/SdFile.h
  14. 5
      ArduinoAddons/Arduino_1.0.x/libraries/SdFat/SdInfo.h
  15. 5
      ArduinoAddons/Arduino_1.0.x/libraries/SdFat/SdVolume.cpp
  16. 3
      ArduinoAddons/Arduino_1.0.x/libraries/SdFat/SdVolume.h
  17. 5
      Marlin/Marlin.pde
  18. 5
      Marlin/temperature.cpp

3
.travis.yml

@ -26,6 +26,9 @@ before_script:
- cd $TRAVIS_BUILD_DIR - cd $TRAVIS_BUILD_DIR
# ino needs files in src directory # ino needs files in src directory
- ln -s Marlin src - ln -s Marlin src
- mkdir lib
- ln -s ../ArduinoAddons/Arduino_1.0.x/libraries/SdFat lib/SdFat
- ls -la lib/SdFat
# remove Marlin.pde as it confuses ino after it finds Marlin.ino # remove Marlin.pde as it confuses ino after it finds Marlin.ino
- rm Marlin/Marlin.pde - rm Marlin/Marlin.pde
script: script:

5
Marlin/Sd2Card.cpp → ArduinoAddons/Arduino_1.0.x/libraries/SdFat/Sd2Card.cpp

@ -17,9 +17,8 @@
* along with the Arduino Sd2Card Library. If not, see * along with the Arduino Sd2Card Library. If not, see
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#include "Marlin.h" #include "SdFat.h"
#ifdef SDSUPPORT
#include "Sd2Card.h" #include "Sd2Card.h"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
#ifndef SOFTWARE_SPI #ifndef SOFTWARE_SPI
@ -719,5 +718,3 @@ bool Sd2Card::writeStop() {
chipSelectHigh(); chipSelectHigh();
return false; return false;
} }
#endif

6
Marlin/Sd2Card.h → ArduinoAddons/Arduino_1.0.x/libraries/SdFat/Sd2Card.h

@ -18,9 +18,6 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#include "Marlin.h"
#ifdef SDSUPPORT
#ifndef Sd2Card_h #ifndef Sd2Card_h
#define Sd2Card_h #define Sd2Card_h
/** /**
@ -238,6 +235,3 @@ class Sd2Card {
bool writeData(uint8_t token, const uint8_t* src); bool writeData(uint8_t token, const uint8_t* src);
}; };
#endif // Sd2Card_h #endif // Sd2Card_h
#endif

6
Marlin/Sd2PinMap.h → ArduinoAddons/Arduino_1.0.x/libraries/SdFat/Sd2PinMap.h

@ -18,9 +18,6 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
// Warning this file was generated by a program. // Warning this file was generated by a program.
#include "Marlin.h"
#ifdef SDSUPPORT
#ifndef Sd2PinMap_h #ifndef Sd2PinMap_h
#define Sd2PinMap_h #define Sd2PinMap_h
#include <avr/io.h> #include <avr/io.h>
@ -363,6 +360,3 @@ static inline __attribute__((always_inline))
} }
} }
#endif // Sd2PinMap_h #endif // Sd2PinMap_h
#endif

49
Marlin/SdBaseFile.cpp → ArduinoAddons/Arduino_1.0.x/libraries/SdFat/SdBaseFile.cpp

@ -17,9 +17,8 @@
* along with the Arduino SdFat Library. If not, see * along with the Arduino SdFat Library. If not, see
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#include "SdFat.h"
#include "Marlin.h" #include <Print.h>
#ifdef SDSUPPORT
#include "SdBaseFile.h" #include "SdBaseFile.h"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@ -315,14 +314,14 @@ void SdBaseFile::getpos(fpos_t* pos) {
* \param[in] indent Amount of space before file name. Used for recursive * \param[in] indent Amount of space before file name. Used for recursive
* list to indicate subdirectory level. * list to indicate subdirectory level.
*/ */
void SdBaseFile::ls(uint8_t flags, uint8_t indent) { void SdBaseFile::ls(Print *p, uint8_t flags, uint8_t indent) {
rewind(); rewind();
int8_t status; int8_t status;
while ((status = lsPrintNext( flags, indent))) { while ((status = lsPrintNext( p, flags, indent))) {
if (status > 1 && (flags & LS_R)) { if (status > 1 && (flags & LS_R)) {
uint16_t index = curPosition()/32 - 1; uint16_t index = curPosition()/32 - 1;
SdBaseFile s; SdBaseFile s;
if (s.open(this, index, O_READ)) s.ls( flags, indent + 2); if (s.open(this, index, O_READ)) s.ls( p, flags, indent + 2);
seekSet(32 * (index + 1)); seekSet(32 * (index + 1));
} }
} }
@ -330,7 +329,8 @@ void SdBaseFile::ls(uint8_t flags, uint8_t indent) {
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// saves 32 bytes on stack for ls recursion // saves 32 bytes on stack for ls recursion
// return 0 - EOF, 1 - normal file, or 2 - directory // return 0 - EOF, 1 - normal file, or 2 - directory
int8_t SdBaseFile::lsPrintNext( uint8_t flags, uint8_t indent) { int8_t SdBaseFile::lsPrintNext( Print *p, uint8_t flags, uint8_t indent) {
Print &MYSERIAL = *p;
dir_t dir; dir_t dir;
uint8_t w = 0; uint8_t w = 0;
@ -365,9 +365,9 @@ int8_t SdBaseFile::lsPrintNext( uint8_t flags, uint8_t indent) {
// print modify date/time if requested // print modify date/time if requested
if (flags & LS_DATE) { if (flags & LS_DATE) {
MYSERIAL.write(' '); MYSERIAL.write(' ');
printFatDate( dir.lastWriteDate); printFatDate( p, dir.lastWriteDate);
MYSERIAL.write(' '); MYSERIAL.write(' ');
printFatTime( dir.lastWriteTime); printFatTime( p, dir.lastWriteTime);
} }
// print size if requested // print size if requested
if (!DIR_IS_SUBDIR(&dir) && (flags & LS_SIZE)) { if (!DIR_IS_SUBDIR(&dir) && (flags & LS_SIZE)) {
@ -939,8 +939,8 @@ int SdBaseFile::peek() {
* \param[in] width Blank fill name if length is less than \a width. * \param[in] width Blank fill name if length is less than \a width.
* \param[in] printSlash Print '/' after directory names if true. * \param[in] printSlash Print '/' after directory names if true.
*/ */
void SdBaseFile::printDirName(const dir_t& dir, void SdBaseFile::printDirName(Print *p, const dir_t& dir, uint8_t width, bool printSlash) {
uint8_t width, bool printSlash) { Print &MYSERIAL = *p;
uint8_t w = 0; uint8_t w = 0;
for (uint8_t i = 0; i < 11; i++) { for (uint8_t i = 0; i < 11; i++) {
if (dir.name[i] == ' ')continue; if (dir.name[i] == ' ')continue;
@ -962,7 +962,8 @@ void SdBaseFile::printDirName(const dir_t& dir,
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// print uint8_t with width 2 // print uint8_t with width 2
static void print2u( uint8_t v) { static void print2u( Print *p, uint8_t v) {
Print &MYSERIAL = *p;
if (v < 10) MYSERIAL.write('0'); if (v < 10) MYSERIAL.write('0');
MYSERIAL.print(v, DEC); MYSERIAL.print(v, DEC);
} }
@ -982,12 +983,14 @@ static void print2u( uint8_t v) {
* \param[in] pr Print stream for output. * \param[in] pr Print stream for output.
* \param[in] fatDate The date field from a directory entry. * \param[in] fatDate The date field from a directory entry.
*/ */
void SdBaseFile::printFatDate(uint16_t fatDate) { void SdBaseFile::printFatDate(Print *p, uint16_t fatDate) {
Print &MYSERIAL = *p;
MYSERIAL.print(FAT_YEAR(fatDate)); MYSERIAL.print(FAT_YEAR(fatDate));
MYSERIAL.write('-'); MYSERIAL.write('-');
print2u( FAT_MONTH(fatDate)); print2u( p, FAT_MONTH(fatDate));
MYSERIAL.write('-'); MYSERIAL.write('-');
print2u( FAT_DAY(fatDate)); print2u( p, FAT_DAY(fatDate));
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@ -998,12 +1001,14 @@ void SdBaseFile::printFatDate(uint16_t fatDate) {
* \param[in] pr Print stream for output. * \param[in] pr Print stream for output.
* \param[in] fatTime The time field from a directory entry. * \param[in] fatTime The time field from a directory entry.
*/ */
void SdBaseFile::printFatTime( uint16_t fatTime) { void SdBaseFile::printFatTime( Print *p, uint16_t fatTime) {
print2u( FAT_HOUR(fatTime)); Print &MYSERIAL = *p;
print2u( p, FAT_HOUR(fatTime));
MYSERIAL.write(':'); MYSERIAL.write(':');
print2u( FAT_MINUTE(fatTime)); print2u( p, FAT_MINUTE(fatTime));
MYSERIAL.write(':'); MYSERIAL.write(':');
print2u( FAT_SECOND(fatTime)); print2u( p, FAT_SECOND(fatTime));
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
/** Print a file's name to Serial /** Print a file's name to Serial
@ -1011,7 +1016,8 @@ void SdBaseFile::printFatTime( uint16_t fatTime) {
* \return The value one, true, is returned for success and * \return The value one, true, is returned for success and
* the value zero, false, is returned for failure. * the value zero, false, is returned for failure.
*/ */
bool SdBaseFile::printName() { bool SdBaseFile::printName(Print *p) {
Print &MYSERIAL = *p;
char name[13]; char name[13];
if (!getFilename(name)) return false; if (!getFilename(name)) return false;
MYSERIAL.print(name); MYSERIAL.print(name);
@ -1820,6 +1826,3 @@ int16_t SdBaseFile::write(const void* buf, uint16_t nbyte) {
#if ALLOW_DEPRECATED_FUNCTIONS && !defined(DOXYGEN) #if ALLOW_DEPRECATED_FUNCTIONS && !defined(DOXYGEN)
void (*SdBaseFile::oldDateTime_)(uint16_t& date, uint16_t& time) = 0; // NOLINT void (*SdBaseFile::oldDateTime_)(uint16_t& date, uint16_t& time) = 0; // NOLINT
#endif // ALLOW_DEPRECATED_FUNCTIONS #endif // ALLOW_DEPRECATED_FUNCTIONS
#endif

19
Marlin/SdBaseFile.h → ArduinoAddons/Arduino_1.0.x/libraries/SdFat/SdBaseFile.h

@ -17,16 +17,12 @@
* along with the Arduino SdFat Library. If not, see * along with the Arduino SdFat Library. If not, see
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#include "Marlin.h"
#ifdef SDSUPPORT
#ifndef SdBaseFile_h #ifndef SdBaseFile_h
#define SdBaseFile_h #define SdBaseFile_h
/** /**
* \file * \file
* \brief SdBaseFile class * \brief SdBaseFile class
*/ */
#include "Marlin.h"
#include "SdFatConfig.h" #include "SdFatConfig.h"
#include "SdVolume.h" #include "SdVolume.h"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@ -174,6 +170,8 @@ static inline uint8_t FAT_SECOND(uint16_t fatTime) {
uint16_t const FAT_DEFAULT_DATE = ((2000 - 1980) << 9) | (1 << 5) | 1; uint16_t const FAT_DEFAULT_DATE = ((2000 - 1980) << 9) | (1 << 5) | 1;
/** Default time for file timestamp is 1 am */ /** Default time for file timestamp is 1 am */
uint16_t const FAT_DEFAULT_TIME = (1 << 11); uint16_t const FAT_DEFAULT_TIME = (1 << 11);
class Print;
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
/** /**
* \class SdBaseFile * \class SdBaseFile
@ -266,7 +264,7 @@ class SdBaseFile {
bool isRoot() const { bool isRoot() const {
return type_ == FAT_FILE_TYPE_ROOT_FIXED || type_ == FAT_FILE_TYPE_ROOT32; return type_ == FAT_FILE_TYPE_ROOT_FIXED || type_ == FAT_FILE_TYPE_ROOT32;
} }
void ls( uint8_t flags = 0, uint8_t indent = 0); void ls( Print *p, uint8_t flags = 0, uint8_t indent = 0);
bool mkdir(SdBaseFile* dir, const char* path, bool pFlag = true); bool mkdir(SdBaseFile* dir, const char* path, bool pFlag = true);
// alias for backward compactability // alias for backward compactability
bool makeDir(SdBaseFile* dir, const char* path) { bool makeDir(SdBaseFile* dir, const char* path) {
@ -278,9 +276,9 @@ class SdBaseFile {
bool openNext(SdBaseFile* dirFile, uint8_t oflag); bool openNext(SdBaseFile* dirFile, uint8_t oflag);
bool openRoot(SdVolume* vol); bool openRoot(SdVolume* vol);
int peek(); int peek();
static void printFatDate(uint16_t fatDate); static void printFatDate(Print *p, uint16_t fatDate);
static void printFatTime( uint16_t fatTime); static void printFatTime(Print *p, uint16_t fatTime);
bool printName(); bool printName(Print *p);
int16_t read(); int16_t read();
int16_t read(void* buf, uint16_t nbyte); int16_t read(void* buf, uint16_t nbyte);
int8_t readDir(dir_t* dir, char* longFilename); int8_t readDir(dir_t* dir, char* longFilename);
@ -352,7 +350,7 @@ class SdBaseFile {
bool addCluster(); bool addCluster();
bool addDirCluster(); bool addDirCluster();
dir_t* cacheDirEntry(uint8_t action); dir_t* cacheDirEntry(uint8_t action);
int8_t lsPrintNext( uint8_t flags, uint8_t indent); int8_t lsPrintNext( Print *p, uint8_t flags, uint8_t indent);
static bool make83Name(const char* str, uint8_t* name, const char** ptr); static bool make83Name(const char* str, uint8_t* name, const char** ptr);
bool mkdir(SdBaseFile* parent, const uint8_t dname[11]); bool mkdir(SdBaseFile* parent, const uint8_t dname[11]);
bool open(SdBaseFile* dirFile, const uint8_t dname[11], uint8_t oflag); bool open(SdBaseFile* dirFile, const uint8_t dname[11], uint8_t oflag);
@ -360,7 +358,7 @@ class SdBaseFile {
dir_t* readDirCache(); dir_t* readDirCache();
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// to be deleted // to be deleted
static void printDirName( const dir_t& dir, static void printDirName( Print *p, const dir_t& dir,
uint8_t width, bool printSlash); uint8_t width, bool printSlash);
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Deprecated functions - suppress cpplint warnings with NOLINT comment // Deprecated functions - suppress cpplint warnings with NOLINT comment
@ -480,4 +478,3 @@ class SdBaseFile {
}; };
#endif // SdBaseFile_h #endif // SdBaseFile_h
#endif

5
ArduinoAddons/Arduino_1.0.x/libraries/SdFat/SdFat.h

@ -0,0 +1,5 @@
#ifndef AT90USB
#define HardwareSerial_h // trick to disable the standard HWserial
#endif
#include <Arduino.h>

6
Marlin/SdFatConfig.h → ArduinoAddons/Arduino_1.0.x/libraries/SdFat/SdFatConfig.h

@ -21,9 +21,6 @@
* \file * \file
* \brief configuration definitions * \brief configuration definitions
*/ */
#include "Marlin.h"
#ifdef SDSUPPORT
#ifndef SdFatConfig_h #ifndef SdFatConfig_h
#define SdFatConfig_h #define SdFatConfig_h
#include <stdint.h> #include <stdint.h>
@ -118,6 +115,3 @@ uint8_t const SOFT_SPI_SCK_PIN = 13;
/** Total size of the buffer used to store the long filenames */ /** Total size of the buffer used to store the long filenames */
#define LONG_FILENAME_LENGTH (13*MAX_VFAT_ENTRIES+1) #define LONG_FILENAME_LENGTH (13*MAX_VFAT_ENTRIES+1)
#endif // SdFatConfig_h #endif // SdFatConfig_h
#endif

6
Marlin/SdFatStructs.h → ArduinoAddons/Arduino_1.0.x/libraries/SdFat/SdFatStructs.h

@ -17,9 +17,6 @@
* along with the Arduino SdFat Library. If not, see * along with the Arduino SdFat Library. If not, see
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#include "Marlin.h"
#ifdef SDSUPPORT
#ifndef SdFatStructs_h #ifndef SdFatStructs_h
#define SdFatStructs_h #define SdFatStructs_h
@ -641,6 +638,3 @@ static inline uint8_t DIR_IS_FILE_OR_SUBDIR(const dir_t* dir) {
return (dir->attributes & DIR_ATT_VOLUME_ID) == 0; return (dir->attributes & DIR_ATT_VOLUME_ID) == 0;
} }
#endif // SdFatStructs_h #endif // SdFatStructs_h
#endif

22
Marlin/SdFatUtil.cpp → ArduinoAddons/Arduino_1.0.x/libraries/SdFat/SdFatUtil.cpp

@ -17,9 +17,8 @@
* along with the Arduino SdFat Library. If not, see * along with the Arduino SdFat Library. If not, see
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#include "Marlin.h" #include "SdFat.h"
#include <Print.h>
#ifdef SDSUPPORT
#include "SdFatUtil.h" #include "SdFatUtil.h"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@ -50,7 +49,8 @@ int SdFatUtil::FreeRam() {
* \param[in] pr Print object for output. * \param[in] pr Print object for output.
* \param[in] str Pointer to string stored in flash memory. * \param[in] str Pointer to string stored in flash memory.
*/ */
void SdFatUtil::print_P( PGM_P str) { void SdFatUtil::print_P( Print *p, PGM_P str) {
Print &MYSERIAL = *p;
for (uint8_t c; (c = pgm_read_byte(str)); str++) MYSERIAL.write(c); for (uint8_t c; (c = pgm_read_byte(str)); str++) MYSERIAL.write(c);
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@ -59,8 +59,9 @@ void SdFatUtil::print_P( PGM_P str) {
* \param[in] pr Print object for output. * \param[in] pr Print object for output.
* \param[in] str Pointer to string stored in flash memory. * \param[in] str Pointer to string stored in flash memory.
*/ */
void SdFatUtil::println_P( PGM_P str) { void SdFatUtil::println_P( Print *p, PGM_P str) {
print_P( str); Print &MYSERIAL = *p;
print_P( p, str);
MYSERIAL.println(); MYSERIAL.println();
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@ -68,15 +69,14 @@ void SdFatUtil::println_P( PGM_P str) {
* *
* \param[in] str Pointer to string stored in flash memory. * \param[in] str Pointer to string stored in flash memory.
*/ */
void SdFatUtil::SerialPrint_P(PGM_P str) { void SdFatUtil::SerialPrint_P( Print *p, PGM_P str) {
print_P(str); print_P(p, str);
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
/** %Print a string in flash memory to Serial followed by a CR/LF. /** %Print a string in flash memory to Serial followed by a CR/LF.
* *
* \param[in] str Pointer to string stored in flash memory. * \param[in] str Pointer to string stored in flash memory.
*/ */
void SdFatUtil::SerialPrintln_P(PGM_P str) { void SdFatUtil::SerialPrintln_P(Print *p, PGM_P str) {
println_P( str); println_P( p, str);
} }
#endif

21
Marlin/SdFatUtil.h → ArduinoAddons/Arduino_1.0.x/libraries/SdFat/SdFatUtil.h

@ -17,32 +17,19 @@
* along with the Arduino SdFat Library. If not, see * along with the Arduino SdFat Library. If not, see
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#include "Marlin.h"
#ifdef SDSUPPORT
#ifndef SdFatUtil_h #ifndef SdFatUtil_h
#define SdFatUtil_h #define SdFatUtil_h
/** /**
* \file * \file
* \brief Useful utility functions. * \brief Useful utility functions.
*/ */
#include "Marlin.h"
#include "MarlinSerial.h"
/** Store and print a string in flash memory.*/
#define PgmPrint(x) SerialPrint_P(PSTR(x))
/** Store and print a string in flash memory followed by a CR/LF.*/
#define PgmPrintln(x) SerialPrintln_P(PSTR(x))
namespace SdFatUtil { namespace SdFatUtil {
int FreeRam(); int FreeRam();
void print_P( PGM_P str); void print_P( Print *p, PGM_P str);
void println_P( PGM_P str); void println_P( Print *p, PGM_P str);
void SerialPrint_P(PGM_P str); void SerialPrint_P(Print *p, PGM_P str);
void SerialPrintln_P(PGM_P str); void SerialPrintln_P(Print *p, PGM_P str);
} }
using namespace SdFatUtil; // NOLINT using namespace SdFatUtil; // NOLINT
#endif // #define SdFatUtil_h #endif // #define SdFatUtil_h
#endif

6
Marlin/SdFile.cpp → ArduinoAddons/Arduino_1.0.x/libraries/SdFat/SdFile.cpp

@ -17,9 +17,6 @@
* along with the Arduino SdFat Library. If not, see * along with the Arduino SdFat Library. If not, see
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#include "Marlin.h"
#ifdef SDSUPPORT
#include "SdFile.h" #include "SdFile.h"
/** Create a file object and open it in the current working directory. /** Create a file object and open it in the current working directory.
* *
@ -90,6 +87,3 @@ void SdFile::writeln_P(PGM_P str) {
write_P(str); write_P(str);
write_P(PSTR("\r\n")); write_P(PSTR("\r\n"));
} }
#endif

6
Marlin/SdFile.h → ArduinoAddons/Arduino_1.0.x/libraries/SdFat/SdFile.h

@ -21,9 +21,6 @@
* \file * \file
* \brief SdFile class * \brief SdFile class
*/ */
#include "Marlin.h"
#ifdef SDSUPPORT
#include "SdBaseFile.h" #include "SdBaseFile.h"
#include <Print.h> #include <Print.h>
#ifndef SdFile_h #ifndef SdFile_h
@ -49,6 +46,3 @@ class SdFile : public SdBaseFile, public Print {
void writeln_P(PGM_P str); void writeln_P(PGM_P str);
}; };
#endif // SdFile_h #endif // SdFile_h
#endif

5
Marlin/SdInfo.h → ArduinoAddons/Arduino_1.0.x/libraries/SdFat/SdInfo.h

@ -17,9 +17,6 @@
* along with the Arduino Sd2Card Library. If not, see * along with the Arduino Sd2Card Library. If not, see
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#include "Marlin.h"
#ifdef SDSUPPORT
#ifndef SdInfo_h #ifndef SdInfo_h
#define SdInfo_h #define SdInfo_h
#include <stdint.h> #include <stdint.h>
@ -276,5 +273,3 @@ union csd_t {
csd2_t v2; csd2_t v2;
}; };
#endif // SdInfo_h #endif // SdInfo_h
#endif

5
Marlin/SdVolume.cpp → ArduinoAddons/Arduino_1.0.x/libraries/SdFat/SdVolume.cpp

@ -17,9 +17,7 @@
* along with the Arduino SdFat Library. If not, see * along with the Arduino SdFat Library. If not, see
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#include "Marlin.h" #include "SdFat.h"
#ifdef SDSUPPORT
#include "SdVolume.h" #include "SdVolume.h"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
#if !USE_MULTIPLE_CARDS #if !USE_MULTIPLE_CARDS
@ -402,4 +400,3 @@ bool SdVolume::init(Sd2Card* dev, uint8_t part) {
fail: fail:
return false; return false;
} }
#endif

3
Marlin/SdVolume.h → ArduinoAddons/Arduino_1.0.x/libraries/SdFat/SdVolume.h

@ -17,8 +17,6 @@
* along with the Arduino SdFat Library. If not, see * along with the Arduino SdFat Library. If not, see
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#include "Marlin.h"
#ifdef SDSUPPORT
#ifndef SdVolume_h #ifndef SdVolume_h
#define SdVolume_h #define SdVolume_h
/** /**
@ -211,4 +209,3 @@ class SdVolume {
#endif // ALLOW_DEPRECATED_FUNCTIONS #endif // ALLOW_DEPRECATED_FUNCTIONS
}; };
#endif // SdVolume #endif // SdVolume
#endif

5
Marlin/Marlin.pde

@ -54,3 +54,8 @@
#if defined(DIGIPOT_I2C) #if defined(DIGIPOT_I2C)
#include <Wire.h> #include <Wire.h>
#endif #endif
#if defined(HEATER_0_USES_MAX6675) || defined(SDSUPPORT)
#include <Sd2Card.h>
#endif

5
Marlin/temperature.cpp

@ -35,8 +35,9 @@
#include "watchdog.h" #include "watchdog.h"
#include "thermistortables.h" #include "thermistortables.h"
#include "Sd2PinMap.h" #ifdef HEATER_0_USES_MAX6675
//#include <Sd2PinMap.h>
#endif
//=========================================================================== //===========================================================================
//=============================public variables============================ //=============================public variables============================

Loading…
Cancel
Save