diff --git a/Configuration.h b/Configuration.h index a3c7f74..5b3b6f7 100644 --- a/Configuration.h +++ b/Configuration.h @@ -24,8 +24,8 @@ Licence: GPL #define CONFIGURATION_H #define NAME "RepRapFirmware" -#define VERSION "0.65b" -#define DATE "2014-05-07" +#define VERSION "0.65c" +#define DATE "2014-05-08" #define LAST_AUTHOR "reprappro" // Other firmware that we might switch to be compatible with. diff --git a/Release/RepRapFirmware-065c-08-05-2014.bin b/Release/RepRapFirmware-065c-08-05-2014.bin new file mode 100755 index 0000000..a98b0a1 Binary files /dev/null and b/Release/RepRapFirmware-065c-08-05-2014.bin differ diff --git a/Webserver.cpp b/Webserver.cpp index 87b9cd3..bb63442 100644 --- a/Webserver.cpp +++ b/Webserver.cpp @@ -415,12 +415,7 @@ void Webserver::GetJsonResponse(const char* request) strncat(jsonResponse, "\"P\",", STRING_LENGTH); // Printing else strncat(jsonResponse, "\"I\",", STRING_LENGTH); // Idle - for(int8_t heater = 0; heater < HEATERS; heater++) - { - strncat(jsonResponse, "\"", STRING_LENGTH); - strncat(jsonResponse, ftoa(0, reprap.GetHeat()->GetTemperature(heater), 1), STRING_LENGTH); - strncat(jsonResponse, "\",", STRING_LENGTH); - } + float liveCoordinates[DRIVES+1]; reprap.GetMove()->LiveCoordinates(liveCoordinates); for(int8_t drive = 0; drive < AXES; drive++) @@ -434,7 +429,18 @@ void Webserver::GetJsonResponse(const char* request) strncat(jsonResponse, "\"", STRING_LENGTH); strncat(jsonResponse, ftoa(0, liveCoordinates[AXES], 4), STRING_LENGTH); - strncat(jsonResponse, "\"", STRING_LENGTH); + strncat(jsonResponse, "\",", STRING_LENGTH); + + for(int8_t heater = 0; heater < HEATERS; heater++) + { + strncat(jsonResponse, "\"", STRING_LENGTH); + strncat(jsonResponse, ftoa(0, reprap.GetHeat()->GetTemperature(heater), 1), STRING_LENGTH); + if(heater < HEATERS - 1) + strncat(jsonResponse, "\",", STRING_LENGTH); + else + strncat(jsonResponse, "\"", STRING_LENGTH); + } + strncat(jsonResponse, "]", STRING_LENGTH); // Send the Z probe value