GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-07-14 15:41:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

#195 #122 use next temp and not previous one when changing filament.

Browse Source
This commit is contained in:
supermerill 2020-07-10 21:10:02 +02:00
parent bf72c34598
commit be17f49cdc
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libslic3r/GCode/WipeTower.cpp
View File

@ -1045,7 +1045,10 @@ void WipeTower::toolchange_Unload(
} }
//otherwise, if toolchange temperature changes are on and in normal mode, return to the previously set temperature //otherwise, if toolchange temperature changes are on and in normal mode, return to the previously set temperature
else if (m_semm && (m_filpar[m_current_tool].filament_enable_toolchange_temp && (m_filpar[m_current_tool].filament_use_fast_skinnydip == false))) { else if (m_semm && (m_filpar[m_current_tool].filament_enable_toolchange_temp && (m_filpar[m_current_tool].filament_use_fast_skinnydip == false))) {
writer.restore_pre_toolchange_temp(m_filpar[m_current_tool].temperature, false); //skinnydip normal mode only if (new_temperature != 0)
writer.restore_pre_toolchange_temp(new_temperature, false); //skinnydip normal mode only
else
writer.restore_pre_toolchange_temp(m_filpar[m_current_tool].temperature, false); //skinnydip normal mode only
} }
// Cooling: // Cooling:
@ -1108,7 +1111,10 @@ void WipeTower::toolchange_Unload(
if ((!m_is_first_layer) && (m_filpar[m_current_tool].filament_enable_toolchange_temp == true) && if ((!m_is_first_layer) && (m_filpar[m_current_tool].filament_enable_toolchange_temp == true) &&
(m_filpar[m_current_tool].filament_use_fast_skinnydip == true)) { (m_filpar[m_current_tool].filament_use_fast_skinnydip == true)) {
//begin to restore pre toolchange temp after skinnydip move completes without delay (SKINNYDIP--fast method) //begin to restore pre toolchange temp after skinnydip move completes without delay (SKINNYDIP--fast method)
writer.restore_pre_toolchange_temp(m_filpar[m_current_tool].temperature, true); //skinnydip fast mode only if (new_temperature != 0)
writer.restore_pre_toolchange_temp(new_temperature, true); //skinnydip fast mode only
else
writer.restore_pre_toolchange_temp(m_filpar[m_current_tool].temperature, true); //skinnydip fast mode only
} }
//the following temperature change is suppressed if using skinnydip normal mode since it has already happened //the following temperature change is suppressed if using skinnydip normal mode since it has already happened
else if (m_is_first_layer && (m_filpar[m_current_tool].filament_enable_toolchange_temp == true) && else if (m_is_first_layer && (m_filpar[m_current_tool].filament_enable_toolchange_temp == true) &&