Browse Source

Fix DUAL_X_CARRIAGE manual moves, add T0/T1 menu item

Scott Lahteine 7 years ago
parent
commit
ca3c9baf1b
1 changed files with 7 additions and 3 deletions
  1. 7
    3
      Marlin/src/lcd/ultralcd.cpp

+ 7
- 3
Marlin/src/lcd/ultralcd.cpp View File

@@ -2750,9 +2750,13 @@ void kill_screen(const char* lcd_msg) {
2750 2750
       , int8_t eindex=-1
2751 2751
     #endif
2752 2752
   ) {
2753
-    #if E_MANUAL > 1
2754
-      if (axis == E_AXIS) manual_move_e_index = eindex >= 0 ? eindex : active_extruder;
2753
+    #if ENABLED(DUAL_X_CARRIAGE) || E_MANUAL > 1
2754
+      #if E_MANUAL > 1
2755
+        if (axis == E_AXIS)
2756
+      #endif
2757
+          manual_move_e_index = eindex >= 0 ? eindex : active_extruder;
2755 2758
     #endif
2759
+
2756 2760
     manual_move_start_time = millis() + (move_menu_scale < 0.99 ? 0UL : 250UL); // delay for bigger moves
2757 2761
     manual_move_axis = (int8_t)axis;
2758 2762
   }
@@ -2963,7 +2967,7 @@ void kill_screen(const char* lcd_msg) {
2963 2967
     else
2964 2968
       MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28"));
2965 2969
 
2966
-    #if ENABLED(SWITCHING_EXTRUDER)
2970
+    #if ENABLED(SWITCHING_EXTRUDER) || ENABLED(DUAL_X_CARRIAGE)
2967 2971
       if (active_extruder)
2968 2972
         MENU_ITEM(gcode, MSG_SELECT " " MSG_E1, PSTR("T0"));
2969 2973
       else

Loading…
Cancel
Save