Browse Source

Merge pull request #4011 from thinkyhead/rc_manual_move_cond

Wrap all items depending on ULTIPANEL
Scott Lahteine 8 years ago
parent
commit
d50ba08246
2 changed files with 1495 additions and 1481 deletions
  1. 1488
    1475
      Marlin/ultralcd.cpp
  2. 7
    6
      Marlin/ultralcd.h

+ 1488
- 1475
Marlin/ultralcd.cpp
File diff suppressed because it is too large
View File


+ 7
- 6
Marlin/ultralcd.h View File

61
   #define LCD_TIMEOUT_TO_STATUS 15000
61
   #define LCD_TIMEOUT_TO_STATUS 15000
62
 
62
 
63
   #if ENABLED(ULTIPANEL)
63
   #if ENABLED(ULTIPANEL)
64
-    void lcd_buttons_update();
65
     extern volatile uint8_t buttons;  //the last checked buttons in a bit array.
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
   #else
69
   #else
67
     FORCE_INLINE void lcd_buttons_update() {}
70
     FORCE_INLINE void lcd_buttons_update() {}
68
   #endif
71
   #endif
79
   #if ENABLED(FILAMENT_LCD_DISPLAY)
82
   #if ENABLED(FILAMENT_LCD_DISPLAY)
80
     extern millis_t previous_lcd_status_ms;
83
     extern millis_t previous_lcd_status_ms;
81
   #endif
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
   bool lcd_blink();
86
   bool lcd_blink();
86
 
87
 
87
-  #if ENABLED(ULTIPANEL) && ENABLED(REPRAPWORLD_KEYPAD)
88
+  #if ENABLED(REPRAPWORLD_KEYPAD)
88
 
89
 
89
     #define REPRAPWORLD_BTN_OFFSET 0 // bit offset into buttons for shift register values
90
     #define REPRAPWORLD_BTN_OFFSET 0 // bit offset into buttons for shift register values
90
 
91
 
114
     #define REPRAPWORLD_KEYPAD_MOVE_Y_UP    (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_UP)
115
     #define REPRAPWORLD_KEYPAD_MOVE_Y_UP    (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_UP)
115
     #define REPRAPWORLD_KEYPAD_MOVE_X_LEFT  (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_LEFT)
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
   #if ENABLED(NEWPANEL)
120
   #if ENABLED(NEWPANEL)
120
 
121
 

Loading…
Cancel
Save