Browse Source

Changed ADAFRUIT_ST7565 to ELB_FULL_GRAPHIC_CONTROLLER

Rename of define to avoid confusion between the controller and the
display which had similar names.
Ed Boston 10 years ago
parent
commit
047e688e93

+ 2
- 2
Marlin/Conditionals.h View File

@@ -22,7 +22,7 @@
22 22
     #define NEWPANEL
23 23
   #endif
24 24
 
25
-  #if defined(miniVIKI) || defined(VIKI2) || defined(ADAFRUIT_ST7565)
25
+  #if defined(miniVIKI) || defined(VIKI2) || defined(ELB_FULL_GRAPHIC_CONTROLLER)
26 26
     #define ULTRA_LCD  //general LCD support, also 16x2
27 27
     #define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
28 28
     #define ULTIMAKERCONTROLLER //as available from the Ultimaker online store.
@@ -31,7 +31,7 @@
31 31
       #define DEFAULT_LCD_CONTRAST 95
32 32
     #elif defined(VIKI2)
33 33
       #define DEFAULT_LCD_CONTRAST 40
34
-    #elif defined(ADAFRUIT_ST7565)
34
+    #elif defined(ELB_FULL_GRAPHIC_CONTROLLER)
35 35
       #define DEFAULT_LCD_CONTRAST 110
36 36
     #endif
37 37
 

+ 3
- 2
Marlin/Configuration.h View File

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

+ 2
- 1
Marlin/dogm_lcd_implementation.h View File

@@ -126,7 +126,8 @@
126 126
 #elif defined(VIKI2) || defined(miniVIKI)
127 127
   // Mini Viki and Viki 2.0 LCD, ST7565 controller as well
128 128
   U8GLIB_NHD_C12864 u8g(DOGLCD_CS, DOGLCD_A0);
129
-#elif defined(ADAFRUIT_ST7565)
129
+#elif defined(ELB_FULL_GRAPHIC_CONTROLLER)
130
+  // Based on the Adafruit ST7565 (http://www.adafruit.com/products/250)
130 131
   U8GLIB_LM6059 u8g(DOGLCD_CS, DOGLCD_A0);
131 132
 #else
132 133
   // for regular DOGM128 display with HW-SPI

+ 1
- 1
Marlin/pins_RAMPS_13.h View File

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

+ 2
- 2
Marlin/ultralcd.cpp View File

@@ -1110,7 +1110,7 @@ static void lcd_control_volumetric_menu() {
1110 1110
 #ifdef HAS_LCD_CONTRAST
1111 1111
   static void lcd_set_contrast() {
1112 1112
     if (encoderPosition != 0) {
1113
-#ifdef ADAFRUIT_ST7565
1113
+#ifdef ELB_FULL_GRAPHIC_CONTROLLER
1114 1114
       lcd_contrast += encoderPosition;
1115 1115
       lcd_contrast &= 0xFF;
1116 1116
 #else
@@ -1122,7 +1122,7 @@ static void lcd_control_volumetric_menu() {
1122 1122
       u8g.setContrast(lcd_contrast);
1123 1123
     }
1124 1124
     if (lcdDrawUpdate) 
1125
-#ifdef ADAFRUIT_ST7565
1125
+#ifdef ELB_FULL_GRAPHIC_CONTROLLER
1126 1126
       lcd_implementation_drawedit(PSTR(MSG_CONTRAST), itostr3(lcd_contrast));
1127 1127
 #else
1128 1128
       lcd_implementation_drawedit(PSTR(MSG_CONTRAST), itostr2(lcd_contrast));

Loading…
Cancel
Save