Skip to content

Fix UBL mesh editing #17670

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 13 commits into from
Apr 28, 2020
Merged

Fix UBL mesh editing #17670

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
91c227e
fix ubl
filippor Apr 22, 2020
551fcf5
Update menu_ubl.cpp
thinkyhead Apr 23, 2020
b3bbbe6
Update menu_ubl.cpp
thinkyhead Apr 23, 2020
d210240
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bf2_ubl_rep…
thinkyhead Apr 25, 2020
3dd3127
Minor cleanup
thinkyhead Apr 25, 2020
b946980
Merge remote-tracking branch 'filippor/UBL_mesh_edit_fix' into bf2_ub…
thinkyhead Apr 25, 2020
602ec39
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bf2_ubl_mes…
thinkyhead Apr 25, 2020
fa19f0f
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bf2_ubl_mes…
thinkyhead Apr 25, 2020
a21b54a
lcd_limbo goes with external control
thinkyhead Apr 25, 2020
0cda4ca
A different patch. Try me!
thinkyhead Apr 25, 2020
6b7a9a9
Update ubl_G29.cpp
thinkyhead Apr 26, 2020
7913c67
Revert to simpler method for nerrr
thinkyhead Apr 26, 2020
9f8d54a
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bf2_ubl_mes…
thinkyhead Apr 26, 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
23 changes: 5 additions & 18 deletions Marlin/src/lcd/menu/menu_ubl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,16 +437,10 @@ void ubl_map_move_to_xy() {
void set_current_from_steppers_for_axis(const AxisEnum axis);
void sync_plan_position();

void _lcd_hard_stop() {
const screenFunc_t old_screen = ui.currentScreen;
lcd_limbo();
planner.quick_stop();
ui.currentScreen = old_screen;
set_current_from_steppers_for_axis(ALL_AXES);
sync_plan_position();
}

void _lcd_ubl_output_map_lcd() {

if (planner.movesplanned()) return;

static int16_t step_scaler = 0;

if (ui.use_click()) return _lcd_ubl_map_lcd_edit_cmd();
Expand All @@ -458,11 +452,7 @@ void _lcd_ubl_output_map_lcd() {
ui.refresh(LCDVIEW_REDRAW_NOW);
}

#if IS_KINEMATIC
#define KEEP_LOOPING true // Loop until a valid point is found
#else
#define KEEP_LOOPING false
#endif
#define KEEP_LOOPING ENABLED(IS_KINEMATIC) // Loop until a valid point is found

do {
// Encoder to the right (++)
Expand Down Expand Up @@ -495,10 +485,6 @@ void _lcd_ubl_output_map_lcd() {

if (ui.should_draw()) {
ui.ubl_plot(x_plot, y_plot);

if (planner.movesplanned()) // If the nozzle is already moving, cancel the move.
_lcd_hard_stop();

ubl_map_move_to_xy(); // Move to new location
}
}
Expand All @@ -511,6 +497,7 @@ void _lcd_ubl_output_map_lcd_cmd() {
set_all_unhomed();
queue.inject_P(G28_STR);
}
if (planner.movesplanned()) return;
ui.goto_screen(_lcd_ubl_map_homing);
}

Expand Down