From 7f8b0ed87bee84dda2d83fbdd6a4bb71e02bbf22 Mon Sep 17 00:00:00 2001 From: Marcio Teixeira Date: Wed, 13 Dec 2017 11:17:21 -0700 Subject: [PATCH] Hide "Change Filament E2" on single extruder (T1535) - Fix for allowing all toolheads to compile - Removed unnecessary state variable on single toolheads. --- Marlin/Conditionals_LulzBot.h | 2 +- Marlin/ultralcd.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Marlin/Conditionals_LulzBot.h b/Marlin/Conditionals_LulzBot.h index 951de2ae5..f45177abc 100644 --- a/Marlin/Conditionals_LulzBot.h +++ b/Marlin/Conditionals_LulzBot.h @@ -13,7 +13,7 @@ * got disabled. */ -#define LULZBOT_FW_VERSION ".61" // Change this with each update +#define LULZBOT_FW_VERSION ".62" // Change this with each update #if ( \ !defined(LULZBOT_Gladiola_Mini) && \ diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 7ced61695..366fa9a55 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -949,7 +949,7 @@ void kill_screen(const char* lcd_msg) { MENU_ITEM(function, MSG_FILAMENTCHANGE " E2", lcd_enqueue_filament_change_e1); #else if (!thermalManager.tooColdToExtrude(active_extruder)) - MENU_ITEM(function, MSG_FILAMENTCHANGE, lcd_enqueue_filament_change_e0); + MENU_ITEM(function, MSG_FILAMENTCHANGE, lcd_enqueue_filament_change); #endif #endif @@ -1271,6 +1271,9 @@ void kill_screen(const char* lcd_msg) { #if ENABLED(ADVANCED_PAUSE_FEATURE) void lcd_enqueue_filament_change() { + #if !defined(LULZBOT_CHANGE_FILAMENT_DUAL_EXTRUDER_SUPPORT) + if (axis_unhomed_error()) {lcd_return_to_status(); return;} + #endif #if ENABLED(PREVENT_COLD_EXTRUSION) if (!DEBUGGING(DRYRUN) && !thermalManager.allow_cold_extrude &&