ソースを参照

Fix for Viki display

Erik van der Zalm 11年前
コミット
314fd13c39
1個のファイルの変更2行の追加1行の削除
  1. 2
    1
      Marlin/ultralcd.cpp

+ 2
- 1
Marlin/ultralcd.cpp ファイルの表示

@@ -104,7 +104,6 @@ static void menu_action_setting_edit_callback_long5(const char* pstr, unsigned l
104 104
     if (encoderPosition > 0x8000) encoderPosition = 0; \
105 105
     if (encoderPosition / ENCODER_STEPS_PER_MENU_ITEM < currentMenuViewOffset) currentMenuViewOffset = encoderPosition / ENCODER_STEPS_PER_MENU_ITEM;\
106 106
     uint8_t _lineNr = currentMenuViewOffset, _menuItemNr; \
107
-    bool wasClicked = LCD_CLICKED;\
108 107
     for(uint8_t _drawLineNr = 0; _drawLineNr < LCD_HEIGHT; _drawLineNr++, _lineNr++) { \
109 108
         _menuItemNr = 0;
110 109
 #define MENU_ITEM(type, label, args...) do { \
@@ -143,6 +142,7 @@ uint8_t currentMenuViewOffset;              /* scroll offset in the current menu
143 142
 uint32_t blocking_enc;
144 143
 uint8_t lastEncoderBits;
145 144
 uint32_t encoderPosition;
145
+bool wasClicked;
146 146
 #if (SDCARDDETECT > 0)
147 147
 bool lcd_oldcardstatus;
148 148
 #endif
@@ -966,6 +966,7 @@ void lcd_update()
966 966
     
967 967
     if (lcd_next_update_millis < millis())
968 968
     {
969
+      wasClicked = LCD_CLICKED;
969 970
 #ifdef ULTIPANEL
970 971
 		#ifdef REPRAPWORLD_KEYPAD
971 972
         	if (REPRAPWORLD_KEYPAD_MOVE_Z_UP) {

読み込み中…
キャンセル
保存