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

+ 3
- 2
Marlin/Configuration.h View File

660
 //#define VIKI2
660
 //#define VIKI2
661
 //#define miniVIKI
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
 // The RepRapDiscount Smart Controller (white PCB)
667
 // The RepRapDiscount Smart Controller (white PCB)
667
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
668
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 2
- 1
Marlin/dogm_lcd_implementation.h View File

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

+ 1
- 1
Marlin/pins_RAMPS_13.h View File

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

+ 2
- 2
Marlin/ultralcd.cpp View File

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

Loading…
Cancel
Save