Commit Graph

6170 Commits

Author SHA1 Message Date
bubnikv
8f77fa7a3f Merge branch 'master' into time_estimate 2018-08-03 23:04:44 +02:00
bubnikv
ee50a6b9ad Merge remote-tracking branch 'origin/lm_minimal_purging_on_wt' 2018-08-03 22:55:08 +02:00
bubnikv
b01d711b24 Merge remote-tracking branch 'remotes/origin/feature_arrange_with_libnest2d' 2018-08-03 22:38:44 +02:00
bubnikv
e3504ee471 Merge remote-tracking branch 'origin/lm_wipe_tower_block_improvements_merged' 2018-08-03 22:34:53 +02:00
bubnikv
bf82491ac9 Added support for the upstream Marlin interpretation of the M204 code.
Fix of https://github.com/prusa3d/Slic3r/issues/1089

M204 S.. T..:
T is interpreted by the firmware and Slic3r time estimator the old way
(as acceleration when retracting) only if an S code is found at the same line.
This allows PrusaResearch to interpret the legacy G-codes generated
by our older Slic3r with older Slic3r profiles.

M204 P.. R.. T..:
T is ignored, P is interpreted as acceleration when extruding,
R is interpreted as acceleration when retracting.
This will be the format the Slic3r 1.41.0 will produce from
the Machine Limits page.
In the future both MK3 firmware and Slic3r will likely be extended
to support the separate travel acceleration.

This change is in sync with the Prusa3D firmware:
dd4c4b39b4

Slic3r will now export
M204 P[machine_max_acceleration_extruding] R[machine_max_acceleration_retracting] T[machine_max_acceleration_extruding]
before the custom start G-code, which will be correctly interpreted
by both the new Prusa3D firmware and the Slic3r's time estimator.

To support our legacy MK2 firmware before we merge the commit above, we may
just insert the following line into the custom start G-code section to override
the block inserted by Slic3r automatically before the custom start G-code:
M204 S[machine_max_acceleration_extruding] T[machine_max_acceleration_retracting]
2018-08-03 16:26:28 +02:00
Lukas Matena
a03474491e Changed color of preliminary wipe tower block 2018-08-03 15:36:47 +02:00
tamasmeszaros
4405d034af Added a spatial index to speed up alignment score calculation. 2018-08-03 12:37:27 +02:00
tamasmeszaros
342a7055a2 reduce accuracy to acceptable performance 2018-08-02 19:25:19 +02:00
tamasmeszaros
a8a5bf0111 Nlopt build fix 2018-08-02 19:17:27 +02:00
tamasmeszaros
83c23555fa Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 2018-08-02 17:51:47 +02:00
tamasmeszaros
94d58259f5 New approach to big items with calculating the best alignment with other big items. 2018-08-02 17:51:11 +02:00
Lukas Matena
dc6c244315 Added a threshold for purging on the wipe tower (before it goes into infill/sacrificial object) 2018-08-02 15:14:12 +02:00
Lukas Matena
2b80462aa9 Merge branch 'master' of http://github.com/prusa3d/Slic3r 2018-08-02 14:07:20 +02:00
Lukas Matena
0d6eba4be9 Bugfix: priming lines for MM print were shown in preview even when disabled 2018-08-02 14:04:50 +02:00
Lukas Matena
9ff7da892d Merge branch 'lm_wipe_tower_block_improvements' into lm_wipe_tower_block_improvements_merged 2018-08-02 13:29:39 +02:00
tamasmeszaros
93757ac811 Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 2018-08-02 13:16:11 +02:00
tamasmeszaros
ae0883970d Fixing the "last item doesn't fit" problem. 2018-08-02 13:15:30 +02:00
bubnikv
e774688047 Fixed the *MK3* references in Prusa3D profiles 2018-08-02 13:09:53 +02:00
Lukas Matena
1b614263b4 New perl callback to force reloading of 3d scene after Purging volumes are changed
After the changes in previous commit, the 3D scene must be reloaded after the wipe tower
is invalidated. This can mostly be done on the C++ side, but reloading after Purging volumes
are changed required this C++ -> Perl call
2018-08-02 11:04:47 +02:00
Lukas Matena
1226a480fd Wipe tower postprocessing, wipe tower block on 3D plate improved.
- it renders red with one egde as indeterminate, the front edge is where the wipe tower will start
- changing width changes depth of the block (as requested)
- the block shows the brim of the wipe tower
- after slicing, the block is rendered in usual dark green and takes the exact shape of the tower (also with brim)
- moving or rotationg the block after slicing does not invalidate the wipe tower (and hence the exact block dimensions are preserved)
- changing anything that invalidates the wipe tower reverts the block back to the "indeterminate" shape
- the block is not shown after slicing, if the wipe tower is not actually generated (printing single color object with the wipe tower enabled)

