3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Relaxed the requirements on the layer height for the Wipe Tower to

Browse source 
the span of 0.15mm to 0.35mm.
This commit is contained in:
bubnikv 2017-06-08 12:10:34 +02:00
parent fe409a76a6
commit a15e6127cf
2 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/Slic3r/GUI/Tab.pm
View file

@ -855,17 +855,18 @@ sub _update {
}
if ($config->wipe_tower &&
($config->first_layer_height != 0.2 || ($config->layer_height != 0.15 && $config->layer_height != 0.2))) {
($config->first_layer_height != 0.2 || $config->layer_height < 0.15 || $config->layer_height > 0.35)) {
my $dialog = Wx::MessageDialog->new($self,
"The Wipe Tower currently supports only:\n"
. "- first layer height 0.2mm\n"
. "- layer height 0.15mm or 0.2mm\n"
. "- layer height from 0.15mm to 0.35mm\n"
. "\nShall I adjust those settings in order to enable the Wipe Tower?",
'Wipe Tower', wxICON_WARNING | wxYES | wxNO);
my $new_conf = Slic3r::Config->new;
if ($dialog->ShowModal() == wxID_YES) {
$new_conf->set("first_layer_height", 0.2);
$new_conf->set("layer_height", 0.15) if $config->layer_height != 0.15 && $config->layer_height != 0.2;
$new_conf->set("layer_height", 0.15) if $config->layer_height < 0.15;
$new_conf->set("layer_height", 0.35) if $config->layer_height > 0.35;
} else {
$new_conf->set("wipe_tower", 0);
}

14
xs/src/libslic3r/GCode/WipeTowerPrusaMM.hpp
View file

@ -93,19 +93,9 @@ public:
m_current_wipe_start_y = 0.f;
m_current_shape = (! is_first_layer && m_current_shape == SHAPE_NORMAL) ? SHAPE_REVERSED : SHAPE_NORMAL;
++ m_num_layer_changes;
// Extrusion rate for an extrusion aka perimeter width 0.35mm.
m_extrusion_flow = std::min(0.2f, layer_height) * 0.145f;
int layer_idx = int(std::floor(layer_height * 1000) + 0.5f);
switch (layer_idx)
{
case 150:
m_extrusion_flow = (float)0.0218;
break;
case 200:
default:
// Extrusion rate for an extrusion aka perimeter width 0.35mm.
m_extrusion_flow = (float)0.029;
break;
}
}
// Return the wipe tower position.