Revert "Move Cancel Object menu, fix canceled item index (MarlinFirmw…

…are#18930)" This reverts commit 1d876a1.
ahmetcemturan · Jan 23, 2021 · 4c6998a · 4c6998a
1 parent 09f02a9
commit 4c6998a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -53,6 +53,7 @@
 
 void menu_tmc();
 void menu_backlash();
+void menu_cancelobject();
 
 #if ENABLED(DAC_STEPPER_CURRENT)
 
@@ -559,6 +560,10 @@ void menu_advanced_settings() {
     SUBMENU(MSG_BACKLASH, menu_backlash);
   #endif
 
+  #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

diff --git a/Marlin/src/lcd/menu/menu_cancelobject.cpp b/Marlin/src/lcd/menu/menu_cancelobject.cpp
@@ -43,7 +43,7 @@ static void lcd_cancel_object_confirm() {
   };
   MenuItem_confirm::confirm_screen(
     []{
-      cancelable.cancel_object(MenuItemBase::itemIndex);
+      cancelable.cancel_object(MenuItemBase::itemIndex - 1);
       ui.completion_feedback();
       ui.goto_previous_screen();
     },

diff --git a/Marlin/src/lcd/menu/menu_main.cpp b/Marlin/src/lcd/menu/menu_main.cpp
@@ -51,7 +51,6 @@
 #endif
 
 void menu_tune();
-void menu_cancelobject();
 void menu_motion();
 void menu_temperature();
 void menu_configuration();
@@ -111,12 +110,7 @@ void menu_main() {
         );
       });
     #endif
-
     SUBMENU(MSG_TUNE, menu_tune);
-
-    #if ENABLED(CANCEL_OBJECTS) && DISABLED(SLIM_LCD_MENUS)
-      SUBMENU(MSG_CANCEL_OBJECT, []{ editable.int8 = -1; ui.goto_screen(menu_cancelobject); });
-    #endif
   }
   else {