From c7ae531e3559edb1c42c931dab924141e2ce6e49 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 20 Jan 2018 12:25:44 -0600 Subject: [PATCH] Better LCD message when heating needed --- Marlin/Marlin_main.cpp | 11 ++++------- Marlin/language_en.h | 3 +++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 14f4409f16..1f44fdca74 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -6508,6 +6508,7 @@ inline void gcode_M17() { #if ENABLED(ULTIPANEL) if (show_lcd) // Show status screen lcd_advanced_pause_show_message(ADVANCED_PAUSE_MESSAGE_STATUS); + LCD_MESSAGEPGM(MSG_M600_TOO_COLD); #endif return false; // unable to reach safe temperature @@ -10043,15 +10044,11 @@ inline void gcode_M502() { ); // Lift Z axis - if (parser.seenval('Z')) - park_point.z = parser.linearval('Z'); + if (parser.seenval('Z')) park_point.z = parser.linearval('Z'); // Move XY axes to filament change position or given position - if (parser.seenval('X')) - park_point.x = parser.linearval('X'); - - if (parser.seenval('Y')) - park_point.y = parser.linearval('Y'); + if (parser.seenval('X')) park_point.x = parser.linearval('X'); + if (parser.seenval('Y')) park_point.y = parser.linearval('Y'); #if HOTENDS > 1 && DISABLED(DUAL_X_CARRIAGE) park_point.x += (active_extruder ? hotend_offset[X_AXIS][active_extruder] : 0); diff --git a/Marlin/language_en.h b/Marlin/language_en.h index 4303c7e546..9d44e6b774 100644 --- a/Marlin/language_en.h +++ b/Marlin/language_en.h @@ -961,6 +961,9 @@ #ifndef MSG_ERR_PROBING_FAILED #define MSG_ERR_PROBING_FAILED _UxGT("Probing failed") #endif +#ifndef MSG_M600_TOO_COLD + #define MSG_M600_TOO_COLD _UxGT("M600: Too cold") +#endif // // Filament Change screens show up to 3 lines on a 4-line display