From 6423fe7601cfa30fb5cd4775253714200e8731fb Mon Sep 17 00:00:00 2001 From: CONSULitAS Date: Tue, 28 Apr 2015 01:01:57 +0200 Subject: [PATCH 01/15] =?UTF-8?q?language.h:=20update=20documentation=20/?= =?UTF-8?q?=20URL=20f=C3=BCr=20K8200?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit language.h: update documentation for LANGUAGE_INCLUDE language.h: URL für K8200 github repository --- Marlin/language.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Marlin/language.h b/Marlin/language.h index c9ddfeee4..9448c07fe 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -32,7 +32,7 @@ // kana_utf Japanese #ifndef LANGUAGE_INCLUDE - // pick your language from the list above + // pick your default from the list above, individual language ist set in LCD section of Configuration.h #define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en) #endif @@ -52,6 +52,7 @@ #define FIRMWARE_URL "http://3dprint.elettronicain.it/" #elif MB(K8200) #define MACHINE_NAME "K8200" + #define FIRMWARE_URL "https://github.com/CONSULitAS/Marlin-K8200" #elif MB(5DPRINT) #define MACHINE_NAME "Makibox" #elif MB(SAV_MKI) From 41f8cdb3a62817b5bea01309e73f9082883c1728 Mon Sep 17 00:00:00 2001 From: Ed Boston Date: Sun, 17 May 2015 12:47:41 -0700 Subject: [PATCH 02/15] 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 f09a8a2fe..0a761872b 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 8e520fa96..c5fdac39d 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 47e4a9244..a091a2c4a 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 c9c796ed4..6328ab6c2 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 1bcd3dbaa..7ab4499cb 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 03/15] 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 0a761872b..f69869e9e 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 c5fdac39d..928e53d16 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 a091a2c4a..c6fe42845 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 6328ab6c2..6f92197ad 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 04/15] 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 f69869e9e..83fcd95a9 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 928e53d16..71a770bd6 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 c6fe42845..0fc2e9484 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 6f92197ad..4b3eda4f0 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 7ab4499cb..593390b32 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 97ca1b3f4de5440f25236e98bc893a2100834897 Mon Sep 17 00:00:00 2001 From: AnHardt Date: Mon, 18 May 2015 14:15:29 +0200 Subject: [PATCH 05/15] Name magic value 20 to MAX_OVERSHOOT_PID_AUTOTUNE to make it better findable. --- Marlin/temperature.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Marlin/temperature.cpp b/Marlin/temperature.cpp index 9ccd1de14..07db02ab4 100644 --- a/Marlin/temperature.cpp +++ b/Marlin/temperature.cpp @@ -312,7 +312,8 @@ void PID_autotune(float temp, int extruder, int ncycles) } } } - if (input > temp + 20) { + #define MAX_OVERSHOOT_PID_AUTOTUNE 20 + if (input > temp + MAX_OVERSHOOT_PID_AUTOTUNE) { SERIAL_PROTOCOLLNPGM(MSG_PID_TEMP_TOO_HIGH); return; } From a83bf18ee1063798e75ad6324b033752e0b1f66f Mon Sep 17 00:00:00 2001 From: Ed Boston Date: Mon, 18 May 2015 05:37:46 -0700 Subject: [PATCH 06/15] 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 83fcd95a9..358131e4a 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 71a770bd6..bc7e7dda0 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 0fc2e9484..c7e371f67 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 4b3eda4f0..37683b8c5 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 593390b32..71f7f2806 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 7750180c931b08d160f2487b201f2ccbcb8caf91 Mon Sep 17 00:00:00 2001 From: AnHardt Date: Mon, 18 May 2015 21:48:10 +0200 Subject: [PATCH 07/15] transpire -> expire Minor wording correction. --- Marlin/Configuration_adv.h | 2 +- Marlin/configurator/config/Configuration_adv.h | 2 +- Marlin/example_configurations/Felix/Configuration_adv.h | 2 +- Marlin/example_configurations/Hephestos/Configuration_adv.h | 2 +- Marlin/example_configurations/K8200/Configuration_adv.h | 2 +- Marlin/example_configurations/SCARA/Configuration_adv.h | 2 +- Marlin/example_configurations/WITBOX/Configuration_adv.h | 2 +- Marlin/example_configurations/delta/biv2.5/Configuration_adv.h | 2 +- Marlin/example_configurations/delta/generic/Configuration_adv.h | 2 +- .../delta/kossel_mini/Configuration_adv.h | 2 +- Marlin/example_configurations/makibox/Configuration_adv.h | 2 +- Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index fd41e9d0d..76dd61c70 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -23,7 +23,7 @@ /** * Whenever an M104 or M109 increases the target temperature the firmware will wait for the - * WATCH_TEMP_PERIOD to transpire, and if the temperature hasn't increased by WATCH_TEMP_INCREASE + * WATCH_TEMP_PERIOD to expire, and if the temperature hasn't increased by WATCH_TEMP_INCREASE * degrees, the machine is halted, requiring a hard reset. This test restarts with any M104/M109, * but only if the current temperature is far enough below the target for a reliable test. */ diff --git a/Marlin/configurator/config/Configuration_adv.h b/Marlin/configurator/config/Configuration_adv.h index 1119e5181..1979d9c96 100644 --- a/Marlin/configurator/config/Configuration_adv.h +++ b/Marlin/configurator/config/Configuration_adv.h @@ -23,7 +23,7 @@ /** * Whenever an M104 or M109 increases the target temperature the firmware will wait for the - * WATCH_TEMP_PERIOD to transpire, and if the temperature hasn't increased by WATCH_TEMP_INCREASE + * WATCH_TEMP_PERIOD to expire, and if the temperature hasn't increased by WATCH_TEMP_INCREASE * degrees, the machine is halted, requiring a hard reset. This test restarts with any M104/M109, * but only if the current temperature is far enough below the target for a reliable test. */ diff --git a/Marlin/example_configurations/Felix/Configuration_adv.h b/Marlin/example_configurations/Felix/Configuration_adv.h index 678ebbe08..913e40a61 100644 --- a/Marlin/example_configurations/Felix/Configuration_adv.h +++ b/Marlin/example_configurations/Felix/Configuration_adv.h @@ -23,7 +23,7 @@ /** * Whenever an M104 or M109 increases the target temperature the firmware will wait for the - * WATCH_TEMP_PERIOD to transpire, and if the temperature hasn't increased by WATCH_TEMP_INCREASE + * WATCH_TEMP_PERIOD to expire, and if the temperature hasn't increased by WATCH_TEMP_INCREASE * degrees, the machine is halted, requiring a hard reset. This test restarts with any M104/M109, * but only if the current temperature is far enough below the target for a reliable test. */ diff --git a/Marlin/example_configurations/Hephestos/Configuration_adv.h b/Marlin/example_configurations/Hephestos/Configuration_adv.h index e1ec3fa6a..078202dca 100644 --- a/Marlin/example_configurations/Hephestos/Configuration_adv.h +++ b/Marlin/example_configurations/Hephestos/Configuration_adv.h @@ -23,7 +23,7 @@ /** * Whenever an M104 or M109 increases the target temperature the firmware will wait for the - * WATCH_TEMP_PERIOD to transpire, and if the temperature hasn't increased by WATCH_TEMP_INCREASE + * WATCH_TEMP_PERIOD to expire, and if the temperature hasn't increased by WATCH_TEMP_INCREASE * degrees, the machine is halted, requiring a hard reset. This test restarts with any M104/M109, * but only if the current temperature is far enough below the target for a reliable test. */ diff --git a/Marlin/example_configurations/K8200/Configuration_adv.h b/Marlin/example_configurations/K8200/Configuration_adv.h index 678ebbe08..913e40a61 100644 --- a/Marlin/example_configurations/K8200/Configuration_adv.h +++ b/Marlin/example_configurations/K8200/Configuration_adv.h @@ -23,7 +23,7 @@ /** * Whenever an M104 or M109 increases the target temperature the firmware will wait for the - * WATCH_TEMP_PERIOD to transpire, and if the temperature hasn't increased by WATCH_TEMP_INCREASE + * WATCH_TEMP_PERIOD to expire, and if the temperature hasn't increased by WATCH_TEMP_INCREASE * degrees, the machine is halted, requiring a hard reset. This test restarts with any M104/M109, * but only if the current temperature is far enough below the target for a reliable test. */ diff --git a/Marlin/example_configurations/SCARA/Configuration_adv.h b/Marlin/example_configurations/SCARA/Configuration_adv.h index af4429b7e..a0ce35161 100644 --- a/Marlin/example_configurations/SCARA/Configuration_adv.h +++ b/Marlin/example_configurations/SCARA/Configuration_adv.h @@ -23,7 +23,7 @@ /** * Whenever an M104 or M109 increases the target temperature the firmware will wait for the - * WATCH_TEMP_PERIOD to transpire, and if the temperature hasn't increased by WATCH_TEMP_INCREASE + * WATCH_TEMP_PERIOD to expire, and if the temperature hasn't increased by WATCH_TEMP_INCREASE * degrees, the machine is halted, requiring a hard reset. This test restarts with any M104/M109, * but only if the current temperature is far enough below the target for a reliable test. */ diff --git a/Marlin/example_configurations/WITBOX/Configuration_adv.h b/Marlin/example_configurations/WITBOX/Configuration_adv.h index da2281eaf..e7af92bb1 100644 --- a/Marlin/example_configurations/WITBOX/Configuration_adv.h +++ b/Marlin/example_configurations/WITBOX/Configuration_adv.h @@ -23,7 +23,7 @@ /** * Whenever an M104 or M109 increases the target temperature the firmware will wait for the - * WATCH_TEMP_PERIOD to transpire, and if the temperature hasn't increased by WATCH_TEMP_INCREASE + * WATCH_TEMP_PERIOD to expire, and if the temperature hasn't increased by WATCH_TEMP_INCREASE * degrees, the machine is halted, requiring a hard reset. This test restarts with any M104/M109, * but only if the current temperature is far enough below the target for a reliable test. */ diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h b/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h index e193015cc..9490c7611 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h @@ -23,7 +23,7 @@ /** * Whenever an M104 or M109 increases the target temperature the firmware will wait for the - * WATCH_TEMP_PERIOD to transpire, and if the temperature hasn't increased by WATCH_TEMP_INCREASE + * WATCH_TEMP_PERIOD to expire, and if the temperature hasn't increased by WATCH_TEMP_INCREASE * degrees, the machine is halted, requiring a hard reset. This test restarts with any M104/M109, * but only if the current temperature is far enough below the target for a reliable test. */ diff --git a/Marlin/example_configurations/delta/generic/Configuration_adv.h b/Marlin/example_configurations/delta/generic/Configuration_adv.h index a003186d8..126eee0cc 100644 --- a/Marlin/example_configurations/delta/generic/Configuration_adv.h +++ b/Marlin/example_configurations/delta/generic/Configuration_adv.h @@ -23,7 +23,7 @@ /** * Whenever an M104 or M109 increases the target temperature the firmware will wait for the - * WATCH_TEMP_PERIOD to transpire, and if the temperature hasn't increased by WATCH_TEMP_INCREASE + * WATCH_TEMP_PERIOD to expire, and if the temperature hasn't increased by WATCH_TEMP_INCREASE * degrees, the machine is halted, requiring a hard reset. This test restarts with any M104/M109, * but only if the current temperature is far enough below the target for a reliable test. */ diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h index c8ac659c3..505a989fc 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h @@ -23,7 +23,7 @@ /** * Whenever an M104 or M109 increases the target temperature the firmware will wait for the - * WATCH_TEMP_PERIOD to transpire, and if the temperature hasn't increased by WATCH_TEMP_INCREASE + * WATCH_TEMP_PERIOD to expire, and if the temperature hasn't increased by WATCH_TEMP_INCREASE * degrees, the machine is halted, requiring a hard reset. This test restarts with any M104/M109, * but only if the current temperature is far enough below the target for a reliable test. */ diff --git a/Marlin/example_configurations/makibox/Configuration_adv.h b/Marlin/example_configurations/makibox/Configuration_adv.h index b08e8bc2f..6a733bed4 100644 --- a/Marlin/example_configurations/makibox/Configuration_adv.h +++ b/Marlin/example_configurations/makibox/Configuration_adv.h @@ -23,7 +23,7 @@ /** * Whenever an M104 or M109 increases the target temperature the firmware will wait for the - * WATCH_TEMP_PERIOD to transpire, and if the temperature hasn't increased by WATCH_TEMP_INCREASE + * WATCH_TEMP_PERIOD to expire, and if the temperature hasn't increased by WATCH_TEMP_INCREASE * degrees, the machine is halted, requiring a hard reset. This test restarts with any M104/M109, * but only if the current temperature is far enough below the target for a reliable test. */ diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h index a86b3279d..fa1444e2c 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h @@ -23,7 +23,7 @@ /** * Whenever an M104 or M109 increases the target temperature the firmware will wait for the - * WATCH_TEMP_PERIOD to transpire, and if the temperature hasn't increased by WATCH_TEMP_INCREASE + * WATCH_TEMP_PERIOD to expire, and if the temperature hasn't increased by WATCH_TEMP_INCREASE * degrees, the machine is halted, requiring a hard reset. This test restarts with any M104/M109, * but only if the current temperature is far enough below the target for a reliable test. */ From 258bcdefe0054901d69ea9a78a549c4e59ff6411 Mon Sep 17 00:00:00 2001 From: Christian Bohn Date: Mon, 18 May 2015 22:54:53 +0200 Subject: [PATCH 08/15] move dogm font selection to configuration_adv.h --- Marlin/Configuration_adv.h | 11 +++++++++++ Marlin/configurator/config/Configuration_adv.h | 11 +++++++++++ Marlin/dogm_lcd_implementation.h | 10 +++------- .../example_configurations/Felix/Configuration_adv.h | 12 ++++++++++++ .../Hephestos/Configuration_adv.h | 12 ++++++++++++ .../example_configurations/K8200/Configuration_adv.h | 12 ++++++++++++ .../example_configurations/SCARA/Configuration_adv.h | 12 ++++++++++++ .../WITBOX/Configuration_adv.h | 12 ++++++++++++ .../delta/biv2.5/Configuration_adv.h | 11 +++++++++++ .../delta/generic/Configuration_adv.h | 12 ++++++++++++ .../delta/kossel_mini/Configuration_adv.h | 12 ++++++++++++ .../makibox/Configuration_adv.h | 12 ++++++++++++ .../tvrrug/Round2/Configuration_adv.h | 12 ++++++++++++ 13 files changed, 144 insertions(+), 7 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index fd41e9d0d..05a2f8914 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -315,6 +315,17 @@ #endif // SDSUPPORT +// for dogm lcd displays you can choose some additional fonts: +#ifdef DOGLCD + // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT + // we don't have a big font for Cyrillic, Kana + //#define USE_BIG_EDIT_FONT + + // If you have spare 2300Byte of progmem and want to use a + // smaller font on the Info-screen uncomment the next line. + //#define USE_SMALL_INFOFONT +#endif // DOGLCD + // @section more // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation. diff --git a/Marlin/configurator/config/Configuration_adv.h b/Marlin/configurator/config/Configuration_adv.h index 1119e5181..1a89ee58f 100644 --- a/Marlin/configurator/config/Configuration_adv.h +++ b/Marlin/configurator/config/Configuration_adv.h @@ -323,6 +323,17 @@ #endif // SDSUPPORT +// for dogm lcd displays you can choose some additional fonts: +#ifdef DOGLCD + // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT + // we don't have a big font for Cyrillic, Kana + //#define USE_BIG_EDIT_FONT + + // If you have spare 2300Byte of progmem and want to use a + // smaller font on the Info-screen uncomment the next line. + //#define USE_SMALL_INFOFONT +#endif // DOGLCD + // @section more // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation. diff --git a/Marlin/dogm_lcd_implementation.h b/Marlin/dogm_lcd_implementation.h index 47e4a9244..6e64ffef9 100644 --- a/Marlin/dogm_lcd_implementation.h +++ b/Marlin/dogm_lcd_implementation.h @@ -35,15 +35,11 @@ #include "ultralcd_st7920_u8glib_rrd.h" #include "Configuration.h" -// save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT -// we don't have a big font for Cyrillic, Kana -#if defined(MAPPER_C2C3) || defined(MAPPER_NON) - //#define USE_BIG_EDIT_FONT +#if !defined(MAPPER_C2C3) && !defined(MAPPER_NON) && defined(USE_BIG_EDIT_FONT) + #undef USE_BIG_EDIT_FONT #endif -// If you have spare 2300Byte of progmem and want to use a -// smaller font on the Info-screen uncomment the next line. -//#define USE_SMALL_INFOFONT + #ifdef USE_SMALL_INFOFONT #include "dogm_font_data_6x9_marlin.h" #define FONT_STATUSMENU_NAME u8g_font_6x9 diff --git a/Marlin/example_configurations/Felix/Configuration_adv.h b/Marlin/example_configurations/Felix/Configuration_adv.h index 678ebbe08..14d3e91f2 100644 --- a/Marlin/example_configurations/Felix/Configuration_adv.h +++ b/Marlin/example_configurations/Felix/Configuration_adv.h @@ -323,6 +323,18 @@ #endif // SDSUPPORT +// for dogm lcd displays you can choose some additional fonts: +#ifdef DOGLCD + // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT + // we don't have a big font for Cyrillic, Kana + //#define USE_BIG_EDIT_FONT + + // If you have spare 2300Byte of progmem and want to use a + // smaller font on the Info-screen uncomment the next line. + //#define USE_SMALL_INFOFONT +#endif // DOGLCD + + // @section more // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation. diff --git a/Marlin/example_configurations/Hephestos/Configuration_adv.h b/Marlin/example_configurations/Hephestos/Configuration_adv.h index e1ec3fa6a..b569fe11e 100644 --- a/Marlin/example_configurations/Hephestos/Configuration_adv.h +++ b/Marlin/example_configurations/Hephestos/Configuration_adv.h @@ -323,6 +323,18 @@ #endif // SDSUPPORT +// for dogm lcd displays you can choose some additional fonts: +#ifdef DOGLCD + // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT + // we don't have a big font for Cyrillic, Kana + //#define USE_BIG_EDIT_FONT + + // If you have spare 2300Byte of progmem and want to use a + // smaller font on the Info-screen uncomment the next line. + //#define USE_SMALL_INFOFONT +#endif // DOGLCD + + // @section more // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation. diff --git a/Marlin/example_configurations/K8200/Configuration_adv.h b/Marlin/example_configurations/K8200/Configuration_adv.h index 678ebbe08..14d3e91f2 100644 --- a/Marlin/example_configurations/K8200/Configuration_adv.h +++ b/Marlin/example_configurations/K8200/Configuration_adv.h @@ -323,6 +323,18 @@ #endif // SDSUPPORT +// for dogm lcd displays you can choose some additional fonts: +#ifdef DOGLCD + // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT + // we don't have a big font for Cyrillic, Kana + //#define USE_BIG_EDIT_FONT + + // If you have spare 2300Byte of progmem and want to use a + // smaller font on the Info-screen uncomment the next line. + //#define USE_SMALL_INFOFONT +#endif // DOGLCD + + // @section more // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation. diff --git a/Marlin/example_configurations/SCARA/Configuration_adv.h b/Marlin/example_configurations/SCARA/Configuration_adv.h index af4429b7e..3765c4861 100644 --- a/Marlin/example_configurations/SCARA/Configuration_adv.h +++ b/Marlin/example_configurations/SCARA/Configuration_adv.h @@ -323,6 +323,18 @@ #endif // SDSUPPORT +// for dogm lcd displays you can choose some additional fonts: +#ifdef DOGLCD + // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT + // we don't have a big font for Cyrillic, Kana + //#define USE_BIG_EDIT_FONT + + // If you have spare 2300Byte of progmem and want to use a + // smaller font on the Info-screen uncomment the next line. + //#define USE_SMALL_INFOFONT +#endif // DOGLCD + + // @section more // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation. diff --git a/Marlin/example_configurations/WITBOX/Configuration_adv.h b/Marlin/example_configurations/WITBOX/Configuration_adv.h index da2281eaf..a7bebcc79 100644 --- a/Marlin/example_configurations/WITBOX/Configuration_adv.h +++ b/Marlin/example_configurations/WITBOX/Configuration_adv.h @@ -323,6 +323,18 @@ #endif // SDSUPPORT +// for dogm lcd displays you can choose some additional fonts: +#ifdef DOGLCD + // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT + // we don't have a big font for Cyrillic, Kana + //#define USE_BIG_EDIT_FONT + + // If you have spare 2300Byte of progmem and want to use a + // smaller font on the Info-screen uncomment the next line. + //#define USE_SMALL_INFOFONT +#endif // DOGLCD + + // @section more // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation. diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h b/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h index e193015cc..cdc76a81e 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h @@ -324,6 +324,17 @@ #endif // SDSUPPORT +// for dogm lcd displays you can choose some additional fonts: +#ifdef DOGLCD + // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT + // we don't have a big font for Cyrillic, Kana + //#define USE_BIG_EDIT_FONT + + // If you have spare 2300Byte of progmem and want to use a + // smaller font on the Info-screen uncomment the next line. + //#define USE_SMALL_INFOFONT +#endif // DOGLCD + // @section more // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation. diff --git a/Marlin/example_configurations/delta/generic/Configuration_adv.h b/Marlin/example_configurations/delta/generic/Configuration_adv.h index a003186d8..e95bde670 100644 --- a/Marlin/example_configurations/delta/generic/Configuration_adv.h +++ b/Marlin/example_configurations/delta/generic/Configuration_adv.h @@ -324,6 +324,18 @@ #endif // SDSUPPORT +// for dogm lcd displays you can choose some additional fonts: +#ifdef DOGLCD + // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT + // we don't have a big font for Cyrillic, Kana + //#define USE_BIG_EDIT_FONT + + // If you have spare 2300Byte of progmem and want to use a + // smaller font on the Info-screen uncomment the next line. + //#define USE_SMALL_INFOFONT +#endif // DOGLCD + + // @section more // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation. diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h index c8ac659c3..5d5e9b308 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h @@ -323,6 +323,18 @@ #endif // SDSUPPORT +// for dogm lcd displays you can choose some additional fonts: +#ifdef DOGLCD + // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT + // we don't have a big font for Cyrillic, Kana + //#define USE_BIG_EDIT_FONT + + // If you have spare 2300Byte of progmem and want to use a + // smaller font on the Info-screen uncomment the next line. + //#define USE_SMALL_INFOFONT +#endif // DOGLCD + + // @section more // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation. diff --git a/Marlin/example_configurations/makibox/Configuration_adv.h b/Marlin/example_configurations/makibox/Configuration_adv.h index b08e8bc2f..ad855dc6c 100644 --- a/Marlin/example_configurations/makibox/Configuration_adv.h +++ b/Marlin/example_configurations/makibox/Configuration_adv.h @@ -323,6 +323,18 @@ #endif // SDSUPPORT +// for dogm lcd displays you can choose some additional fonts: +#ifdef DOGLCD + // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT + // we don't have a big font for Cyrillic, Kana + //#define USE_BIG_EDIT_FONT + + // If you have spare 2300Byte of progmem and want to use a + // smaller font on the Info-screen uncomment the next line. + //#define USE_SMALL_INFOFONT +#endif // DOGLCD + + // @section more // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation. diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h index a86b3279d..fb4c56c6c 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h @@ -323,6 +323,18 @@ #endif // SDSUPPORT +// for dogm lcd displays you can choose some additional fonts: +#ifdef DOGLCD + // save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT + // we don't have a big font for Cyrillic, Kana + //#define USE_BIG_EDIT_FONT + + // If you have spare 2300Byte of progmem and want to use a + // smaller font on the Info-screen uncomment the next line. + //#define USE_SMALL_INFOFONT +#endif // DOGLCD + + // @section more // The hardware watchdog should reset the microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation. From b96b28b7cc6fc6aa0a7e3d6b90a2ab435de1a526 Mon Sep 17 00:00:00 2001 From: CONSULitAS Date: Mon, 18 May 2015 23:11:26 +0200 Subject: [PATCH 09/15] language.h: update documentation for LANGUAGE_INCLUDE language.h: update documentation for LANGUAGE_INCLUDE @thinkyhead What do you think? I think there should be a warning like this. --- Marlin/language.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/language.h b/Marlin/language.h index 9448c07fe..c13f50c1b 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -31,8 +31,8 @@ // kana Japanese // kana_utf Japanese +// fallback if no language is set, don't change #ifndef LANGUAGE_INCLUDE - // pick your default from the list above, individual language ist set in LCD section of Configuration.h #define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en) #endif From ca8d1756d559e6ed52f88a702e322b79975e0bea Mon Sep 17 00:00:00 2001 From: Ed Boston Date: Mon, 18 May 2015 14:23:31 -0700 Subject: [PATCH 10/15] 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 bc7e7dda0..2d57d3061 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 71f7f2806..8584a963d 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 4d4fa3607bc598441cb4a3de0e1f3a8064f0f75f Mon Sep 17 00:00:00 2001 From: AnHardt Date: Tue, 19 May 2015 02:46:37 +0200 Subject: [PATCH 11/15] Remove Duemilanove No way to fit Marlin into 32K. --- Marlin/Makefile | 6 ---- Marlin/boards.h | 1 - Marlin/configurator/config/boards.h | 1 - Marlin/pins.h | 2 -- Marlin/pins_DUEMILANOVE_328P.h | 43 ----------------------------- 5 files changed, 53 deletions(-) delete mode 100644 Marlin/pins_DUEMILANOVE_328P.h diff --git a/Marlin/Makefile b/Marlin/Makefile index 34ad1340d..b22cca671 100644 --- a/Marlin/Makefile +++ b/Marlin/Makefile @@ -99,12 +99,6 @@ else ifeq ($(HARDWARE_MOTHERBOARD),34) HARDWARE_VARIANT ?= arduino MCU ?= atmega2560 -#Duemilanove w/ ATMega328P pin assignment -else ifeq ($(HARDWARE_MOTHERBOARD),4) -HARDWARE_VARIANT ?= arduino -HARDWARE_SUB_VARIANT ?= standard -MCU ?= atmega328p - #Gen6 else ifeq ($(HARDWARE_MOTHERBOARD),5) HARDWARE_VARIANT ?= Gen6 diff --git a/Marlin/boards.h b/Marlin/boards.h index cc9d1f289..5ccf0f82e 100644 --- a/Marlin/boards.h +++ b/Marlin/boards.h @@ -16,7 +16,6 @@ #define BOARD_RAMPS_13_EEF 36 // RAMPS 1.3 / 1.4 (Power outputs: Extruder0, Extruder1, Fan) #define BOARD_RAMPS_13_SF 38 // RAMPS 1.3 / 1.4 (Power outputs: Spindle, Controller Fan) #define BOARD_FELIX2 37 // Felix 2.0+ Electronics Board (RAMPS like) -#define BOARD_DUEMILANOVE_328P 4 // Duemilanove w/ ATMega328P pin assignments #define BOARD_GEN6 5 // Gen6 #define BOARD_GEN6_DELUXE 51 // Gen6 deluxe #define BOARD_SANGUINOLOLU_11 6 // Sanguinololu < 1.2 diff --git a/Marlin/configurator/config/boards.h b/Marlin/configurator/config/boards.h index 8a60f011d..0e9c8c20a 100644 --- a/Marlin/configurator/config/boards.h +++ b/Marlin/configurator/config/boards.h @@ -15,7 +15,6 @@ #define BOARD_RAMPS_13_EFF 35 // RAMPS 1.3 / 1.4 (Power outputs: Extruder, Fan, Fan) #define BOARD_RAMPS_13_EEF 36 // RAMPS 1.3 / 1.4 (Power outputs: Extruder0, Extruder1, Fan) #define BOARD_FELIX2 37 // Felix 2.0+ Electronics Board (RAMPS like) -#define BOARD_DUEMILANOVE_328P 4 // Duemilanove w/ ATMega328P pin assignments #define BOARD_GEN6 5 // Gen6 #define BOARD_GEN6_DELUXE 51 // Gen6 deluxe #define BOARD_SANGUINOLOLU_11 6 // Sanguinololu < 1.2 diff --git a/Marlin/pins.h b/Marlin/pins.h index 6af115d63..abffe2c93 100644 --- a/Marlin/pins.h +++ b/Marlin/pins.h @@ -36,8 +36,6 @@ #include "pins_RAMPS_OLD.h" #elif MB(RAMPS_13_EFB) || MB(RAMPS_13_EEB) || MB(RAMPS_13_EFF) || MB(RAMPS_13_EEF) || MB(RAMPS_13_SF) #include "pins_RAMPS_13.h" -#elif MB(DUEMILANOVE_328P) - #include "pins_DUEMILANOVE_328P.h" #elif MB(GEN6) #include "pins_GEN6.h" #elif MB(GEN6_DELUXE) diff --git a/Marlin/pins_DUEMILANOVE_328P.h b/Marlin/pins_DUEMILANOVE_328P.h deleted file mode 100644 index 9e4705584..000000000 --- a/Marlin/pins_DUEMILANOVE_328P.h +++ /dev/null @@ -1,43 +0,0 @@ -/** - * Duemilanove w/ ATMega328P pin assignments - */ - -#ifndef __AVR_ATmega328P__ - #error Oops! Make sure you have 'Arduino Duemilanove w/ ATMega328' selected from the 'Tools -> Boards' menu. -#endif - -#define X_STEP_PIN 19 -#define X_DIR_PIN 18 -#define X_ENABLE_PIN -1 -#define X_STOP_PIN 17 - -#define Y_STEP_PIN 10 -#define Y_DIR_PIN 7 -#define Y_ENABLE_PIN -1 -#define Y_STOP_PIN 8 - -#define Z_STEP_PIN 13 -#define Z_DIR_PIN 3 -#define Z_ENABLE_PIN 2 -#define Z_STOP_PIN 4 - -#define E0_STEP_PIN 11 -#define E0_DIR_PIN 12 -#define E0_ENABLE_PIN -1 - -#define SDPOWER -1 -#define SDSS -1 -#define LED_PIN -1 -#define FAN_PIN 5 -#define PS_ON_PIN -1 -#define KILL_PIN -1 - -#define HEATER_0_PIN 6 -#define HEATER_1_PIN -1 -#define HEATER_2_PIN -1 -#define TEMP_0_PIN 0 // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!! -#define TEMP_1_PIN -1 -#define TEMP_2_PIN -1 -#define HEATER_BED_PIN -1 -#define TEMP_BED_PIN -1 - From 23ee57c1c121bab4ae17db257a5e3a70d136add2 Mon Sep 17 00:00:00 2001 From: AnHardt Date: Tue, 19 May 2015 03:17:56 +0200 Subject: [PATCH 12/15] Remove DUEMILANOVE from Travis too. --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f844a29eb..8154ace31 100644 --- a/.travis.yml +++ b/.travis.yml @@ -161,6 +161,3 @@ script: #- rm -rf .build/ #- ino build -m mega2560 ######## Board Types ############# - - sed -i 's/#define MOTHERBOARD BOARD_RAMPS_13_EFB/#define MOTHERBOARD BOARD_DUEMILANOVE_328P/g' Marlin/Configuration.h - - rm -rf .build/ - - ino build -m atmega328 \ No newline at end of file From 152b681bb5b436f435b9602fb2e63fb9df643142 Mon Sep 17 00:00:00 2001 From: Ed Boston Date: Tue, 19 May 2015 04:14:55 -0700 Subject: [PATCH 13/15] 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 2d57d3061..ccd978681 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 14/15] 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 de4c8a5f7..0d8a5d422 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 078af2a0d..9df608264 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 c5184ac6e..4e8503aa6 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 f4fccc82a..b430543ef 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 27a258290..b98c72437 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 e4941a7fd..aa623d2db 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 f0c71c16d..f9543b0c4 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 908acce5a..f86b2da38 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 0a5b7e671..6aeb7fa41 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 87d1cd2a1..0f7662892 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 63a402467..33419bd87 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 0dd00045b..a317358a9 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 From 89d2ee6f13363525b62365209613a48aec471185 Mon Sep 17 00:00:00 2001 From: AnHardt Date: Wed, 20 May 2015 22:03:16 +0200 Subject: [PATCH 15/15] Make output on display dependant of ULTRA_LCD --- Marlin/Marlin_main.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 7282adeb9..3b915306c 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -6374,7 +6374,9 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) { } void kill(const char *lcd_msg) { - lcd_setalertstatuspgm(lcd_msg); + #ifdef ULTRA_LCD + lcd_setalertstatuspgm(lcd_msg); + #endif cli(); // Stop interrupts disable_all_heaters();