Browse Source

Revert "Fix for Viki display"

This reverts commit 314fd13c39.
Erik van der Zalm 11 years ago
parent
commit
667d278f54
1 changed files with 1 additions and 2 deletions
  1. 1
    2
      Marlin/ultralcd.cpp

+ 1
- 2
Marlin/ultralcd.cpp View File

104
     if (encoderPosition > 0x8000) encoderPosition = 0; \
104
     if (encoderPosition > 0x8000) encoderPosition = 0; \
105
     if (encoderPosition / ENCODER_STEPS_PER_MENU_ITEM < currentMenuViewOffset) currentMenuViewOffset = encoderPosition / ENCODER_STEPS_PER_MENU_ITEM;\
105
     if (encoderPosition / ENCODER_STEPS_PER_MENU_ITEM < currentMenuViewOffset) currentMenuViewOffset = encoderPosition / ENCODER_STEPS_PER_MENU_ITEM;\
106
     uint8_t _lineNr = currentMenuViewOffset, _menuItemNr; \
106
     uint8_t _lineNr = currentMenuViewOffset, _menuItemNr; \
107
+    bool wasClicked = LCD_CLICKED;\
107
     for(uint8_t _drawLineNr = 0; _drawLineNr < LCD_HEIGHT; _drawLineNr++, _lineNr++) { \
108
     for(uint8_t _drawLineNr = 0; _drawLineNr < LCD_HEIGHT; _drawLineNr++, _lineNr++) { \
108
         _menuItemNr = 0;
109
         _menuItemNr = 0;
109
 #define MENU_ITEM(type, label, args...) do { \
110
 #define MENU_ITEM(type, label, args...) do { \
142
 uint32_t blocking_enc;
143
 uint32_t blocking_enc;
143
 uint8_t lastEncoderBits;
144
 uint8_t lastEncoderBits;
144
 uint32_t encoderPosition;
145
 uint32_t encoderPosition;
145
-bool wasClicked;
146
 #if (SDCARDDETECT > 0)
146
 #if (SDCARDDETECT > 0)
147
 bool lcd_oldcardstatus;
147
 bool lcd_oldcardstatus;
148
 #endif
148
 #endif
1042
     
1042
     
1043
     if (lcd_next_update_millis < millis())
1043
     if (lcd_next_update_millis < millis())
1044
     {
1044
     {
1045
-      wasClicked = LCD_CLICKED;
1046
 #ifdef ULTIPANEL
1045
 #ifdef ULTIPANEL
1047
 		#ifdef REPRAPWORLD_KEYPAD
1046
 		#ifdef REPRAPWORLD_KEYPAD
1048
         	if (REPRAPWORLD_KEYPAD_MOVE_Z_UP) {
1047
         	if (REPRAPWORLD_KEYPAD_MOVE_Z_UP) {

Loading…
Cancel
Save