diff --git a/Configuration.h b/Configuration.h index 1229ccd..6570f16 100644 --- a/Configuration.h +++ b/Configuration.h @@ -24,8 +24,8 @@ Licence: GPL #define CONFIGURATION_H #define NAME "RepRapFirmware" -#define VERSION "0.57f-dc42" -#define DATE "2014-01-30" +#define VERSION "0.57h-dc42" +#define DATE "2014-01-31" #define LAST_AUTHOR "reprappro.com" // Other firmware that we might switch to be compatible with. diff --git a/Platform.cpp b/Platform.cpp index 42de134..74f46f1 100644 --- a/Platform.cpp +++ b/Platform.cpp @@ -300,7 +300,10 @@ void Platform::PrintMemoryUsage() snprintf(scratchString, STRING_LENGTH, "Stack ram used: %d\n", ramend - stack_ptr); reprap.GetWebserver()->AppendReply(scratchString); Message(HOST_MESSAGE, scratchString); - snprintf(scratchString, STRING_LENGTH, "Guess at free mem: %d\n\n", stack_ptr - heapend + mi.fordblks); + snprintf(scratchString, STRING_LENGTH, "Recycled heap: %d\n\n", mi.fordblks); + reprap.GetWebserver()->AppendReply(scratchString); + Message(HOST_MESSAGE, scratchString); + snprintf(scratchString, STRING_LENGTH, "Guess at free mem: %d\n\n", stack_ptr - heapend); reprap.GetWebserver()->AppendReply(scratchString); Message(HOST_MESSAGE, scratchString); } diff --git a/Platform.h b/Platform.h index 0e638f7..f2fea7d 100644 --- a/Platform.h +++ b/Platform.h @@ -59,7 +59,7 @@ Licence: GPL // Some numbers... -#define STRING_LENGTH 1100 // needs to be long enough to receive web data +#define STRING_LENGTH 1029 // needs to be long enough to receive web data #define SHORT_STRING_LENGTH 40 #define TIME_TO_REPRAP 1.0e6 // Convert seconds to the units used by the machine (usually microseconds) #define TIME_FROM_REPRAP 1.0e-6 // Convert the units used by the machine (usually microseconds) to seconds diff --git a/Release/RepRapFirmware-057f-dc42.bin b/Release/RepRapFirmware-057h-dc42.bin similarity index 68% rename from Release/RepRapFirmware-057f-dc42.bin rename to Release/RepRapFirmware-057h-dc42.bin index 98bbf41..d15fab8 100644 Binary files a/Release/RepRapFirmware-057f-dc42.bin and b/Release/RepRapFirmware-057h-dc42.bin differ diff --git a/Webserver.h b/Webserver.h index 5e8c9ae..6b08fb2 100644 --- a/Webserver.h +++ b/Webserver.h @@ -37,7 +37,7 @@ Licence: GPL const unsigned int gcodeBufLength = 2048; // size of our gcode ring buffer, ideally a power of 2 const unsigned int minReportedFreeBuf = 100; // the minimum free buffer we report if not zero -const unsigned int maxReportedFreeBuf = 1024; // the max we own up to having free, to avoid overlong messages +const unsigned int maxReportedFreeBuf = 900; // the max we own up to having free, to avoid overlong messages class Webserver {