This required changes in the wipe tower generator, which now generates the tower
at origin with no rotation. Resulting gcode is postprocessed and transformed during
gcode export. This means the wipe tower needs not be invalidated when it is moved or rotated.
2018-08-02 11:04:04 +02:00
bubnikv
e9c13720ee Configuration improvements:
Bumped up firmware versions for MK2.5/MK3 to 3.3.1, disabled priming areas for MK3MMU2
2018-08-02 09:11:11 +02:00
bubnikv
c675fd9962 Updated the start G-codes for the MK3 MMU2 profiles:
Implemented wiping line for MMU when the priming blocks are disabled,
added initialization of the MMU2 unit with the filament types.
2018-08-01 19:07:49 +02:00
bubnikv
00fa363b42 Merge remote-tracking branch 'remotes/origin/wipe_tower_no_priming' 2018-08-01 13:16:49 +02:00
bubnikv
6360715d22 Merge commit '4e901a9db778660d3471a49cd95d66f85b2dbc88' 2018-08-01 13:16:30 +02:00
Vojtech Kral
6f050ebc4d FirmwareDialog: Fix dialog resizing 2018-08-01 12:18:19 +02:00
Vojtech Kral
a86854fe92 FirmwareDialog: UI improvements, bugfixes 2018-08-01 12:18:19 +02:00
YuSanka
408156b2d6 Add variable name to tooltips 2018-07-31 10:42:37 +02:00
bubnikv
3c894e306c Changed the filament_load_time / filament_unload_time defaults to zero. 2018-07-31 09:46:39 +02:00
bubnikv
16e12292be Added filament_load_time and filament_unload_time parameters
to define the filament load / unload times spent in the MMU2.0 unit
when performing the tool change code (the T code).
2018-07-31 09:44:29 +02:00
tamasmeszaros
eb736cf484 Prepare integration for arbitrary shaped print beds. 2018-07-30 16:41:35 +02:00
tamasmeszaros
5115fc6ba6 linest2d ready for arbitrary shaped beds. 2018-07-30 15:16:44 +02:00
Enrico Turri
64f0e4ec85 Fixed camera jump after object rotate 2018-07-30 13:57:05 +02:00
Enrico Turri
e5141d9143 Fixed slice info after re-export of gcode. Fixes #1081 2018-07-30 13:54:54 +02:00
Enrico Turri
175282f713 Time estimator: added placeholder to process gcode lines T 2018-07-30 12:08:26 +02:00
Enrico Turri
e54901cee6 Minimum z of object to lay on the bed after rotations. Fixes #1093 2018-07-30 11:38:36 +02:00
Enrico Turri
b2ab51e34b Fixed rotation of 3D view camera after change of bed data 2018-07-30 10:35:08 +02:00
Enrico Turri
414f672652 Fixed calculation of bed origin in bed shape dialog 2018-07-30 10:03:17 +02:00
Enrico Turri
c569a2ed31 Improved remove hovering on objects when mouse leaves 3D scene 2018-07-30 09:09:14 +02:00
bubnikv
f7c583a604 Added the alpha4 config to the index. 2018-07-27 23:28:59 +02:00
bubnikv
4ad27ae50b Merge branch 'master' into wipe_tower_no_priming 2018-07-27 23:26:10 +02:00
bubnikv
da9fb6ab0b Updated change log for the Prusa3D config index,
bumped up the version to 1.41.0-alpha3
2018-07-27 22:31:24 +02:00
bubnikv
6cfa614202 New parameter "single_extruder_multi_material_priming" to be able
to suppress the MM priming towers.
The PrusaResearch.ini was modified for the MMU2 printers to
correctly prime the initial extruder when
single_extruder_multi_material_priming is disabled.
2018-07-27 22:19:46 +02:00
tamasmeszaros
c5057fcfa8 Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 2018-07-27 17:46:19 +02:00
tamasmeszaros
b153e7aabf New object function considering item size categories (big and small) 2018-07-27 17:31:30 +02:00
bubnikv
e944f09a4f New PrusaResearch configuration, renamed and improved the MK3 MMU2 wizard
picture.
2018-07-27 15:57:00 +02:00
Vojtech Kral
9b920e1185 avrdude: Fix: Stray winsock usage on Windows 2018-07-27 15:10:44 +02:00
Vojtech Kral
52336b519d Fix: port friendly name encoding 2018-07-27 13:27:52 +02:00
Vojtech Kral
b0d61b3089 Fix: Race conditions 2018-07-27 13:27:52 +02:00
Vojtech Kral
4079313223 FirmwareUpdater: MMU 2.0 / Caterina flashing 2018-07-27 13:27:52 +02:00
Vojtech Kral
226b5c8613 Utils: Serial port printer communication abstraction 2018-07-27 13:27:52 +02:00