swissnorp
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
7 additions and
6 deletions
-
Marlin/src/lcd/menu/menu_advanced.cpp
-
Marlin/src/lcd/menu/menu_cancelobject.cpp
-
Marlin/src/lcd/menu/menu_main.cpp
|
@ -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 |
|
|
|
@ -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(); |
|
|
}, |
|
|
}, |
|
|
|
@ -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 { |
|
|
|
|
|
|
|
|