Move Cancel Object menu, fix canceled item index (MarlinFirmware#18930)

walterp1982 · Aug 15, 2022 · 0cc1e5a · 0cc1e5a
1 parent 99688a7
commit 0cc1e5a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -643,7 +643,11 @@ void menu_advanced_settings() {
     SUBMENU(MSG_BACKLASH, menu_backlash);
   #endif
 
-  #if HAS_MOTOR_CURRENT_DAC
+  #if ENABLED(CANCEL_OBJECTS)
+    SUBMENU(MSG_CANCEL_OBJECT, []{ editable.int8 = -1; ui.goto_screen(menu_cancelobject); });
+  #endif
+
+  #if ENABLED(DAC_STEPPER_CURRENT)
     SUBMENU(MSG_DRIVE_STRENGTH, menu_dac);
   #endif
   #if HAS_MOTOR_CURRENT_PWM

diff --git a/Marlin/src/lcd/menu/menu_main.cpp b/Marlin/src/lcd/menu/menu_main.cpp
@@ -286,12 +286,9 @@ void menu_main() {
       });
     #endif
 
-    #if ENABLED(GCODE_REPEAT_MARKERS)
-      if (repeat.is_active())
-        ACTION_ITEM(MSG_END_LOOPS, repeat.cancel);
-    #endif
+    #if !HAS_ENCODER_WHEEL && ENABLED(SDSUPPORT)
 
-    SUBMENU(MSG_TUNE, menu_tune);
+      // *** IF THIS SECTION IS CHANGED, REPRODUCE BELOW ***
 
     #if ENABLED(CANCEL_OBJECTS) && DISABLED(SLIM_LCD_MENUS)
       SUBMENU(MSG_CANCEL_OBJECT, []{ editable.int8 = -1; ui.goto_screen(menu_cancelobject); });