3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-30 23:30:16 +00:00
Code Issues Releases Wiki Activity

Better LCD message when heating needed

Browse Source
This commit is contained in:
Scott Lahteine 2018-01-20 12:25:44 -06:00
parent c373afbddd
commit c7ae531e35
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Marlin/Marlin_main.cpp
View File

@ -6508,6 +6508,7 @@ inline void gcode_M17() {
#if ENABLED(ULTIPANEL) #if ENABLED(ULTIPANEL)
if (show_lcd) // Show status screen if (show_lcd) // Show status screen
lcd_advanced_pause_show_message(ADVANCED_PAUSE_MESSAGE_STATUS); lcd_advanced_pause_show_message(ADVANCED_PAUSE_MESSAGE_STATUS);
LCD_MESSAGEPGM(MSG_M600_TOO_COLD);
#endif #endif
return false; // unable to reach safe temperature return false; // unable to reach safe temperature
@ -10043,15 +10044,11 @@ inline void gcode_M502() {
); );
// Lift Z axis // Lift Z axis
if (parser.seenval('Z')) if (parser.seenval('Z')) park_point.z = parser.linearval('Z');
park_point.z = parser.linearval('Z');
// Move XY axes to filament change position or given position // Move XY axes to filament change position or given position
if (parser.seenval('X')) if (parser.seenval('X')) park_point.x = parser.linearval('X');
park_point.x = parser.linearval('X'); if (parser.seenval('Y')) park_point.y = parser.linearval('Y');
if (parser.seenval('Y'))
park_point.y = parser.linearval('Y');
#if HOTENDS > 1 && DISABLED(DUAL_X_CARRIAGE) #if HOTENDS > 1 && DISABLED(DUAL_X_CARRIAGE)
park_point.x += (active_extruder ? hotend_offset[X_AXIS][active_extruder] : 0); park_point.x += (active_extruder ? hotend_offset[X_AXIS][active_extruder] : 0);

3
Marlin/language_en.h
View File

@ -961,6 +961,9 @@
#ifndef MSG_ERR_PROBING_FAILED #ifndef MSG_ERR_PROBING_FAILED
#define MSG_ERR_PROBING_FAILED _UxGT("Probing failed") #define MSG_ERR_PROBING_FAILED _UxGT("Probing failed")
#endif #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 // Filament Change screens show up to 3 lines on a 4-line display