Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Used filament outputs (gcode comments) in more computer-parseable format #4969

Merged
merged 5 commits into from
Jul 23, 2020
Merged

Used filament outputs (gcode comments) in more computer-parseable format #4969

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
087613b
Used filament outputs (gcode comments) in more computer-parseable format
roman-dvorak May 14, 2020
c0f2f47
Auto stash before rebase of "refs/heads/filament_calculations"
roman-dvorak Jun 19, 2020
efb1f86
Used filament outputs (gcode comments) in more computer-parseable format
roman-dvorak May 14, 2020
fb657d9
Auto stash before rebase of "refs/heads/filament_calculations"
roman-dvorak Jun 19, 2020
7f98cfa
Merge remote-tracking branch 'origin/filament_calculations' into fila…
roman-dvorak Jun 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions lib/Slic3r/Print/GCode.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,26 +337,26 @@ sub export {
my $filament_weight = $extruded_volume * $extruder->filament_density / 1000;
my $filament_cost = $filament_weight * ($extruder->filament_cost / 1000);
$self->print->set_filament_stats($extruder->id, $used_filament);
printf $fh "; filament used = %.1fmm (%.1fcm3)\n",
$used_filament, $extruded_volume/1000;

printf $fh "; filament_length_m = %.4f \n", $used_filament/1000;
printf $fh "; filament_volume_cm3 = %.4f\n", $extruded_volume/1000;
if ($filament_weight > 0) {
$self->print->total_weight($self->print->total_weight + $filament_weight);
printf $fh "; filament used = %.1fg\n",
printf $fh "; filament mass_g = %.2f\n",
$filament_weight;
if ($filament_cost > 0) {
$self->print->total_cost($self->print->total_cost + $filament_cost);
printf $fh "; filament cost = %.1f\n",
printf $fh "; filament_cost = %.2f\n",
$filament_cost;
}
}

$self->print->total_used_filament($self->print->total_used_filament + $used_filament);
$self->print->total_extruded_volume($self->print->total_extruded_volume + $extruded_volume);
}
printf $fh "; total filament cost = %.1f\n",
printf $fh "; total_filament_cost = %.1f\n",
$self->print->total_cost;

# append full config
print $fh "\n";
foreach my $config ($self->print->config, $self->print->default_object_config, $self->print->default_region_config) {
Expand Down