Commit Graph

164 Commits

Author SHA1 Message Date
abda9f2fc3 ENH: update X1E start gcode
jira:STUDIO-3518

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Iecf60753d05bb1ee79a01d1dd69f4a0755a0634d
2023-09-22 16:21:26 +08:00
131d48b172 FIX: Change z hop height from 0.2mm to 0.4mm
Models with overhanging areas are easily knocked down with Z hop height
at 0.2mm
Github: None
Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com>
Change-Id: I65fa14fe5f217c2d1384569efa8c2233c14dde83
2023-09-22 16:21:26 +08:00
bfdd013698 ENH: fix placeholder error in X1E start gcode
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ifbdaba7d5897a44bda1c7ac69ebaf6ef4654814b
2023-09-22 16:21:26 +08:00
1ad0bd84aa ENH: add printer structure in config
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I78969725c8b9984872e57fd2da476b9417cc1df7
2023-09-22 16:21:26 +08:00
37485e2115 FIX: use extruder list to decide chamber temp
As title.Use the same way to decide exhaust fan.
Removes end print exhaust fan control.

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I4353be3a1a9cbdfc3c1943ee447bac349b5177e9
2023-09-22 16:21:26 +08:00
621ee9a236 ENH: Sync X1E presets from the master branch.
Also sort the filaments and remove duplicated keys

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I31678c42d55ba3d77c743eaeff071849a8f3d0e7
2023-09-22 16:21:26 +08:00
e0c15b49d6 FIX: Different default Z hop upper boundary for different machines.
Github: #77
Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com>
Change-Id: I8065a2ea57496b5f415e591225877ba773fdb9f6
(cherry picked from commit 6fb7e1084caf9006d504c24ce1f026e475bcb348)
2023-09-22 16:21:26 +08:00
1ce17e1c02 ENH: update A1 mini gcode
1.G39.2 G392
2.update change filament gcode

jira:STUDIO-3518

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I2bb8ccf5ae92e229e4b36bf0a50ae8cd642d14fd
2023-09-22 16:21:26 +08:00
d7e1c9388f 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
ca9c354630 ENH: modify A1 structure config for traditional timelapse
Jira: 3935

Change-Id: I833c8a48e81364ce35a2685694fd3d92868fdb84
2023-09-22 16:21:26 +08:00
2d823b19c4 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
b8528de641 ENH: update profiles for N1
Adjust the print acceleration from 10000 to 6000.
Retain only PLA-type filaments, including support types for PLA,PETG,TPU.
Delete all other high-temperature filament types.

jira: STUDIO-4038
Change-Id: Iba56bfe94aee0235a629b98a29cdcac323490e34
2023-09-22 16:21:26 +08:00
54c59f4fd3 ENH: update N1 start& end gcode
Modify the motor beep G-code to support changing the volume for each beat

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
(cherry picked from commit 5dac263e17a39d5ab0a432cf6e2a04ee6bb74f22)

Change-Id: I0aabba8cf7d0d9db1d84a9151b7659d045d790ca
2023-09-22 16:21:26 +08:00
46217d805d ENH: add upward machine for N1
Also fix a bug in default print profiles

Change-Id: I515e8762870968acce8fe17bdf33c7d380b3c29b
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
(cherry picked from commit 33c0a597c8b5390790772da06d880f6c03259817)
2023-09-22 16:21:26 +08:00
4a86cb678c ENH: update N1 start gcode
Reduce the wiping speed of the mouth.

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I23bda42affc173a4d88ccfb1f4b79943d0bbecdc
(cherry picked from commit 12971f00f8918ce30634ef7467753fde0a562d82)
2023-09-22 16:21:26 +08:00
2df5dbaec4 ENH: update N1 start gcode
Flow rate calibration checkbox in.

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ie51ca6e7e1d96569fc22cbcea261f662fd3dbf84
(cherry picked from commit 890ee755449fe6a4ca7d0d0b41558b43d97eed0b)
2023-09-22 16:21:26 +08:00
c30271254b ENH: add profiles for N1
Add filament,process,machine profiles.

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Iea89d42090fa7bf6ee66c84189b7425b8acffc27
(cherry picked from commit c9f6284d882b5df9fa8e34ab62a16813d198788c)
2023-09-22 16:21:26 +08:00
59ca5f9fa2 FIX: use extruder list to decide chamber temp
As title.Use the same way to decide exhaust fan.
Removes end print exhaust fan control.

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Id14f3d91171b81239b336ef879061c6de7d68edf
2023-09-22 16:21:26 +08:00
80587efd00 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
74ef0a5fd6 update BBL OTA profiles 2023-09-09 14:21:02 +08:00
8325a897ee semm 2023-09-09 13:19:59 +08:00
cf72362fff Support Marlin 2 2023-08-30 23:39:00 +08:00
76e9a9b6c5 update latest BL profiles from BS 1.7.1 2023-08-03 08:49:37 +08:00
a3811967fe tweak profiles 2023-08-03 00:47:48 +08:00
e6ca6ac161 FIX: sync the layer change gcode to P1P
Change-Id: I8a57c43dbb1e5979a1714939426995dc7d229966
2023-08-01 22:09:01 +08:00
427267a01f FIX: Revert "FIX: Smooth timelapse in common profile was wrong"
This reverts commit 31c0fc89e3f70b0fa110fa715586c2a597e0929a.

