Commit Graph

34 Commits

Author SHA1 Message Date
SoftFever
9be2e4c884 Merge branch 'master-remote' into SoftFever
# Conflicts:
#	resources/profiles/Creality.json
#	resources/profiles/Voron.json
#	version.inc
2022-11-05 11:26:59 +08:00
Arthur
d17c3eb42d FIX: 2 auto-arrange bugss with per-object printing
1. use strict ordering to ensure the printing order is right
2. reduce height-to-lid to 100mm considering towline is lower than lid
and may collid with objects

TODO: printing brim may still collide, need to subtract inflated boundary of
others during brim generation

Change-Id: Icf0cba10c579d28fabd97764c1b3abec267ebd9b
(cherry picked from commit 46c6f5ff94488b2f4481bf1d34555f4a7c45e135)
2022-11-01 20:52:23 +08:00
Arthur
16b22cfbd1 FIX: print ordering didn't consider object height
This may cause tall objects be printed before short ones. There are two
possible solutions:
1. do strict ordering only when y-overlap is large enough (the one
   chosen in this commit)
2. when considering vertical collision with rod, the actual expansion
   can be much smaller (because the rod is only slightly off extruder).
   But this solution requires an extra parameter. Let's hold it for a
   while.

Change-Id: Icc9a4796d49dad93cbcc20d4103e641a48886e5e
(cherry picked from commit 6a958b1fa9e58e4ca3be63b4918da77bcdc53314)
(cherry picked from commit ceff67789c27ea576afd663a2e5bae9a10241728)
2022-11-01 20:52:23 +08:00
Arthur Tang
dc90d5e170 FIX: rewrite per-object printing order logic
1. Previous logic can't guarantee left-to-right printing order, so
   toolhead may crash on the right side. In the new algorithm printing
   order is guaranteed.
2. Clearance radius should be the max of 3 directions (left, bottom,
   up), not including right, otherwise collision may happen on bottom or
   up directions.
3. Add is_extrusion_cali_object property to handle extrusion brim
   overlap better.

