viewit/OrcaSlicer-KX
5
4
Fork 1
Code Issues 3 Pull Requests Packages Projects Releases 3 Wiki Activity
2,804 Commits 11 Branches 3 Tags
7ce404d449a382fc76c8564e5e3084f22d4e5aef
Commit Graph

54 Commits

Author SHA1 Message Date
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
qing.zhang
0dfbc7e719 FIX: conflict of setting-id 
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I8eb290e4c1f86635b8d1cbafa80a221ab8ea967c
 2023-04-17 15:39:02 +08:00
qing.zhang
63c9b81127 ENH: update the temp of high plate of PLA Silk 
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I1154af98d966aa7a0f384538944d569c190ffd41
 2023-04-17 15:39:02 +08:00
qing.zhang
4c41f46163 ENH: add filament_is_support to all files 
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I439ef9a2902563874d748be9aa9fe067e99588e6
 2023-04-17 15:39:02 +08:00
qing.zhang
d3d3f41f8c ENH: update fan nax speed of Bambu PETG Basic 
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I7e43702eb3af0e7960ea91ef3dd3a38c496b6f6b
 2023-04-17 15:39:02 +08:00
lane.wei
5772b013de FIX: fix the filename not correct issue under linux 
Change-Id: Ic720c7734be60197135965f3dcecc84eb9a8eb5d
 2023-04-17 15:39:02 +08:00
qing.zhang
afb9886e0e ENH: add Bambu PLA Silk & Bambu PETG Basic 
add cool plate temp for PLA

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: If3ca9c773351939358d7bed9f6d6c890a28b302b
 2023-04-17 15:39:02 +08:00
qing.zhang
cafd8e7f7e ENH: modify temperature_temp of PET-CF 
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I2e361b79620cbc5e7df7d5a657f8b26e285d3538
 2023-04-17 15:39:02 +08:00
qing.zhang
a8488f65b2 ENH: add Bambu PET-CF & modify slow down layer time of Bambu PLA-CF 
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I8396840eca762def30cb794f4c29808f2f71adfa
 2023-04-17 15:39:02 +08:00
qing.zhang
4adfb71115 ENH: add Bambu PETG-CF & change filament id of PLA Silk 
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ib62b479a2a6648a2a4bfa0d3deb11f6f37f754a4
 2023-04-17 15:39:02 +08:00
lane.wei
dce7751750 ENH: param: remove redundant values in fdm_common 
Change-Id: Ie23377db59196edc1857071b91889e2165e63127
(cherry picked from commit 84dc9d988decae3164c084a6b579522276cb4010)
 2023-04-17 15:39:02 +08:00
SoftFever
da57260101 change default slow_down_min_speed to 10 2023-03-14 21:30:45 +08:00
qing.zhang
67daabaddc ENH: modify temperature_temp of PET-CF 
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I2e361b79620cbc5e7df7d5a657f8b26e285d3538
 2023-03-09 19:07:29 +08:00
qing.zhang
fa1d8953ad ENH: add Bambu PET-CF & modify slow down layer time of Bambu PLA-CF 
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I8396840eca762def30cb794f4c29808f2f71adfa
 2023-03-09 19:07:29 +08:00
qing.zhang
df157d3682 ENH: add Bambu PETG-CF & change filament id of PLA Silk 
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ib62b479a2a6648a2a4bfa0d3deb11f6f37f754a4
 2023-03-09 19:07:28 +08:00
qing.zhang
d484b5e5fb ENH: add PETG-CF 
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Iaee30ced3be002120b6138be31a7b57422cf20bc
 2023-02-28 18:44:28 +08:00
salt.wei
14ca73ec3c ENH: miss generic PLA silk for P1P 
As title

Handle for github issue #1303

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Iffda4f3ea615a4e876f83ef8f85dacf954d5678e
 2023-02-24 09:23:57 +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
qing.zhang
ab0ba360e4 ENH: STUDIO-2171 update PC temp & TPU 95A's max vol 
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I229c8634971a20dbdff548ad16d80f0129e76079
 2023-02-22 20:09:17 +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
salt.wei
21485dec6a ENH: add some new filament 
Bambu PLA tough, Bambu PLA Marble, Bambu PLA Sparkle

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ib882485d9bdf6a29b8f5c8681e2d7bda8c7e1da0
 2023-02-01 16:24:44 +08:00
qing.zhang
d287b88548 ENH: add metal PLA-CF & PAHT-CF 
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I698cca7e9a8f62d16361184f0ab8428dc177eacf
 2022-12-26 05:31:54 -05:00
salt.wei
dd7dbd9936 ENH: modify generic pa-cf cooling setting 
Bambu pa-cf has been modified, generic pa-cf
should be changed as well

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ie859b41bd4d138a5fab204d6ad6a79806c3f0a9b
 2022-12-15 04:38:15 -05:00
qing.zhang
1f5454052f ENH: align the parameter 
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: If5b5f5c18d23ccae9524501dd4b99eff2e5532b4
 2022-12-15 04:38:15 -05:00
qing.zhang
49b00bfcd2 ENH: close the fan if the filament end 
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ifbf46d4987bb76628881c1be85f3870d1d490e78
 2022-12-15 04:33:48 -05:00
salt.wei
dea19ded1e ENH: add generic PLA silk 
Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I4e988b5c2e7f1b3689c50f231eac170591ab1bf5
 2022-12-15 04:33:48 -05:00
salt.wei
47302b0cf9 ENH: support force cooling for outer wall only 
For PA-cf material, forcing cooling for all outer
wall and using lower fan speed for infill and inner
wall can get more high strength.

Add this cooling strategy.

