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

Use Timer class for button blanking. Save 74B FLASH and 1B RAM.

Browse Source
This commit is contained in:
PavelSindler 2018-07-22 15:05:24 +02:00
parent ce7c4aa737
commit 5b6fb9e49b
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Firmware/lcd.cpp
View File

@ -675,7 +675,7 @@ lcd_charsetup_func_t lcd_charsetup_func = 0;
lcd_lcdupdate_func_t lcd_lcdupdate_func = 0; lcd_lcdupdate_func_t lcd_lcdupdate_func = 0;
uint32_t lcd_button_blanking_time = millis(); static ShortTimer buttonBlanking;
ShortTimer longPressTimer; ShortTimer longPressTimer;
@ -763,9 +763,8 @@ void lcd_buttons_update(void)
if (READ(BTN_ENC) == 0) if (READ(BTN_ENC) == 0)
{ //button is pressed { //button is pressed
lcd_timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS; lcd_timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS;
if (millis() > lcd_button_blanking_time) if (!buttonBlanking.running() || buttonBlanking.expired(BUTTON_BLANKING_TIME)) {
{ buttonBlanking.start();
lcd_button_blanking_time = millis() + BUTTON_BLANKING_TIME;
if ((lcd_button_pressed == 0) && (lcd_long_press_active == 0)) if ((lcd_button_pressed == 0) && (lcd_long_press_active == 0))
{ {
longPressTimer.start(); longPressTimer.start();
@ -786,7 +785,7 @@ void lcd_buttons_update(void)
{ //button not pressed { //button not pressed
if (lcd_button_pressed) if (lcd_button_pressed)
{ //button was released { //button was released
lcd_button_blanking_time = millis() + BUTTON_BLANKING_TIME; buttonBlanking.start();
if (lcd_long_press_active == 0) if (lcd_long_press_active == 0)
{ //button released before long press gets activated { //button released before long press gets activated
newbutton |= EN_C; newbutton |= EN_C;