Commit graph

32 commits

Author SHA1 Message Date
SoftFever
59bab91da9 Merge branch 'merge-upstream'
Signed-off-by: SoftFever <softfeverever@gmail.com>

# Conflicts:
#	src/libslic3r/Preset.cpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
2023-09-30 09:51:56 +08:00
chunmao.guo
e789489ed9 NEW: add best_object_pos for auto-arranging
For i3 printers, best object position may not be the bed center,
we need to align objects to the specified best_object_pos.

Jira: STUDIO-4133

Change-Id: I06e31e597d2dd8288eb24a52d836cc8a134a4111
2023-09-22 16:21:26 +08:00
lane.wei
f20a1932ee ENH: Params: set the value of P1P/P1S to the same value of X1C
JIRA: no jira
Change-Id: I51f0dce20b128319478176c5dce3d47aacf5ab35
2023-09-22 16:21:26 +08:00
xun.zhang
f968c152c2 ENH: sync to A1 mini profiles
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Idf0414a43bedcd970811d87b40ee3e2063e4e5c6
2023-09-22 16:21:26 +08:00
lane.wei
6d5fad236e ENH: refine the logic of extruder_clearance_radius
1. use extruder_clearance_max_radius instead
2. set the value of P1P/P1S to the same value of X1C
JIRA: STUDIO-4214

Change-Id: I1ae5e4203db0933854b4388b5505dbf34b40edae
(cherry picked from commit 19cb6a0fbad0192d39813e449baed090baa163c5)
2023-09-22 16:21:26 +08:00
SoftFever
cae9ca950f update BBL OTA profiles 2023-09-09 14:21:02 +08:00
SoftFever
e624632969 semm 2023-09-09 13:19:59 +08:00
SoftFever
f3b1694a14 update latest BL profiles from BS 1.7.1 2023-08-03 08:49:37 +08:00
xun.zhang
793c657b46 ENH: remove nozzle_hrc in params page and profiles
use std::map to map nozzle_type to nozzle_hrc

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ie9d1db486808bd5164c7952caecaf4ac279f43d8
2023-07-31 14:29:15 +08:00
qing.zhang
d53d03f1fc ENH: add p1s as compatible machine
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I08b5f069be45fe0d16bd9e148ffb2409285b2503
2023-07-31 14:29:15 +08:00
xun.zhang
9b74fbe459 ENH: update X1C/X1/P1P start gcode
Change-Id: Ic552ac801202589e00ef692bae57126b8eed79c7
2023-07-07 17:52:43 +08:00
xun.zhang
f525785338 ENH: update X1/X1C/P1P start gcode
Change-Id: I487778ac32435b870ce78fc515187c0d08db9aba
2023-07-07 17:52:43 +08:00
xun.zhang
029e246fe0 ENH: update gcode of N1,X1,P1P
Change-Id: I417b77c33ff76eeec3eddf8be246f60785ee5454
2023-07-07 17:52:43 +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
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
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
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
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
SoftFever
f983610827 enable aux part cooling fan by default for Bambulab P1P 2023-04-06 15:42:35 +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
qing.zhang
bcd3ec146c ENH: mult height process for diff nozzle
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I26dec4431dba40dd35cc4038c674c6108e607304
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
salt.wei
582ec2c109 ENH: for issue that initial layer temp doesn't work
Start gcode of P1P is wrong.

This is for github issue #1044

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Id078b7c9020ef773373c3486f74dc51385b9dcc0
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
Arthur
7596b3fed9 ENH: improve auto arranging and by-object printing
1. In auto arranging bed temp can be higher than vitrify temp by no more than 15 degrees.
2. In by-object printing we use max radius for clearance
3. Add P1P max radius

Change-Id: If595f3e19fd74f6f36d2f394edbb835c413cc800
(cherry picked from commit 2af42420ad3770f0728adb583082600544519a58)
2022-12-26 05:31:54 -05:00
Arthur
ab96238a69 FIX: timelapse type was wrong in end gcode
Change-Id: I4b73e74cebb36f540fd27c71584d4b4a4cff94e9
2022-12-15 04:38:15 -05:00
qing.zhang
fe4fc04eb8 ENH: add upward_compatible_machine to preset
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I489f3cc7f9fbd0de79861b71c47494b377ef1a16
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