Commit graph

253 commits

Author SHA1 Message Date
xun.zhang
029e246fe0 ENH: update gcode of N1,X1,P1P
Change-Id: I417b77c33ff76eeec3eddf8be246f60785ee5454
2023-07-07 17:52:43 +08:00
qing.zhang
1368501508 ENH: add Generic HIPS
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I0fd861db6137c39f59630ae443661ddeb7a7b060
2023-07-07 17:29:08 +08:00
qing.zhang
9bd0e3e85b ENH: update start gcode
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ide7f55f348b1b49c56da02079178a4b1242d4897
2023-07-07 17:29:08 +08:00
qing.zhang
9cbd43049e ENH: add eSUN PLA
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: If518adba2d6a7651e8c8ca083578899c9267940e
(cherry picked from commit a06b89273f0f690781116f889de93e95970f9cef)
2023-07-07 17:29:08 +08:00
qing.zhang
4f4516357f ENH: add seam parameters and increase wall loops
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Id5c6cd6e97493f8912ce1857aed56eecace66cee
2023-07-07 17:29:08 +08:00
qing.zhang
d9a04d8c09 ENH: set wall generator to arachne
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I6f39baaca4c26440e210cd0780b56f421cab2904
2023-07-07 17:29:08 +08:00
xun.zhang
6e34ecd749 ENH:update PETG/PTEG-CF fan_threshold
Change-Id: Iffdffd936f249dd763ab7ebad0b7622d1eb504af
2023-07-07 17:29:08 +08:00
xun.zhang
254c3f77c2 ENH: reduce v-speed in 0.4 nozzle for PETG/PETG-CF
Change-Id: I1ec04a44a16872c19de4e5148fd269aee1952147
2023-07-07 17:29:08 +08:00
xun.zhang
fb5a9062ff ENH:add support for ASA and PLA Aero
Change-Id: I1d4be3cbfce5115bd06b310c947b8aa13960b43b
2023-07-07 17:25:51 +08:00
xun.zhang
2c00a44de6 ENH: update PLA/PETG start gcode
Change-Id: I7488f8d38dce87ac3d3c08f6d0367743b61a04ff
(cherry picked from commit 6058fe6fdc8293d7d2542958b9e9aa3562a62bd9)
2023-07-07 17:25:51 +08:00
qing.zhang
cdae0ac2b5 ENH: set fid of Genric PLA Silk & travel_length
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I4f8b7e73007c9740fac8c379c2b85f2d6fbdd9d8
2023-07-07 17:25:51 +08:00
qing.zhang
1d0476fa44 ENH: optimize the efficiency of auto lift
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I9c1679cc80ae23ff066df6e2fe98b5530a9d2288
2023-07-07 17:25:51 +08:00
xun.zhang
8b893e631b ENH: delete duplicate keys in filament profiles
Change-Id: If87ed772ceae1c8b09f3dbd09f1006918622cfe5
2023-07-07 17:25:51 +08:00
xun.zhang
4297f72283 ENH: update end G-code
Change-Id: I4d153b76df8752ca97f394ebb4dd96c4550e95af
(cherry picked from commit 217e7b332c89160d322a86c25ae35b106dcb7d60)
2023-07-07 17:25:51 +08:00
qing.zhang
c86c3bf897 FIX: set temp befor open HB fan to avoid oozing
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ibbda89a855927615d7da0e6da94a988852a10465
2023-07-07 17:25:51 +08:00
qing.zhang
8b19310d5d ENH: add support for PLA and support for PA
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I83781d4e11bd986131caaabba479c0074f2506a0
(cherry picked from commit 545c0122d1c0fce96b62de7ee9042b24911d93a6)
2023-07-07 17:25:51 +08:00
SoftFever
bdf8c8d5b1 Merge remote-tracking branch 'remote/v1.6.0'
# Conflicts:
#	.github/workflows/build_ubuntu.yml
#	src/libslic3r/Print.cpp
#	version.inc
2023-07-07 00:38:54 +08:00
qing.zhang
8be14d6cfe FIX: set temp befor open HB fan to avoid oozing
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ibbda89a855927615d7da0e6da94a988852a10465
2023-04-27 15:50:47 +08:00
qing.zhang
64428b4d3b ENH: add support for PLA and support for PA
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I83781d4e11bd986131caaabba479c0074f2506a0
(cherry picked from commit 545c0122d1c0fce96b62de7ee9042b24911d93a6)
2023-04-27 15:50:47 +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
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
liz.li
d776c7595e ENH: enable gcode window and support viewing added custom gcode
Change-Id: I2def8c32c17b6f2edfd2e6d0776123127560f167
2023-04-17 15:39:02 +08:00
qing.zhang
9309831d26 ENH: update machine_start_gcode
turn on HB fan before setting the nozzle temp

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I55908465055dcd93d274c1d861715cf7b9cbe655
2023-04-17 15:39:02 +08:00
zhimin.zeng
34f52b213c FIX: modify the camera command of P1P smooth timelapse
P1P use its own layer_change_gcode