Reason for revert: X1 not working

Change-Id: I9b634e61b37aa3294aa133458d257bc2035b8d48
2023-08-01 22:09:01 +08:00
7322f389d4 ENH: modify P1S start gcode
Use P1P start gcode for P1S

Change-Id: Ic787c78e1e368551740344893a0d7092a34f5b40
2023-07-31 14:29:15 +08:00
ee55ce4299 FIX: Smooth timelapse in common profile was wrong
Remember C10 is for traditional timelapse, C11 is smooth timelapse.

The mother profile of all machines should be right.

Change-Id: Ia941f743d2a81ef4b5b4fa08a37ca654eb86d0d7
2023-07-31 14:29:15 +08:00
964df40630 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
aee3ffceba 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
6bc2265391 fix: missing newlines 2023-07-21 19:51:38 +08:00
b6250e7929 ENH: add P1S machine
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ide4b293e20e0a66dde748ee5844c7bc0dfcc359e
2023-07-13 10:35:05 +08:00
36c8e3dba4 ENH: update X1C/X1/P1P start gcode
Change-Id: Ic552ac801202589e00ef692bae57126b8eed79c7
2023-07-07 17:52:43 +08:00
84a8ab388c ENH: update X1/X1C/P1P start gcode
Change-Id: I487778ac32435b870ce78fc515187c0d08db9aba
2023-07-07 17:52:43 +08:00
7dbaf28ab6 ENH: update X1/X1C start gcode
Change-Id: Ib6ac426ee91be4b85590df2343bc1cb9933dfe73
2023-07-07 17:52:43 +08:00
04db2f2cf5 ENH: update X1C start gcode
Change-Id: Ib1c7e829ae7876c55fdf2d9d3b7f436653dea27a
2023-07-07 17:52:43 +08:00
8f42b3e022 ENH: add PLA-AERO,add default key in common json
Change-Id: Ia6551f50e0f921a196a3a94659b367ca1ec4424f
2023-07-07 17:52:43 +08:00
3119eb4612 ENH: update gcode of N1,X1,P1P
Change-Id: I417b77c33ff76eeec3eddf8be246f60785ee5454
2023-07-07 17:52:43 +08:00
e7289daaf3 ENH: update start gcode
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ide7f55f348b1b49c56da02079178a4b1242d4897
2023-07-07 17:29:08 +08:00
d8764b0612 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
7ec6eff442 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
fa1ad0cff2 ENH: update end G-code
Change-Id: I4d153b76df8752ca97f394ebb4dd96c4550e95af
(cherry picked from commit 217e7b332c89160d322a86c25ae35b106dcb7d60)
2023-07-07 17:25:51 +08:00
0b574838a4 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
98dafd7c47 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
6278f82346 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
91a4cfb422 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
3c24d1be30 ENH: enable gcode window and support viewing added custom gcode
Change-Id: I2def8c32c17b6f2edfd2e6d0776123127560f167
2023-04-17 15:39:02 +08:00
7328fcb0dc 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
5b5b75f202 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
cdd95ccbb3 ENH: get start_gcode filament
Change-Id: Ia511f758d5c59ddc38c79f251e8c95511de4a235
2023-04-17 15:39:02 +08:00