SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

starting with sanguino arduino 1.0 compatibility

Browse source
This commit is contained in:
Bernhard 2011-12-22 16:11:15 +01:00
parent 2bc160a978
commit 8463e39a4a
3 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Marlin/Marlin.h
View file

@ -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

3
Marlin/SdFile.cpp
View file

@ -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

8
Marlin/SdFile.h
View file

@ -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);