3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1759 from wavexx/enhanced_longpress

Browse Source 
Default to "Live Adjust Z" when longpressing during a print (closes #1604)
This commit is contained in:
DRracer 2019-09-10 14:13:00 +02:00 committed by GitHub
commit 60de313b8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Firmware/ultralcd.cpp
View File

@ -8523,8 +8523,23 @@ uint8_t get_message_level()
void menu_lcd_longpress_func(void)
{
move_menu_scale = 1.0;
menu_submenu(lcd_move_z);
if (homing_flag || mesh_bed_leveling_flag || menu_menu == lcd_babystep_z || menu_menu == lcd_move_z)
{
// disable longpress during re-entry, while homing or calibration
lcd_quick_feedback();
return;
}
if (current_position[Z_AXIS] < Z_HEIGHT_HIDE_LIVE_ADJUST_MENU && (moves_planned() || IS_SD_PRINTING || is_usb_printing ))
{
lcd_clear();
menu_submenu(lcd_babystep_z);
}
else
{
move_menu_scale = 1.0;
menu_submenu(lcd_move_z);
}
}
void menu_lcd_charsetup_func(void)