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

Corrections to 1.00h

Browse source 
Corrected web interface status responses
This commit is contained in:
David Crocker 2015-02-12 00:08:48 +00:00
parent 7fb8f47424
commit 9c5b1d24d0
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Release/RepRapFirmware-1.00h.bin
View file

Binary file not shown.

14
RepRapFirmware.cpp
View file

@ -899,7 +899,7 @@ void RepRap::GetStatusResponse(StringRef& response, uint8_t type, bool forWebser
response.catf(",\"currentLayerTime\":%.1f", (lastLayerTime > 0.0) ? (platform->Time() - lastLayerTime) : 0.0); response.catf(",\"currentLayerTime\":%.1f", (lastLayerTime > 0.0) ? (platform->Time() - lastLayerTime) : 0.0);
// Raw Extruder Positions // Raw Extruder Positions
response.catf("],\"extrRaw\":"); // announce the extruder positions response.cat(",\"extrRaw\":"); // announce the extruder positions
ch = '['; ch = '[';
for (size_t drive = 0; drive < reprap.GetExtrudersInUse(); drive++) // loop through extruders for (size_t drive = 0; drive < reprap.GetExtrudersInUse(); drive++) // loop through extruders
{ {
@ -1204,15 +1204,19 @@ void RepRap::GetNameResponse(StringRef& response) const
// Get the list of files in the specified directory in JSON format // Get the list of files in the specified directory in JSON format
void RepRap::GetFilesResponse(StringRef& response, const char* dir) const void RepRap::GetFilesResponse(StringRef& response, const char* dir) const
{ {
response.copy("{\"files\":"); response.copy("{\"files\":[");
char c = '[';
FileInfo file_info; FileInfo file_info;
bool firstFile = true;
bool gotFile = platform->GetMassStorage()->FindFirst(dir, file_info); bool gotFile = platform->GetMassStorage()->FindFirst(dir, file_info);
while (gotFile && response.strlen() + strlen(file_info.fileName) + 6 < response.Length()) while (gotFile && response.strlen() + strlen(file_info.fileName) + 6 < response.Length())
{ {
response.catf("%c", c); if (!firstFile)
{
response.catf(",");
}
EncodeString(response, file_info.fileName, 3, false); EncodeString(response, file_info.fileName, 3, false);
c = ',';
firstFile = false;
gotFile = platform->GetMassStorage()->FindNext(file_info); gotFile = platform->GetMassStorage()->FindNext(file_info);
} }
response.cat("]}"); response.cat("]}");