浏览代码

Wrap all items depending on ULTIPANEL

Scott Lahteine 8 年前
父节点
当前提交
45ea8749d3
共有 2 个文件被更改,包括 1480 次插入1466 次删除
  1. 1473
    1460
      Marlin/ultralcd.cpp
  2. 7
    6
      Marlin/ultralcd.h

+ 1473
- 1460
Marlin/ultralcd.cpp
文件差异内容过多而无法显示
查看文件


+ 7
- 6
Marlin/ultralcd.h 查看文件

@@ -61,8 +61,11 @@
61 61
   #define LCD_TIMEOUT_TO_STATUS 15000
62 62
 
63 63
   #if ENABLED(ULTIPANEL)
64
-    void lcd_buttons_update();
65 64
     extern volatile uint8_t buttons;  //the last checked buttons in a bit array.
65
+    void lcd_buttons_update();
66
+    void lcd_quick_feedback(); // Audible feedback for a button click - could also be visual
67
+    bool lcd_clicked();
68
+    void lcd_ignore_click(bool b=true);
66 69
   #else
67 70
     FORCE_INLINE void lcd_buttons_update() {}
68 71
   #endif
@@ -79,12 +82,10 @@
79 82
   #if ENABLED(FILAMENT_LCD_DISPLAY)
80 83
     extern millis_t previous_lcd_status_ms;
81 84
   #endif
82
-  void lcd_quick_feedback(); // Audible feedback for a button click - could also be visual
83
-  bool lcd_clicked();
84
-  void lcd_ignore_click(bool b=true);
85
+
85 86
   bool lcd_blink();
86 87
 
87
-  #if ENABLED(ULTIPANEL) && ENABLED(REPRAPWORLD_KEYPAD)
88
+  #if ENABLED(REPRAPWORLD_KEYPAD)
88 89
 
89 90
     #define REPRAPWORLD_BTN_OFFSET 0 // bit offset into buttons for shift register values
90 91
 
@@ -114,7 +115,7 @@
114 115
     #define REPRAPWORLD_KEYPAD_MOVE_Y_UP    (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_UP)
115 116
     #define REPRAPWORLD_KEYPAD_MOVE_X_LEFT  (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_LEFT)
116 117
 
117
-  #endif //ULTIPANEL && REPRAPWORLD_KEYPAD
118
+  #endif // REPRAPWORLD_KEYPAD
118 119
 
119 120
   #if ENABLED(NEWPANEL)
120 121
 

正在加载...
取消
保存