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

Merge pull request #2245 from DRracer/knob-long-press 

Knob long press fixes
This commit is contained in:
Marek Běl 2019-10-01 22:33:26 +02:00 committed by GitHub
parent d044d3b7b5 f3c3526aa5
commit 210d7f6bf1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Firmware/lcd.cpp
View File

@ -761,8 +761,7 @@ void lcd_buttons_update(void)
//else if (menu_menu == lcd_move_z) lcd_quick_feedback(); //else if (menu_menu == lcd_move_z) lcd_quick_feedback();
//lcd_button_pressed is set back to false via lcd_quick_feedback function //lcd_button_pressed is set back to false via lcd_quick_feedback function
} }
else lcd_long_press_active = 0;
lcd_long_press_active = 0;
} }
lcd_buttons = newbutton; lcd_buttons = newbutton;

46
Firmware/ultralcd.cpp
View File

@ -8647,7 +8647,6 @@ uint8_t get_message_level()
return lcd_status_message_level; return lcd_status_message_level;
} }
void menu_lcd_longpress_func(void) void menu_lcd_longpress_func(void)
{ {
if (homing_flag || mesh_bed_leveling_flag || menu_menu == lcd_babystep_z || menu_menu == lcd_move_z) if (homing_flag || mesh_bed_leveling_flag || menu_menu == lcd_babystep_z || menu_menu == lcd_move_z)
@ -8657,15 +8656,42 @@ void menu_lcd_longpress_func(void)
return; return;
} }
if (current_position[Z_AXIS] < Z_HEIGHT_HIDE_LIVE_ADJUST_MENU && (moves_planned() || IS_SD_PRINTING || is_usb_printing )) // explicitely listed menus which are allowed to rise the move-z or live-adj-z functions
{ // The lists are not the same for both functions, so first decide which function is to be performed
lcd_clear(); if ( (moves_planned() || IS_SD_PRINTING || is_usb_printing )){ // long press as live-adj-z
menu_submenu(lcd_babystep_z); if(( current_position[Z_AXIS] < Z_HEIGHT_HIDE_LIVE_ADJUST_MENU ) // only allow live-adj-z up to 2mm of print height
} && ( menu_menu == lcd_status_screen // and in listed menus...
else || menu_menu == lcd_main_menu
{ || menu_menu == lcd_tune_menu
move_menu_scale = 1.0; || menu_menu == lcd_support_menu
menu_submenu(lcd_move_z); )
){
lcd_clear();
menu_submenu(lcd_babystep_z);
} else {
// otherwise consume the long press as normal click
if( menu_menu != lcd_status_screen )
menu_back();
}
} else { // long press as move-z
if(menu_menu == lcd_status_screen
|| menu_menu == lcd_main_menu
|| menu_menu == lcd_preheat_menu
|| menu_menu == lcd_sdcard_menu
|| menu_menu == lcd_settings_menu
|| menu_menu == lcd_control_temperature_menu
#if (LANG_MODE != 0)
|| menu_menu == lcd_language
#endif
|| menu_menu == lcd_support_menu
){
move_menu_scale = 1.0;
menu_submenu(lcd_move_z);
} else {
// otherwise consume the long press as normal click
if( menu_menu != lcd_status_screen )
menu_back();
}
} }
} }