From 8f8bf3a897621c08afd42e9b854a28ac5f0ac287 Mon Sep 17 00:00:00 2001 From: brupje Date: Tue, 5 May 2015 11:03:20 +0200 Subject: [PATCH] Make Marlin actually compile when #define REPRAPWORLD_KEYPAD is uncommented --- Marlin/ultralcd.cpp | 8 ++++---- Marlin/ultralcd_implementation_hitachi_HD44780.h | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 5ca094337..15c20fff3 100644 --- a/Marlin/ultralcd.cpp +++ b/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 diff --git a/Marlin/ultralcd_implementation_hitachi_HD44780.h b/Marlin/ultralcd_implementation_hitachi_HD44780.h index eb1f525cc..b5b046da3 100644 --- a/Marlin/ultralcd_implementation_hitachi_HD44780.h +++ b/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