From 3843a5151ac5934690d7c937f194227e6e4ec0e7 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 17 May 2017 09:44:34 -0500
Subject: [PATCH] Patch LCD code for 5th extruder, EEPROM reset
---
Marlin/language_en.h | 6 +++---
Marlin/ultralcd.cpp | 33 +++++++++++++++++++--------------
2 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/Marlin/language_en.h b/Marlin/language_en.h
index 7dd2edf0af..fefc41082e 100644
--- a/Marlin/language_en.h
+++ b/Marlin/language_en.h
@@ -455,16 +455,16 @@
#define MSG_CONTRAST _UxGT("LCD contrast")
#endif
#ifndef MSG_STORE_EEPROM
- #define MSG_STORE_EEPROM _UxGT("Store memory")
+ #define MSG_STORE_EEPROM _UxGT("Store settings")
#endif
#ifndef MSG_LOAD_EEPROM
- #define MSG_LOAD_EEPROM _UxGT("Load memory")
+ #define MSG_LOAD_EEPROM _UxGT("Load settings")
#endif
#ifndef MSG_RESTORE_FAILSAFE
#define MSG_RESTORE_FAILSAFE _UxGT("Restore failsafe")
#endif
#ifndef MSG_INIT_EEPROM
- #define MSG_INIT_EEPROM _UxGT("Initalize Memory")
+ #define MSG_INIT_EEPROM _UxGT("Initialize EEPROM")
#endif
#ifndef MSG_REFRESH
#define MSG_REFRESH _UxGT("Refresh")
diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp
index 6b3784bac7..5d9ee29827 100644
--- a/Marlin/ultralcd.cpp
+++ b/Marlin/ultralcd.cpp
@@ -1289,7 +1289,7 @@ void kill_screen(const char* lcd_msg) {
void lcd_preheat_m2_bedonly() { _lcd_preheat(0, 0, lcd_preheat_bed_temp[1], lcd_preheat_fan_speed[1]); }
#endif
- #if TEMP_SENSOR_0 != 0 && (TEMP_SENSOR_1 != 0 || TEMP_SENSOR_2 != 0 || TEMP_SENSOR_3 != 0 || TEMP_SENSOR_BED != 0)
+ #if TEMP_SENSOR_0 != 0 && (TEMP_SENSOR_1 != 0 || TEMP_SENSOR_2 != 0 || TEMP_SENSOR_3 != 0 || TEMP_SENSOR_4 != 0 || TEMP_SENSOR_BED != 0)
void lcd_preheat_m1_menu() {
START_MENU();
@@ -1395,7 +1395,7 @@ void kill_screen(const char* lcd_msg) {
END_MENU();
}
- #endif // TEMP_SENSOR_0 && (TEMP_SENSOR_1 || TEMP_SENSOR_2 || TEMP_SENSOR_3 || TEMP_SENSOR_BED)
+ #endif // TEMP_SENSOR_0 && (TEMP_SENSOR_1 || TEMP_SENSOR_2 || TEMP_SENSOR_3 || TEMP_SENSOR_4 || TEMP_SENSOR_BED)
void lcd_cooldown() {
#if FAN_COUNT > 0
@@ -2076,18 +2076,14 @@ void kill_screen(const char* lcd_msg) {
MENU_ITEM(gcode, MSG_DISABLE_STEPPERS, PSTR("M84"));
//
- // Preheat PLA
- // Preheat ABS
+ // Change filament
//
- #if TEMP_SENSOR_0 != 0
+ #if ENABLED(FILAMENT_CHANGE_FEATURE)
+ if (!thermalManager.tooColdToExtrude(active_extruder))
+ MENU_ITEM(function, MSG_FILAMENTCHANGE, lcd_enqueue_filament_change);
+ #endif
- //
- // Change filament
- //
- #if ENABLED(FILAMENT_CHANGE_FEATURE)
- if (!thermalManager.tooColdToExtrude(active_extruder))
- MENU_ITEM(function, MSG_FILAMENTCHANGE, lcd_enqueue_filament_change);
- #endif
+ #if TEMP_SENSOR_0 != 0
//
// Cooldown
@@ -2102,7 +2098,7 @@ void kill_screen(const char* lcd_msg) {
//
// Preheat for Material 1 and 2
//
- #if TEMP_SENSOR_1 != 0 || TEMP_SENSOR_2 != 0 || TEMP_SENSOR_3 != 0 || TEMP_SENSOR_BED != 0
+ #if TEMP_SENSOR_1 != 0 || TEMP_SENSOR_2 != 0 || TEMP_SENSOR_3 != 0 || TEMP_SENSOR_4 != 0 || TEMP_SENSOR_BED != 0
MENU_ITEM(submenu, MSG_PREHEAT_1, lcd_preheat_m1_menu);
MENU_ITEM(submenu, MSG_PREHEAT_2, lcd_preheat_m2_menu);
#else
@@ -2498,7 +2494,7 @@ void kill_screen(const char* lcd_msg) {
MENU_ITEM(function, MSG_STORE_EEPROM, lcd_store_settings);
MENU_ITEM(function, MSG_LOAD_EEPROM, lcd_load_settings);
MENU_ITEM(function, MSG_RESTORE_FAILSAFE, lcd_factory_settings);
- MENU_ITEM(gcode, MSG_INIT_EEPROM, PSTR("M502\nM500\nM501"));
+ MENU_ITEM(gcode, MSG_INIT_EEPROM, PSTR("M502\nM500")); // TODO: Add "Are You Sure?" step
#endif
END_MENU();
}
@@ -3146,6 +3142,15 @@ void kill_screen(const char* lcd_msg) {
STATIC_ITEM(MSG_INFO_MAX_TEMP ": " STRINGIFY(HEATER_3_MAXTEMP), false);
#endif
+ #if TEMP_SENSOR_4 != 0
+ #undef THERMISTOR_ID
+ #define THERMISTOR_ID TEMP_SENSOR_4
+ #include "thermistornames.h"
+ STATIC_ITEM("T4: " THERMISTOR_NAME, false, true);
+ STATIC_ITEM(MSG_INFO_MIN_TEMP ": " STRINGIFY(HEATER_4_MINTEMP), false);
+ STATIC_ITEM(MSG_INFO_MAX_TEMP ": " STRINGIFY(HEATER_4_MAXTEMP), false);
+ #endif
+
#if TEMP_SENSOR_BED != 0
#undef THERMISTOR_ID
#define THERMISTOR_ID TEMP_SENSOR_BED