526 Commits

Author SHA1 Message Date
Lukas Matena
cb916c4dda Fixed warnings in libslic3r 2019-06-25 16:04:29 +02:00
remi
9f91aba4f9 debug gcode slice msg.
remove some warnings
add some test stls to use
2019-06-25 10:58:37 +02:00
supermerill
47f5b30c5a Merge remote-tracking branch 'remotes/prusa/master' 2019-06-20 17:57:41 +02:00
Lukas Matena
05e6dbbe4b Wipe tower - refactoring (removed the abstract WipeTower class)
- abstract class WipeTower and its descendant WipeTowerPrusaMM were merged into a single (non-abstract) WipeTower class
- all uses of WipeTower::xy struct were replaced by Eigen Vec2f (it is no longer necessary to be independent on libraries that PrusaSlicer uses)
- the WipeTowerPrusaMM.hpp/.cpp will be renamed in the next commit (hopefully it will retain its git history that way)
2019-06-17 10:16:07 +02:00
Lukas Matena
678d0e18a7 WipeTowerIntegration class: print_z is not passed around, ToolChangeResult objects are aware of it 2019-06-14 14:43:40 +02:00
Lukas Matena
aee376762e Changed handling of priming extrusions to allow injection of filament and toolchange custom gcodes
The priming extrusions were handled separately from the rest of the wipe tower toolchanges. In order to be able to use the logic from previous commit for them (custom toolchange gcodes etc), some unpleasant code shuffling was needed
2019-06-14 14:42:07 +02:00
Lukas Matena
41164a9cb3 Multimaterial printing: Changed the way how custom gcodes are inserted
Each toolchange now emits:
- end filament custom gcode
- toolchange custom gcode; if not provided, a standard Tn command is inserted
- start filament gcode

Hopefully it is now consistent for SE/ME printers with/without the wipe tower
The priming line does not work - will be fixed in the next commit
2019-06-14 14:38:58 +02:00
Thomas Moore
da1aea889f Enable wipe tower for all multi-extruder configurations 2019-06-14 12:28:52 +02:00
Lukas Matena
6f7051c3b1 GCode preview shows correct volumetric flow for the wipe tower
The neccessary annotations for the GCodeAnalyzer were missing
2019-06-14 12:28:52 +02:00
supermerill
6304f7fc28 merge bugfixs 2019-06-09 19:55:20 +02:00
Bryan Smith
0ea6f895c5 Write the total toolchanges statistic to the end of the GCODE file like the other statistics. 2019-06-05 11:23:44 -04:00
Bryan Smith
f364b956fc Add [total_toolchanges] placeholder for filename and custom gcode sections. 2019-06-05 11:23:44 -04:00
Bryan Smith
3d8bd85187 Add new [total_layer_count] placeholder everywhere [layer_num] is avalible.
Missed adding [total_layer_count] to layer_gcode


Revert "Add new [total_layer_count] placeholder everywhere [layer_num] is avalible."

This reverts commit e29e766224a14e1f237908c3e5507ac5586ca5b7.

Revert "Missed adding [total_layer_count] to layer_gcode"

This reverts commit f07907a8acc450e9ae1220c6a9fe4f7c7e6d896c.

