Tweak M600 display resume
- Add startFileprint(); call to M108 display routine to fix progress and ensure "printing done" gets shown - Add SD printing check in marlin_main.cpp M600 routine to skip TFTstate if not necessary (e.g. USB printing) - Move routine to the top again to ensure immediate execution
This commit is contained in:
parent
8fc01144f1
commit
2c53c33d52
|
@ -264,13 +264,14 @@ void AnycubicTFTClass::FilamentChangeResume(){
|
||||||
HOTEND_LOOP() thermalManager.reset_heater_idle_timer(e); // resume heating if timed out
|
HOTEND_LOOP() thermalManager.reset_heater_idle_timer(e); // resume heating if timed out
|
||||||
wait_for_heatup = false;
|
wait_for_heatup = false;
|
||||||
wait_for_user = false; // remove waiting flags
|
wait_for_user = false; // remove waiting flags
|
||||||
// TFTstate=ANYCUBIC_TFT_STATE_SDPRINT;
|
card.startFileprint(); // resume with proper progress state
|
||||||
#ifdef ANYCUBIC_TFT_DEBUG
|
#ifdef ANYCUBIC_TFT_DEBUG
|
||||||
SERIAL_ECHOLNPGM("DEBUG: M108 Resume called");
|
SERIAL_ECHOLNPGM("DEBUG: M108 Resume called");
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void AnycubicTFTClass::FilamentChangePause(){
|
void AnycubicTFTClass::FilamentChangePause(){
|
||||||
|
PausedByFilamentChange=true;
|
||||||
enqueue_and_echo_commands_P(PSTR("M600"));
|
enqueue_and_echo_commands_P(PSTR("M600"));
|
||||||
TFTstate=ANYCUBIC_TFT_STATE_SDPAUSE_REQ; // set TFT state to paused
|
TFTstate=ANYCUBIC_TFT_STATE_SDPAUSE_REQ; // set TFT state to paused
|
||||||
#ifdef ANYCUBIC_TFT_DEBUG
|
#ifdef ANYCUBIC_TFT_DEBUG
|
||||||
|
@ -329,7 +330,6 @@ void AnycubicTFTClass::HandleSpecialMenu()
|
||||||
enqueue_and_echo_commands_P(PSTR("G91\nG1 Z-0.1\nG90"));
|
enqueue_and_echo_commands_P(PSTR("G91\nG1 Z-0.1\nG90"));
|
||||||
} else if (strcmp(SelectedDirectory, "<filamentchange pause>")==0) {
|
} else if (strcmp(SelectedDirectory, "<filamentchange pause>")==0) {
|
||||||
SERIAL_PROTOCOLLNPGM("Special Menu: FilamentChange Pause");
|
SERIAL_PROTOCOLLNPGM("Special Menu: FilamentChange Pause");
|
||||||
PausedByFilamentChange=true;
|
|
||||||
FilamentChangePause();
|
FilamentChangePause();
|
||||||
} else if (strcmp(SelectedDirectory, "<filamentchange resume>")==0) {
|
} else if (strcmp(SelectedDirectory, "<filamentchange resume>")==0) {
|
||||||
SERIAL_PROTOCOLLNPGM("Special Menu: FilamentChange Resume");
|
SERIAL_PROTOCOLLNPGM("Special Menu: FilamentChange Resume");
|
||||||
|
|
|
@ -10992,6 +10992,23 @@ inline void gcode_M502() {
|
||||||
* Default values are used for omitted arguments.
|
* Default values are used for omitted arguments.
|
||||||
*/
|
*/
|
||||||
inline void gcode_M600() {
|
inline void gcode_M600() {
|
||||||
|
|
||||||
|
#ifdef SDSUPPORT
|
||||||
|
if (card.sdprinting) { // are we printing from sd?
|
||||||
|
#ifdef ANYCUBIC_TFT_DEBUG
|
||||||
|
SERIAL_ECHOLNPGM("DEBUG: Enter M600 TFTstate routine");
|
||||||
|
#endif
|
||||||
|
AnycubicTFT.TFTstate=ANYCUBIC_TFT_STATE_SDPAUSE_REQ; // enter correct display state to show resume button
|
||||||
|
#ifdef ANYCUBIC_TFT_DEBUG
|
||||||
|
SERIAL_ECHOLNPGM("DEBUG: Set TFTstate to SDPAUSE_REQ");
|
||||||
|
#endif
|
||||||
|
AnycubicTFT.PausedByFilamentChange=true; // set flag to ensure correct resume routine gets executed
|
||||||
|
#ifdef ANYCUBIC_TFT_DEBUG
|
||||||
|
SERIAL_ECHOLNPGM("DEBUG: Set filament change flag");
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
point_t park_point = NOZZLE_PARK_POINT;
|
point_t park_point = NOZZLE_PARK_POINT;
|
||||||
|
|
||||||
if (get_target_extruder_from_command(600)) return;
|
if (get_target_extruder_from_command(600)) return;
|
||||||
|
@ -11054,19 +11071,6 @@ inline void gcode_M502() {
|
||||||
const bool job_running = print_job_timer.isRunning();
|
const bool job_running = print_job_timer.isRunning();
|
||||||
|
|
||||||
if (pause_print(retract, park_point, unload_length, true)) {
|
if (pause_print(retract, park_point, unload_length, true)) {
|
||||||
#ifdef SDSUPPORT
|
|
||||||
#ifdef ANYCUBIC_TFT_DEBUG
|
|
||||||
SERIAL_ECHOLNPGM("DEBUG: Enter TFTstate routine");
|
|
||||||
#endif
|
|
||||||
AnycubicTFT.TFTstate=ANYCUBIC_TFT_STATE_SDPAUSE_REQ; // enter correct display state to show resume button
|
|
||||||
#ifdef ANYCUBIC_TFT_DEBUG
|
|
||||||
SERIAL_ECHOLNPGM("DEBUG: Set TFTState to SDPAUSE_REQ");
|
|
||||||
#endif
|
|
||||||
AnycubicTFT.PausedByFilamentChange=true; // set flag to ensure correct resume routine gets executed
|
|
||||||
#ifdef ANYCUBIC_TFT_DEBUG
|
|
||||||
SERIAL_ECHOLNPGM("DEBUG: Set filament change flag");
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
wait_for_filament_reload(beep_count);
|
wait_for_filament_reload(beep_count);
|
||||||
resume_print(slow_load_length, fast_load_length, ADVANCED_PAUSE_PURGE_LENGTH, beep_count);
|
resume_print(slow_load_length, fast_load_length, ADVANCED_PAUSE_PURGE_LENGTH, beep_count);
|
||||||
}
|
}
|
||||||
|
@ -15139,7 +15143,6 @@ void setup() {
|
||||||
SERIAL_ECHOPGM(MSG_MARLIN);
|
SERIAL_ECHOPGM(MSG_MARLIN);
|
||||||
SERIAL_CHAR(' ');
|
SERIAL_CHAR(' ');
|
||||||
SERIAL_ECHOLNPGM(SHORT_BUILD_VERSION);
|
SERIAL_ECHOLNPGM(SHORT_BUILD_VERSION);
|
||||||
SERIAL_CHAR(' ');
|
|
||||||
SERIAL_ECHOPGM(MSG_MARLIN_AI3M);
|
SERIAL_ECHOPGM(MSG_MARLIN_AI3M);
|
||||||
SERIAL_CHAR(' ');
|
SERIAL_CHAR(' ');
|
||||||
SERIAL_ECHOLNPGM(CUSTOM_BUILD_VERSION);
|
SERIAL_ECHOLNPGM(CUSTOM_BUILD_VERSION);
|
||||||
|
|
|
@ -41,7 +41,7 @@
|
||||||
* Defines the version of the Marlin-AI3M build. Not to be confused with
|
* Defines the version of the Marlin-AI3M build. Not to be confused with
|
||||||
* Marlin's own build number, e.g. 1.1.9.
|
* Marlin's own build number, e.g. 1.1.9.
|
||||||
*/
|
*/
|
||||||
#define CUSTOM_BUILD_VERSION "v1.4.1"
|
#define CUSTOM_BUILD_VERSION "v1.4.2"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Verbose version identifier which should contain a reference to the location
|
* Verbose version identifier which should contain a reference to the location
|
||||||
|
@ -54,7 +54,7 @@
|
||||||
* here we define this default string as the date where the latest release
|
* here we define this default string as the date where the latest release
|
||||||
* version was tagged.
|
* version was tagged.
|
||||||
*/
|
*/
|
||||||
#define STRING_DISTRIBUTION_DATE "2019-02-23"
|
#define STRING_DISTRIBUTION_DATE "2019-02-24"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Required minimum Configuration.h and Configuration_adv.h file versions.
|
* Required minimum Configuration.h and Configuration_adv.h file versions.
|
||||||
|
|
Loading…
Reference in New Issue