tschwery/reprapfirmware-dc42
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reverted a buffer size to fix random print hang

Browse source 
Reverted STRING_LENGTH to 1029 to avoid random print hangs that occurred
using 0.57f firmware. Reduced max reported buffer size to fit within
this. Report additional memory usage detail in response to M111 S0.
This commit is contained in:
David Crocker 2014-01-31 17:35:55 +00:00
parent 66c934a791
commit 41daff3d26
5 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Configuration.h
View file

@ -24,8 +24,8 @@ Licence: GPL
#define CONFIGURATION_H #define CONFIGURATION_H
#define NAME "RepRapFirmware" #define NAME "RepRapFirmware"
#define VERSION "0.57f-dc42" #define VERSION "0.57h-dc42"
#define DATE "2014-01-30" #define DATE "2014-01-31"
#define LAST_AUTHOR "reprappro.com" #define LAST_AUTHOR "reprappro.com"
// Other firmware that we might switch to be compatible with. // Other firmware that we might switch to be compatible with.

5
Platform.cpp
View file

@ -300,7 +300,10 @@ void Platform::PrintMemoryUsage()
snprintf(scratchString, STRING_LENGTH, "Stack ram used: %d\n", ramend - stack_ptr); snprintf(scratchString, STRING_LENGTH, "Stack ram used: %d\n", ramend - stack_ptr);
reprap.GetWebserver()->AppendReply(scratchString); reprap.GetWebserver()->AppendReply(scratchString);
Message(HOST_MESSAGE, 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); reprap.GetWebserver()->AppendReply(scratchString);
Message(HOST_MESSAGE, scratchString); Message(HOST_MESSAGE, scratchString);
} }

2
Platform.h
View file

@ -59,7 +59,7 @@ Licence: GPL
// Some numbers... // 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 SHORT_STRING_LENGTH 40
#define TIME_TO_REPRAP 1.0e6 // Convert seconds to the units used by the machine (usually microseconds) #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 #define TIME_FROM_REPRAP 1.0e-6 // Convert the units used by the machine (usually microseconds) to seconds

BIN
Release/RepRapFirmware-057f-dc42.bin → Release/RepRapFirmware-057h-dc42.bin
View file

Binary file not shown.

2
Webserver.h
View file

@ -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 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 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 class Webserver
{ {