When set overhang fan threshold to be 0%, then bridge
and all outer wall will be force to cool with
the overhang fan speed.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ideed1ac8690f1eeb68aad760678db76bb4dae8ec
 2022-12-15 04:33:48 -05:00
qing.zhang
033a101da3 ENH: increase the temp of some plate to improve the print result 
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ia933d2aa63dcdad634316fe830e470ac6bc2c159
 2022-12-15 04:33:48 -05:00
qing.zhang
6ca5df9118 NEW: add nozzle_hrc and filament required hrc 
hrc determine which filament could be printed by the nozzle
if the filament required hrc smaller than the nozzle hrc
the fillament could be printed

either of it be zero means use other printers
or user want to print it anyway

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ic32dfaed4f9c80774a670c362de612254f3a5ed0
 2022-12-15 04:33:48 -05:00
salt.wei
c61fd447c9 ENH: fix duplicate setting name 
As title.

Test multi-color 3MF loading OK

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I9b2791f8d020a051f934cda3027293a948b07088
 2022-12-15 04:33:48 -05:00
qing.zhang
4d8eefb1ea ENH: open the filament_color preset 
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Idca08be5401aad1672adc46f9604338e3456f519
 2022-12-15 04:33:48 -05:00
qing.zhang
b3e9fbce67 NEW: add preset of X1 0.2mm nozzle 
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ic04fd53ea640c67449a455fd34fd714e76eac946
 2022-10-09 10:37:45 +08:00
qing.zhang
21e035ffbb ENH: modify the preset of some filaments 
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ia660304b830af36dfddec793e164660811c29c08
 2022-09-29 11:16:43 +08:00
qing.zhang
c778207bc2 ENH: modify the start_code & virification temperature of PETG & TPU 
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ic2a6490d73b59b91a954d55827b84a0f0714d575
 2022-09-14 17:39:11 +08:00
qing.zhang
b025de8746 NEW: add preset of 0.2 nozzle X1 
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ib5639a4f503f7c27023dd43d1a7e3929b51bdd77
 2022-09-08 21:49:36 +08:00
qing.zhang
dbe414c38c ENH: revise the filament preset. 
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ia9a82b87746ac7a70100ffd5f2383422069e0a81
 2022-09-02 13:16:54 +08:00
zhimin.zeng
0ab13a6abb ENH: Add Textured PEI Plate 
Change-Id: I08178e86a8ccb23844cca00bc9d265df7507f910
(cherry picked from commit 8f101963ecab1352e2721ead83928b327d6c0dbd)
 2022-09-02 12:52:18 +08:00
qing.zhang
c6fc915164 NEW: add preset of 0.6 & 0.8 X1C 
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ica13fe3284eb7165822d6f4f0f03da23625835eb
 2022-09-02 12:52:18 +08:00
qing.zhang
d290fc8095 FIX: fix exist invalid setting id 
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: If4e498a5b65f999634900ab6f0580c6edaab5acd
 2022-09-02 12:52:18 +08:00
qing.zhang
18d0ac259e ENH: add filament configure of 0.2 nozzle 
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I23cc9979cefe6bf5198526007eb57a9ec785426e
 2022-09-02 12:52:18 +08:00
qing.zhang
ef46654cca NEW: show cost of filament in GUI 
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: If28f6e969728fb5edd9cb35d6bc6d0a6c155d96e
(cherry picked from commit a4b8e620794f611c2f94f639cec49ec7c8fe8926)
 2022-09-02 12:52:18 +08:00
qing.zhang
62e6287ab5 FIX: fix fail load Bambu PC @BBL 0.6 nozzle 
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I591d38e6b7ae9bb7a0097af2fbbdc6860ed7864d
(cherry picked from commit 40e040c5e26235c16de09ac11dd8803f247f96b8)
 2022-08-26 09:25:59 +08:00
qing.zhang
ddb1163c79 FIX: delete redudant configure file of Bambu PC material 
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I897000a306700dd3f7b17563e25ef4dce0df1d49
(cherry picked from commit b74b33d0cd5b47ea192da8f78db40e4202ea5174)
 2022-08-26 09:25:59 +08:00
qing.zhang
cbefb77de3 ENH:add parameters of filaments 
Change-Id: I7a07dbd91d68896c1efc8642ee61646cbaf7622f
(cherry picked from commit f52c53bc2d1aa74584eae310d9617a32f3a03972)
 2022-08-26 09:25:59 +08:00
salt.wei
7fb886a03c ENH: provide filament_start and end gcode options 
Requirement from user to set filament_start_gcode
and filament_end_gcode. Set these two settings to
advanced mode

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I0d8ddb394b37614d0ef0f10f8434553cb20e9ffd
 2022-08-08 22:19:42 +08:00
salt.wei
bfe46a67d5 ENH: recover setting id to be old value 
Don't change setting ids to avoid potential user preset
loading issue

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Idbc8cfcbbbf7531f09e156844e286c672494af86
 2022-08-05 16:11:42 +08:00
salt.wei
a00e58c3bf ENH: sync filament_id with RFID 
Make filament_id to be same with information
from nectarine

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I3012d74bb8fe849fbaf9fabab791a6b06335dcf6
 2022-08-05 16:11:42 +08:00
salt.wei
97ffa093c3 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
a713573544 ENH: add extruder offset for X1 and X1 carbon 
The extruder offset of X1 and X1C is (0,2).
All generated gcode should minus this value.

Also change the min speed of cooling buffer for
better cooling for small area(from pineapple)

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I06e58a26f8736ae24fa9da02477a9d19114daeca
 2022-08-05 16:11:42 +08:00