From 4a0b1921f155f26960b28b4655cd543ee6d51bfb Mon Sep 17 00:00:00 2001 From: Marcio Teixeira Date: Thu, 7 Dec 2017 14:40:29 -0700 Subject: [PATCH] Allow resume of paused print via the LCD (T1460) --- Marlin/Conditionals_LulzBot.h | 8 +++++++- Marlin/Marlin_main.cpp | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Marlin/Conditionals_LulzBot.h b/Marlin/Conditionals_LulzBot.h index 3947dc97f..3f2b3d3be 100644 --- a/Marlin/Conditionals_LulzBot.h +++ b/Marlin/Conditionals_LulzBot.h @@ -13,7 +13,7 @@ * got disabled. */ -#define LULZBOT_FW_VERSION ".56" // Change this with each update +#define LULZBOT_FW_VERSION ".57" // Change this with each update #if ( \ !defined(LULZBOT_Gladiola_Mini) && \ @@ -252,6 +252,12 @@ // Backport of upstream Marlin fix T7811 related to M600 resume_print #define LULZBOT_M600_BACKPORT_T7811 +// In Marlin 1.1.5, a paused print cannot be resumed from the LCD if +// PAUSE_PARK_RETRACT_LENGTH is non-zero. This has been submitted as +// bug #8703 + +#define LULZBOT_LCD_PAUSE_WORKAROUND + /************************* EXPERIMENTAL FEATURES ******************************/ #if defined(LULZBOT_USE_EXPERIMENTAL_FEATURES) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 15ee70b26..e0bac4969 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -6189,6 +6189,9 @@ inline void gcode_M17() { } } } + #if ENABLED(ULTIPANEL) && defined(LULZBOT_LCD_PAUSE_WORKAROUND) + lcd_advanced_pause_show_message(ADVANCED_PAUSE_MESSAGE_STATUS); + #endif } static bool pause_print(const float &retract, const float &z_lift, const float &x_pos, const float &y_pos,