Make Marlin actually compile when #define REPRAPWORLD_KEYPAD is uncommented
This commit is contained in:
parent
777f2d3820
commit
8f8bf3a897
2 changed files with 9 additions and 9 deletions
|
@ -212,11 +212,11 @@ static void lcd_status_screen();
|
||||||
} } while(0)
|
} } while(0)
|
||||||
|
|
||||||
/** Used variables to keep track of the menu */
|
/** Used variables to keep track of the menu */
|
||||||
#ifndef REPRAPWORLD_KEYPAD
|
volatile uint8_t buttons; //the last checked buttons in a bit array.
|
||||||
volatile uint8_t buttons; // Bits of the pressed buttons.
|
#ifdef REPRAPWORLD_KEYPAD
|
||||||
#else
|
volatile uint8_t buttons_reprapworld_keypad; // to store the keypad shift register values
|
||||||
volatile uint8_t buttons_reprapworld_keypad; // The reprapworld_keypad shift register values
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef LCD_HAS_SLOW_BUTTONS
|
#ifdef LCD_HAS_SLOW_BUTTONS
|
||||||
volatile uint8_t slow_buttons; // Bits of the pressed buttons.
|
volatile uint8_t slow_buttons; // Bits of the pressed buttons.
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -6,11 +6,11 @@
|
||||||
* When selecting the Russian language, a slightly different LCD implementation is used to handle UTF8 characters.
|
* When selecting the Russian language, a slightly different LCD implementation is used to handle UTF8 characters.
|
||||||
**/
|
**/
|
||||||
|
|
||||||
#ifndef REPRAPWORLD_KEYPAD
|
//#ifndef REPRAPWORLD_KEYPAD
|
||||||
extern volatile uint8_t buttons; //the last checked buttons in a bit array.
|
// extern volatile uint8_t buttons; //the last checked buttons in a bit array.
|
||||||
#else
|
//#else
|
||||||
extern volatile uint16_t buttons; //an extended version of the last checked buttons in a bit array.
|
extern volatile uint8_t buttons; //an extended version of the last checked buttons in a bit array.
|
||||||
#endif
|
//#endif
|
||||||
|
|
||||||
////////////////////////////////////
|
////////////////////////////////////
|
||||||
// Setup button and encode mappings for each panel (into 'buttons' variable
|
// Setup button and encode mappings for each panel (into 'buttons' variable
|
||||||
|
|
Reference in a new issue