Browse Source

Make Marlin actually compile when #define REPRAPWORLD_KEYPAD is uncommented

pull/1/head
brupje 9 years ago
parent
commit
8f8bf3a897
  1. 8
      Marlin/ultralcd.cpp
  2. 10
      Marlin/ultralcd_implementation_hitachi_HD44780.h

8
Marlin/ultralcd.cpp

@ -212,11 +212,11 @@ static void lcd_status_screen();
} } while(0)
/** Used variables to keep track of the menu */
#ifndef REPRAPWORLD_KEYPAD
volatile uint8_t buttons; // Bits of the pressed buttons.
#else
volatile uint8_t buttons_reprapworld_keypad; // The reprapworld_keypad shift register values
volatile uint8_t buttons; //the last checked buttons in a bit array.
#ifdef REPRAPWORLD_KEYPAD
volatile uint8_t buttons_reprapworld_keypad; // to store the keypad shift register values
#endif
#ifdef LCD_HAS_SLOW_BUTTONS
volatile uint8_t slow_buttons; // Bits of the pressed buttons.
#endif

10
Marlin/ultralcd_implementation_hitachi_HD44780.h

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

Loading…
Cancel
Save