Skip to content

FIX menu_cancelobject.cpp and move it below tune while busy #18930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thinkyhead merged 12 commits into from
Aug 6, 2020
Merged

FIX menu_cancelobject.cpp and move it below tune while busy #18930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
292ac9b
Update cancel_object.cpp
swissnorp Jul 28, 2020
7e6ed9f
Update G28.cpp
swissnorp Jul 28, 2020
b06528e
Revert "Update G28.cpp"
swissnorp Jul 28, 2020
8de48c1
Revert "Update cancel_object.cpp"
swissnorp Jul 28, 2020
7086a83
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
swissnorp Jul 30, 2020
e2ec5fa
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
swissnorp Aug 1, 2020
b28add0
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
swissnorp Aug 3, 2020
d53f7d7
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
swissnorp Aug 4, 2020
94628dc
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
swissnorp Aug 4, 2020
32c606a
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
swissnorp Aug 5, 2020
164de79
Fix and move menu_cancelobject
swissnorp Aug 5, 2020
ae26719
Update menu_main.cpp
thinkyhead Aug 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions Marlin/src/lcd/menu/menu_advanced.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@

void menu_tmc();
void menu_backlash();
void menu_cancelobject();

#if ENABLED(DAC_STEPPER_CURRENT)

Expand Down Expand Up @@ -560,10 +559,6 @@ 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
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/menu/menu_cancelobject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ static void lcd_cancel_object_confirm() {
};
MenuItem_confirm::confirm_screen(
[]{
cancelable.cancel_object(MenuItemBase::itemIndex - 1);
cancelable.cancel_object(MenuItemBase::itemIndex);
ui.completion_feedback();
ui.goto_previous_screen();
},
Expand Down
6 changes: 6 additions & 0 deletions Marlin/src/lcd/menu/menu_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
#endif

void menu_tune();
void menu_cancelobject();
void menu_motion();
void menu_temperature();
void menu_configuration();
Expand Down Expand Up @@ -110,7 +111,12 @@ 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 {

Expand Down