0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
swissnorp 2020-08-06 05:38:23 +02:00 committed by GitHub
parent 3341fc6728
commit 6da477e6bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Marlin/src/lcd/menu/menu_advanced.cpp
View file

@ -53,7 +53,6 @@
void menu_tmc(); void menu_tmc();
void menu_backlash(); void menu_backlash();
void menu_cancelobject();
#if ENABLED(DAC_STEPPER_CURRENT) #if ENABLED(DAC_STEPPER_CURRENT)
@ -560,10 +559,6 @@ void menu_advanced_settings() {
SUBMENU(MSG_BACKLASH, menu_backlash); SUBMENU(MSG_BACKLASH, menu_backlash);
#endif #endif
#if ENABLED(CANCEL_OBJECTS)
SUBMENU(MSG_CANCEL_OBJECT, []{ editable.int8 = -1; ui.goto_screen(menu_cancelobject); });
#endif
#if ENABLED(DAC_STEPPER_CURRENT) #if ENABLED(DAC_STEPPER_CURRENT)
SUBMENU(MSG_DRIVE_STRENGTH, menu_dac); SUBMENU(MSG_DRIVE_STRENGTH, menu_dac);
#endif #endif

2
Marlin/src/lcd/menu/menu_cancelobject.cpp
View file

@ -43,7 +43,7 @@ static void lcd_cancel_object_confirm() {
}; };
MenuItem_confirm::confirm_screen( MenuItem_confirm::confirm_screen(
[]{ []{
cancelable.cancel_object(MenuItemBase::itemIndex - 1); cancelable.cancel_object(MenuItemBase::itemIndex);
ui.completion_feedback(); ui.completion_feedback();
ui.goto_previous_screen(); ui.goto_previous_screen();
}, },

6
Marlin/src/lcd/menu/menu_main.cpp
View file

@ -51,6 +51,7 @@
#endif #endif
void menu_tune(); void menu_tune();
void menu_cancelobject();
void menu_motion(); void menu_motion();
void menu_temperature(); void menu_temperature();
void menu_configuration(); void menu_configuration();
@ -110,7 +111,12 @@ void menu_main() {
); );
}); });
#endif #endif
SUBMENU(MSG_TUNE, menu_tune); 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 { else {