mirror of
				https://github.com/SoftFever/OrcaSlicer.git
				synced 2025-10-30 20:21:12 -06:00 
			
		
		
		
	Merge branch 'gcode-refactoring'
This commit is contained in:
		
						commit
						f82e92f498
					
				
					 20 changed files with 747 additions and 363 deletions
				
			
		|  | @ -9,12 +9,14 @@ use Slic3r::Geometry qw(epsilon scale unscale scaled_epsilon points_coincide PI | |||
| use Slic3r::Geometry::Clipper qw(union_ex offset_ex); | ||||
| use Slic3r::Surface ':types'; | ||||
| 
 | ||||
| extends 'Slic3r::GCode::Base'; | ||||
| 
 | ||||
| has 'config'             => (is => 'ro', default => sub { Slic3r::Config::Full->new }); | ||||
| has 'placeholder_parser' => (is => 'rw', default => sub { Slic3r::GCode::PlaceholderParser->new }); | ||||
| has 'standby_points'     => (is => 'rw'); | ||||
| has 'ooze_prevention'    => (is => 'rw'); | ||||
| has 'enable_loop_clipping' => (is => 'rw', default => sub {1}); | ||||
| has 'enable_wipe'        => (is => 'rw', default => sub {0});   # at least one extruder has wipe enabled | ||||
| has 'layer_count'        => (is => 'ro', required => 1 ); | ||||
| has 'layer_count'        => (is => 'ro'); | ||||
| has '_layer_index'       => (is => 'rw', default => sub {-1});  # just a counter | ||||
| has 'layer'              => (is => 'rw'); | ||||
| has '_layer_islands'     => (is => 'rw'); | ||||
|  | @ -23,32 +25,28 @@ has '_seam_position'     => (is => 'ro', default => sub { {} });  # $object => p | |||
| has 'shift_x'            => (is => 'rw', default => sub {0} ); | ||||
| has 'shift_y'            => (is => 'rw', default => sub {0} ); | ||||
| has 'z'                  => (is => 'rw'); | ||||
| has 'extruders'          => (is => 'ro', default => sub {{}}); | ||||
| has 'multiple_extruders' => (is => 'rw', default => sub {0}); | ||||
| has 'extruder'           => (is => 'rw'); | ||||
| has 'external_mp'        => (is => 'rw'); | ||||
| has 'layer_mp'           => (is => 'rw'); | ||||
| has 'new_object'         => (is => 'rw', default => sub {0}); | ||||
| has 'straight_once'      => (is => 'rw', default => sub {1}); | ||||
| has 'elapsed_time'       => (is => 'rw', default => sub {0} );  # seconds | ||||
| has 'lifted'             => (is => 'rw', default => sub {0} ); | ||||
| has 'last_pos'           => (is => 'rw', default => sub { Slic3r::Point->new(0,0) } ); | ||||
| has 'last_fan_speed'     => (is => 'rw', default => sub {0}); | ||||
| has 'last_acceleration'  => (is => 'rw', default => sub {0}); | ||||
| has 'wipe_path'          => (is => 'rw'); | ||||
| 
 | ||||
| sub apply_print_config { | ||||
|     my ($self, $print_config) = @_; | ||||
|      | ||||
|     $self->SUPER::apply_print_config($print_config); | ||||
|     $self->config->apply_print_config($print_config); | ||||
| } | ||||
| 
 | ||||
| sub set_extruders { | ||||
|     my ($self, $extruder_ids, $print_config) = @_; | ||||
|     my ($self, $extruder_ids) = @_; | ||||
|      | ||||
|     foreach my $i (@$extruder_ids) { | ||||
|         $self->extruders->{$i} = my $e = Slic3r::Extruder->new($i, $print_config); | ||||
|         $self->enable_wipe(1) if $e->wipe; | ||||
|     } | ||||
|     $self->SUPER::set_extruders($extruder_ids); | ||||
|      | ||||
|     # we enable support for multiple extruder if any extruder greater than 0 is used | ||||
|     # (even if prints only uses that one) since we need to output Tx commands | ||||
|     # first extruder has index 0 | ||||
|     $self->multiple_extruders(max(@$extruder_ids) > 0); | ||||
|     # enable wipe path generation if any extruder has wipe enabled | ||||
|     $self->enable_wipe(defined first { $_->wipe } values %{$self->_extruders}); | ||||
| } | ||||
| 
 | ||||
| sub set_shift { | ||||
|  | @ -82,49 +80,17 @@ sub change_layer { | |||
|     } | ||||
|      | ||||
|     my $gcode = ""; | ||||
|     if ($self->config->gcode_flavor =~ /^(?:makerware|sailfish)$/) { | ||||
|     if (defined $self->layer_count) { | ||||
|         # TODO: cap this to 99% and add an explicit M73 P100 in the end G-code | ||||
|         $gcode .= sprintf "M73 P%s%s\n", | ||||
|             int(99 * ($self->_layer_index / ($self->layer_count - 1))), | ||||
|             ($self->config->gcode_comments ? ' ; update progress' : ''); | ||||
|         $gcode .= $self->update_progress(int(99 * ($self->_layer_index / ($self->layer_count - 1)))); | ||||
|     } | ||||
|      | ||||
|     $gcode .= $self->move_z($layer->print_z); | ||||
|     return $gcode; | ||||
| } | ||||
| 
 | ||||
| # this method accepts Z in unscaled coordinates | ||||
| sub move_z { | ||||
|     my ($self, $z, $comment) = @_; | ||||
|      | ||||
|     my $gcode = ""; | ||||
|      | ||||
|     $z += $self->config->z_offset; | ||||
|     my $current_z = $self->z; | ||||
|     my $nominal_z = defined $current_z ? ($current_z - $self->lifted) : undef; | ||||
|      | ||||
|     if (!defined $current_z || $z > $current_z || $z < $nominal_z) { | ||||
|         # we're moving above the current actual Z (so above the lift height of the current | ||||
|         # layer if any) or below the current nominal layer | ||||
|          | ||||
|         # in both cases, we're going to the nominal Z of the next layer | ||||
|         $self->lifted(0); | ||||
|          | ||||
|         if ($self->extruder->retract_layer_change) { | ||||
|             # this retraction may alter $self->z | ||||
|             $gcode .= $self->retract(move_z => $z); | ||||
|             $current_z = $self->z;  # update current z in case retract() changed it | ||||
|             $nominal_z = defined $current_z ? ($current_z - $self->lifted) : undef; | ||||
|         } | ||||
|         $gcode .= $self->G0(undef, $z, 0, $self->config->travel_speed*60, $comment || ('move to next layer (' . $self->layer->id . ')')) | ||||
|             if !defined $current_z || abs($z - $nominal_z) > epsilon; | ||||
|     } elsif ($z < $current_z) { | ||||
|         # we're moving above the current nominal layer height and below the current actual one. | ||||
|         # we're basically advancing to next layer, whose nominal Z is still lower than the previous | ||||
|         # layer Z with lift. | ||||
|         $self->lifted($current_z - $z); | ||||
|     my $z = $layer->print_z + $self->config->z_offset;  # in unscaled coordinates | ||||
|     if ($self->_extruder->retract_layer_change && $self->will_move_z($z)) { | ||||
|         $gcode .= $self->retract; | ||||
|         $gcode .= $self->lift; | ||||
|     } | ||||
|      | ||||
|     $gcode .= $self->travel_to_z($z, 'move to next layer (' . $self->layer->id . ')'); | ||||
|     return $gcode; | ||||
| } | ||||
| 
 | ||||
|  | @ -154,7 +120,7 @@ sub extrude_loop { | |||
|     } elsif ($self->config->seam_position eq 'nearest' || $self->config->seam_position eq 'aligned') { | ||||
|         # simplify polygon in order to skip false positives in concave/convex detection | ||||
|         my $polygon = $loop->polygon; | ||||
|         my @simplified = @{$polygon->simplify(scale $self->extruder->nozzle_diameter/2)}; | ||||
|         my @simplified = @{$polygon->simplify(scale $self->_extruder->nozzle_diameter/2)}; | ||||
|          | ||||
|         # concave vertices have priority | ||||
|         my @candidates = map @{$_->concave_points(PI*4/3)}, @simplified; | ||||
|  | @ -200,7 +166,7 @@ sub extrude_loop { | |||
|     # if polyline was shorter than the clipping distance we'd get a null polyline, so | ||||
|     # we discard it in that case | ||||
|     my $clip_length = $self->enable_loop_clipping | ||||
|         ? scale($self->extruder->nozzle_diameter) * &Slic3r::LOOP_CLIPPING_LENGTH_OVER_NOZZLE_DIAMETER | ||||
|         ? scale($self->_extruder->nozzle_diameter) * &Slic3r::LOOP_CLIPPING_LENGTH_OVER_NOZZLE_DIAMETER | ||||
|         : 0; | ||||
|      | ||||
|     # get paths | ||||
|  | @ -234,7 +200,7 @@ sub extrude_loop { | |||
|         # we make sure we don't exceed the segment length because we don't know | ||||
|         # the rotation of the second segment so we might cross the object boundary | ||||
|         my $first_segment = Slic3r::Line->new(@$last_path_polyline[0,1]); | ||||
|         my $distance = min(scale($self->extruder->nozzle_diameter), $first_segment->length); | ||||
|         my $distance = min(scale($self->_extruder->nozzle_diameter), $first_segment->length); | ||||
|         my $point = $first_segment->point_at($distance); | ||||
|         $point->rotate($angle, $last_path_polyline->first_point); | ||||
|          | ||||
|  | @ -290,8 +256,8 @@ sub _extrude_path { | |||
|     } | ||||
|      | ||||
|     # calculate extrusion length per distance unit | ||||
|     my $e = $self->extruder->e_per_mm3 * $path->mm3_per_mm; | ||||
|     $e = 0 if !$self->config->get_extrusion_axis; | ||||
|     my $e_per_mm = $self->_extruder->e_per_mm3 * $path->mm3_per_mm; | ||||
|     $e_per_mm = 0 if !$self->_extrusion_axis; | ||||
|      | ||||
|     # set speed | ||||
|     my $F; | ||||
|  | @ -323,10 +289,10 @@ sub _extrude_path { | |||
|     $gcode .= ";_BRIDGE_FAN_START\n" if $path->is_bridge; | ||||
|     my $path_length = unscale $path->length; | ||||
|     { | ||||
|         $gcode .= $path->gcode($self->extruder, $e, $F, | ||||
|             $self->shift_x - $self->extruder->extruder_offset->x, | ||||
|             $self->shift_y - $self->extruder->extruder_offset->y,  #,, | ||||
|             $self->config->get_extrusion_axis, | ||||
|         $gcode .= $path->gcode($self->_extruder, $e_per_mm, $F, | ||||
|             $self->shift_x - $self->_extruder->extruder_offset->x, | ||||
|             $self->shift_y - $self->_extruder->extruder_offset->y,  #,, | ||||
|             $self->_extrusion_axis, | ||||
|             $self->config->gcode_comments ? " ; $description" : ""); | ||||
| 
 | ||||
|         if ($self->enable_wipe) { | ||||
|  | @ -358,7 +324,7 @@ sub travel_to { | |||
|      | ||||
|     # skip retraction if the travel move is contained in an island in the current layer | ||||
|     # *and* in an island in the upper layer (so that the ooze will not be visible) | ||||
|     if ($travel->length < scale $self->extruder->retract_before_travel | ||||
|     if ($travel->length < scale $self->_extruder->retract_before_travel | ||||
|         || ($self->config->only_retract_when_crossing_perimeters | ||||
|             && $self->config->fill_density > 0 | ||||
|             && (first { $_->contains_line($travel) } @{$self->_upper_layer_islands}) | ||||
|  | @ -366,11 +332,11 @@ sub travel_to { | |||
|         || (defined $role && $role == EXTR_ROLE_SUPPORTMATERIAL && (first { $_->contains_line($travel) } @{$self->layer->support_islands})) | ||||
|         ) { | ||||
|         $self->straight_once(0); | ||||
|         $gcode .= $self->G0($point, undef, 0, $self->config->travel_speed*60, $comment || ""); | ||||
|         $gcode .= $self->travel_to_xy($self->point_to_gcode($point), $comment); | ||||
|     } elsif (!$self->config->avoid_crossing_perimeters || $self->straight_once) { | ||||
|         $self->straight_once(0); | ||||
|         $gcode .= $self->retract; | ||||
|         $gcode .= $self->G0($point, undef, 0, $self->config->travel_speed*60, $comment || ""); | ||||
|         $gcode .= $self->travel_to_xy($self->point_to_gcode($point), $comment); | ||||
|     } else { | ||||
|         if ($self->new_object) { | ||||
|             $self->new_object(0); | ||||
|  | @ -411,83 +377,75 @@ sub _plan { | |||
|         } | ||||
|     } | ||||
|      | ||||
|     # do the retract (the travel_to argument is broken) | ||||
|     # perform the retraction | ||||
|     $gcode .= $self->retract if $need_retract; | ||||
|      | ||||
|     # append the actual path and return | ||||
|     # use G1 because we rely on paths being straight (G0 may make round paths) | ||||
|     $gcode .= join '', map $self->G1($_->b, undef, 0, $self->config->travel_speed*60, $comment || ""), @travel; | ||||
|     $gcode .= join '', | ||||
|         map $self->travel_to_xy($self->point_to_gcode($_->b), $comment), | ||||
|         @travel; | ||||
|     return $gcode; | ||||
| } | ||||
| 
 | ||||
| sub retract { | ||||
|     my ($self, %params) = @_; | ||||
|     my ($self, $toolchange) = @_; | ||||
|      | ||||
|     # get the retraction length and abort if none | ||||
|     my ($length, $restart_extra, $comment) = $params{toolchange} | ||||
|         ? ($self->extruder->retract_length_toolchange,  $self->extruder->retract_restart_extra_toolchange,  "retract for tool change") | ||||
|         : ($self->extruder->retract_length,             $self->extruder->retract_restart_extra,             "retract"); | ||||
|     return "" if !defined $self->_extruder; | ||||
|      | ||||
|     # if we already retracted, reduce the required amount of retraction | ||||
|     $length -= $self->extruder->retracted; | ||||
|     return "" unless $length > 0; | ||||
|     my $gcode = ""; | ||||
|      | ||||
|     # wipe | ||||
|     my $wipe_path; | ||||
|     if ($self->extruder->wipe && $self->wipe_path) { | ||||
|         my @points = @{$self->wipe_path}; | ||||
|         $wipe_path = Slic3r::Polyline->new($self->last_pos, @{$self->wipe_path}[1..$#{$self->wipe_path}]); | ||||
|         $wipe_path->clip_end($wipe_path->length - $self->extruder->scaled_wipe_distance($self->config->travel_speed)); | ||||
|     } | ||||
|      | ||||
|     # prepare moves | ||||
|     my $retract = [undef, undef, -$length, $self->extruder->retract_speed_mm_min, $comment]; | ||||
|     my $lift    = ($self->config->retract_lift->[0] == 0 || defined $params{move_z}) && !$self->lifted | ||||
|         ? undef | ||||
|         : [undef, $self->z + $self->config->retract_lift->[0], 0, $self->config->travel_speed*60, 'lift plate during travel']; | ||||
|      | ||||
|     # check that we have a positive wipe length | ||||
|     if ($wipe_path) { | ||||
|         # subdivide the retraction | ||||
|     # wipe (if it's enabled for this extruder and we have a stored wipe path) | ||||
|     if ($self->_extruder->wipe && $self->wipe_path) { | ||||
|         # Reduce feedrate a bit; travel speed is often too high to move on existing material. | ||||
|         # Too fast = ripping of existing material; too slow = short wipe path, thus more blob. | ||||
|         my $wipe_speed = $self->gcode_config->travel_speed * 0.8; | ||||
|          | ||||
|         # get the retraction length | ||||
|         my $length = $toolchange | ||||
|             ? $self->_extruder->retract_length | ||||
|             : $self->_extruder->retract_length_toolchange; | ||||
|          | ||||
|         # Calculate how long we need to travel in order to consume the required | ||||
|         # amount of retraction. In other words, how far do we move in XY at $wipe_speed | ||||
|         # for the time needed to consume retract_length at retract_speed? | ||||
|         my $wipe_dist = scale($length / $self->_extruder->retract_speed * $wipe_speed); | ||||
|          | ||||
|         # Take the stored wipe path and replace first point with the current actual position | ||||
|         # (they might be different, for example, in case of loop clipping). | ||||
|         my $wipe_path = Slic3r::Polyline->new( | ||||
|             $self->last_pos, | ||||
|             @{$self->wipe_path}[1..$#{$self->wipe_path}], | ||||
|         ); | ||||
|         #  | ||||
|         $wipe_path->clip_end($wipe_path->length - $wipe_dist); | ||||
|          | ||||
|         # subdivide the retraction in segments | ||||
|         my $retracted = 0; | ||||
|         foreach my $line (@{$wipe_path->lines}) { | ||||
|             my $segment_length = $line->length; | ||||
|             # reduce retraction length a bit to avoid effective retraction speed to be greater than the configured one | ||||
|             # due to rounding | ||||
|             my $e = $retract->[2] * ($segment_length / $self->extruder->scaled_wipe_distance($self->config->travel_speed)) * 0.95; | ||||
|             $retracted += $e; | ||||
|             $gcode .= $self->G1($line->b, undef, $e, $self->config->travel_speed*60*0.8, $retract->[3] . ";_WIPE"); | ||||
|             # Reduce retraction length a bit to avoid effective retraction speed to be greater than the configured one | ||||
|             # due to rounding (TODO: test and/or better math for this) | ||||
|             my $dE = $length * ($segment_length / $wipe_dist) * 0.95; | ||||
|             $gcode .= $self->set_speed($wipe_speed*60); | ||||
|             $gcode .= $self->extrude_to_xy( | ||||
|                 $self->point_to_gcode($line->b), | ||||
|                 -$dE, | ||||
|                 'retract;_WIPE', | ||||
|             ); | ||||
|             $retracted += $dE; | ||||
|         } | ||||
|         if ($retracted > $retract->[2]) { | ||||
|             # if we retracted less than we had to, retract the remainder | ||||
|             # TODO: add regression test | ||||
|             $gcode .= $self->G1(undef, undef, $retract->[2] - $retracted, $self->extruder->retract_speed_mm_min, $comment); | ||||
|         } | ||||
|         $gcode .= $self->reset_e; | ||||
|     } elsif ($self->config->use_firmware_retraction) { | ||||
|         $gcode .= "G10 ; retract\n"; | ||||
|     } else { | ||||
|         $gcode .= $self->G1(@$retract); | ||||
|      | ||||
|         # reset extrusion distance during retracts | ||||
|         # this makes sure we leave sufficient precision in the firmware | ||||
|         $gcode .= $self->reset_e; | ||||
|         $self->_extruder->set_retracted($self->_extruder->retracted + $retracted); | ||||
|     } | ||||
|     if (!$self->lifted) { | ||||
|         if (defined $params{move_z} && $self->config->retract_lift->[0] > 0) { | ||||
|             my $travel = [undef, $params{move_z} + $self->config->retract_lift->[0], 0, $self->config->travel_speed*60, 'move to next layer (' . $self->layer->id . ') and lift']; | ||||
|             $gcode .= $self->G0(@$travel); | ||||
|             $self->lifted($self->config->retract_lift->[0]); | ||||
|         } elsif ($lift) { | ||||
|             $gcode .= $self->G1(@$lift); | ||||
|         } | ||||
|     } | ||||
|     $self->extruder->set_retracted($self->extruder->retracted + $length); | ||||
|     $self->extruder->set_restart_extra($restart_extra); | ||||
|     $self->lifted($self->config->retract_lift->[0]) if $lift; | ||||
|      | ||||
|     $gcode .= "M103 ; extruder off\n" if $self->config->gcode_flavor eq 'makerware'; | ||||
|     # The parent class will decide whether we need to perform an actual retraction | ||||
|     # (the extruder might be already retracted fully or partially). We call these  | ||||
|     # methods even if we performed wipe, since this will ensure the entire retraction | ||||
|     # length is honored in case wipe path was too short.p | ||||
|     $gcode .= $toolchange ? $self->retract_for_toolchange : $self->SUPER::retract; | ||||
|      | ||||
|     $gcode .= $self->reset_e; | ||||
|     $gcode .= $self->lift; | ||||
|      | ||||
|     return $gcode; | ||||
| } | ||||
|  | @ -496,53 +454,11 @@ sub unretract { | |||
|     my ($self) = @_; | ||||
|      | ||||
|     my $gcode = ""; | ||||
|     $gcode .= "M101 ; extruder on\n" if $self->config->gcode_flavor eq 'makerware'; | ||||
|      | ||||
|     if ($self->lifted) { | ||||
|         $gcode .= $self->G0(undef, $self->z - $self->lifted, 0, $self->config->travel_speed*60, 'restore layer Z'); | ||||
|         $self->lifted(0); | ||||
|     } | ||||
|      | ||||
|     my $to_unretract = $self->extruder->retracted + $self->extruder->restart_extra; | ||||
|     if ($to_unretract) { | ||||
|         if ($self->config->use_firmware_retraction) { | ||||
|             $gcode .= "G11 ; unretract\n"; | ||||
|             $gcode .= $self->reset_e; | ||||
|         } elsif ($self->config->get_extrusion_axis) { | ||||
|             # use G1 instead of G0 because G0 will blend the restart with the previous travel move | ||||
|             $gcode .= sprintf "G1 %s%.5f F%.3f", | ||||
|                 $self->config->get_extrusion_axis, | ||||
|                 $self->extruder->extrude($to_unretract), | ||||
|                 $self->extruder->retract_speed_mm_min; | ||||
|             $gcode .= " ; compensate retraction" if $self->config->gcode_comments; | ||||
|             $gcode .= "\n"; | ||||
|         } | ||||
|         $self->extruder->set_retracted(0); | ||||
|         $self->extruder->set_restart_extra(0); | ||||
|     } | ||||
|      | ||||
|     $gcode .= $self->unlift; | ||||
|     $gcode .= $self->SUPER::unretract('compensate retraction'); | ||||
|     return $gcode; | ||||
| } | ||||
| 
 | ||||
| sub reset_e { | ||||
|     my ($self) = @_; | ||||
|     return "" if $self->config->gcode_flavor =~ /^(?:mach3|makerware|sailfish)$/; | ||||
|      | ||||
|     $self->extruder->set_E(0) if $self->extruder; | ||||
|     return sprintf "G92 %s0%s\n", $self->config->get_extrusion_axis, ($self->config->gcode_comments ? ' ; reset extrusion distance' : '') | ||||
|         if $self->config->get_extrusion_axis && !$self->config->use_relative_e_distances; | ||||
| } | ||||
| 
 | ||||
| sub set_acceleration { | ||||
|     my ($self, $acceleration) = @_; | ||||
|      | ||||
|     return "" if !$acceleration || $acceleration == $self->last_acceleration; | ||||
|      | ||||
|     $self->last_acceleration($acceleration); | ||||
|     return sprintf "M204 S%s%s\n", | ||||
|         $acceleration, ($self->config->gcode_comments ? ' ; adjust acceleration' : ''); | ||||
| } | ||||
| 
 | ||||
| sub G0 { | ||||
|     my $self = shift; | ||||
|     return $self->G1(@_) if !($self->config->g0 || $self->config->gcode_flavor eq 'mach3'); | ||||
|  | @ -559,8 +475,8 @@ sub _G0_G1 { | |||
|      | ||||
|     if ($point) { | ||||
|         $gcode .= sprintf " X%.3f Y%.3f",  | ||||
|             ($point->x * &Slic3r::SCALING_FACTOR) + $self->shift_x - $self->extruder->extruder_offset->x, | ||||
|             ($point->y * &Slic3r::SCALING_FACTOR) + $self->shift_y - $self->extruder->extruder_offset->y; #** | ||||
|             ($point->x * &Slic3r::SCALING_FACTOR) + $self->shift_x - $self->_extruder->extruder_offset->x, | ||||
|             ($point->y * &Slic3r::SCALING_FACTOR) + $self->shift_y - $self->_extruder->extruder_offset->y; #** | ||||
|         $self->last_pos($point->clone); | ||||
|     } | ||||
|     if (defined $z && (!defined $self->z || $z != $self->z)) { | ||||
|  | @ -571,14 +487,24 @@ sub _G0_G1 { | |||
|     return $self->_Gx($gcode, $e, $F, $comment); | ||||
| } | ||||
| 
 | ||||
| # convert a model-space scaled point into G-code coordinates | ||||
| sub point_to_gcode { | ||||
|     my ($self, $point) = @_; | ||||
|      | ||||
|     return Slic3r::Pointf->new( | ||||
|         ($point->x * &Slic3r::SCALING_FACTOR) + $self->shift_x - $self->_extruder->extruder_offset->x, | ||||
|         ($point->y * &Slic3r::SCALING_FACTOR) + $self->shift_y - $self->_extruder->extruder_offset->y, #** | ||||
|     ); | ||||
| } | ||||
| 
 | ||||
| sub _Gx { | ||||
|     my ($self, $gcode, $e, $F, $comment) = @_; | ||||
|      | ||||
|     $gcode .= sprintf " F%.3f", $F; | ||||
|      | ||||
|     # output extrusion distance | ||||
|     if ($e && $self->config->get_extrusion_axis) { | ||||
|         $gcode .= sprintf " %s%.5f", $self->config->get_extrusion_axis, $self->extruder->extrude($e); | ||||
|     if ($e && $self->_extrusion_axis) { | ||||
|         $gcode .= sprintf " %s%.5f", $self->_extrusion_axis, $self->_extruder->extrude($e); | ||||
|     } | ||||
|      | ||||
|     $gcode .= " ; $comment" if $comment && $self->config->gcode_comments; | ||||
|  | @ -588,124 +514,35 @@ sub _Gx { | |||
| sub set_extruder { | ||||
|     my ($self, $extruder_id) = @_; | ||||
|      | ||||
|     # return nothing if this extruder was already selected | ||||
|     return "" if (defined $self->extruder) && ($self->extruder->id == $extruder_id); | ||||
|     return "" if !$self->need_toolchange($extruder_id); | ||||
|      | ||||
|     # if we are running a single-extruder setup, just set the extruder and return nothing | ||||
|     if (!$self->multiple_extruders) { | ||||
|         $self->extruder($self->extruders->{$extruder_id}); | ||||
|         return ""; | ||||
|     if (!$self->_multiple_extruders) { | ||||
|         return $self->_toolchange($extruder_id); | ||||
|     } | ||||
|      | ||||
|     # trigger retraction on the current extruder (if any)  | ||||
|     my $gcode = ""; | ||||
|     $gcode .= $self->retract(toolchange => 1) if defined $self->extruder; | ||||
|     # prepend retraction on the current extruder | ||||
|     my $gcode = $self->retract(1); | ||||
|      | ||||
|     # append custom toolchange G-code | ||||
|     if (defined $self->extruder && $self->config->toolchange_gcode) { | ||||
|     if (defined $self->_extruder && $self->config->toolchange_gcode) { | ||||
|         $gcode .= sprintf "%s\n", $self->placeholder_parser->process($self->config->toolchange_gcode, { | ||||
|             previous_extruder   => $self->extruder->id, | ||||
|             previous_extruder   => $self->_extruder->id, | ||||
|             next_extruder       => $extruder_id, | ||||
|         }); | ||||
|     } | ||||
|      | ||||
|     # set the current extruder to the standby temperature | ||||
|     if ($self->standby_points && defined $self->extruder) { | ||||
|         # move to the nearest standby point | ||||
|         { | ||||
|             my $last_pos = $self->last_pos->clone; | ||||
|             $last_pos->translate(scale +$self->shift_x, scale +$self->shift_y); | ||||
|             my $standby_point = $last_pos->nearest_point($self->standby_points); | ||||
|             $standby_point->translate(scale -$self->shift_x, scale -$self->shift_y); | ||||
|             $gcode .= $self->travel_to($standby_point); | ||||
|         } | ||||
|          | ||||
|         if ($self->config->standby_temperature_delta != 0) { | ||||
|             my $temp = defined $self->layer && $self->layer->id == 0 | ||||
|                 ? $self->extruder->first_layer_temperature | ||||
|                 : $self->extruder->temperature; | ||||
|             # we assume that heating is always slower than cooling, so no need to block | ||||
|             $gcode .= $self->set_temperature($temp + $self->config->standby_temperature_delta, 0); | ||||
|         } | ||||
|     } | ||||
|     # if ooze prevention is enabled, park current extruder in the nearest | ||||
|     # standby point and set it to the standby temperature | ||||
|     $gcode .= $self->ooze_prevention->pre_toolchange($self) | ||||
|         if $self->ooze_prevention && defined $self->_extruder; | ||||
|      | ||||
|     # set the new extruder | ||||
|     $self->extruder($self->extruders->{$extruder_id}); | ||||
|     $gcode .= sprintf "%s%d%s\n",  | ||||
|         ($self->config->gcode_flavor eq 'makerware' | ||||
|             ? 'M135 T' | ||||
|             : $self->config->gcode_flavor eq 'sailfish' | ||||
|                 ? 'M108 T' | ||||
|                 : 'T'), | ||||
|         $extruder_id, | ||||
|         ($self->config->gcode_comments ? ' ; change extruder' : ''); | ||||
|      | ||||
|     $gcode .= $self->reset_e; | ||||
|     # append the toolchange command | ||||
|     $gcode .= $self->_toolchange($extruder_id); | ||||
|      | ||||
|     # set the new extruder to the operating temperature | ||||
|     if ($self->config->ooze_prevention && $self->config->standby_temperature_delta != 0) { | ||||
|         my $temp = defined $self->layer && $self->layer->id == 0 | ||||
|             ? $self->extruder->first_layer_temperature | ||||
|             : $self->extruder->temperature; | ||||
|         $gcode .= $self->set_temperature($temp, 1); | ||||
|     } | ||||
|      | ||||
|     return $gcode; | ||||
| } | ||||
| 
 | ||||
| sub set_fan { | ||||
|     my ($self, $speed, $dont_save) = @_; | ||||
|      | ||||
|     if ($self->last_fan_speed != $speed || $dont_save) { | ||||
|         $self->last_fan_speed($speed) if !$dont_save; | ||||
|         if ($speed == 0) { | ||||
|             my $code = $self->config->gcode_flavor eq 'teacup' | ||||
|                 ? 'M106 S0' | ||||
|                 : $self->config->gcode_flavor =~ /^(?:makerware|sailfish)$/ | ||||
|                     ? 'M127' | ||||
|                     : 'M107'; | ||||
|             return sprintf "$code%s\n", ($self->config->gcode_comments ? ' ; disable fan' : ''); | ||||
|         } else { | ||||
|             if ($self->config->gcode_flavor =~ /^(?:makerware|sailfish)$/) { | ||||
|                 return sprintf "M126%s\n", ($self->config->gcode_comments ? ' ; enable fan' : ''); | ||||
|             } else { | ||||
|                 return sprintf "M106 %s%d%s\n", ($self->config->gcode_flavor eq 'mach3' ? 'P' : 'S'), | ||||
|                     (255 * $speed / 100), ($self->config->gcode_comments ? ' ; enable fan' : ''); | ||||
|             } | ||||
|         } | ||||
|     } | ||||
|     return ""; | ||||
| } | ||||
| 
 | ||||
| sub set_temperature { | ||||
|     my ($self, $temperature, $wait, $tool) = @_; | ||||
|      | ||||
|     return "" if $wait && $self->config->gcode_flavor =~ /^(?:makerware|sailfish)$/; | ||||
|      | ||||
|     my ($code, $comment) = ($wait && $self->config->gcode_flavor ne 'teacup') | ||||
|         ? ('M109', 'wait for temperature to be reached') | ||||
|         : ('M104', 'set temperature'); | ||||
|     my $gcode = sprintf "$code %s%d %s; $comment\n", | ||||
|         ($self->config->gcode_flavor eq 'mach3' ? 'P' : 'S'), $temperature, | ||||
|         (defined $tool && ($self->multiple_extruders || $self->config->gcode_flavor =~ /^(?:makerware|sailfish)$/)) ? "T$tool " : ""; | ||||
|      | ||||
|     $gcode .= "M116 ; wait for temperature to be reached\n" | ||||
|         if $self->config->gcode_flavor eq 'teacup' && $wait; | ||||
|      | ||||
|     return $gcode; | ||||
| } | ||||
| 
 | ||||
| sub set_bed_temperature { | ||||
|     my ($self, $temperature, $wait) = @_; | ||||
|      | ||||
|     my ($code, $comment) = ($wait && $self->config->gcode_flavor ne 'teacup') | ||||
|         ? (($self->config->gcode_flavor =~ /^(?:makerware|sailfish)$/ ? 'M109' : 'M190'), 'wait for bed temperature to be reached') | ||||
|         : ('M140', 'set bed temperature'); | ||||
|     my $gcode = sprintf "$code %s%d ; $comment\n", | ||||
|         ($self->config->gcode_flavor eq 'mach3' ? 'P' : 'S'), $temperature; | ||||
|      | ||||
|     $gcode .= "M116 ; wait for bed temperature to be reached\n" | ||||
|         if $self->config->gcode_flavor eq 'teacup' && $wait; | ||||
|     $gcode .= $self->ooze_prevention->post_toolchange($self) | ||||
|         if $self->ooze_prevention; | ||||
|      | ||||
|     return $gcode; | ||||
| } | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Alessandro Ranellucci
						Alessandro Ranellucci