Browse Source

starting with sanguino arduino 1.0 compatibility

pull/1/head
Bernhard 13 years ago
parent
commit
8463e39a4a
  1. 11
      Marlin/Marlin.h
  2. 1
      Marlin/SdFile.cpp
  3. 6
      Marlin/SdFile.h

11
Marlin/Marlin.h

@ -21,19 +21,16 @@
#include <avr/interrupt.h>
#include "fastio.h"
#include "Configuration.h"
#include "pins.h"
#if ARDUINO >= 100
#if defined(__AVR_ATmega644P__)
#include "WProgram.h"
#else
#include "Arduino.h"
#endif
#else
#include "WProgram.h"
#endif

1
Marlin/SdFile.cpp

@ -47,6 +47,7 @@ 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.

6
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
@ -37,9 +37,9 @@ class SdFile : public SdBaseFile, public Print {
SdFile(const char* name, uint8_t oflag);
#if ARDUINO >= 100
size_t write(uint8_t b);
#else
#else
void write(uint8_t b);
#endif
#endif
int16_t write(const void* buf, uint16_t nbyte);
void write(const char* str);

Loading…
Cancel
Save