diff --git a/.travis.yml b/.travis.yml
index f844a29eb73b4fc39d9d1df7366f7b2221147f46..8154ace313acd4e2f6b3cc7d5f67dd9b88d63c5e 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
diff --git a/Marlin/Conditionals.h b/Marlin/Conditionals.h
index f09a8a2fe892c20de39235b9a31088f179498eef..358131e4ae834283f981be8b768b75a0627c6b8a 100644
--- a/Marlin/Conditionals.h
+++ b/Marlin/Conditionals.h
@@ -22,15 +22,20 @@
#define NEWPANEL
#endif
- #if defined(miniVIKI) || defined(VIKI2)
+ #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.
#ifdef miniVIKI
#define DEFAULT_LCD_CONTRAST 95
- #else
+ #elif defined(VIKI2)
#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 8e520fa96a8d79a7d47da60a0549ab31c09388c5..ccd97868118ade72b8c5422afb21c3acc8c22400 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -660,6 +660,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/Configuration_adv.h b/Marlin/Configuration_adv.h
index fd41e9d0dc953d7019c8136fd304f59f2a62df9f..8818b1b665e1819f05943e64fbc2244e8ce27794 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.
*/
@@ -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/Makefile b/Marlin/Makefile
index 34ad1340da48c9be63ae79dc843fae1a529cc2bf..b22cca671387c76f19da91eab88ef09b917f7d8d 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/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 7282adeb90178a6546e643b26ffb29bddaaaa0c3..3b915306c699427f95a58138ec341df44dc1b49b 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();
diff --git a/Marlin/boards.h b/Marlin/boards.h
index cc9d1f28979f9750b5e4af50935390f2dab8729a..5ccf0f82e2afb6f76e4dabff08a2d4c3de80be61 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/Configuration.h b/Marlin/configurator/config/Configuration.h
index de4c8a5f7192b6305325e6c8754957f4ae764489..0d8a5d422853193846c8ea3c47f93c708e09516f 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/configurator/config/Configuration_adv.h b/Marlin/configurator/config/Configuration_adv.h
index 1119e51814f948a6186b7cce7d2b90e7e38ccc31..91d8c9dc0107dd2d81deb8a5016ffc17467d382d 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.
*/
@@ -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/configurator/config/boards.h b/Marlin/configurator/config/boards.h
index 8a60f011d5752901dee50d3fc28b3ca7b72c5618..0e9c8c20a19142ced5d6d5c1622f396672ac94f4 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/dogm_lcd_implementation.h b/Marlin/dogm_lcd_implementation.h
index 47e4a9244dad956a1a89ae50f8694aac52403589..d935d767a975c5230c83d1d9fbaf34f4367455da 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
@@ -126,6 +122,9 @@
#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(U8GLIB_LM6059_AF)
+ // 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
U8GLIB_DOGM128 u8g(DOGLCD_CS, DOGLCD_A0); // HW-SPI Com: CS, A0
diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h
index 078af2a0d53e4b22707e9d7523d5656c154f5b13..9df608264d039e5bb2b0fd14d22daae33f56bef1 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/Felix/Configuration_adv.h b/Marlin/example_configurations/Felix/Configuration_adv.h
index 678ebbe0833d9ac0c835e54aa059481234adbc13..24b0b93ebf6fd9340d2ea8600e8b7eb0eadb233f 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.
*/
@@ -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.h b/Marlin/example_configurations/Hephestos/Configuration.h
index c5184ac6e449a7f519933bc23df7b6070d29fea9..4e8503aa6fa5918d36b253ff513c29265f473fd5 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/Hephestos/Configuration_adv.h b/Marlin/example_configurations/Hephestos/Configuration_adv.h
index e1ec3fa6a76896560d1077e8971ed52576363c61..485afd15b55b7fc4888f8dc181fad629a851853f 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.
*/
@@ -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.h b/Marlin/example_configurations/K8200/Configuration.h
index f4fccc82acbb9f92e9f31ad376d98a541bcfb966..b430543ef50b644deac1ddd6693cbcbfabf878c6 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/K8200/Configuration_adv.h b/Marlin/example_configurations/K8200/Configuration_adv.h
index 678ebbe0833d9ac0c835e54aa059481234adbc13..24b0b93ebf6fd9340d2ea8600e8b7eb0eadb233f 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.
*/
@@ -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/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
index 27a2582900bcb8712eff731b677d8aafe8964293..b98c72437ae65cfa3567981bdc24154ba0c03117 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 e4941a7fd6ec6cc7b2a0cd74b1cdc83b3c184703..aa623d2db5a1f655ef088c876280609b8c2bef77 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/SCARA/Configuration_adv.h b/Marlin/example_configurations/SCARA/Configuration_adv.h
index af4429b7e66284ee01500851c4bd19641f2ec26e..b2e05ef373f34f0931686dbac949d4907b536ef0 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.
*/
@@ -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.h b/Marlin/example_configurations/WITBOX/Configuration.h
index f0c71c16deb13c255afba1d62079779339ee61aa..f9543b0c45679b896496e41e2f5c73c8c6442218 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/WITBOX/Configuration_adv.h b/Marlin/example_configurations/WITBOX/Configuration_adv.h
index da2281eaf8d00faadb1e858e97444cb0b1bc03b6..2d187ae45f467e118e1268a3fa6dfa6d2f477f51 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.
*/
@@ -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.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h
index 908acce5ab09f50b66acdceeb9547b559bdf092f..f86b2da3823063fde76f94d9078e295e6a3af154 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/biv2.5/Configuration_adv.h b/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h
index e193015cc36d5430a91bb37070a78eaf4d3fb34b..9a9104e60c45a42d96ac93263e3276eb4e6c4de1 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.
*/
@@ -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.h b/Marlin/example_configurations/delta/generic/Configuration.h
index 0a5b7e6711ce3664d702a02d68c24a636550b29a..6aeb7fa41fd506a8bd259ddf7c3d06481ea7cd2a 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/generic/Configuration_adv.h b/Marlin/example_configurations/delta/generic/Configuration_adv.h
index a003186d81be1ac8c4b7ea74fec6c6e12a7c7c29..9a86fc83fff95f6d887bbb9d27fecc42c77d6670 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.
*/
@@ -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.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h
index 87d1cd2a1e908a30cd221cad93a0e7f7efbdb119..0f7662892e061e894025126b232ad6030652efff 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/delta/kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
index c8ac659c327205663f91ae2737808f93c81c7f78..8cd7786172d14f0f814c43b44ebeb721fb09d443 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.
*/
@@ -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.h b/Marlin/example_configurations/makibox/Configuration.h
index 63a4024673857977d17b3e6b500f71590f43f335..33419bd87abac91747f8b21155766a69b7a6f2a2 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/makibox/Configuration_adv.h b/Marlin/example_configurations/makibox/Configuration_adv.h
index b08e8bc2ff1de9d2e7ae661a391d4081ae5a9db5..d502852d44f1cfd5a357eab70da52746dd62032c 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.
*/
@@ -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.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h
index 0dd00045b2941216afc4cb95e696f7bca42d97cd..a317358a9de0755649076cb2aba6ee6a663ffe34 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
diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
index a86b3279d49d4e915705ec03ed44af70a92a1549..85b75e1a11cc6d4f36780719bc44ffad7a44ca34 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.
*/
@@ -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/language.h b/Marlin/language.h
index 096b416c04db94f66711718a30f394264ff9bb5d..6e078d1dbc434321bb7f125e3808e71aca7a9772 100644
--- a/Marlin/language.h
+++ b/Marlin/language.h
@@ -32,8 +32,8 @@
// kana_utf Japanese
// cn Chinese
+// fallback if no language is set, don't change
#ifndef LANGUAGE_INCLUDE
- // pick your language from the list above
#define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en)
#endif
@@ -53,6 +53,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)
diff --git a/Marlin/pins.h b/Marlin/pins.h
index 6af115d63ac0f6f9d7031a492cc3a2a4da71cf13..abffe2c9345d940d5dde9430cb0ca0d5553d6a55 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 9e47055849b472c25bc1095ef6cc47a2ad666f5a..0000000000000000000000000000000000000000
--- 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
-
diff --git a/Marlin/pins_RAMPS_13.h b/Marlin/pins_RAMPS_13.h
index c9c796ed426e2c5765f8be7bf32fa250f91d5c36..37683b8c5929f48ce0259e5baa6f04faa23040cd 100644
--- a/Marlin/pins_RAMPS_13.h
+++ b/Marlin/pins_RAMPS_13.h
@@ -180,6 +180,17 @@
#define BTN_ENC -1
#define LCD_SDSS 53
#define SDCARDDETECT 49
+ #elif defined(ELB_FULL_GRAPHIC_CONTROLLER)
+ #define BTN_EN1 35 // reverse if the encoder turns the wrong way.
+ #define BTN_EN2 37
+ #define BTN_ENC 31
+ #define SDCARDDETECT 49
+ #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,7 +220,6 @@
#endif
#endif
-
#else // Old-style panel with shift register
// Arduino pin witch triggers an piezzo beeper
#define BEEPER 33 // No Beeper added
diff --git a/Marlin/temperature.cpp b/Marlin/temperature.cpp
index fea4e96152a55426fadd0a69bd66e8c96a14c089..9fdcb785cdb4f76f015871840735802feff11b76 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;
}
diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp
index 1bcd3dbaae5e5fc5c4468480099950ef5ed2633f..8584a963d5c42133846a49e457e7c40b1f512608 100644
--- a/Marlin/ultralcd.cpp
+++ b/Marlin/ultralcd.cpp
@@ -1110,13 +1110,24 @@ static void lcd_control_volumetric_menu() {
#ifdef HAS_LCD_CONTRAST
static void lcd_set_contrast() {
if (encoderPosition != 0) {
- lcd_contrast -= encoderPosition;
- lcd_contrast &= 0x3F;
+ #ifdef U8GLIB_LM6059_AF
+ 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 U8GLIB_LM6059_AF
+ 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