Browse Source

Fix manual moves for switching tools (#10868)

Scott Lahteine 7 years ago
parent
commit
cf7d5a642a
No account linked to committer's email address
2 changed files with 29 additions and 15 deletions
  1. 0
    2
      Marlin/src/inc/Conditionals_LCD.h
  2. 29
    13
      Marlin/src/lcd/ultralcd.cpp

+ 0
- 2
Marlin/src/inc/Conditionals_LCD.h View File

@@ -426,10 +426,8 @@
426 426
 #if ENABLED(SWITCHING_EXTRUDER)                               // One stepper for every two EXTRUDERS
427 427
   #if EXTRUDERS > 4
428 428
     #define E_STEPPERS    3
429
-    #define E_MANUAL      3
430 429
   #elif EXTRUDERS > 2
431 430
     #define E_STEPPERS    2
432
-    #define E_MANUAL      2
433 431
   #else
434 432
     #define E_STEPPERS    1
435 433
   #endif

+ 29
- 13
Marlin/src/lcd/ultralcd.cpp View File

@@ -3260,20 +3260,36 @@ void lcd_quick_feedback(const bool clear_buttons) {
3260 3260
 
3261 3261
     #endif
3262 3262
 
3263
-    MENU_ITEM(submenu, MSG_MOVE_E, lcd_move_get_e_amount);
3264
-    #if E_MANUAL > 1
3265
-      MENU_ITEM(submenu, MSG_MOVE_E MSG_MOVE_E1, lcd_move_get_e0_amount);
3266
-      MENU_ITEM(submenu, MSG_MOVE_E MSG_MOVE_E2, lcd_move_get_e1_amount);
3267
-      #if E_MANUAL > 2
3263
+    #if ENABLED(SWITCHING_EXTRUDER) || ENABLED(SWITCHING_NOZZLE)
3264
+
3265
+      // Only the current...
3266
+      MENU_ITEM(submenu, MSG_MOVE_E, lcd_move_get_e_amount);
3267
+      // ...and the non-switching
3268
+      #if E_MANUAL == 5
3269
+        MENU_ITEM(submenu, MSG_MOVE_E MSG_MOVE_E5, lcd_move_get_e4_amount);
3270
+      #elif E_MANUAL == 3
3268 3271
         MENU_ITEM(submenu, MSG_MOVE_E MSG_MOVE_E3, lcd_move_get_e2_amount);
3269
-        #if E_MANUAL > 3
3270
-          MENU_ITEM(submenu, MSG_MOVE_E MSG_MOVE_E4, lcd_move_get_e3_amount);
3271
-          #if E_MANUAL > 4
3272
-            MENU_ITEM(submenu, MSG_MOVE_E MSG_MOVE_E5, lcd_move_get_e4_amount);
3273
-          #endif // E_MANUAL > 4
3274
-        #endif // E_MANUAL > 3
3275
-      #endif // E_MANUAL > 2
3276
-    #endif // E_MANUAL > 1
3272
+      #endif
3273
+
3274
+    #else
3275
+
3276
+      // Independent extruders with one E-stepper per hotend
3277
+      MENU_ITEM(submenu, MSG_MOVE_E, lcd_move_get_e_amount);
3278
+      #if E_MANUAL > 1
3279
+        MENU_ITEM(submenu, MSG_MOVE_E MSG_MOVE_E1, lcd_move_get_e0_amount);
3280
+        MENU_ITEM(submenu, MSG_MOVE_E MSG_MOVE_E2, lcd_move_get_e1_amount);
3281
+        #if E_MANUAL > 2
3282
+          MENU_ITEM(submenu, MSG_MOVE_E MSG_MOVE_E3, lcd_move_get_e2_amount);
3283
+          #if E_MANUAL > 3
3284
+            MENU_ITEM(submenu, MSG_MOVE_E MSG_MOVE_E4, lcd_move_get_e3_amount);
3285
+            #if E_MANUAL > 4
3286
+              MENU_ITEM(submenu, MSG_MOVE_E MSG_MOVE_E5, lcd_move_get_e4_amount);
3287
+            #endif // E_MANUAL > 4
3288
+          #endif // E_MANUAL > 3
3289
+        #endif // E_MANUAL > 2
3290
+      #endif // E_MANUAL > 1
3291
+
3292
+    #endif
3277 3293
 
3278 3294
     END_MENU();
3279 3295
   }

Loading…
Cancel
Save