melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

reusing millis()

Browse Source
This commit is contained in:
Ruwan J Egoda Gamage 2015-12-13 22:06:03 -05:00 committed by Richard Wackerbarth
parent 1b7c443628
commit 1833049b8a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Marlin/ultralcd.cpp
View File

@ -1860,8 +1860,10 @@ void lcd_reset_alert_level() { lcd_status_message_level = 0; }
#if BTN_EN2 > 0 #if BTN_EN2 > 0
if (READ(BTN_EN2) == 0) newbutton |= EN_B; if (READ(BTN_EN2) == 0) newbutton |= EN_B;
#endif #endif
#if ENABLED(RIGIDBOT_PANEL) #if ENABLED(RIGIDBOT_PANEL) || BTN_ENC > 0
millis_t now = millis(); millis_t now = millis();
#endif
#if ENABLED(RIGIDBOT_PANEL)
if (now > next_button_update_ms) { if (now > next_button_update_ms) {
if (READ(BTN_UP) == 0) { if (READ(BTN_UP) == 0) {
encoderDiff = -1 * ENCODER_STEPS_PER_MENU_ITEM; encoderDiff = -1 * ENCODER_STEPS_PER_MENU_ITEM;
@ -1881,9 +1883,8 @@ void lcd_reset_alert_level() { lcd_status_message_level = 0; }
} }
} }
#endif #endif
#if BTN_ENC > 0 #if BTN_ENC > 0
if (millis() > next_button_update_ms && READ(BTN_ENC) == 0) newbutton |= EN_C; if (now > next_button_update_ms && READ(BTN_ENC) == 0) newbutton |= EN_C;
#endif #endif
buttons = newbutton; buttons = newbutton;
#if ENABLED(LCD_HAS_SLOW_BUTTONS) #if ENABLED(LCD_HAS_SLOW_BUTTONS)