0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Revert "Fix for Viki display"

Browse source 
This reverts commit 314fd13c39.
This commit is contained in:
Erik van der Zalm 2013-10-20 10:16:46 +02:00
parent bf27e79e74
commit 667d278f54
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Marlin/ultralcd.cpp
View file

@ -104,6 +104,7 @@ static void menu_action_setting_edit_callback_long5(const char* pstr, unsigned l
if (encoderPosition > 0x8000) encoderPosition = 0; \
if (encoderPosition / ENCODER_STEPS_PER_MENU_ITEM < currentMenuViewOffset) currentMenuViewOffset = encoderPosition / ENCODER_STEPS_PER_MENU_ITEM;\
uint8_t _lineNr = currentMenuViewOffset, _menuItemNr; \
bool wasClicked = LCD_CLICKED;\
for(uint8_t _drawLineNr = 0; _drawLineNr < LCD_HEIGHT; _drawLineNr++, _lineNr++) { \
_menuItemNr = 0;
#define MENU_ITEM(type, label, args...) do { \
@ -142,7 +143,6 @@ uint8_t currentMenuViewOffset; /* scroll offset in the current menu
uint32_t blocking_enc;
uint8_t lastEncoderBits;
uint32_t encoderPosition;
bool wasClicked;
#if (SDCARDDETECT > 0)
bool lcd_oldcardstatus;
#endif
@ -1042,7 +1042,6 @@ void lcd_update()
if (lcd_next_update_millis < millis())
{
wasClicked = LCD_CLICKED;
#ifdef ULTIPANEL
#ifdef REPRAPWORLD_KEYPAD
if (REPRAPWORLD_KEYPAD_MOVE_Z_UP) {