From 6b945eb548c7478e38dac161edc717a177c6d9ef Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 2 Oct 2019 19:05:12 -0500 Subject: [PATCH] Show "FILAMENT CHANGE" during filament change --- Marlin/src/feature/pause.cpp | 4 ++-- Marlin/src/feature/pause.h | 1 + Marlin/src/lcd/language/language_en.h | 19 +++++++++++-------- Marlin/src/lcd/menu/menu_filament.cpp | 8 +++++++- 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp index 632433094e..b319bbab6e 100644 --- a/Marlin/src/feature/pause.cpp +++ b/Marlin/src/feature/pause.cpp @@ -240,10 +240,10 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l wait_for_user = true; #if ENABLED(HOST_PROMPT_SUPPORT) - host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Continuous Purge Running..."), PSTR("Continue")); + host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Filament Purge Running..."), PSTR("Continue")); #endif #if ENABLED(EXTENSIBLE_UI) - ExtUI::onUserConfirmRequired(PSTR("Continuous Purge Running...")); + ExtUI::onUserConfirmRequired(PSTR("Filament Purge Running...")); #endif for (float purge_count = purge_length; purge_count > 0 && wait_for_user; --purge_count) do_pause_e_move(1, ADVANCED_PAUSE_PURGE_FEEDRATE); diff --git a/Marlin/src/feature/pause.h b/Marlin/src/feature/pause.h index cb6787d913..42f70cc601 100644 --- a/Marlin/src/feature/pause.h +++ b/Marlin/src/feature/pause.h @@ -39,6 +39,7 @@ typedef struct { enum PauseMode : char { PAUSE_MODE_SAME, PAUSE_MODE_PAUSE_PRINT, + PAUSE_MODE_CHANGE_FILAMENT, PAUSE_MODE_LOAD_FILAMENT, PAUSE_MODE_UNLOAD_FILAMENT }; diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h index ce24ecba67..d9e5eba5d1 100644 --- a/Marlin/src/lcd/language/language_en.h +++ b/Marlin/src/lcd/language/language_en.h @@ -1266,6 +1266,9 @@ #ifndef MSG_DAC_EEPROM_WRITE #define MSG_DAC_EEPROM_WRITE _UxGT("DAC EEPROM Write") #endif +#ifndef MSG_FILAMENT_CHANGE_HEADER + #define MSG_FILAMENT_CHANGE_HEADER _UxGT("FILAMENT CHANGE") +#endif #ifndef MSG_FILAMENT_CHANGE_HEADER_PAUSE #define MSG_FILAMENT_CHANGE_HEADER_PAUSE _UxGT("PRINT PAUSED") #endif @@ -1493,20 +1496,20 @@ #define MSG_FILAMENT_CHANGE_HEATING_2 _UxGT("Please wait...") #endif #ifndef MSG_FILAMENT_CHANGE_UNLOAD_1 - #define MSG_FILAMENT_CHANGE_UNLOAD_1 _UxGT("Wait for") - #define MSG_FILAMENT_CHANGE_UNLOAD_2 _UxGT("filament unload") + #define MSG_FILAMENT_CHANGE_UNLOAD_1 _UxGT("Wait for filament") + #define MSG_FILAMENT_CHANGE_UNLOAD_2 _UxGT("to fully unload") #endif #ifndef MSG_FILAMENT_CHANGE_LOAD_1 - #define MSG_FILAMENT_CHANGE_LOAD_1 _UxGT("Wait for") - #define MSG_FILAMENT_CHANGE_LOAD_2 _UxGT("filament load") + #define MSG_FILAMENT_CHANGE_LOAD_1 _UxGT("Wait for filament") + #define MSG_FILAMENT_CHANGE_LOAD_2 _UxGT("to load to nozzle") #endif #ifndef MSG_FILAMENT_CHANGE_PURGE_1 - #define MSG_FILAMENT_CHANGE_PURGE_1 _UxGT("Wait for") - #define MSG_FILAMENT_CHANGE_PURGE_2 _UxGT("filament purge") + #define MSG_FILAMENT_CHANGE_PURGE_1 _UxGT("Wait for filament") + #define MSG_FILAMENT_CHANGE_PURGE_2 _UxGT("purge to finish") #endif #ifndef MSG_FILAMENT_CHANGE_CONT_PURGE_1 - #define MSG_FILAMENT_CHANGE_CONT_PURGE_1 _UxGT("Click to finish") - #define MSG_FILAMENT_CHANGE_CONT_PURGE_2 _UxGT("filament purge") + #define MSG_FILAMENT_CHANGE_CONT_PURGE_1 _UxGT("Click to stop") + #define MSG_FILAMENT_CHANGE_CONT_PURGE_2 _UxGT("purging filament") #endif #ifndef MSG_FILAMENT_CHANGE_RESUME_1 #define MSG_FILAMENT_CHANGE_RESUME_1 _UxGT("Wait for print") diff --git a/Marlin/src/lcd/menu/menu_filament.cpp b/Marlin/src/lcd/menu/menu_filament.cpp index 7e524c260b..ac84215105 100644 --- a/Marlin/src/lcd/menu/menu_filament.cpp +++ b/Marlin/src/lcd/menu/menu_filament.cpp @@ -47,6 +47,7 @@ inline PGM_P _change_filament_temp_command() { return PSTR("M701 T%d"); case PAUSE_MODE_UNLOAD_FILAMENT: return _change_filament_temp_extruder >= 0 ? PSTR("M702 T%d") : PSTR("M702 ;%d"); + case PAUSE_MODE_CHANGE_FILAMENT: case PAUSE_MODE_PAUSE_PRINT: default: return PSTR("M600 B0 T%d"); @@ -75,7 +76,9 @@ static PGM_P change_filament_header(const PauseMode mode) { return PSTR(MSG_FILAMENTCHANGE); } -void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) { +void _menu_temp_filament_op(const PauseMode inMode, const int8_t extruder) { + // If no print is active, just label as "filament change" + const PauseMode mode = (inMode != PAUSE_MODE_PAUSE_PRINT || printingIsPaused()) ? inMode : PAUSE_MODE_CHANGE_FILAMENT; _change_filament_temp_mode = mode; _change_filament_temp_extruder = extruder; START_MENU(); @@ -315,10 +318,13 @@ static uint8_t hotend_status_extruder = 0; static PGM_P pause_header() { switch (pause_mode) { + case PAUSE_MODE_CHANGE_FILAMENT: + return PSTR(MSG_FILAMENT_CHANGE_HEADER); case PAUSE_MODE_LOAD_FILAMENT: return PSTR(MSG_FILAMENT_CHANGE_HEADER_LOAD); case PAUSE_MODE_UNLOAD_FILAMENT: return PSTR(MSG_FILAMENT_CHANGE_HEADER_UNLOAD); + case PAUSE_MODE_PAUSE_PRINT: default: break; } return PSTR(MSG_FILAMENT_CHANGE_HEADER_PAUSE);