MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #4058 from MagoKimbra/gcode_T

Browse Source 
Fix gcode_T
This commit is contained in:
Scott Lahteine 2016-06-16 12:54:21 -07:00 committed by GitHub
commit 55edb37b52
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Marlin/Marlin_main.cpp
View File

@ -6624,6 +6624,8 @@ inline void gcode_T(uint8_t tmp_extruder) {
return; return;
} }
#if HOTENDS > 1
float stored_feedrate = feedrate; float stored_feedrate = feedrate;
if (code_seen('F')) { if (code_seen('F')) {
@ -6638,7 +6640,6 @@ inline void gcode_T(uint8_t tmp_extruder) {
#endif #endif
} }
#if HOTENDS > 1
if (tmp_extruder != active_extruder) { if (tmp_extruder != active_extruder) {
bool no_move = code_seen('S') && code_value_bool(); bool no_move = code_seen('S') && code_value_bool();
// Save current position to return to after applying extruder offset // Save current position to return to after applying extruder offset
@ -6794,10 +6795,15 @@ inline void gcode_T(uint8_t tmp_extruder) {
enable_solenoid_on_active_extruder(); enable_solenoid_on_active_extruder();
#endif // EXT_SOLENOID #endif // EXT_SOLENOID
#endif // HOTENDS > 1
feedrate = stored_feedrate; feedrate = stored_feedrate;
#else // !HOTENDS > 1
// Set the new active extruder
active_extruder = tmp_extruder;
#endif
SERIAL_ECHO_START; SERIAL_ECHO_START;
SERIAL_ECHO(MSG_ACTIVE_EXTRUDER); SERIAL_ECHO(MSG_ACTIVE_EXTRUDER);
SERIAL_PROTOCOLLN((int)active_extruder); SERIAL_PROTOCOLLN((int)active_extruder);