bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Fix Pause Print message and behavior (#13394)

Browse Source
This commit is contained in:
Scott Lahteine
2019-03-14 02:26:07 -05:00
committed by GitHub
parent f5bcc00570
commit 9a515cbd32
18 changed files with 174 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/gcode/feature/pause/M125.cpp
View File

@ -36,7 +36,7 @@
#endif
/**
* M125: Store current position and move to filament change position.
* M125: Store current position and move to parking position.
* Called on pause (by M25) to prevent material leaking onto the
* object. On resume (M24) the head will be moved back and the
* print will resume.
@ -79,14 +79,14 @@ void GcodeSuite::M125() {
#endif
#if HAS_LCD_MENU
lcd_advanced_pause_show_message(ADVANCED_PAUSE_MESSAGE_INIT, ADVANCED_PAUSE_MODE_PAUSE_PRINT);
lcd_pause_show_message(PAUSE_MESSAGE_PAUSING, PAUSE_MODE_PAUSE_PRINT);
const bool show_lcd = parser.seenval('P');
#else
constexpr bool show_lcd = false;
#endif
if (pause_print(retract, park_point, 0, show_lcd)) {
if (!sd_printing || show_lcd ) {
if (!sd_printing || show_lcd) {
wait_for_confirmation(false, 0);
resume_print(0, 0, PAUSE_PARK_RETRACT_LENGTH, 0);
}

2
Marlin/src/gcode/feature/pause/M600.cpp
View File

@ -76,7 +76,7 @@ void GcodeSuite::M600() {
// Show initial "wait for start" message
#if HAS_LCD_MENU && DISABLED(MMU2_MENUS)
lcd_advanced_pause_show_message(ADVANCED_PAUSE_MESSAGE_INIT, ADVANCED_PAUSE_MODE_PAUSE_PRINT, target_extruder);
lcd_pause_show_message(PAUSE_MESSAGE_CHANGING, PAUSE_MODE_PAUSE_PRINT, target_extruder);
#endif
#if ENABLED(HOME_BEFORE_FILAMENT_CHANGE)

14
Marlin/src/gcode/feature/pause/M701_M702.cpp
View File

@ -68,7 +68,7 @@ void GcodeSuite::M701() {
// Show initial "wait for load" message
#if HAS_LCD_MENU
lcd_advanced_pause_show_message(ADVANCED_PAUSE_MESSAGE_LOAD, ADVANCED_PAUSE_MODE_LOAD_FILAMENT, target_extruder);
lcd_pause_show_message(PAUSE_MESSAGE_LOAD, PAUSE_MODE_LOAD_FILAMENT, target_extruder);
#endif
#if EXTRUDERS > 1 && DISABLED(PRUSA_MMU2)
@ -90,7 +90,7 @@ void GcodeSuite::M701() {
const float fast_load_length = ABS(parser.seen('L') ? parser.value_axis_units(E_AXIS)
: fc_settings[active_extruder].load_length);
load_filament(slow_load_length, fast_load_length, ADVANCED_PAUSE_PURGE_LENGTH, FILAMENT_CHANGE_ALERT_BEEPS,
true, thermalManager.still_heating(target_extruder), ADVANCED_PAUSE_MODE_LOAD_FILAMENT
true, thermalManager.still_heating(target_extruder), PAUSE_MODE_LOAD_FILAMENT
#if ENABLED(DUAL_X_CARRIAGE)
, target_extruder
#endif
@ -109,7 +109,7 @@ void GcodeSuite::M701() {
// Show status screen
#if HAS_LCD_MENU
lcd_advanced_pause_show_message(ADVANCED_PAUSE_MESSAGE_STATUS);
lcd_pause_show_message(PAUSE_MESSAGE_STATUS);
#endif
}
@ -139,7 +139,7 @@ void GcodeSuite::M702() {
// Show initial "wait for unload" message
#if HAS_LCD_MENU
lcd_advanced_pause_show_message(ADVANCED_PAUSE_MESSAGE_UNLOAD, ADVANCED_PAUSE_MODE_UNLOAD_FILAMENT, target_extruder);
lcd_pause_show_message(PAUSE_MESSAGE_UNLOAD, PAUSE_MODE_UNLOAD_FILAMENT, target_extruder);
#endif
#if EXTRUDERS > 1 && DISABLED(PRUSA_MMU2)
@ -161,7 +161,7 @@ void GcodeSuite::M702() {
if (!parser.seenval('T')) {
HOTEND_LOOP() {
if (e != active_extruder) tool_change(e, 0, false);
unload_filament(-fc_settings[e].unload_length, true, ADVANCED_PAUSE_MODE_UNLOAD_FILAMENT);
unload_filament(-fc_settings[e].unload_length, true, PAUSE_MODE_UNLOAD_FILAMENT);
}
}
else
@ -171,7 +171,7 @@ void GcodeSuite::M702() {
const float unload_length = -ABS(parser.seen('U') ? parser.value_axis_units(E_AXIS)
: fc_settings[target_extruder].unload_length);
unload_filament(unload_length, true, ADVANCED_PAUSE_MODE_UNLOAD_FILAMENT);
unload_filament(unload_length, true, PAUSE_MODE_UNLOAD_FILAMENT);
}
#endif
@ -187,7 +187,7 @@ void GcodeSuite::M702() {
// Show status screen
#if HAS_LCD_MENU
lcd_advanced_pause_show_message(ADVANCED_PAUSE_MESSAGE_STATUS);
lcd_pause_show_message(PAUSE_MESSAGE_STATUS);
#endif
}