From 047e688e93c58f7428547d5f1eb45d5e149e278b Mon Sep 17 00:00:00 2001 From: Ed Boston Date: Sun, 17 May 2015 15:23:17 -0700 Subject: [PATCH] Changed ADAFRUIT_ST7565 to ELB_FULL_GRAPHIC_CONTROLLER Rename of define to avoid confusion between the controller and the display which had similar names. --- Marlin/Conditionals.h | 4 ++-- Marlin/Configuration.h | 5 +++-- Marlin/dogm_lcd_implementation.h | 3 ++- Marlin/pins_RAMPS_13.h | 2 +- Marlin/ultralcd.cpp | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Marlin/Conditionals.h b/Marlin/Conditionals.h index f69869e9e1..83fcd95a95 100644 --- a/Marlin/Conditionals.h +++ b/Marlin/Conditionals.h @@ -22,7 +22,7 @@ #define NEWPANEL #endif - #if defined(miniVIKI) || defined(VIKI2) || defined(ADAFRUIT_ST7565) + #if defined(miniVIKI) || defined(VIKI2) || defined(ELB_FULL_GRAPHIC_CONTROLLER) #define ULTRA_LCD //general LCD support, also 16x2 #define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) #define ULTIMAKERCONTROLLER //as available from the Ultimaker online store. @@ -31,7 +31,7 @@ #define DEFAULT_LCD_CONTRAST 95 #elif defined(VIKI2) #define DEFAULT_LCD_CONTRAST 40 - #elif defined(ADAFRUIT_ST7565) + #elif defined(ELB_FULL_GRAPHIC_CONTROLLER) #define DEFAULT_LCD_CONTRAST 110 #endif diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 928e53d162..71a770bd60 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -660,8 +660,9 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic //#define VIKI2 //#define miniVIKI -// The Adafruit ST7565 is a custom display. More info will be posted as the project files are finialized. -//#define ADAFRUIT_ST7565 +// This is a new controller currently under development. A link to more information will be provided as it +// becomes available. +//#define ELB_FULL_GRAPHIC_CONTROLLER // The RepRapDiscount Smart Controller (white PCB) // http://reprap.org/wiki/RepRapDiscount_Smart_Controller diff --git a/Marlin/dogm_lcd_implementation.h b/Marlin/dogm_lcd_implementation.h index c6fe428453..0fc2e94846 100644 --- a/Marlin/dogm_lcd_implementation.h +++ b/Marlin/dogm_lcd_implementation.h @@ -126,7 +126,8 @@ #elif defined(VIKI2) || defined(miniVIKI) // Mini Viki and Viki 2.0 LCD, ST7565 controller as well U8GLIB_NHD_C12864 u8g(DOGLCD_CS, DOGLCD_A0); -#elif defined(ADAFRUIT_ST7565) +#elif defined(ELB_FULL_GRAPHIC_CONTROLLER) + // Based on the Adafruit ST7565 (http://www.adafruit.com/products/250) U8GLIB_LM6059 u8g(DOGLCD_CS, DOGLCD_A0); #else // for regular DOGM128 display with HW-SPI diff --git a/Marlin/pins_RAMPS_13.h b/Marlin/pins_RAMPS_13.h index 6f92197ad5..4b3eda4f0d 100644 --- a/Marlin/pins_RAMPS_13.h +++ b/Marlin/pins_RAMPS_13.h @@ -180,7 +180,7 @@ #define BTN_ENC -1 #define LCD_SDSS 53 #define SDCARDDETECT 49 - #elif defined(ADAFRUIT_ST7565) + #elif defined(ELB_FULL_GRAPHIC_CONTROLLER) #define BTN_EN1 35 #define BTN_EN2 37 #define BTN_ENC 31 diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 7ab4499cba..593390b324 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -1110,7 +1110,7 @@ static void lcd_control_volumetric_menu() { #ifdef HAS_LCD_CONTRAST static void lcd_set_contrast() { if (encoderPosition != 0) { -#ifdef ADAFRUIT_ST7565 +#ifdef ELB_FULL_GRAPHIC_CONTROLLER lcd_contrast += encoderPosition; lcd_contrast &= 0xFF; #else @@ -1122,7 +1122,7 @@ static void lcd_control_volumetric_menu() { u8g.setContrast(lcd_contrast); } if (lcdDrawUpdate) -#ifdef ADAFRUIT_ST7565 +#ifdef ELB_FULL_GRAPHIC_CONTROLLER lcd_implementation_drawedit(PSTR(MSG_CONTRAST), itostr3(lcd_contrast)); #else lcd_implementation_drawedit(PSTR(MSG_CONTRAST), itostr2(lcd_contrast));