Commit graph

42 commits

Author SHA1 Message Date
SoftFever
e624632969 semm 2023-09-09 13:19:59 +08:00
SoftFever
33ac24d35a Support Marlin 2 2023-08-30 23:39:00 +08:00
SoftFever
f3b1694a14 update latest BL profiles from BS 1.7.1 2023-08-03 08:49:37 +08:00
SoftFever
afdd753db7 tweak profiles 2023-08-03 00:47:48 +08:00
SoftFever
9f598046d1 Merge remote-tracking branch 'remote/master' into feature/merge_upstream
# Conflicts:
#	bbl/i18n/OrcaSlicer.pot
#	bbl/i18n/de/OrcaSlicer_de.po
#	bbl/i18n/en/OrcaSlicer_en.po
#	bbl/i18n/es/OrcaSlicer_es.po
#	bbl/i18n/fr/OrcaSlicer_fr.po
#	bbl/i18n/hu/OrcaSlicer_hu.po
#	bbl/i18n/it/OrcaSlicer_it.po
#	bbl/i18n/ja/OrcaSlicer_ja.po
#	bbl/i18n/nl/OrcaSlicer_nl.po
#	bbl/i18n/sv/OrcaSlicer_sv.po
#	bbl/i18n/zh_cn/OrcaSlicer_zh_CN.po
#	resources/config.json
#	resources/i18n/de/BambuStudio.mo
#	resources/i18n/en/BambuStudio.mo
#	resources/i18n/es/BambuStudio.mo
#	resources/i18n/fr/BambuStudio.mo
#	resources/i18n/hu/BambuStudio.mo
#	resources/i18n/it/BambuStudio.mo
#	resources/i18n/ja/OrcaSlicer.mo
#	resources/i18n/nl/BambuStudio.mo
#	resources/i18n/sv/BambuStudio.mo
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/images/ams_humidity_2.svg
#	resources/images/ams_humidity_3.svg
#	resources/images/ams_humidity_4.svg
#	resources/images/ams_humidity_tips.svg
#	resources/images/monitor_state_on.svg
#	resources/images/sdcard_state_normal.svg
#	resources/profiles/BBL.json
#	resources/profiles/BBL/filament/Bambu PETG-CF @base.json
#	resources/profiles/BBL/filament/Generic PETG-CF @base.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.4 nozzle.json
#	resources/web/data/text.js
#	resources/web/guide/3/index.html
#	resources/web/guide/31/index.html
#	src/BambuStudio.cpp
#	src/libslic3r/AABBTreeLines.hpp
#	src/libslic3r/Brim.cpp
#	src/libslic3r/CMakeLists.txt
#	src/libslic3r/ExPolygon.hpp
#	src/libslic3r/Fill/FillBase.hpp
#	src/libslic3r/Format/bbs_3mf.cpp
#	src/libslic3r/GCodeWriter.cpp
#	src/libslic3r/Line.hpp
#	src/libslic3r/PerimeterGenerator.cpp
#	src/libslic3r/Preset.cpp
#	src/libslic3r/Print.cpp
#	src/libslic3r/Print.hpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/TreeSupport.cpp
#	src/slic3r/GUI/AmsMappingPopup.cpp
#	src/slic3r/GUI/BackgroundSlicingProcess.cpp
#	src/slic3r/GUI/ConfigManipulation.cpp
#	src/slic3r/GUI/GCodeViewer.cpp
#	src/slic3r/GUI/GCodeViewer.hpp
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/GUI_App.cpp
#	src/slic3r/GUI/MainFrame.cpp
#	src/slic3r/GUI/PartPlate.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/Preferences.cpp
#	src/slic3r/GUI/SelectMachine.cpp
#	src/slic3r/GUI/Widgets/AMSControl.cpp
#	src/slic3r/GUI/wxMediaCtrl2.cpp
#	src/slic3r/Utils/Process.cpp
#	version.inc
2023-04-19 08:48:07 +08:00
liz.li
d776c7595e ENH: enable gcode window and support viewing added custom gcode
Change-Id: I2def8c32c17b6f2edfd2e6d0776123127560f167
2023-04-17 15:39:02 +08:00
zhimin.zeng
dda90b1810 ENH: get start_gcode filament
Change-Id: Ia511f758d5c59ddc38c79f251e8c95511de4a235
2023-04-17 15:39:02 +08:00
SoftFever
6cb7d0de95 fix extruder_clearance_radius
#620
2023-04-02 20:58:49 +08:00
salt.wei
538c607842 ENH: z_hop_types is enum not string
Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ia05eff8c78c65e358c8df36ea8b606a9b8da2663
2023-02-28 18:44:28 +08:00
salt.wei
354a3736e4 ENH: use spiral lift as default lift type
Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I52477adc3e6d48ab8201364c74006c5432db5d67
2023-02-24 17:44:15 +08:00
Arthur
2616479489 FIX: fix possible toolhead shake by adding 300ms delay
1. It seems there are a lot of buffered frames in IP CAM. Have to
   wait enough time untill all buffers are flushed.
