diff --git a/Configuration.h b/Configuration.h index d75e921..caacee4 100644 --- a/Configuration.h +++ b/Configuration.h @@ -24,8 +24,8 @@ Licence: GPL #define CONFIGURATION_H #define NAME "RepRapFirmware" -#define VERSION "0.78m-dc42" -#define DATE "2014-08-24" +#define VERSION "0.78n-dc42" +#define DATE "2014-08-26" #define AUTHORS "reprappro, dc42, zpl" // Other firmware that we might switch to be compatible with. diff --git a/GCodes.cpp b/GCodes.cpp index e1d94f0..2a5c04c 100644 --- a/GCodes.cpp +++ b/GCodes.cpp @@ -1840,18 +1840,20 @@ bool GCodes::HandleMcode(GCodeBuffer* gb) case 20: // Deprecated... { - bool encapsulate_list; + // To mimic the behaviour of the official RepRapPro firmware: + // If we are emulating RepRap then we print "GCode files:\n" at the start, otherwise we don't. + // If we are emulating Marlin and the code came via the serial/USB interface, then we don't put quotes around the names and we separate them with newline; + // otherwise we put quotes around them and separate them with comma. if (platform->Emulating() == me || platform->Emulating() == reprapFirmware) { reply.copy("GCode files:\n"); - encapsulate_list = false; } else { reply.Clear(); - encapsulate_list = true; } + bool encapsulate_list = (gb != serialGCode || platform->Emulating() != marlin); FileInfo file_info; if (platform->GetMassStorage()->FindFirst(platform->GetGCodeDir(), file_info)) { @@ -1867,7 +1869,7 @@ bool GCodes::HandleMcode(GCodeBuffer* gb) } } while (platform->GetMassStorage()->FindNext(file_info)); - // remove the last character + // remove the last separator reply[reply.strlen() - 1] = 0; } else diff --git a/Release/RepRapFirmware-078n-dc42.bin b/Release/RepRapFirmware-078n-dc42.bin new file mode 100644 index 0000000..52f9a7b Binary files /dev/null and b/Release/RepRapFirmware-078n-dc42.bin differ