bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.

Browse Source
This commit is contained in:
daid303
2012-11-06 12:06:41 +01:00
parent 539f3b3fe4
commit 06b58a9c4f
14 changed files with 2159 additions and 2134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Marlin/SdFile.cpp
View File

@ -55,13 +55,16 @@ int16_t SdFile::write(const void* buf, uint16_t nbyte) {
* Use writeError to check for errors.
*/
#if ARDUINO >= 100
size_t SdFile::write(uint8_t b)
#else
void SdFile::write(uint8_t b)
#endif
size_t SdFile::write(uint8_t b)
{
SdBaseFile::write(&b, 1);
return SdBaseFile::write(&b, 1);
}
#else
void SdFile::write(uint8_t b)
{
SdBaseFile::write(&b, 1);
}
#endif
//------------------------------------------------------------------------------
/** Write a string to a file. Used by the Arduino Print class.
* \param[in] str Pointer to the string.
@ -89,4 +92,4 @@ void SdFile::writeln_P(PGM_P str) {
}
#endif
#endif