2. From watermellon's suggestion, increase travel speed duing layer
   change, to save time and reduce oozing.

JIRA: STUDIO-2167
Change-Id: Ia2ec0bde216e90207897c00c395f7e02ea2fe342
(cherry picked from commit 9c85a7c68617b1628e1698912da20f1ebc69ec16)
2023-02-24 09:23:57 +08:00
Arthur
a981d3ac2c ENH: reduce possible toolhead shake in smooth timelapse
It's not necessary to pause before photo-shooting, but after it.
Pausng by 50ms should be enough.

Jira: STUDIO-2167

Change-Id: I88ba5db1d6cce390ae5e26ac03533b0ee277b5bd
(cherry picked from commit ae34c0b9e875d1e52798a5359b0cce2151942fb8)
2023-02-22 20:09:17 +08:00
salt.wei
209c50f50d ENH: fix for collision when print by object of multi color
Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I3d8b285dedb13ecbb5df38d46293680d9a0c1a61
2023-02-22 20:09:17 +08:00
chunmao.guo
cbb84d2fb6 ENH: support filament_z_hop_types
Support override z top type in filament

This is handling for STUDIO-2082

Change-Id: I885d1d5e44d626e28b260ff569d0359e462a5f8d
2023-02-22 20:09:17 +08:00
zhimin.zeng
ecd8418640 FIX: Unnecessary heat up when flush volume is 0
Change-Id: I5e0143d8b94ba4007a47ba3edb7277ee64bfafdb
2023-02-22 20:09:17 +08:00
qing.zhang
a726628657 ENH: cut travel before wipe
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I3b5dfc19c601e0cd72a4fd7fe320791f1d10c87b
2023-02-22 20:09:17 +08:00
zhimin.zeng
c225481a5d FIX: modify filament change travel path(toolchange_count == 2)
Change-Id: Ieca0aeb236582015e5e4e53629ef66567f420e7a
(cherry picked from commit 7d5c45ec46dace26c3e5ae35e8d11e7a7d54fcc2)
2023-02-02 12:14:41 +08:00
qing.zhang
3d378563b5 ENH: modify start gcode
fix the text errot of density of PolyTerra
z_hop_type change to auto

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I7f59d2620b42d2f2092ebb4c01ac3a5455c40a4f
2023-02-01 16:24:44 +08:00
qing.zhang
2705b5e4e6 ENH: updare end gcode and max_vol of TPU 95A
1 extrude move to dustbin
2 max vol of TPU 95A of X1 to 3.6

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I0b9d2a1db9c57c58255f95aad8a77772317a3ec9
2023-02-01 16:24:44 +08:00
zhimin.zeng
1015b7bca9 ENH: enhance the travel path of change filament
Change-Id: I720b833fc203f7ece63487e00290f4d91423c9f9
(cherry picked from commit 55e5fd8df1576d2b9252b2bd9e3e494db76218bf)
2023-02-01 16:24:44 +08:00
Arthur
2800c97165 ENH: add gcode command for void printing detection
1. add gcode command for void printing detection
2. fix the issue that the toolhead is not at excess chute position when
  smooth timelapse ends, by adding 2s pause after M991 command.
  Jira: STUDIO-1996

