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

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

Browse source
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
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.36" #define VERSION "0.37"
#define DATE "2013-12-11" #define DATE "2013-12-13"
#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.

12
GCodes.cpp
View file

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

BIN
Release/RepRapFirmware.bin
View file

Binary file not shown.