Browse Source

Fix for Viki display

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

+ 2
- 1
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;\
108
     for(uint8_t _drawLineNr = 0; _drawLineNr < LCD_HEIGHT; _drawLineNr++, _lineNr++) { \
107
     for(uint8_t _drawLineNr = 0; _drawLineNr < LCD_HEIGHT; _drawLineNr++, _lineNr++) { \
109
         _menuItemNr = 0;
108
         _menuItemNr = 0;
110
 #define MENU_ITEM(type, label, args...) do { \
109
 #define MENU_ITEM(type, label, args...) do { \
143
 uint32_t blocking_enc;
142
 uint32_t blocking_enc;
144
 uint8_t lastEncoderBits;
143
 uint8_t lastEncoderBits;
145
 uint32_t encoderPosition;
144
 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
966
     
966
     
967
     if (lcd_next_update_millis < millis())
967
     if (lcd_next_update_millis < millis())
968
     {
968
     {
969
+      wasClicked = LCD_CLICKED;
969
 #ifdef ULTIPANEL
970
 #ifdef ULTIPANEL
970
 		#ifdef REPRAPWORLD_KEYPAD
971
 		#ifdef REPRAPWORLD_KEYPAD
971
         	if (REPRAPWORLD_KEYPAD_MOVE_Z_UP) {
972
         	if (REPRAPWORLD_KEYPAD_MOVE_Z_UP) {

Loading…
Cancel
Save