Change-Id: I40cf16116e742744cea9bd90969e556a9ea2b2f1
(cherry picked from commit 2fbf7ffe6b1bd8850a76e229ff91750c689721b9)
2023-02-01 16:24:44 +08:00
salt.wei
de6ba75f40 ENH: add layer progress into gcode file
As title

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I7b083e15e0f9030d7822494c4d6fc9cc72335ec2
2023-01-10 19:08:26 +08:00
salt.wei
f59d59fbe8 ENH: change some system presets
1 Use 25% infill density. 60% is too high and useless
2 update filament change gcode

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I9a1fbbfb56b61723aa6e9d6bc44a22f467d92562
2022-12-15 04:38:15 -05:00
zhimin.zeng
36d08e1849 ENH: add layer_num/[total_layer_count in layer change gcode
Change-Id: Ib5f7ad56390c07002999019816174f035aa3d484
(cherry picked from commit c4142c666d1613f6ad3c4269fb741b9a72558512)
2022-12-15 04:38:15 -05:00
zhimin.zeng
c38daab5da FIX: raise the nozzle when moving to wipe tower in smooth timelapse
Change-Id: I3feea8dc36697b9328d68faa97e55f5a1dcb827e
2022-12-15 04:38:15 -05:00
yifan.wu
4abce326bc ENH: refine the nozzle_volume
Exclude T command extrusion from nozzle_volume.

Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: Ie06a84a6b22ef1bcbf8cdd81b928835f8b3fd439
(cherry picked from commit 63e722a297b89432fe50113d00a1ff12fb99c507)
2022-12-15 04:33:48 -05:00
zhimin.zeng
148f6ba05d ENH: enhance timelapse user interaction
Change-Id: I95e84d20cbb8973a76a5b5887399b4ccc293c78b
(cherry picked from commit ade00ade11b285b69fb4a635274f5c6d16dc64aa)
2022-12-15 04:33:48 -05:00
qing.zhang
f3469729e5 ENH: update gcode of X1
start_gcode
end_gcode
change_filament_gcode
layer_change_gcode

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I1dc52c3e371cf702a02c18e877a3aafbfcc186b3
2022-12-15 04:33:48 -05:00
salt.wei
c70e8d486f ENH: update jerk strategy according to printer
Jerk handling has been changed in printer.
Changed in slicer as well.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ic3aef43a534a7f0b85b734e747dc3ca883faaa46
2022-12-15 04:33:48 -05:00
salt.wei
bd577fafb2 ENH: don't apply new fan speed until filament change finished
This patch can make sure that the cooling fan will not
be enabled during change fimanet.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I9f480b99116d62fe7522233b69b5bca209663821
2022-12-15 04:33:48 -05:00
Arthur
703f93d8e2 FIX: reduce height_to_lid to 90mm
Towline may be even lower than the upper rod. Let's
take away 10mm tolerance.

Change-Id: I13972fc4ecb0671e1af4b2c6d102e319417e532f
(cherry picked from commit cedcb862556c8c9014a91ef2aad8f39fc118d925)
2022-11-01 20:52:23 +08:00
Arthur
f16f5afec5 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 Tang
5544e9602c 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
Arthur
13b5e589cb ENH: reduce extruder_clearance_radius to 32
to improve per-object auto-arrange

Change-Id: I682c5405ef1aebdb3a9c32a0314e83bf9f116653
(cherry picked from commit 2c3d6b657694aa4826bb80526d160163bb673a33)
2022-10-20 19:34:37 +08:00
Arthur
8614d24932 FIX: nozzle_volume should not be array
Change-Id: Ib6de4bda64fb0a8620caf56c18f9fd6ac86f0171
2022-10-20 19:34:37 +08:00
salt.wei
78ff2f4daa ENH: allow higher z speed
This is change requirement from printer developer
for github issue #393

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ief306d89dba70d8515050cbd842edc4e1d22822e
2022-10-20 19:34:37 +08:00
salt.wei
ccd7b7fd7b ENH: modify default value to support 3rd-party printer
As title.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Id8be38a23e4fe4c19eb255ffb7cabf1befeae85b
2022-10-20 19:34:37 +08:00
salt.wei
1d1e12901b ENH: max e speed is 30mm/s
As title. Sync with printer limitation

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I5f9f594d5f6f33b0035f8200bf8b46b43e5955c5
2022-09-29 11:16:43 +08:00
zhimin.zeng
05625a5e43 ENH: add traditional timelapse without wipe tower
Change-Id: I77792fb1a7af2ee95242c6f2501371dc0745287f
(cherry picked from commit f6d434cc8b6c8d11d16bbabf9600c2f2b63868db)
2022-09-08 21:49:36 +08:00
salt.wei
70313deaf0 ENH: fix one bug which cause zero speed when flushing
filament_max_volumetric may be 0 which cause zero
flushing speed. Add protection for this issue.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I866b9d97c9c6d97122a4a2beaf508ce9c72ee3b2
2022-08-08 22:19:42 +08:00
salt.wei
7ced9f4e23 ENH: add M400 before switch temperature when change filament
Add M400 to avoid temperature switched before flush end.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I118bb240357e5c820c15e46ae34efa62248fdacc
2022-08-05 16:11:42 +08:00
lane.wei
1555904bef Add the full source of BambuStudio
using version 1.0.10
2022-07-15 23:42:08 +08:00