Change-Id: I3f640a8d6fdc4481460e0f5aca33cd1ebf3de5ab
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
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
f983610827 enable aux part cooling fan by default for Bambulab P1P 2023-04-06 15:42:35 +08:00
SoftFever
ba2933d7d8 tweak calib lines rendering for Linux 2023-04-04 21:37:08 +08:00
SoftFever
6cb7d0de95 fix extruder_clearance_radius
#620
2023-04-02 20:58:49 +08:00
SoftFever
bf556a0272 New feature: show auto calibration marks on bed for X1/X1C printers
#88
2023-04-02 11:42:18 +08:00
SoftFever
da57260101 change default slow_down_min_speed to 10 2023-03-14 21:30:45 +08:00
SoftFever
a47c756112 Added gcode_label_objects and gcode_comments option 2023-03-12 18:25:42 +08:00
SoftFever
da61839e84 Merge remote-tracking branch 'upstream/v1.5.0' into SoftFever 2023-03-10 18:46:46 +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
SoftFever
5ef51f6c8a Merge branch 'master-remote' into feature/1.5
Signed-off-by: SoftFever <softfeverever@gmail.com>

# Conflicts:
#	bbl/i18n/BambuStudio.pot
#	bbl/i18n/de/BambuStudio_de.po
#	bbl/i18n/en/BambuStudio_en.po
#	bbl/i18n/es/BambuStudio_es.po
#	bbl/i18n/fr/BambuStudio_fr.po
#	bbl/i18n/hu/BambuStudio_hu.po
#	bbl/i18n/it/BambuStudio_it.po
#	bbl/i18n/nl/BambuStudio_nl.po
#	bbl/i18n/sv/BambuStudio_sv.po
#	bbl/i18n/zh_cn/BambuStudio_zh_CN.po
#	deps/Boost/Boost.cmake
#	deps/wxWidgets/wxWidgets.cmake
#	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/nl/BambuStudio.mo
#	resources/i18n/sv/BambuStudio.mo
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/images/tips_arrow.svg
#	resources/profiles/Anycubic.json
#	resources/profiles/Anycubic/filament/Anycubic Generic ABS.json
#	resources/profiles/Anycubic/filament/Anycubic Generic ASA.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PA-CF.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PA.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PC.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PETG.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PLA-CF.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PLA.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PVA.json
#	resources/profiles/Anycubic/filament/Anycubic Generic TPU.json
#	resources/profiles/Anycubic/filament/fdm_filament_common.json
#	resources/profiles/Anycubic/machine/Anycubic 4Max Pro 0.4 nozzle.json
#	resources/profiles/Anycubic/machine/Anycubic 4Max Pro.json
#	resources/profiles/Anycubic/process/0.20mm Standard @4MaxPro.json
#	resources/profiles/Anycubic/process/fdm_process_common.json
#	resources/profiles/BBL.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.2 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.4 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.6 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.8 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 0.2 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 0.4 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 0.6 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 0.8 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.2 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.4 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.6 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.8 nozzle.json
#	resources/profiles/BBL/machine/fdm_bbl_3dp_001_common.json
#	resources/profiles/Voron.json
#	resources/web/data/text.js
#	resources/web/image/printer/Anycubic 4Max Pro_cover.png
#	src/BambuStudio.cpp
#	src/libslic3r/GCode.cpp
#	src/libslic3r/GCode.hpp
#	src/libslic3r/GCode/GCodeProcessor.cpp
#	src/libslic3r/GCodeWriter.hpp
#	src/libslic3r/PerimeterGenerator.cpp
#	src/libslic3r/PresetBundle.cpp
#	src/libslic3r/Print.cpp
#	src/libslic3r/Print.hpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/PrintObject.cpp
#	src/slic3r/GUI/AMSMaterialsSetting.cpp
#	src/slic3r/GUI/AMSMaterialsSetting.hpp
#	src/slic3r/GUI/AmsMappingPopup.cpp
#	src/slic3r/GUI/AmsMappingPopup.hpp
#	src/slic3r/GUI/Auxiliary.cpp
#	src/slic3r/GUI/BackgroundSlicingProcess.cpp
#	src/slic3r/GUI/ConfigManipulation.cpp
#	src/slic3r/GUI/DeviceManager.cpp
#	src/slic3r/GUI/DeviceManager.hpp
#	src/slic3r/GUI/ExtrusionCalibration.cpp
#	src/slic3r/GUI/GCodeViewer.cpp
#	src/slic3r/GUI/GCodeViewer.hpp
#	src/slic3r/GUI/GUI_App.cpp
#	src/slic3r/GUI/IMSlider.cpp
#	src/slic3r/GUI/Jobs/PrintJob.cpp
#	src/slic3r/GUI/Jobs/PrintJob.hpp
#	src/slic3r/GUI/Jobs/SendJob.cpp
#	src/slic3r/GUI/Jobs/SendJob.hpp
#	src/slic3r/GUI/MainFrame.cpp
#	src/slic3r/GUI/MainFrame.hpp
#	src/slic3r/GUI/MediaPlayCtrl.cpp
#	src/slic3r/GUI/OptionsGroup.cpp
#	src/slic3r/GUI/PhysicalPrinterDialog.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/PrintHostDialogs.cpp
#	src/slic3r/GUI/Printer/BambuTunnel.h
#	src/slic3r/GUI/Printer/PrinterFileSystem.cpp
#	src/slic3r/GUI/Printer/gstbambusrc.c
#	src/slic3r/GUI/Printer/gstbambusrc.h
#	src/slic3r/GUI/ReleaseNote.cpp
#	src/slic3r/GUI/ReleaseNote.hpp
#	src/slic3r/GUI/SelectMachine.cpp
#	src/slic3r/GUI/SendToPrinter.cpp
#	src/slic3r/GUI/SetBedTypeDialog.cpp
#	src/slic3r/GUI/StatusPanel.cpp
#	src/slic3r/GUI/StatusPanel.hpp
#	src/slic3r/GUI/Tab.cpp
#	src/slic3r/GUI/Widgets/AMSControl.cpp
#	src/slic3r/GUI/Widgets/AMSControl.hpp
#	src/slic3r/GUI/Widgets/ImageSwitchButton.cpp
#	src/slic3r/GUI/Widgets/Label.cpp
#	src/slic3r/GUI/WipeTowerDialog.cpp
#	src/slic3r/Utils/Process.cpp
#	src/slic3r/Utils/bambu_networking.hpp
#	version.inc
2023-03-08 00:08:26 +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
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
yifan.wu
3e2fea33a9 ENH: update upward compatible machines
P1P, X1 and X1C may compatible with each other

Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I1de7350cbc613e0dc539fe2e7f26dbe9d455e4f3
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