bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Changed ADAFRUIT_ST7565 to ELB_FULL_GRAPHIC_CONTROLLER

Browse Source 
Rename of define to avoid confusion between the controller and the
display which had similar names.
This commit is contained in:
Ed Boston 2015-05-17 15:23:17 -07:00
parent 1999ac415c
commit 047e688e93
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/Conditionals.h
View File

@ -22,7 +22,7 @@
#define NEWPANEL #define NEWPANEL
#endif #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 ULTRA_LCD //general LCD support, also 16x2
#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) #define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
#define ULTIMAKERCONTROLLER //as available from the Ultimaker online store. #define ULTIMAKERCONTROLLER //as available from the Ultimaker online store.
@ -31,7 +31,7 @@
#define DEFAULT_LCD_CONTRAST 95 #define DEFAULT_LCD_CONTRAST 95
#elif defined(VIKI2) #elif defined(VIKI2)
#define DEFAULT_LCD_CONTRAST 40 #define DEFAULT_LCD_CONTRAST 40
#elif defined(ADAFRUIT_ST7565) #elif defined(ELB_FULL_GRAPHIC_CONTROLLER)
#define DEFAULT_LCD_CONTRAST 110 #define DEFAULT_LCD_CONTRAST 110
#endif #endif

5
Marlin/Configuration.h
View File

@ -660,8 +660,9 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
//#define VIKI2 //#define VIKI2
//#define miniVIKI //#define miniVIKI
// The Adafruit ST7565 is a custom display. More info will be posted as the project files are finialized. // This is a new controller currently under development. A link to more information will be provided as it
//#define ADAFRUIT_ST7565 // becomes available.
//#define ELB_FULL_GRAPHIC_CONTROLLER
// The RepRapDiscount Smart Controller (white PCB) // The RepRapDiscount Smart Controller (white PCB)
// http://reprap.org/wiki/RepRapDiscount_Smart_Controller // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

3
Marlin/dogm_lcd_implementation.h
View File

@ -126,7 +126,8 @@
#elif defined(VIKI2) || defined(miniVIKI) #elif defined(VIKI2) || defined(miniVIKI)
// Mini Viki and Viki 2.0 LCD, ST7565 controller as well // Mini Viki and Viki 2.0 LCD, ST7565 controller as well
U8GLIB_NHD_C12864 u8g(DOGLCD_CS, DOGLCD_A0); 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); U8GLIB_LM6059 u8g(DOGLCD_CS, DOGLCD_A0);
#else #else
// for regular DOGM128 display with HW-SPI // for regular DOGM128 display with HW-SPI

2
Marlin/pins_RAMPS_13.h
View File

@ -180,7 +180,7 @@
#define BTN_ENC -1 #define BTN_ENC -1
#define LCD_SDSS 53 #define LCD_SDSS 53
#define SDCARDDETECT 49 #define SDCARDDETECT 49
#elif defined(ADAFRUIT_ST7565) #elif defined(ELB_FULL_GRAPHIC_CONTROLLER)
#define BTN_EN1 35 #define BTN_EN1 35
#define BTN_EN2 37 #define BTN_EN2 37
#define BTN_ENC 31 #define BTN_ENC 31

4
Marlin/ultralcd.cpp
View File

@ -1110,7 +1110,7 @@ static void lcd_control_volumetric_menu() {
#ifdef HAS_LCD_CONTRAST #ifdef HAS_LCD_CONTRAST
static void lcd_set_contrast() { static void lcd_set_contrast() {
if (encoderPosition != 0) { if (encoderPosition != 0) {
#ifdef ADAFRUIT_ST7565 #ifdef ELB_FULL_GRAPHIC_CONTROLLER
lcd_contrast += encoderPosition; lcd_contrast += encoderPosition;
lcd_contrast &= 0xFF; lcd_contrast &= 0xFF;
#else #else
@ -1122,7 +1122,7 @@ static void lcd_control_volumetric_menu() {
u8g.setContrast(lcd_contrast); u8g.setContrast(lcd_contrast);
} }
if (lcdDrawUpdate) if (lcdDrawUpdate)
#ifdef ADAFRUIT_ST7565 #ifdef ELB_FULL_GRAPHIC_CONTROLLER
lcd_implementation_drawedit(PSTR(MSG_CONTRAST), itostr3(lcd_contrast)); lcd_implementation_drawedit(PSTR(MSG_CONTRAST), itostr3(lcd_contrast));
#else #else
lcd_implementation_drawedit(PSTR(MSG_CONTRAST), itostr2(lcd_contrast)); lcd_implementation_drawedit(PSTR(MSG_CONTRAST), itostr2(lcd_contrast));