|
@@ -85,6 +85,7 @@ MMU2::MMU2()
|
|
: is_mmu_error_monitor_active(false)
|
|
: is_mmu_error_monitor_active(false)
|
|
, logic(&mmu2Serial)
|
|
, logic(&mmu2Serial)
|
|
, extruder(MMU2_NO_TOOL)
|
|
, extruder(MMU2_NO_TOOL)
|
|
|
|
+ , previous_extruder(MMU2_NO_TOOL)
|
|
, resume_position()
|
|
, resume_position()
|
|
, resume_hotend_temp(0)
|
|
, resume_hotend_temp(0)
|
|
, logicStepLastStatus(StepStatus::Finished)
|
|
, logicStepLastStatus(StepStatus::Finished)
|
|
@@ -228,6 +229,7 @@ bool MMU2::tool_change(uint8_t index) {
|
|
// SERIAL_ECHOLN(current_position[E_AXIS]);
|
|
// SERIAL_ECHOLN(current_position[E_AXIS]);
|
|
|
|
|
|
extruder = index; //filament change is finished
|
|
extruder = index; //filament change is finished
|
|
|
|
+ previous_extruder = extruder;
|
|
SetActiveExtruder(0);
|
|
SetActiveExtruder(0);
|
|
|
|
|
|
// @@TODO really report onto the serial? May be for the Octoprint? Not important now
|
|
// @@TODO really report onto the serial? May be for the Octoprint? Not important now
|
|
@@ -260,6 +262,7 @@ bool MMU2::tool_change(char code, uint8_t slot) {
|
|
logic.ToolChange(slot);
|
|
logic.ToolChange(slot);
|
|
manage_response(false, false);
|
|
manage_response(false, false);
|
|
extruder = slot;
|
|
extruder = slot;
|
|
|
|
+ previous_extruder = extruder;
|
|
SetActiveExtruder(0);
|
|
SetActiveExtruder(0);
|
|
set_extrude_min_temp(EXTRUDE_MINTEMP);
|
|
set_extrude_min_temp(EXTRUDE_MINTEMP);
|
|
} break;
|
|
} break;
|
|
@@ -383,6 +386,7 @@ bool MMU2::load_filament_to_nozzle(uint8_t index) {
|
|
execute_extruder_sequence((const E_Step *)load_to_nozzle_sequence, sizeof(load_to_nozzle_sequence) / sizeof (load_to_nozzle_sequence[0]));
|
|
execute_extruder_sequence((const E_Step *)load_to_nozzle_sequence, sizeof(load_to_nozzle_sequence) / sizeof (load_to_nozzle_sequence[0]));
|
|
|
|
|
|
extruder = index;
|
|
extruder = index;
|
|
|
|
+ previous_extruder = extruder;
|
|
SetActiveExtruder(0);
|
|
SetActiveExtruder(0);
|
|
|
|
|
|
Sound_MakeSound(e_SOUND_TYPE_StandardConfirm);
|
|
Sound_MakeSound(e_SOUND_TYPE_StandardConfirm);
|