CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects 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

38
Marlin/Marlin_main.cpp
View File

@ -6624,21 +6624,22 @@ inline void gcode_T(uint8_t tmp_extruder) {
return;
}
float stored_feedrate = feedrate;
if (code_seen('F')) {
float next_feedrate = code_value_axis_units(X_AXIS);
if (next_feedrate > 0.0) stored_feedrate = feedrate = next_feedrate;
}
else {
#ifdef XY_TRAVEL_SPEED
feedrate = XY_TRAVEL_SPEED;
#else
feedrate = min(planner.max_feedrate[X_AXIS], planner.max_feedrate[Y_AXIS]);
#endif
}
#if HOTENDS > 1
float stored_feedrate = feedrate;
if (code_seen('F')) {
float next_feedrate = code_value_axis_units(X_AXIS);
if (next_feedrate > 0.0) stored_feedrate = feedrate = next_feedrate;
}
else {
#ifdef XY_TRAVEL_SPEED
feedrate = XY_TRAVEL_SPEED;
#else
feedrate = min(planner.max_feedrate[X_AXIS], planner.max_feedrate[Y_AXIS]);
#endif
}
if (tmp_extruder != active_extruder) {
bool no_move = code_seen('S') && code_value_bool();
// Save current position to return to after applying extruder offset
@ -6794,9 +6795,14 @@ inline void gcode_T(uint8_t tmp_extruder) {
enable_solenoid_on_active_extruder();
#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(MSG_ACTIVE_EXTRUDER);