CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes #6975

Browse Source
This commit is contained in:
Scott Lahteine 2017-06-07 11:14:30 -05:00
parent 19b62c14f0
commit 4406fba994
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Marlin/Marlin_main.cpp
View File

@ -7918,19 +7918,18 @@ inline void gcode_M121() { endstops.enable_globally(false); }
#ifdef PAUSE_PARK_X_POS #ifdef PAUSE_PARK_X_POS
+ PAUSE_PARK_X_POS + PAUSE_PARK_X_POS
#endif #endif
#if HOTENDS > 1 && DISABLED(DUAL_X_CARRIAGE)
+ (active_extruder ? hotend_offset[X_AXIS][active_extruder] : 0)
#endif
; ;
const float y_pos = parser.seen('Y') ? parser.value_linear_units() : 0 const float y_pos = parser.seen('Y') ? parser.value_linear_units() : 0
#ifdef PAUSE_PARK_Y_POS #ifdef PAUSE_PARK_Y_POS
+ PAUSE_PARK_Y_POS + PAUSE_PARK_Y_POS
#endif #endif
;
#if HOTENDS > 1 && DISABLED(DUAL_X_CARRIAGE) #if HOTENDS > 1 && DISABLED(DUAL_X_CARRIAGE)
if (active_extruder > 0) { + (active_extruder ? hotend_offset[Y_AXIS][active_extruder] : 0)
if (!parser.seen('X')) x_pos += hotend_offset[X_AXIS][active_extruder];
if (!parser.seen('Y')) y_pos += hotend_offset[Y_AXIS][active_extruder];
}
#endif #endif
;
const bool job_running = print_job_timer.isRunning(); const bool job_running = print_job_timer.isRunning();