Change-Id: I44868b9925d983f5cca0c31d35dfa28d895fadbf
2022-11-01 20:52:23 +08:00
SoftFever
b531270aa4 support changing thumbnail size 2022-10-23 23:00:46 +08:00
SoftFever
0267e2f230 Merge branch 'master-remote' into feature/merge_remote_1.3
# Conflicts:
#	bbl/i18n/zh_cn/BambuStudio_zh_CN.po
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/profiles/Voron.json
#	resources/profiles/Voron/filament/Voron Generic ABS.json
#	resources/profiles/Voron/filament/Voron Generic ASA.json
#	resources/profiles/Voron/filament/Voron Generic PA-CF.json
#	resources/profiles/Voron/filament/Voron Generic PA.json
#	resources/profiles/Voron/filament/Voron Generic PC.json
#	resources/profiles/Voron/filament/Voron Generic PETG.json
#	resources/profiles/Voron/filament/Voron Generic PLA-CF.json
#	resources/profiles/Voron/filament/Voron Generic PLA.json
#	resources/profiles/Voron/filament/Voron Generic PVA.json
#	resources/profiles/Voron/filament/Voron Generic TPU.json
#	resources/profiles/Voron/filament/fdm_filament_abs.json
#	resources/profiles/Voron/filament/fdm_filament_asa.json
#	resources/profiles/Voron/filament/fdm_filament_common.json
#	resources/profiles/Voron/filament/fdm_filament_pa.json
#	resources/profiles/Voron/filament/fdm_filament_pc.json
#	resources/profiles/Voron/filament/fdm_filament_pet.json
#	resources/profiles/Voron/filament/fdm_filament_pla.json
#	resources/profiles/Voron/filament/fdm_filament_pva.json
#	resources/profiles/Voron/filament/fdm_filament_tpu.json
#	resources/profiles/Voron/machine/Voron 0.1 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron 0.1.json
#	resources/profiles/Voron/machine/Voron 2.4 250 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron 2.4 250.json
#	resources/profiles/Voron/machine/Voron 2.4 300 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron 2.4 300.json
#	resources/profiles/Voron/machine/Voron 2.4 350 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron 2.4 350.json
#	resources/profiles/Voron/machine/Voron Trident 250 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron Trident 250.json
#	resources/profiles/Voron/machine/Voron Trident 300 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron Trident 300.json
#	resources/profiles/Voron/machine/Voron Trident 350 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron Trident 350.json
#	resources/profiles/Voron/machine/fdm_klipper_common.json
#	resources/profiles/Voron/process/0.08mm Extra Fine @Voron.json
#	resources/profiles/Voron/process/0.12mm Fine @Voron.json
#	resources/profiles/Voron/process/0.15mm Optimal @Voron.json
#	resources/profiles/Voron/process/0.20mm Standard @Voron.json
#	resources/profiles/Voron/process/0.24mm Draft @Voron.json
#	resources/profiles/Voron/process/0.28mm Extra Draft @Voron.json
#	resources/profiles/Voron/process/fdm_process_voron_common.json
#	src/libslic3r/Preset.cpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/PrintObject.cpp
#	src/slic3r/GUI/BackgroundSlicingProcess.cpp
#	src/slic3r/GUI/Field.cpp
#	src/slic3r/GUI/GLToolbar.cpp
#	src/slic3r/GUI/GLToolbar.hpp
#	src/slic3r/GUI/MainFrame.cpp
#	src/slic3r/GUI/MainFrame.hpp
#	src/slic3r/GUI/NotificationManager.cpp
#	src/slic3r/GUI/PhysicalPrinterDialog.cpp
#	src/slic3r/GUI/PhysicalPrinterDialog.hpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/Plater.hpp
#	src/slic3r/GUI/PrintHostDialogs.cpp
#	src/slic3r/GUI/PrintHostDialogs.hpp
#	src/slic3r/Utils/PrintHost.cpp
2022-10-20 23:12:00 +08:00
zhimin.zeng
59ebdc51e0 FIX: allow smooth timelapse without wipe tower
Change-Id: I60d487faa96641dbf88f5502d2fa9ccb83e622c6
(cherry picked from commit 0286a7add9c698a2efd6d40910d72a83f06edba5)
2022-10-20 19:34:37 +08:00
SoftFever
9c6f90b70a z lift type 2022-10-19 17:02:19 +08:00
SoftFever
0a702245a9 Merge branch 'master-remote' into SoftFever 2022-10-14 20:40:22 +08:00
lane.wei
77e6dd4976 ENH: refine the text description of collision
Change-Id: Id78537de719cd5081c097694948a81ee735205f9
2022-10-09 10:37:45 +08:00
zhimin.zeng
f6fe999860 FIX: modify reorder extruders time
Change-Id: Ib72faf039dee6a08770617c4c2f341079d7e02e9
(cherry picked from commit 5e9d479bd7d7ef54bcafe7181dcdd8c03adaae51)
2022-10-09 10:37:45 +08:00
SoftFever
8eff6e6641 Merge mainstream changes 2022-10-04 13:51:34 +08:00
SoftFever
fdbcee5679 Add following options:
1. Travel acceleration control
2. X Y jerk control for different parts
3. Manually Linear Advance control
2022-10-03 11:26:48 +08:00
zhimin.zeng
21caed4c66 FIX: Incorrect color of a layer after slicing
Change-Id: I8b53d4cdf23d8f3389b1063ec84572ede3706ca2
(cherry picked from commit 608150a1b823e5c728540dc62df9a03571acfe9a)
2022-09-29 11:16:43 +08:00
zhimin.zeng
b35decb7c3 FIX: disable wipe tower still prompting too close to the tower
Change-Id: Ie6a3be2fb6021bc6f5e18cd061667e02d7b36f0b
(cherry picked from commit b83337f56b61d3b80679ec2714594012550e6f4b)
2022-09-29 11:16:43 +08:00
zhimin.zeng
7ad67b7ab0 FIX: sort extruders for minimal flush volume
Change-Id: Idf96e10ae5a8809a689c80e38611a14dbb108f0a
(cherry picked from commit cbfa3f17807313b7120e19e5f30836fb49d36b55)
2022-09-29 11:16:43 +08:00
zhimin.zeng
5144514ba4 FIX: wipe tower does not extruder fill in smooth mode timelapse
Change-Id: Ia6957cfe41ed3624baa4c12b6df90462fc436475
(cherry picked from commit 39ecccc94bea2a43a74ac852f121c5dbc739dc67)
2022-09-29 11:16:43 +08:00
SoftFever
5548587e07 Allow users to set acceleration for outer/inner walls 2022-09-22 23:46:01 +08:00
zhimin.zeng
eb2eadaf49 FIX: add tips for timelapse
add tips when both print by object and smooth mode are selected

