Scott Lahteine 8 years ago
parent
commit
4406fba994
1 changed files with 6 additions and 7 deletions
  1. 6
    7
      Marlin/Marlin_main.cpp

+ 6
- 7
Marlin/Marlin_main.cpp View File

7918
       #ifdef PAUSE_PARK_X_POS
7918
       #ifdef PAUSE_PARK_X_POS
7919
         + PAUSE_PARK_X_POS
7919
         + PAUSE_PARK_X_POS
7920
       #endif
7920
       #endif
7921
+      #if HOTENDS > 1 && DISABLED(DUAL_X_CARRIAGE)
7922
+        + (active_extruder ? hotend_offset[X_AXIS][active_extruder] : 0)
7923
+      #endif
7921
     ;
7924
     ;
7922
     const float y_pos = parser.seen('Y') ? parser.value_linear_units() : 0
7925
     const float y_pos = parser.seen('Y') ? parser.value_linear_units() : 0
7923
       #ifdef PAUSE_PARK_Y_POS
7926
       #ifdef PAUSE_PARK_Y_POS
7924
         + PAUSE_PARK_Y_POS
7927
         + PAUSE_PARK_Y_POS
7925
       #endif
7928
       #endif
7929
+      #if HOTENDS > 1 && DISABLED(DUAL_X_CARRIAGE)
7930
+        + (active_extruder ? hotend_offset[Y_AXIS][active_extruder] : 0)
7931
+      #endif
7926
     ;
7932
     ;
7927
 
7933
 
7928
-    #if HOTENDS > 1 && DISABLED(DUAL_X_CARRIAGE)
7929
-      if (active_extruder > 0) {
7930
-        if (!parser.seen('X')) x_pos += hotend_offset[X_AXIS][active_extruder];
7931
-        if (!parser.seen('Y')) y_pos += hotend_offset[Y_AXIS][active_extruder];
7932
-      }
7933
-    #endif
7934
-
7935
     const bool job_running = print_job_timer.isRunning();
7934
     const bool job_running = print_job_timer.isRunning();
7936
 
7935
 
7937
     if (pause_print(retract, z_lift, x_pos, y_pos)) {
7936
     if (pause_print(retract, z_lift, x_pos, y_pos)) {

Loading…
Cancel
Save