Browse Source

Followup to endstops tweaks

Scott Lahteine 7 years ago
parent
commit
ee333f6be2
2 changed files with 12 additions and 16 deletions
  1. 0
    2
      Marlin/src/lcd/ultralcd.cpp
  2. 12
    14
      Marlin/src/lcd/ultralcd.h

+ 0
- 2
Marlin/src/lcd/ultralcd.cpp View File

@@ -5497,11 +5497,9 @@ void lcd_reset_alert_level() { lcd_status_message_level = 0; }
5497 5497
         #if BUTTON_EXISTS(EN1)
5498 5498
           if (BUTTON_PRESSED(EN1)) newbutton |= EN_A;
5499 5499
         #endif
5500
-
5501 5500
         #if BUTTON_EXISTS(EN2)
5502 5501
           if (BUTTON_PRESSED(EN2)) newbutton |= EN_B;
5503 5502
         #endif
5504
-
5505 5503
         #if BUTTON_EXISTS(ENC)
5506 5504
           if (BUTTON_PRESSED(ENC)) newbutton |= EN_C;
5507 5505
         #endif

+ 12
- 14
Marlin/src/lcd/ultralcd.h View File

@@ -180,12 +180,6 @@
180 180
     #define REPRAPWORLD_KEYPAD_MOVE_HOME    (buttons_reprapworld_keypad & KEYPAD_HOME)
181 181
     #define REPRAPWORLD_KEYPAD_MOVE_MENU    (buttons_reprapworld_keypad & KEYPAD_EN_C)
182 182
 
183
-    #if BUTTON_EXISTS(ENC)
184
-      #define LCD_CLICKED ((buttons & EN_C) || REPRAPWORLD_KEYPAD_MOVE_MENU)
185
-    #else
186
-      #define LCD_CLICKED REPRAPWORLD_KEYPAD_MOVE_MENU
187
-    #endif
188
-
189 183
     #define REPRAPWORLD_KEYPAD_PRESSED      (buttons_reprapworld_keypad & ( \
190 184
                                               EN_REPRAPWORLD_KEYPAD_F3 | \
191 185
                                               EN_REPRAPWORLD_KEYPAD_F2 | \
@@ -197,14 +191,6 @@
197 191
                                               EN_REPRAPWORLD_KEYPAD_LEFT) \
198 192
                                             )
199 193
 
200
-  #elif defined(EN_C)
201
-
202
-    #define LCD_CLICKED (buttons & EN_C)
203
-
204
-  #else
205
-
206
-    #define LCD_CLICKED false
207
-
208 194
   #endif
209 195
 
210 196
   #if ENABLED(AUTO_BED_LEVELING_UBL) || ENABLED(G26_MESH_VALIDATION)
@@ -259,6 +245,18 @@
259 245
 
260 246
 #endif
261 247
 
248
+#if ENABLED(REPRAPWORLD_KEYPAD)
249
+  #ifdef EN_C
250
+    #define LCD_CLICKED ((buttons & EN_C) || REPRAPWORLD_KEYPAD_MOVE_MENU)
251
+  #else
252
+    #define LCD_CLICKED REPRAPWORLD_KEYPAD_MOVE_MENU
253
+  #endif
254
+#elif defined(EN_C)
255
+  #define LCD_CLICKED (buttons & EN_C)
256
+#else
257
+  #define LCD_CLICKED false
258
+#endif
259
+
262 260
 #define LCD_MESSAGEPGM(x)      lcd_setstatusPGM(PSTR(x))
263 261
 #define LCD_ALERTMESSAGEPGM(x) lcd_setalertstatusPGM(PSTR(x))
264 262
 

Loading…
Cancel
Save