Change-Id: I13f4cc14f2ff7c33c23dcd1708fdb784aef5afa3
(cherry picked from commit a0bfe48df21d4eecf105d41387838f14b22fff3c)
2022-09-14 17:39:11 +08:00
SoftFever
e4924e29e4 Merge branch 'master-remote' into SoftFever
# Conflicts:
#	src/slic3r/GUI/MediaPlayCtrl.cpp
2022-09-13 23:04:58 +08:00
yifan.wu
f72317d144 FIX: fix a prime tower issue in timelapse smooth mode
Fix the issue that the first 2 layers of prime tower are not generated
when timelapse is set to smooth mode. This issue only happens in single
filament printing.

Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
2022-09-13 19:42:32 +08:00
SoftFever
a09ffa2131 Merge remote-tracking branch 'remote/master' into SoftFever
# Conflicts:
#	src/libslic3r/Preset.cpp
2022-09-09 21:54:57 +08:00
zhimin.zeng
2abb598028 ENH: add traditional timelapse without wipe tower
Change-Id: I77792fb1a7af2ee95242c6f2501371dc0745287f
(cherry picked from commit f6d434cc8b6c8d11d16bbabf9600c2f2b63868db)
2022-09-08 21:49:36 +08:00
zhimin.zeng
295a23da0f FIX: STUDIO-787 & STUDIO-786 lion face model problem
1. memory explosion when enable timelapse.
2. Models with only one color become multicolor after slicing.

Change-Id: Iab3ace70c08d03ab612158d52ff67eef8d5bc718
2022-09-08 21:49:36 +08:00
SoftFever
2e2263d7b7 Merge remote-tracking branch 'remote/master' into SoftFever 2022-09-03 00:17:59 +08:00
zhimin.zeng
49aca26497 ENH: Add Textured PEI Plate
Change-Id: I08178e86a8ccb23844cca00bc9d265df7507f910
(cherry picked from commit 8f101963ecab1352e2721ead83928b327d6c0dbd)
2022-09-02 12:52:18 +08:00
lane.wei
51c6d15694 add the logic to reduce slicing time between shared-mesh objects
also reduce the storage size

Change-Id: I61d6e0997979ec0ce701cc580fa6640a21b6260f
2022-09-02 12:52:18 +08:00
SoftFever
b6c1f101f8 Merge remote-tracking branch 'remote/master' into SoftFever
# Conflicts:
#	src/libslic3r/PerimeterGenerator.cpp
2022-08-28 12:03:49 +08:00
zhimin.zeng
297262d9db ENH: Optimize and design the time-lapse wiper tower
Multiplex existing wipe tower and revert old time-lapse wipe tower code

Change-Id: Ia1cba9808647ea900f691b2c5d5887077be12d89
(cherry picked from commit 61f41df572d11b7cc738c34f2624fd123cd9a6df)
2022-08-26 09:25:59 +08:00
SoftFever
2671e3969d Profile rework (#4)
* default BBL profile

* voron

* wip

* Voron profile

* Prusa MK3S

* add Prusa mk3s

* fix an issue that print_host value was not retrieved.

* add chamber temperature option for filament

* slightly adjust thumbernail angle

* Revert "slightly adjust thumbernail angle"

This reverts commit 6ad38efb36c66abe82c7fdeb23f6a24aac43654e.

* add `one wall on first layer` option

* save preset for connection

* remove unused options

* set default 3000 accl for MK3S

* tweak profile

* update Voron logo

* UI twwaks

* Readme update

* change abs default nozzle temp

* misc

* tweak profiles

* Update README
2022-08-24 15:40:43 +08:00
salt.wei
b148810de8 ENH: align the filament type with app/machine/RFID
Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I534e6b619efbb7fe6b813bf51640f46066f378c5
2022-08-05 16:11:42 +08:00
salt.wei
36968f643c ENH: separate PA and PA-CF filament type
Filament type of Bambu PA-CF in RFID is PA-CF.
Change it to PA-CF as well in preset to avoid
failure of AMS mapping.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ic6b6269123d59863fea2b7d262a124468c95b8af
2022-08-05 16:11:42 +08:00
lane.wei
af0b3ddb28 Update the codes to 01.01.00.10 for the formal release
1. first formal version of macos
2. add the bambu networking plugin install logic
3. auto compute the wipe volume when filament change
4. add the logic of wiping into support
5. refine the GUI layout and icons, improve the gui apperance in lots of
   small places
6. serveral improve to support
7. support AMS auto-mapping
8. disable lots of unstable features: such as params table, media file download, HMS
9. fix serveral kinds of bugs
10. update the document of building
11. ...
2022-07-22 20:35:34 +08:00
lane.wei
f8756e6c89 Add the full source of BambuStudio
using version 1.0.10
2022-07-15 23:42:08 +08:00