0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use SdFatUtil::FreeRam() for freeMemory() if there

Browse source
This commit is contained in:
Scott Lahteine 2014-12-03 05:19:42 -08:00
parent 4d61287807
commit 0450e83fa5
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Marlin/Marlin_main.cpp
View file

@ -402,7 +402,11 @@ void serial_echopair_P(const char *s_P, double v)
void serial_echopair_P(const char *s_P, unsigned long v)
{ serialprintPGM(s_P); SERIAL_ECHO(v); }
extern "C"{
#ifdef SDSUPPORT
#include "SdFatUtil.h"
int freeMemory() { return SdFatUtil::FreeRam(); }
#else
extern "C" {
extern unsigned int __bss_end;
extern unsigned int __heap_start;
extern void *__brkval;
@ -410,14 +414,15 @@ extern "C"{
int freeMemory() {
int free_memory;
if((int)__brkval == 0)
if ((int)__brkval == 0)
free_memory = ((int)&free_memory) - ((int)&__bss_end);
else
free_memory = ((int)&free_memory) - ((int)__brkval);
return free_memory;
}
}
}
#endif //!SDSUPPORT
//adds an command to the main command buffer
//thats really done in a non-safe way.