3d_print_resources/Marlin
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Move lcd_map_control to UBL

Browse source 
For parity with bugfix-2.0.x
This commit is contained in:
Scott Lahteine 2017-11-22 18:28:43 -06:00
parent 73ddc762c8
commit 99b71c1dde
7 changed files with 23 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Marlin/ubl_G29.cpp
View file

@ -1526,7 +1526,7 @@
idle();
} while (!ubl_lcd_clicked());
if (!ubl_lcd_map_control) lcd_return_to_status();
if (!lcd_map_control) lcd_return_to_status();
// The technique used here generates a race condition for the encoder click.
// It could get detected in lcd_mesh_edit (actually _lcd_mesh_fine_tune) or here.
@ -1571,7 +1571,7 @@
LCD_MESSAGEPGM(MSG_UBL_DONE_EDITING_MESH);
SERIAL_ECHOLNPGM("Done Editing Mesh");
if (ubl_lcd_map_control)
if (lcd_map_control)
lcd_goto_screen(_lcd_ubl_output_map_lcd);
else
lcd_return_to_status();