From 41f8cdb3a62817b5bea01309e73f9082883c1728 Mon Sep 17 00:00:00 2001 From: Ed Boston Date: Sun, 17 May 2015 12:47:41 -0700 Subject: [PATCH 1/7] ADAFRUIT_ST7565 Added support for new display type --- Marlin/Conditionals.h | 6 ++++-- Marlin/Configuration.h | 2 ++ Marlin/dogm_lcd_implementation.h | 2 ++ Marlin/pins_RAMPS_13.h | 16 ++++++++++++++-- Marlin/ultralcd.cpp | 12 +++++++++++- 5 files changed, 33 insertions(+), 5 deletions(-) diff --git a/Marlin/Conditionals.h b/Marlin/Conditionals.h index f09a8a2fe8..0a761872bb 100644 --- a/Marlin/Conditionals.h +++ b/Marlin/Conditionals.h @@ -22,15 +22,17 @@ #define NEWPANEL #endif - #if defined(miniVIKI) || defined(VIKI2) + #if defined(miniVIKI) || defined(VIKI2) || defined(ADAFRUIT_ST7565) #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. #ifdef miniVIKI #define DEFAULT_LCD_CONTRAST 95 - #else + #elif defined(VIKI2) #define DEFAULT_LCD_CONTRAST 40 + #elif defined(ADAFRUIT_ST7565) + #define DEFAULT_LCD_CONTRAST 110 #endif #define ENCODER_PULSES_PER_STEP 4 diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 8e520fa96a..c5fdac39db 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -660,6 +660,8 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic //#define VIKI2 //#define miniVIKI +#define ADAFRUIT_ST7565 + // The RepRapDiscount Smart Controller (white PCB) // http://reprap.org/wiki/RepRapDiscount_Smart_Controller //#define REPRAP_DISCOUNT_SMART_CONTROLLER diff --git a/Marlin/dogm_lcd_implementation.h b/Marlin/dogm_lcd_implementation.h index 47e4a9244d..a091a2c4af 100644 --- a/Marlin/dogm_lcd_implementation.h +++ b/Marlin/dogm_lcd_implementation.h @@ -126,6 +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) + U8GLIB_LM6059 u8g(DOGLCD_CS, DOGLCD_A0); #else // for regular DOGM128 display with HW-SPI U8GLIB_DOGM128 u8g(DOGLCD_CS, DOGLCD_A0); // HW-SPI Com: CS, A0 diff --git a/Marlin/pins_RAMPS_13.h b/Marlin/pins_RAMPS_13.h index c9c796ed42..6328ab6c20 100644 --- a/Marlin/pins_RAMPS_13.h +++ b/Marlin/pins_RAMPS_13.h @@ -180,6 +180,19 @@ #define BTN_ENC -1 #define LCD_SDSS 53 #define SDCARDDETECT 49 + #elif defined(ADAFRUIT_ST7565) + #define BTN_EN1 35 + #define BTN_EN2 37 + #define BTN_ENC 31 + #define SDCARDDETECT 49 + #define SDCARDDETECTINVERTED + #define SDSLOW + #define LCD_SDSS 53 + #define KILL_PIN 41 + #define BEEPER 23 + #define DOGLCD_CS 29 + #define DOGLCD_A0 27 + #define LCD_PIN_BL 33 #else // arduino pin which triggers an piezzo beeper #define BEEPER 33 // Beeper on AUX-4 @@ -209,8 +222,7 @@ #endif #endif - - #else // Old-style panel with shift register + #else // Old-style panel with shift register // Arduino pin witch triggers an piezzo beeper #define BEEPER 33 // No Beeper added diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 1bcd3dbaae..7ab4499cba 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -1110,13 +1110,23 @@ static void lcd_control_volumetric_menu() { #ifdef HAS_LCD_CONTRAST static void lcd_set_contrast() { if (encoderPosition != 0) { +#ifdef ADAFRUIT_ST7565 + lcd_contrast += encoderPosition; + lcd_contrast &= 0xFF; +#else lcd_contrast -= encoderPosition; lcd_contrast &= 0x3F; +#endif encoderPosition = 0; lcdDrawUpdate = 1; u8g.setContrast(lcd_contrast); } - if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR(MSG_CONTRAST), itostr2(lcd_contrast)); + if (lcdDrawUpdate) +#ifdef ADAFRUIT_ST7565 + lcd_implementation_drawedit(PSTR(MSG_CONTRAST), itostr3(lcd_contrast)); +#else + lcd_implementation_drawedit(PSTR(MSG_CONTRAST), itostr2(lcd_contrast)); +#endif if (LCD_CLICKED) lcd_goto_menu(lcd_control_menu); } #endif // HAS_LCD_CONTRAST From 1999ac415cd1e0a1786a601bbfbd13e9aacf2648 Mon Sep 17 00:00:00 2001 From: Ed Boston Date: Sun, 17 May 2015 13:39:24 -0700 Subject: [PATCH 2/7] Formatting Changes Fixes for some code formatting changes and commenting out the ADAFRUIT_ST7565 define that was left defined. --- Marlin/Conditionals.h | 4 ++-- Marlin/Configuration.h | 3 ++- Marlin/dogm_lcd_implementation.h | 2 +- Marlin/pins_RAMPS_13.h | 8 ++++---- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Marlin/Conditionals.h b/Marlin/Conditionals.h index 0a761872bb..f69869e9e1 100644 --- a/Marlin/Conditionals.h +++ b/Marlin/Conditionals.h @@ -31,8 +31,8 @@ #define DEFAULT_LCD_CONTRAST 95 #elif defined(VIKI2) #define DEFAULT_LCD_CONTRAST 40 - #elif defined(ADAFRUIT_ST7565) - #define DEFAULT_LCD_CONTRAST 110 + #elif defined(ADAFRUIT_ST7565) + #define DEFAULT_LCD_CONTRAST 110 #endif #define ENCODER_PULSES_PER_STEP 4 diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index c5fdac39db..928e53d162 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -660,7 +660,8 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic //#define VIKI2 //#define miniVIKI -#define ADAFRUIT_ST7565 +// The Adafruit ST7565 is a custom display. More info will be posted as the project files are finialized. +//#define ADAFRUIT_ST7565 // 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 a091a2c4af..c6fe428453 100644 --- a/Marlin/dogm_lcd_implementation.h +++ b/Marlin/dogm_lcd_implementation.h @@ -127,7 +127,7 @@ // Mini Viki and Viki 2.0 LCD, ST7565 controller as well U8GLIB_NHD_C12864 u8g(DOGLCD_CS, DOGLCD_A0); #elif defined(ADAFRUIT_ST7565) - U8GLIB_LM6059 u8g(DOGLCD_CS, DOGLCD_A0); + U8GLIB_LM6059 u8g(DOGLCD_CS, DOGLCD_A0); #else // for regular DOGM128 display with HW-SPI U8GLIB_DOGM128 u8g(DOGLCD_CS, DOGLCD_A0); // HW-SPI Com: CS, A0 diff --git a/Marlin/pins_RAMPS_13.h b/Marlin/pins_RAMPS_13.h index 6328ab6c20..6f92197ad5 100644 --- a/Marlin/pins_RAMPS_13.h +++ b/Marlin/pins_RAMPS_13.h @@ -180,13 +180,13 @@ #define BTN_ENC -1 #define LCD_SDSS 53 #define SDCARDDETECT 49 - #elif defined(ADAFRUIT_ST7565) + #elif defined(ADAFRUIT_ST7565) #define BTN_EN1 35 #define BTN_EN2 37 #define BTN_ENC 31 #define SDCARDDETECT 49 - #define SDCARDDETECTINVERTED - #define SDSLOW + #define SDCARDDETECTINVERTED + #define SDSLOW #define LCD_SDSS 53 #define KILL_PIN 41 #define BEEPER 23 @@ -222,7 +222,7 @@ #endif #endif - #else // Old-style panel with shift register + #else // Old-style panel with shift register // Arduino pin witch triggers an piezzo beeper #define BEEPER 33 // No Beeper added From 047e688e93c58f7428547d5f1eb45d5e149e278b Mon Sep 17 00:00:00 2001 From: Ed Boston Date: Sun, 17 May 2015 15:23:17 -0700 Subject: [PATCH 3/7] 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)); From a83bf18ee1063798e75ad6324b033752e0b1f66f Mon Sep 17 00:00:00 2001 From: Ed Boston Date: Mon, 18 May 2015 05:37:46 -0700 Subject: [PATCH 4/7] More functional seperation Moved SDCARDDETECTINVERTED and SDSLOW to Conditionals.h. Added U8GLIB_LM6059_AF to define display specific actions. Added reminder to compile in u8glib --- Marlin/Conditionals.h | 3 +++ Marlin/Configuration.h | 4 +++- Marlin/dogm_lcd_implementation.h | 2 +- Marlin/pins_RAMPS_13.h | 4 +--- Marlin/ultralcd.cpp | 27 ++++++++++++++------------- 5 files changed, 22 insertions(+), 18 deletions(-) diff --git a/Marlin/Conditionals.h b/Marlin/Conditionals.h index 83fcd95a95..358131e4ae 100644 --- a/Marlin/Conditionals.h +++ b/Marlin/Conditionals.h @@ -33,6 +33,9 @@ #define DEFAULT_LCD_CONTRAST 40 #elif defined(ELB_FULL_GRAPHIC_CONTROLLER) #define DEFAULT_LCD_CONTRAST 110 + #define SDCARDDETECTINVERTED + #define SDSLOW + #define U8GLIB_LM6059_AF #endif #define ENCODER_PULSES_PER_STEP 4 diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 71a770bd60..bc7e7dda05 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -662,7 +662,9 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic // 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 +// +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +#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 0fc2e94846..c7e371f67f 100644 --- a/Marlin/dogm_lcd_implementation.h +++ b/Marlin/dogm_lcd_implementation.h @@ -126,7 +126,7 @@ #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(ELB_FULL_GRAPHIC_CONTROLLER) +#elif defined(U8GLIB_LM6059_AF) // Based on the Adafruit ST7565 (http://www.adafruit.com/products/250) U8GLIB_LM6059 u8g(DOGLCD_CS, DOGLCD_A0); #else diff --git a/Marlin/pins_RAMPS_13.h b/Marlin/pins_RAMPS_13.h index 4b3eda4f0d..37683b8c59 100644 --- a/Marlin/pins_RAMPS_13.h +++ b/Marlin/pins_RAMPS_13.h @@ -181,12 +181,10 @@ #define LCD_SDSS 53 #define SDCARDDETECT 49 #elif defined(ELB_FULL_GRAPHIC_CONTROLLER) - #define BTN_EN1 35 + #define BTN_EN1 35 // reverse if the encoder turns the wrong way. #define BTN_EN2 37 #define BTN_ENC 31 #define SDCARDDETECT 49 - #define SDCARDDETECTINVERTED - #define SDSLOW #define LCD_SDSS 53 #define KILL_PIN 41 #define BEEPER 23 diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 593390b324..71f7f28064 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -1110,23 +1110,24 @@ static void lcd_control_volumetric_menu() { #ifdef HAS_LCD_CONTRAST static void lcd_set_contrast() { if (encoderPosition != 0) { -#ifdef ELB_FULL_GRAPHIC_CONTROLLER - lcd_contrast += encoderPosition; - lcd_contrast &= 0xFF; -#else - lcd_contrast -= encoderPosition; - lcd_contrast &= 0x3F; -#endif + #ifdef U8GLIB_ST7920 + lcd_contrast += encoderPosition; + lcd_contrast &= 0xFF; + #else + lcd_contrast -= encoderPosition; + lcd_contrast &= 0x3F; + #endif encoderPosition = 0; lcdDrawUpdate = 1; u8g.setContrast(lcd_contrast); } - if (lcdDrawUpdate) -#ifdef ELB_FULL_GRAPHIC_CONTROLLER - lcd_implementation_drawedit(PSTR(MSG_CONTRAST), itostr3(lcd_contrast)); -#else - lcd_implementation_drawedit(PSTR(MSG_CONTRAST), itostr2(lcd_contrast)); -#endif + if (lcdDrawUpdate) { + #ifdef U8GLIB_ST7920 + lcd_implementation_drawedit(PSTR(MSG_CONTRAST), itostr3(lcd_contrast)); + #else + lcd_implementation_drawedit(PSTR(MSG_CONTRAST), itostr2(lcd_contrast)); + #endif + } if (LCD_CLICKED) lcd_goto_menu(lcd_control_menu); } #endif // HAS_LCD_CONTRAST From ca8d1756d559e6ed52f88a702e322b79975e0bea Mon Sep 17 00:00:00 2001 From: Ed Boston Date: Mon, 18 May 2015 14:23:31 -0700 Subject: [PATCH 5/7] Define fixes Fixed a couple defines that were not changed or commented out. --- Marlin/Configuration.h | 2 +- Marlin/ultralcd.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index bc7e7dda05..2d57d3061f 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -664,7 +664,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic // becomes available. // // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib -#define ELB_FULL_GRAPHIC_CONTROLLER +//#define ELB_FULL_GRAPHIC_CONTROLLER // The RepRapDiscount Smart Controller (white PCB) // http://reprap.org/wiki/RepRapDiscount_Smart_Controller diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 71f7f28064..8584a963d5 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 U8GLIB_ST7920 + #ifdef U8GLIB_LM6059_AF lcd_contrast += encoderPosition; lcd_contrast &= 0xFF; #else @@ -1122,7 +1122,7 @@ static void lcd_control_volumetric_menu() { u8g.setContrast(lcd_contrast); } if (lcdDrawUpdate) { - #ifdef U8GLIB_ST7920 + #ifdef U8GLIB_LM6059_AF lcd_implementation_drawedit(PSTR(MSG_CONTRAST), itostr3(lcd_contrast)); #else lcd_implementation_drawedit(PSTR(MSG_CONTRAST), itostr2(lcd_contrast)); From 152b681bb5b436f435b9602fb2e63fb9df643142 Mon Sep 17 00:00:00 2001 From: Ed Boston Date: Tue, 19 May 2015 04:14:55 -0700 Subject: [PATCH 6/7] Added link to controller github Added the link to the github information about the ELB_FULL_GRAPHIC_CONTROLLER --- Marlin/Configuration.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 2d57d3061f..ccd9786811 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -660,8 +660,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic //#define VIKI2 //#define miniVIKI -// This is a new controller currently under development. A link to more information will be provided as it -// becomes available. +// This is a new controller currently under development. https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/ // // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib //#define ELB_FULL_GRAPHIC_CONTROLLER From 082ed3beedfaffaa7fb8b8e2ae4fa2f0f9f8aca4 Mon Sep 17 00:00:00 2001 From: Ed Boston Date: Tue, 19 May 2015 14:04:57 -0700 Subject: [PATCH 7/7] Propagate Configuration.h changes Updated all the example Configuration.h files for the new display type. --- Marlin/configurator/config/Configuration.h | 5 +++++ Marlin/example_configurations/Felix/Configuration.h | 5 +++++ Marlin/example_configurations/Hephestos/Configuration.h | 5 +++++ Marlin/example_configurations/K8200/Configuration.h | 5 +++++ .../RepRapWorld/Megatronics/Configuration.h | 5 +++++ Marlin/example_configurations/SCARA/Configuration.h | 5 +++++ Marlin/example_configurations/WITBOX/Configuration.h | 5 +++++ Marlin/example_configurations/delta/biv2.5/Configuration.h | 5 +++++ Marlin/example_configurations/delta/generic/Configuration.h | 5 +++++ .../example_configurations/delta/kossel_mini/Configuration.h | 5 +++++ Marlin/example_configurations/makibox/Configuration.h | 5 +++++ Marlin/example_configurations/tvrrug/Round2/Configuration.h | 5 +++++ 12 files changed, 60 insertions(+) diff --git a/Marlin/configurator/config/Configuration.h b/Marlin/configurator/config/Configuration.h index de4c8a5f71..0d8a5d4228 100644 --- a/Marlin/configurator/config/Configuration.h +++ b/Marlin/configurator/config/Configuration.h @@ -661,6 +661,11 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic //#define VIKI2 //#define miniVIKI +// This is a new controller currently under development. https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/ +// +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +//#define ELB_FULL_GRAPHIC_CONTROLLER + // The RepRapDiscount Smart Controller (white PCB) // http://reprap.org/wiki/RepRapDiscount_Smart_Controller //#define REPRAP_DISCOUNT_SMART_CONTROLLER diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index 078af2a0d5..9df608264d 100644 --- a/Marlin/example_configurations/Felix/Configuration.h +++ b/Marlin/example_configurations/Felix/Configuration.h @@ -595,6 +595,11 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic //#define VIKI2 //#define miniVIKI +// This is a new controller currently under development. https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/ +// +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +//#define ELB_FULL_GRAPHIC_CONTROLLER + // The RepRapDiscount Smart Controller (white PCB) // http://reprap.org/wiki/RepRapDiscount_Smart_Controller //#define REPRAP_DISCOUNT_SMART_CONTROLLER diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index c5184ac6e4..4e8503aa6f 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -615,6 +615,11 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic //#define VIKI2 //#define miniVIKI +// This is a new controller currently under development. https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/ +// +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +//#define ELB_FULL_GRAPHIC_CONTROLLER + // The RepRapDiscount Smart Controller (white PCB) // http://reprap.org/wiki/RepRapDiscount_Smart_Controller #define REPRAP_DISCOUNT_SMART_CONTROLLER diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h index f4fccc82ac..b430543ef5 100644 --- a/Marlin/example_configurations/K8200/Configuration.h +++ b/Marlin/example_configurations/K8200/Configuration.h @@ -678,6 +678,11 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic //#define VIKI2 //#define miniVIKI +// This is a new controller currently under development. https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/ +// +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +//#define ELB_FULL_GRAPHIC_CONTROLLER + // The RepRapDiscount Smart Controller (white PCB) // http://reprap.org/wiki/RepRapDiscount_Smart_Controller //#define REPRAP_DISCOUNT_SMART_CONTROLLER diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h index 27a2582900..b98c72437a 100644 --- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h @@ -661,6 +661,11 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic //#define VIKI2 //#define miniVIKI +// This is a new controller currently under development. https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/ +// +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +//#define ELB_FULL_GRAPHIC_CONTROLLER + // The RepRapDiscount Smart Controller (white PCB) // http://reprap.org/wiki/RepRapDiscount_Smart_Controller //#define REPRAP_DISCOUNT_SMART_CONTROLLER diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index e4941a7fd6..aa623d2db5 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -646,6 +646,11 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic //#define VIKI2 //#define miniVIKI +// This is a new controller currently under development. https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/ +// +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +//#define ELB_FULL_GRAPHIC_CONTROLLER + // The RepRapDiscount Smart Controller (white PCB) // http://reprap.org/wiki/RepRapDiscount_Smart_Controller //#define REPRAP_DISCOUNT_SMART_CONTROLLER diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index f0c71c16de..f9543b0c45 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -614,6 +614,11 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic //#define VIKI2 //#define miniVIKI +// This is a new controller currently under development. https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/ +// +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +//#define ELB_FULL_GRAPHIC_CONTROLLER + // The RepRapDiscount Smart Controller (white PCB) // http://reprap.org/wiki/RepRapDiscount_Smart_Controller #define REPRAP_DISCOUNT_SMART_CONTROLLER diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h index 908acce5ab..f86b2da382 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h @@ -660,6 +660,11 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic //#define VIKI2 //#define miniVIKI +// This is a new controller currently under development. https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/ +// +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +//#define ELB_FULL_GRAPHIC_CONTROLLER + // The RepRapDiscount Smart Controller (white PCB) // http://reprap.org/wiki/RepRapDiscount_Smart_Controller //#define REPRAP_DISCOUNT_SMART_CONTROLLER diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index 0a5b7e6711..6aeb7fa41f 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -663,6 +663,11 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic //#define VIKI2 //#define miniVIKI +// This is a new controller currently under development. https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/ +// +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +//#define ELB_FULL_GRAPHIC_CONTROLLER + // The RepRapDiscount Smart Controller (white PCB) // http://reprap.org/wiki/RepRapDiscount_Smart_Controller //#define REPRAP_DISCOUNT_SMART_CONTROLLER diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index 87d1cd2a1e..0f7662892e 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -667,6 +667,11 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic //#define VIKI2 //#define miniVIKI +// This is a new controller currently under development. https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/ +// +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +//#define ELB_FULL_GRAPHIC_CONTROLLER + // The RepRapDiscount Smart Controller (white PCB) // http://reprap.org/wiki/RepRapDiscount_Smart_Controller //#define REPRAP_DISCOUNT_SMART_CONTROLLER diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index 63a4024673..33419bd87a 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -614,6 +614,11 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic //#define VIKI2 //#define miniVIKI +// This is a new controller currently under development. https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/ +// +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +//#define ELB_FULL_GRAPHIC_CONTROLLER + // The RepRapDiscount Smart Controller (white PCB) // http://reprap.org/wiki/RepRapDiscount_Smart_Controller //#define REPRAP_DISCOUNT_SMART_CONTROLLER diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index 0dd00045b2..a317358a9d 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -620,6 +620,11 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic //#define VIKI2 //#define miniVIKI +// This is a new controller currently under development. https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/ +// +// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib +//#define ELB_FULL_GRAPHIC_CONTROLLER + // The RepRapDiscount Smart Controller (white PCB) // http://reprap.org/wiki/RepRapDiscount_Smart_Controller //#define REPRAP_DISCOUNT_SMART_CONTROLLER