Bug where by selecting an already selected extruder did not reply (eg "ok" to Pronterface) fixed.

This commit is contained in:
Adrian Bowyer 2013-12-13 14:49:05 +00:00
parent cfdb9dcd89
commit 6f275e0df1
3 changed files with 11 additions and 7 deletions

View file

@ -24,8 +24,8 @@ Licence: GPL
#define CONFIGURATION_H
#define NAME "RepRapFirmware"
#define VERSION "0.36"
#define DATE "2013-12-11"
#define VERSION "0.37"
#define DATE "2013-12-13"
#define LAST_AUTHOR "reprappro.com"
// Other firmware that we might switch to be compatible with.

View file

@ -1609,13 +1609,17 @@ bool GCodes::ActOnGcode(GCodeBuffer *gb)
{
code = gb->GetIValue();
if(code == selectedHead)
return result;
{
if(result)
HandleReply(error, gb == serialGCode, reply, 'T', code, resend);
return result;
}
error = true;
for(int8_t i = AXES; i < DRIVES; i++)
{
if(selectedHead == i - AXES)
reprap.GetHeat()->Standby(selectedHead + 1); // + 1 because 0 is the Bed
if(selectedHead == i - AXES)
reprap.GetHeat()->Standby(selectedHead + 1); // + 1 because 0 is the Bed
}
for(int8_t i = AXES; i < DRIVES; i++)
{
@ -1628,7 +1632,7 @@ bool GCodes::ActOnGcode(GCodeBuffer *gb)
}
if(error)
snprintf(reply, STRING_LENGTH, "invalid T Code: %s", gb->Buffer());
snprintf(reply, STRING_LENGTH, "Invalid T Code: %s", gb->Buffer());
if(result)
HandleReply(error, gb == serialGCode, reply, 'T', code, resend);

Binary file not shown.