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

Use ShortTimer instead of long_press_timer global variable.

This commit is contained in:
Marek Bel 2018-05-11 17:05:12 +02:00
parent 02ecd08786
commit b71a29ad96
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Firmware/ultralcd.cpp
View File

@ -174,7 +174,6 @@ unsigned long display_time; //just timer for showing pid finished message on lcd
float pid_temp = DEFAULT_PID_TEMP; float pid_temp = DEFAULT_PID_TEMP;
bool long_press_active = false; bool long_press_active = false;
long long_press_timer = millis();
unsigned long button_blanking_time = millis(); unsigned long button_blanking_time = millis();
bool button_pressed = false; bool button_pressed = false;
@ -7704,13 +7703,13 @@ void lcd_buttons_update()
lcd_timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS; lcd_timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS;
if (millis() > button_blanking_time) { if (millis() > button_blanking_time) {
button_blanking_time = millis() + BUTTON_BLANKING_TIME; button_blanking_time = millis() + BUTTON_BLANKING_TIME;
static ShortTimer longPressTimer;
if (button_pressed == false && long_press_active == false) { if (button_pressed == false && long_press_active == false) {
long_press_timer = millis(); longPressTimer.start();
button_pressed = true; button_pressed = true;
} }
else { else {
if (millis() - long_press_timer > LONG_PRESS_TIME) { //long press activated if (longPressTimer.expired(LONG_PRESS_TIME)) {
long_press_active = true; long_press_active = true;
move_menu_scale = 1.0; move_menu_scale = 1.0;
menu_action_submenu(lcd_move_z); menu_action_submenu(lcd_move_z);