Browse Source

Make Marlin actually compile when #define REPRAPWORLD_KEYPAD is uncommented

brupje 9 years ago
parent
commit
8f8bf3a897
2 changed files with 9 additions and 9 deletions
  1. 4
    4
      Marlin/ultralcd.cpp
  2. 5
    5
      Marlin/ultralcd_implementation_hitachi_HD44780.h

+ 4
- 4
Marlin/ultralcd.cpp View File

212
       } } while(0)
212
       } } while(0)
213
 
213
 
214
   /** Used variables to keep track of the menu */
214
   /** Used variables to keep track of the menu */
215
-  #ifndef REPRAPWORLD_KEYPAD
216
-    volatile uint8_t buttons; // Bits of the pressed buttons.
217
-  #else
218
-    volatile uint8_t buttons_reprapworld_keypad; // The reprapworld_keypad shift register values
215
+  volatile uint8_t buttons;  //the last checked buttons in a bit array.
216
+  #ifdef REPRAPWORLD_KEYPAD
217
+    volatile uint8_t buttons_reprapworld_keypad; // to store the keypad shift register values
219
   #endif
218
   #endif
219
+    
220
   #ifdef LCD_HAS_SLOW_BUTTONS
220
   #ifdef LCD_HAS_SLOW_BUTTONS
221
     volatile uint8_t slow_buttons; // Bits of the pressed buttons.
221
     volatile uint8_t slow_buttons; // Bits of the pressed buttons.
222
   #endif
222
   #endif

+ 5
- 5
Marlin/ultralcd_implementation_hitachi_HD44780.h View File

6
 * When selecting the Russian language, a slightly different LCD implementation is used to handle UTF8 characters.
6
 * When selecting the Russian language, a slightly different LCD implementation is used to handle UTF8 characters.
7
 **/
7
 **/
8
 
8
 
9
-#ifndef REPRAPWORLD_KEYPAD
10
-  extern volatile uint8_t buttons;  //the last checked buttons in a bit array.
11
-#else
12
-  extern volatile uint16_t buttons;  //an extended version of the last checked buttons in a bit array.
13
-#endif
9
+//#ifndef REPRAPWORLD_KEYPAD
10
+//  extern volatile uint8_t buttons;  //the last checked buttons in a bit array.
11
+//#else
12
+  extern volatile uint8_t buttons;  //an extended version of the last checked buttons in a bit array.
13
+//#endif
14
 
14
 
15
 ////////////////////////////////////
15
 ////////////////////////////////////
16
 // Setup button and encode mappings for each panel (into 'buttons' variable
16
 // Setup button and encode mappings for each panel (into 'buttons' variable

Loading…
Cancel
Save