Merge pull request #1167 from thinkyhead/sd_freemem
Use SdFatUtil::FreeRam() for freeMemory() if there
This commit is contained in:
commit
60628864ca
1 changed files with 17 additions and 12 deletions
|
@ -402,6 +402,10 @@ void serial_echopair_P(const char *s_P, double v)
|
||||||
void serial_echopair_P(const char *s_P, unsigned long v)
|
void serial_echopair_P(const char *s_P, unsigned long v)
|
||||||
{ serialprintPGM(s_P); SERIAL_ECHO(v); }
|
{ serialprintPGM(s_P); SERIAL_ECHO(v); }
|
||||||
|
|
||||||
|
#ifdef SDSUPPORT
|
||||||
|
#include "SdFatUtil.h"
|
||||||
|
int freeMemory() { return SdFatUtil::FreeRam(); }
|
||||||
|
#else
|
||||||
extern "C" {
|
extern "C" {
|
||||||
extern unsigned int __bss_end;
|
extern unsigned int __bss_end;
|
||||||
extern unsigned int __heap_start;
|
extern unsigned int __heap_start;
|
||||||
|
@ -418,6 +422,7 @@ extern "C"{
|
||||||
return free_memory;
|
return free_memory;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif //!SDSUPPORT
|
||||||
|
|
||||||
//adds an command to the main command buffer
|
//adds an command to the main command buffer
|
||||||
//thats really done in a non-safe way.
|
//thats really done in a non-safe way.
|
||||||
|
|
Reference in a new issue