CMS/Marlin
3
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 2f9ed1777d
commit ae1a698263
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) void serial_echopair_P(const char *s_P, unsigned long v)
{ serialprintPGM(s_P); SERIAL_ECHO(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 __bss_end;
extern unsigned int __heap_start; extern unsigned int __heap_start;
extern void *__brkval; extern void *__brkval;
@ -410,14 +414,15 @@ extern "C"{
int freeMemory() { int freeMemory() {
int free_memory; int free_memory;
if((int)__brkval == 0) if ((int)__brkval == 0)
free_memory = ((int)&free_memory) - ((int)&__bss_end); free_memory = ((int)&free_memory) - ((int)&__bss_end);
else else
free_memory = ((int)&free_memory) - ((int)__brkval); free_memory = ((int)&free_memory) - ((int)__brkval);
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.