zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Tweak M125 code

Browse source
This commit is contained in:
Scott Lahteine 2017-12-25 01:39:55 -06:00
parent 3b51f5c67e
commit c6354fa153
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Marlin/src/gcode/feature/pause/M125.cpp
View file

@ -49,8 +49,6 @@
* Z = override Z raise * Z = override Z raise
*/ */
void GcodeSuite::M125() { void GcodeSuite::M125() {
point_t park_point = NOZZLE_PARK_POINT;
// Initial retract before move to filament change position // Initial retract before move to filament change position
const float retract = parser.seen('L') ? parser.value_axis_units(E_AXIS) : 0 const float retract = parser.seen('L') ? parser.value_axis_units(E_AXIS) : 0
#ifdef PAUSE_PARK_RETRACT_LENGTH #ifdef PAUSE_PARK_RETRACT_LENGTH
@ -58,16 +56,14 @@ void GcodeSuite::M125() {
#endif #endif
; ;
// Lift Z axis point_t park_point = NOZZLE_PARK_POINT;
if (parser.seenval('Z'))
park_point.z = parser.linearval('Z');
// Move XY axes to filament change position or given position // Move XY axes to filament change position or given position
if (parser.seenval('X')) if (parser.seenval('X')) park_point.x = parser.linearval('X');
park_point.x = parser.linearval('X'); if (parser.seenval('Y')) park_point.y = parser.linearval('Y');
if (parser.seenval('Y')) // Lift Z axis
park_point.y = parser.linearval('Y'); if (parser.seenval('Z')) park_point.z = parser.linearval('Z');
#if HOTENDS > 1 && DISABLED(DUAL_X_CARRIAGE) #if HOTENDS > 1 && DISABLED(DUAL_X_CARRIAGE)
park_point.x += (active_extruder ? hotend_offset[X_AXIS][active_extruder] : 0); park_point.x += (active_extruder ? hotend_offset[X_AXIS][active_extruder] : 0);