bubnikv
93b8f3147c
Fixed inccorect (excessive) time estimates with the MMU 2.0
2018-08-07 14:15:37 +02:00
bubnikv
288cd58ee2
Bumped up version number.
2018-08-06 18:09:52 +02:00
Lukas Matena
a0fdcd9f47
Merge branch 'master' of http://github.com/prusa3d/Slic3r
2018-08-06 16:38:16 +02:00
Lukas Matena
a8cef5bf50
Changed checkbox labels for purge into infill/object feature
2018-08-06 16:37:41 +02:00
bubnikv
4f52601081
Minor tweaks of UI texts,
...
optimization of the wipe tower invalidation,
show collisions of the wipe tower with known dimensions.
2018-08-06 16:31:51 +02:00
YuSanka
7edc1dd577
Deleted empty line between "default value" and "variable name"
2018-08-06 15:47:03 +02:00
bubnikv
ea163edc41
Deregister the update callback on end of the application.
...
This fixes a crash on exit.
2018-08-05 23:36:25 +02:00
bubnikv
c13cd284e4
Fix of a regression bug: Update the print bed texture when switching
...
between printer profiles.
2018-08-05 22:52:38 +02:00
bubnikv
71b1e09af9
T1 and M702 C are now evaluated by the time estimator to add the new
...
"filament_load_time" and "filament_unload_time" values to match
the MK3 MMU2 behavior.
Emitting of the remaining times into the output G-code was made optional
through a new "remaining_times" configuration value, so the firmware
flavors and versions, which do not know the M73 code, will not complain.
Configuration changes:
The wipe tower default position was shifted inwards after the wipe tower
coordinate reference point was changed from the center to the left front
corner.
Added the "filament_load_time" and "filament_unload_time" values
to the MK3 MMU filament profiles.
Enabled "remaining_times" for the MK2.5, MK3 and MK3MMU2 printers.
2018-08-04 17:38:25 +02:00
bubnikv
ac2b20b54b
Merge branch 'master' into time_estimate
2018-08-03 23:04:44 +02:00
bubnikv
73ad49b9ae
Merge remote-tracking branch 'origin/lm_minimal_purging_on_wt'
2018-08-03 22:55:08 +02:00
bubnikv
02d6d04185
Merge remote-tracking branch 'remotes/origin/feature_arrange_with_libnest2d'
2018-08-03 22:38:44 +02:00
bubnikv
6a9bd540c1
Merge remote-tracking branch 'origin/lm_wipe_tower_block_improvements_merged'
2018-08-03 22:34:53 +02:00
bubnikv
0454adc194
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
2fe26bfac7
Changed color of preliminary wipe tower block
2018-08-03 15:36:47 +02:00
tamasmeszaros
e7e212cb52
Added a spatial index to speed up alignment score calculation.
2018-08-03 12:37:27 +02:00
tamasmeszaros
8e516bc3e4
reduce accuracy to acceptable performance
2018-08-02 19:25:19 +02:00
tamasmeszaros
9172a69e27
Nlopt build fix
2018-08-02 19:17:27 +02:00
tamasmeszaros
588456a5d9
Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d
2018-08-02 17:51:47 +02:00
tamasmeszaros
c8370b5408
New approach to big items with calculating the best alignment with other big items.
2018-08-02 17:51:11 +02:00
Lukas Matena
cc24861042
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
751fe864e2
Bugfix: priming lines for MM print were shown in preview even when disabled
2018-08-02 14:04:50 +02:00
Lukas Matena
f694600054
Merge branch 'lm_wipe_tower_block_improvements' into lm_wipe_tower_block_improvements_merged
2018-08-02 13:29:39 +02:00
tamasmeszaros
66d1eb9b9d
Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d
2018-08-02 13:16:11 +02:00
tamasmeszaros
a7ba51bd11
Fixing the "last item doesn't fit" problem.
2018-08-02 13:15:30 +02:00
Lukas Matena
7683870350
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
d5f042b4b8
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
a76cb3bd67
Merge remote-tracking branch 'remotes/origin/wipe_tower_no_priming'
2018-08-01 13:16:49 +02:00
bubnikv
3e2aedaaf0
Merge commit '4e901a9db778660d3471a49cd95d66f85b2dbc88'
2018-08-01 13:16:30 +02:00
Vojtech Kral
675e4cfd24
FirmwareDialog: Fix dialog resizing
2018-08-01 12:18:19 +02:00
Vojtech Kral
b6d70f5fe8
FirmwareDialog: UI improvements, bugfixes
2018-08-01 12:18:19 +02:00
Enrico Turri
c9d23d0ac0
Font for warning texture set to bold
2018-07-31 15:32:16 +02:00
Enrico Turri
e7cc3c5f4a
Code cleanup
2018-07-31 15:31:24 +02:00
Enrico Turri
a03d5178eb
Legend texture use square power of two image
2018-07-31 14:32:59 +02:00
Enrico Turri
e234973ab4
Warning texture use square power of two image and bigger font size
2018-07-31 14:20:16 +02:00
Enrico Turri
1c0fa19824
3D scene toolbar uses a single texture
2018-07-31 12:25:00 +02:00
YuSanka
14c9ff174d
Add variable name to tooltips
2018-07-31 10:42:37 +02:00
bubnikv
fa6a72ab2d
Changed the filament_load_time / filament_unload_time defaults to zero.
2018-07-31 09:46:39 +02:00
bubnikv
f49f871992
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
Enrico Turri
55e7a1af46
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-07-31 08:34:34 +02:00
tamasmeszaros
6cdec7ac9a
Prepare integration for arbitrary shaped print beds.
2018-07-30 16:41:35 +02:00
tamasmeszaros
d136d61edd
linest2d ready for arbitrary shaped beds.
2018-07-30 15:16:44 +02:00
Enrico Turri
2f7876b852
Fixed camera jump after object rotate
2018-07-30 13:57:05 +02:00
Enrico Turri
8e433c32bf
Time estimator: added placeholder to process gcode lines T
2018-07-30 12:08:26 +02:00
Enrico Turri
df201d65f4
Minimum z of object to lay on the bed after rotations. Fixes #1093
2018-07-30 11:38:36 +02:00
Enrico Turri
3f6d3b903d
Fixed rotation of 3D view camera after change of bed data
2018-07-30 10:35:08 +02:00
Enrico Turri
11b0325c66
Fixed calculation of bed origin in bed shape dialog
2018-07-30 10:03:17 +02:00
Enrico Turri
1882cd41a4
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-07-30 09:10:15 +02:00
Enrico Turri
bf4871d7f8
Improved remove hovering on objects when mouse leaves 3D scene
2018-07-30 09:09:14 +02:00
Enrico Turri
22f02acc3d
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-07-30 08:33:28 +02:00
bubnikv
4778312fa5
Merge branch 'master' into wipe_tower_no_priming
2018-07-27 23:26:10 +02:00
bubnikv
4a88075334
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
db8ba5fb76
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
4e901a9db7
Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d
2018-07-27 17:46:19 +02:00
tamasmeszaros
f364bd1884
New object function considering item size categories (big and small)
2018-07-27 17:31:30 +02:00
Enrico Turri
e1a13e9f08
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-07-27 15:19:42 +02:00
Vojtech Kral
81a229045a
avrdude: Fix: Stray winsock usage on Windows
2018-07-27 15:10:44 +02:00
Enrico Turri
39c326ebae
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-07-27 14:41:05 +02:00
Enrico Turri
c64cba8ec2
A few fixes on 3D scene toolbar
2018-07-27 14:38:19 +02:00
Vojtech Kral
a9aca4426c
Fix: port friendly name encoding
2018-07-27 13:27:52 +02:00
Vojtech Kral
f729ab4b12
Fix: Race conditions
2018-07-27 13:27:52 +02:00
Vojtech Kral
a32bd17b75
FirmwareUpdater: MMU 2.0 / Caterina flashing
2018-07-27 13:27:52 +02:00
Vojtech Kral
a7eaf38853
Utils: Serial port printer communication abstraction
2018-07-27 13:27:52 +02:00
Vojtech Kral
3c2170acf8
avrdude: Standalone binary
2018-07-27 13:27:52 +02:00
Vojtech Kral
6b801f250a
avrdude: use sections instead of offsets
2018-07-27 13:27:52 +02:00
tamasmeszaros
84f97e1f64
Improved libnest2d caching
2018-07-27 12:28:14 +02:00
Enrico Turri
590773d77b
Fixed conflict after merge with master
2018-07-27 12:15:35 +02:00
Enrico Turri
ddda5062c2
3D scene toolbar actions
2018-07-27 12:08:33 +02:00
bubnikv
987fc4c6df
Merge remote-tracking branch 'origin/backspace_to_delete_on_osx'
2018-07-27 09:55:13 +02:00
bubnikv
5c1de9fdd5
Merge remote-tracking branch 'origin/scene_manipulators'
2018-07-27 09:54:39 +02:00
bubnikv
c2291e54f4
Fixes crash when loading a config with zero number of default_filament_profile
...
values. Fixes SPE-427
2018-07-27 09:53:12 +02:00
Enrico Turri
3a1ec8285e
Reddish background when detected out of print volume toolpaths
2018-07-27 09:38:39 +02:00
Enrico Turri
c2ab8c2ae3
Out of print volume detection for extrusion toolpaths only
2018-07-27 08:49:58 +02:00
Enrico Turri
b5b7894a6f
Fixed color of all toolpaths when detected as out of print bed volume
2018-07-26 13:12:09 +02:00
tamasmeszaros
c430f57187
Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d
2018-07-26 12:58:52 +02:00
tamasmeszaros
629108265b
Fix for SPE-421 and emergency fix for SPE-422 (needs further investigation)
2018-07-26 12:57:47 +02:00
Enrico Turri
dd014136b0
Remove hovering on objects when mouse leaves 3D scene
2018-07-26 12:51:31 +02:00
Enrico Turri
828d3ddabc
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-07-26 12:46:59 +02:00
Enrico Turri
efbc1cce25
Fixed rotate gizmo update with multimaterial objects
2018-07-25 11:49:38 +02:00
Enrico Turri
93a05c4946
Use wxWidgets tooltip for 3D scene toolbar
2018-07-25 10:01:17 +02:00
Enrico Turri
dd724e9dab
M73 lines emitted to gcode only for Marlin firmare. Fixes #1071
2018-07-25 09:19:20 +02:00
Enrico Turri
2107ea7702
Fixed selection of multimaterial objects
2018-07-25 08:40:34 +02:00
Enrico Turri
23e51cd941
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-07-25 08:35:13 +02:00
Enrico Turri
496a83bb28
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-07-25 08:35:05 +02:00
Enrico Turri
d8f5daf345
Fixed selection of object modified by gizmo
2018-07-24 15:32:44 +02:00
Vojtech Kral
b49bfadd87
PresetUpdater: Fail harder on bundle version not present in index
2018-07-24 15:29:37 +02:00
Enrico Turri
d4adcd4077
Out of print volume detection for toolpaths
2018-07-24 13:39:17 +02:00
Enrico Turri
4db75d08a9
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-07-24 12:29:43 +02:00
Lukas Matena
21a59ce710
Shifted the MM priming lines inside a bit (for the out-of-bed detection)
2018-07-24 12:17:26 +02:00
Lukas Matena
c5448514ac
Fixed an issue with MM and supports layering
2018-07-24 11:20:29 +02:00
Enrico Turri
8bf3e63f75
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-07-24 11:20:02 +02:00
Enrico Turri
bbe5586c15
Merge branch 'scene_manipulators' of https://github.com/prusa3d/Slic3r
2018-07-24 10:03:45 +02:00
Enrico Turri
cac4b29153
Fixed crash when generating gcode of multimaterial objects with some object out of the bed
2018-07-23 15:58:08 +02:00
YuSanka
dd088ba0cc
Localized the (modified) profile indicator
2018-07-23 15:44:01 +02:00
Vojtech Kral
1842520ea6
ConfigWizard: Fix: Don't check the default printer if the wizard is requested by user or re-configure
2018-07-23 15:04:21 +02:00
Vojtech Kral
3e65b4410b
PresetUpdater: Fix reloading of profiles after reconfigure and update
...
Fix #1060
Fix #985
2018-07-23 15:02:13 +02:00
Enrico Turri
1c6d3c9c69
Added xml escape characters detection when exporting object and volumes names to 3mf files
2018-07-23 14:39:50 +02:00
Enrico Turri
4294510ed7
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-07-23 13:56:26 +02:00
Enrico Turri
0bd8affab9
Attempt to fix #1067
2018-07-23 13:54:43 +02:00
Enrico Turri
c68bcb9e60
1st installment of 3D scene toolbar
2018-07-23 13:49:48 +02:00