Better way to add [total_layer_count]
2019-06-03 14:47:18 +02:00
bubnikv
04397c7948 Changed the G-code export and send to OctoPrint GUI code
to store the G-code next to the project file if it exists,
and to process the project name with the PlaceholderParser.
2019-05-17 16:27:00 +02:00
supermerill
8840d01fb0 Merge remote-tracking branch 'remotes/prusa/master' 2019-05-16 19:55:45 +02:00
Lukas Matena
cf3b992269 GCode.cpp: Update the 'current_extruder' placeholder even if filament start gcode is empty 2019-05-06 14:48:59 +02:00
Lukas Matena
08cb5bc2c7 Wipe tower uses correct gcodes for RepRap gcode flavor (M907->M906, M900->M572 - should fix #1843)
Also, fixed proper setting of the extruder current during toolchange (was broken since 6da83c7)
2019-04-24 12:09:58 +02:00
bubnikv
d83a013d6b Export of filament statistics into G-code for multi-material prints
has been rewritten to be easier to parse.

Old format
; filament used = 19248.8mm (46.3cm3)
; filament used = 57.4
; filament cost = 1.5
; filament used = 8007.6mm (19.3cm3)
; filament used = 23.9
; filament cost = 0.6
; filament used = 0.0mm (0.0cm3)
; filament used = 0.0mm (0.0cm3)
; filament used = 0.0mm (0.0cm3)
; total filament cost = 2.1

New format
; filament used [mm] = 1600.7,1600.7,1600.7,1600.7,1600.7
; filament used [cm3] = 3.9,3.9,3.9,3.9,3.9
; filament used [g] = 4.8,4.8,4.8,4.8,4.8
; filament cost = 1.5,1.5,1.5,1.5,1.5
; total filament used [g] = 24.0
; total filament cost = 7.5

Where the non-printing extruders are filled in with zeros, and
the trailing non-printing extruders are not exported.

; filament used [g]
and
; filament cost
are only printed if non zero (material density and cost are defined)
2019-04-16 14:25:50 +02:00
supermerill
c03564f218 restore most loop orientation to ccw.
add test_model and test_print tests. Work is needed for them
2019-04-08 20:10:00 +02:00
supermerill
18a57ee137 Changed precision from ~25b (2 147.48mm -> 0.1um) to ~40b (17km -> 0.1um)
it's scaled by 10^6 (~20b), with 10^2 (~7b) under the epsilon
also, CLIPPER_OFFSET_SCALE scale the number by 2^17, and clipper disallow the use of the 2 higher bits, so it can't go higher than 45b
2019-04-08 20:02:21 +02:00
Enrico Turri
ea3d30bff1 Fix of #2082 -> Added lines M73 P100 and M73 Q100 to gcode to signal that print is finished 2019-04-08 11:54:58 +02:00
supermerill
8bc9f645f0 Merge remote-tracking branch 'remotes/prusa/master' 2019-03-26 15:42:08 +01:00
bubnikv
e0e1e2b682 Improved SLA layer view: Low layer shall be rendered from the slice above,
triangulated slices are shifted slightly away from the clipping planes.

FDM: Ported a "(bridged)" G-code comment from upstream.
2019-03-26 10:38:50 +01:00
supermerill
7afe2092b2 skirt & brim with complete individual object, now one per copy instead of one per object.
Also printed at the right g-code position.
2019-03-15 17:01:44 +01:00
Enrico Turri
f5b5e48ad7 Added cancel mechanism to GCodeAnalyzer::calc_gcode_preview_data() 2019-03-12 11:57:39 +01:00
supermerill
b12f484b48 quick fix for "silent time_estimator" when enabled but does not exist => CTD 2019-03-10 21:09:12 +01:00
Enrico Turri
219ea04c23 Fix of #1812 (GCode Anayzer take in account extruder offsets for multiextruder printers) 2019-03-06 10:22:10 +01:00
supermerill
12a7143882 Merge remote-tracking branch 'remotes/prusa/master' into masterPE 2019-03-06 01:00:37 +01:00
Enrico Turri
8a29ec2204 GCode Anayzer take in account extruder offsets 2019-03-05 15:03:56 +01:00
supermerill
a3b9bebfa3 restore "hidden" seam as prusa "nearest". 2019-03-02 23:42:06 +01:00
Enrico Turri
8a6d29f7d8 Workaround to fix inconsistencies of width of gcode preview extrusion paths 2019-03-01 09:55:43 +01:00
supermerill
c6239850b0 new: fan startup delay. (or advanced speed-up) 2019-02-21 19:28:13 +01:00
supermerill
cfbafe4322 Sawtooth infill : may be useful for support interface (idea by e3D)
add a setting to select the support interface.
need some tests to see if it works.
2019-02-21 19:12:35 +01:00
supermerill
d7141abcb4 vase mode fix:
* if the object is hollow and has only thin walls loops, the orientation must be enforced on gcode.cpp
 * add extra_perimeters as unwanted setting for spiral vase.
 * add dense infill as unwanted setting for spiral vase.
2019-02-14 13:34:37 +01:00
supermerill
3cbb2f7524 Octoprint-Cancelobject : more reliable (i think) and add header for object bounding box. 2019-02-12 19:11:02 +01:00
supermerill
95a6ea1477 Merge remote-tracking branch 'remotes/prusa/master' into masterPE 2019-02-11 15:32:35 +01:00
bubnikv
a56f7d60e5 Fixed an issue, where the output G-code file name was not always updated
from the current Model/ModelObjects.
Fixed a possible race condition in updating Print::m_placeholder_parser
with the proposed filename / filename base.
Improved documentation (source code comments).
2019-02-03 10:41:14 +01:00
supermerill
0680d6fe05 Merge remote-tracking branch 'remotes/prusa/master' into masterPE 2019-02-01 11:52:07 +01:00
bubnikv
c82d346c1a Fixed a bug in initialization of some StaticPrintConfig derived classes.
Merged implementation of support for "Octoprint-Cancelobject" #972
thanks @supermerill
2019-01-31 15:09:16 +01:00
bubnikv
57bd0889c3 Disabled the experimental pressure equalizer. 2019-01-29 18:07:45 +01:00
supermerill
a76bb026df Merge remote-tracking branch 'remotes/prusa/master' into masterPE 2019-01-29 17:55:24 +01:00
bubnikv
aaaffd7f90 Fixes Add [layer_num] and [layer_z] to Custom Tool change G-code #1651 2019-01-29 12:02:48 +01:00
supermerill
1999974f7a Merge remote-tracking branch 'remotes/prusa/master' into masterPE 2019-01-25 19:45:50 +01:00
Lukas Matena
ed1aad9de4 PURGING FINISHED gcode comment only emitted on layers where some purging was happening 2019-01-21 14:05:28 +01:00
bubnikv
54299d8eb0 Fix of https://github.com/prusa3d/Slic3r/issues/1631
This is a fix of a long standing bug, where an extrusion is incorrectly
drawn from the end of the last wipe move. Interestingly enough,
this bug is in Slic3r at least since 1.2.9, but lucky enough
it only occured for single perimeter, no infill prints with wipe after
retract enabled, and only if the two successive slices were discretized
exactly the same, which is quite unlikely.
2019-01-14 19:57:41 +01:00
supermerill
b1b76c0723 brim ears
- add brim_ears setting: bool: set to true to activate this new funtino
 - add brim_ears_max_angle : float : max angle for a corner to be assigned a brim ear.
2019-01-10 23:49:06 +01:00
meril
b91b476032 bugfix 2019-01-08 17:40:16 +01:00
bubnikv
2f4adc1906 Implemented [filament_extruder_id] placeholder #1568 2019-01-07 15:12:40 +01:00
bubnikv
026bc801e3 Fix of #1505, #1541
Fixed a regression issue in initialization of the "Avoid external perimeters"
feature.
2019-01-07 12:20:48 +01:00
supermerill
339531fa71 Merge remote-tracking branch 'remotes/prusa/master' into masterPE 2019-01-04 19:35:01 +01:00