3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-28 22:35:21 +00:00
Code Issues Releases Wiki Activity

🚸 Use M600 for disabled MMU (#21865)

Browse Source
This commit is contained in:
Giuliano Zaro 2021-12-14 01:47:57 +01:00 committed by GitHub
parent 8277f3ca0d
commit 1dd9adbfe4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Marlin/src/MarlinCore.cpp
View File

@ -784,7 +784,10 @@ void idle(bool no_stepper_sleep/*=false*/) {
(void)check_tool_sensor_stats(active_extruder, true); (void)check_tool_sensor_stats(active_extruder, true);
// Handle filament runout sensors // Handle filament runout sensors
TERN_(HAS_FILAMENT_SENSOR, runout.run()); #if HAS_FILAMENT_SENSOR
if (TERN1(HAS_PRUSA_MMU2, !mmu2.enabled()))
runout.run();
#endif
// Run HAL idle tasks // Run HAL idle tasks
TERN_(HAL_IDLETASK, HAL_idletask()); TERN_(HAL_IDLETASK, HAL_idletask());

15
Marlin/src/feature/pause.h
View File

@ -73,17 +73,10 @@ extern fil_change_settings_t fc_settings[EXTRUDERS];
extern uint8_t did_pause_print; extern uint8_t did_pause_print;
#if ENABLED(DUAL_X_CARRIAGE) #define DXC_PARAMS OPTARG(DUAL_X_CARRIAGE, const int8_t DXC_ext=-1)
#define DXC_PARAMS , const int8_t DXC_ext=-1 #define DXC_ARGS OPTARG(DUAL_X_CARRIAGE, const int8_t DXC_ext)
#define DXC_ARGS , const int8_t DXC_ext #define DXC_PASS OPTARG(DUAL_X_CARRIAGE, DXC_ext)
#define DXC_PASS , DXC_ext #define DXC_SAY OPTARG(DUAL_X_CARRIAGE, " dxc:", int(DXC_ext))
#define DXC_SAY , " dxc:", int(DXC_ext)
#else
#define DXC_PARAMS
#define DXC_ARGS
#define DXC_PASS
#define DXC_SAY
#endif
// Pause the print. If unload_length is set, do a Filament Unload // Pause the print. If unload_length is set, do a Filament Unload
bool pause_print( bool pause_print(

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

@ -34,8 +34,11 @@
#include "../../../module/tool_change.h" #include "../../../module/tool_change.h"
#endif #endif
#if ENABLED(MMU2_MENUS) #if ENABLED(HAS_PRUSA_MMU2)
#include "../../../lcd/menu/menu_mmu2.h" #include "../../../feature/mmu/mmu2.h"
#if ENABLED(MMU2_MENUS)
#include "../../../lcd/menu/menu_mmu2.h"
#endif
#endif #endif
#if ENABLED(MIXING_EXTRUDER) #if ENABLED(MIXING_EXTRUDER)
@ -92,10 +95,11 @@ void GcodeSuite::M600() {
} }
#endif #endif
const bool standardM600 = TERN1(MMU2_MENUS, !mmu2.enabled());
// Show initial "wait for start" message // Show initial "wait for start" message
#if DISABLED(MMU2_MENUS) if (standardM600)
ui.pause_show_message(PAUSE_MESSAGE_CHANGING, PAUSE_MODE_PAUSE_PRINT, target_extruder); ui.pause_show_message(PAUSE_MESSAGE_CHANGING, PAUSE_MODE_PAUSE_PRINT, target_extruder);
#endif
#if ENABLED(HOME_BEFORE_FILAMENT_CHANGE) #if ENABLED(HOME_BEFORE_FILAMENT_CHANGE)
// If needed, home before parking for filament change // If needed, home before parking for filament change
@ -126,17 +130,11 @@ void GcodeSuite::M600() {
#endif #endif
#if ENABLED(MMU2_MENUS) #if ENABLED(MMU2_MENUS)
// For MMU2 reset retract and load/unload values so they don't mess with MMU filament handling // For MMU2, when enabled, reset retract value so it doesn't mess with MMU filament handling
constexpr float unload_length = 0.5f, const float unload_length = standardM600 ? -ABS(parser.axisunitsval('U', E_AXIS, fc_settings[active_extruder].unload_length)) : 0.5f;
slow_load_length = 0.0f,
fast_load_length = 0.0f;
#else #else
// Unload filament // Unload filament
const float unload_length = -ABS(parser.axisunitsval('U', E_AXIS, fc_settings[active_extruder].unload_length)); const float unload_length = -ABS(parser.axisunitsval('U', E_AXIS, fc_settings[active_extruder].unload_length));
// Slow load filament
constexpr float slow_load_length = FILAMENT_CHANGE_SLOW_LOAD_LENGTH;
// Fast load filament
const float fast_load_length = ABS(parser.axisunitsval('L', E_AXIS, fc_settings[active_extruder].load_length));
#endif #endif
const int beep_count = parser.intval('B', -1 const int beep_count = parser.intval('B', -1
@ -146,14 +144,23 @@ void GcodeSuite::M600() {
); );
if (pause_print(retract, park_point, true, unload_length DXC_PASS)) { if (pause_print(retract, park_point, true, unload_length DXC_PASS)) {
#if ENABLED(MMU2_MENUS) if (standardM600) {
mmu2_M600();
resume_print(slow_load_length, fast_load_length, 0, beep_count DXC_PASS);
#else
wait_for_confirmation(true, beep_count DXC_PASS); wait_for_confirmation(true, beep_count DXC_PASS);
resume_print(slow_load_length, fast_load_length, ADVANCED_PAUSE_PURGE_LENGTH, resume_print(
beep_count, (parser.seenval('R') ? parser.value_celsius() : 0) DXC_PASS); FILAMENT_CHANGE_SLOW_LOAD_LENGTH,
#endif ABS(parser.axisunitsval('L', E_AXIS, fc_settings[active_extruder].load_length)),
ADVANCED_PAUSE_PURGE_LENGTH,
beep_count,
parser.celsiusval('R')
DXC_PASS
);
}
else {
#if ENABLED(MMU2_MENUS)
mmu2_M600();
resume_print(0, 0, 0, beep_count, 0 DXC_PASS);
#endif
}
} }
#if HAS_MULTI_EXTRUDER #if HAS_MULTI_EXTRUDER