Commit Graph

315 Commits

Author SHA1 Message Date
Ian Bassi
16727644bb Reduce size by Json Fromatting (#13163)
Reduce the size of current and new JSONs by standardising them with 1 tab indentation instead of 4 spaces.
This effectively reduces the size by almost 20 MB.

| Current | New |
|---|---|
| 85.2 Mib | 67 Mib |

Used [JQ](https://jqlang.org/) `--tab` to automatically format every current JSON.

> [!NOTE]
> Some profiles had the arrays on the same line, but those created by Orca were in the standard format (each object below the previous one). In some cases, this increases the number of tabs due to the new lines, but the increase is negligible, and this way both the base profiles and those created by Orca maintain the same style.
2026-04-15 22:58:12 +08:00
Misterff1
211971b9d2 Updated profile to match latest officlal BBL tweaks (#13118)
* Updated profile to match latest officlal BBL tweaks

Updated the profile for the P2S with several changes to match the latest machine gcode changes made by BBL:

- Added Ventobox support
- Added air purification at the end of the print. When exhaust fan controls are setup in the filament profile, this is skipped
- Disabled auxiliary_fan by default to fix the issue that it overrides  auto cooling and heating managed by the printer. Enabling this in printer settings makes it behave as before if so desired
- Updated with other tweaks made by BBL

* Reverted one line in layer change code

Reverted one line in layer change gcode as it was causing issues and was bambu studio specific anyway. Filament change works exactly as expected now.

* Re-enabled soaking time

This was a personal change that sneaked in, but may be unwanted for other users who have been using Orca for this printer for a while.

* Fixed redundant homing command and moved enable input shaping up

Fixed some issues BBL made in their original startup code that executes one redundant homing command for people who disable ABL. Also moved up the enable input shaping command to make the startup sequence quieter.

---------

Co-authored-by: SoftFever <softfeverever@gmail.com>
2026-04-08 22:09:52 +08:00
Ian Bassi
7c91459c37 Emit Disable Power Loss Recovery (#11616)
* Emit Disable Power Loss Recovery

Now only works if it's enabled but the goal it's to force disable it.
With this change it will always emit the command for BBL or Marlin 2.

Co-Authored-By: Michael Rook <54159303+michaelr0@users.noreply.github.com>

* Refactor power loss recovery G-code comments

* Return empty power loss recovery when no compatible printer

* Update power loss recovery comments

Update label and tooltip for power loss recovery

* Add enum for power loss recovery mode

Refactored power loss recovery configuration to use a new PowerLossRecoveryMode enum instead of a boolean. Updated GCodeWriter and related logic to handle the new enum, allowing for 'printer_configuration', 'enable', and 'disable' options. Updated config handling, legacy value conversion, and default values accordingly.

* Update PrintConfig.cpp

---------

Co-authored-by: Michael Rook <54159303+michaelr0@users.noreply.github.com>
Co-authored-by: SoftFever <softfeverever@gmail.com>
2025-12-31 00:16:47 +08:00
Michael Rook
5c547ea4a1 Add ability to disable Power Loss Recovery on BBL machines (#11582)
* Add ability to disable Power Loss Recovery

* Fix typo in PrintConfig.hpp for power loss recovery

* Attempt to resolve Unknown option exception: disable_power_less_recovery

Add disable_power_loss_recovery property to any json which had scan_first_layer

* Revert "Attempt to resolve Unknown option exception: disable_power_less_recovery"

This reverts commit ddaf34b317.

* Fix typo

* Change attribution from BBS to Orca in PrintConfig.cpp

* Mini refactor power loss recovery handling in GCode export

- Moved power loss recovery G-code generation to a new method in GCodeWriter.
- Support Marlin 2

* Update comments and power loss recovery handling

* Implement power loss recovery G-code commands

Added functions to start and end power loss recovery with appropriate G-code commands and comments.

* Add power loss recovery methods to GCodeWriter

* refactor and fix build errors

---------

Co-authored-by: Michael Rook <michael@rook.id.au>
Co-authored-by: Ioannis Giannakas <59056762+igiannakas@users.noreply.github.com>
Co-authored-by: SoftFever <softfeverever@gmail.com>
2025-12-10 23:19:57 +08:00
Noisyfox
435dba580c Fix profile 2025-10-28 15:30:06 +08:00
weizhen.xie
ca34800cad ENH:Object skipping supports skipping flushing of filament change
Jira:[STUDIO-12781]

Change-Id: Ia21d07b0ef107867cce55631d99bd03caebd6387
(cherry picked from commit d74849d499078f87d14282e92f48b2c02355d96c)
2025-10-28 15:30:05 +08:00
weizhen.xie
a50f14c6ce Fix: Fix the abnormal temperature display issue in the G-code viewer for the P2S
Jira: None

Change-Id: I7b7f21bbab400ebec8aa10219120b938ff7bf174
(cherry picked from commit 8e4384d80e5b44260921a40ac226fe99f0d0ba43)
2025-10-28 15:30:04 +08:00
七喜
8cec2a854e Revert "Revert "ENH:[filament/process]add high flow of X/P""
This reverts commit 4f8d3466508f3706e8d3f656294f7c5d3a9a7f88.

Reason for revert: use another method

Change-Id: I2a6465ea507f15ce200ea9cf03994b18bb2f257f
(cherry picked from commit 630248ae566c8cf8c61ceacb74ae3cd31d9e1501)
2025-10-28 15:30:04 +08:00
窝头
88222a5f64 Revert "ENH:[filament/process]add high flow of X/P"
This reverts commit 576444e746f4de3ab71c91b8a66fa4a64c3427c8.

Reason for revert: <remove high flow of X/P>

Change-Id: I875f649c62d503bdf1321b5fec829bb190b02bce
(cherry picked from commit 0b46acb8e793af883b797f83a9ad72a55dd69f3e)
2025-10-28 15:30:03 +08:00
shsst
5e279118d0 ENH:[Process/Filament] N7 modify start.gcode Profile Edited by yuran.wang
Change-Id: Ia7beff3329948ce3e59c365fa91ba9b762768b94
(cherry picked from commit 1f54bbd93d233e1a80f0c77cbffd0532e00e95a0)
2025-10-28 15:30:01 +08:00
zhou.xu
a4fe4633ce FIX:delete cool plate
jira: STUDIO-14877
Change-Id: Ia65fcc706c255072dd78bfcfc80abc6e17fe213a
(cherry picked from commit 501991eaf9ac7cb1bf7b0bafa1213014e6b09e2e)
2025-10-28 15:29:59 +08:00
shsst
edb46704aa ENH:[Process/Filament] Modify:endgcode turn off left aux fan Profile Edited by peiyu.yao
Change-Id: I3db016a15e877fb44c0023a6ce3f9c0a2b56d9a7
(cherry picked from commit f1787c34502fde5b1d141f61bc4e234f0ef8aa61)
2025-10-28 15:29:59 +08:00
shsst
642cf3c09c ENH: modify N7 start and end gcode
Change-Id: Ic058fc9e35ded7dd5693097660d4847d837fc22b
(cherry picked from commit 2e534e594405a32b66d6fe92fbe72e37de2571c4)
2025-10-28 15:29:58 +08:00
shsst
f2c9acbd58 ENH:[Process/Filament] Modify:P2S add left aux fan gcode Profile Edited by peiyu.yao
Change-Id: I10e844b81f7651ff55e4d3fc59ba56f96668a9dc
(cherry picked from commit 5ad83d9aa423410dacccab480068874383e17210)
2025-10-28 15:29:58 +08:00
shsst
3c829f4df2 ENH:[Process/Filament] P2S add clumping_detection gcode Profile Edited by yuran.wang
Change-Id: I36a54fa4508f854cf2e7215896532ec7cc03c802
(cherry picked from commit 33191488f9b584134187660628dfbebe92d50235)
2025-10-28 15:29:58 +08:00
shsst
f2996a529b ENH: modify N7 start.gcode
Change-Id: I14737df6eb8829308002849193b2257a8f1a9084
(cherry picked from commit 1a3fef5d0f3a2520fd0b94cd8c55a9433848cfb4)
2025-10-28 15:29:58 +08:00
qian.wang
901bdea706 ENH:[filament/process]add high flow of X/P
Change-Id: Id4b1c9ee6c99cc4f95970ff94eac1f68f661ad86
jira:None
(cherry picked from commit ca9d5a226a07ecd5454046e6e45e52bf2ccb4936)
2025-10-28 15:29:57 +08:00
shsst
8534cf5fce ENH:[Process/Filament] [N7]Adjust clumping exclude area Profile Edited by yuanzhe.shen
Change-Id: I4753301dace1b017a4350414642d026a4bd20a25
(cherry picked from commit 574702cc4be361cde6d18d72d7d90b5847d69bc1)
(cherry picked from commit 04b1588fe5918e15e530b0bb6220efbcfdb6915d)
2025-10-28 15:29:55 +08:00
songwei.li
69b2b5d86d ENH: Optimizing the extrusion compensation pattern of the X series
Modify the machine start gcode for nozzle diameters 0.2, 0.4, 0.6, and 0.8 on the X1, X1 Carbon, and X1E models to move the compensation lines closer to the edge.

jira: STUDIO-14317
Change-Id: Ib0662d5cf9dfd63b960fcb7c458fa35dc0954c1b
(cherry picked from commit 6aaa7ae4ffd2c893ed41a5eed51a6a7dd2d83f7b)
(cherry picked from commit 62bcdd5b1627526035ce3f23ca9999b958fd05b2)
2025-10-28 15:29:55 +08:00
shsst
d3bf96f067 ENH:[Process/Filament] [X1/X1C/X1E/P1P/P1S/A1/A1 mini]Change the purging temperature and speed to independent variables(Requires the latest slicer). Profile Edited by pi.chen
The configuration changes that were previously reverted are now reintegrated

jira: none

Change-Id: I82148ddb9688ffb358018c187ed71accad47529c
(cherry picked from commit 55fad607fd4e66b6b44b1b11b67f8cc5141c3af6)
2025-10-28 15:29:54 +08:00
shsst
434d2142e4 ENH:[Process/Filament] [N7] Add clumping exclude area Profile Edited by yuanzhe.shen
Change-Id: I90aa1eab6f4b5adfc17ba907919e9189b8407f8f
(cherry picked from commit e8a367e4ec54d24dfc5334e10b352b7d82508855)
2025-10-28 15:29:54 +08:00
zhou.xu
4e63907f72 ENH:modidy bed type
jira: STUDIO-13919 STUDIO-13920
Change-Id: I8e9e6bda972d294b91add1eeaf15061188bcdb2d
(cherry picked from commit a436da8930d631e094eef3b7829d270a027a9ac4)
(cherry picked from commit 5468697ff4ac4546111afdfd1f7eb43bd899f1de)
2025-10-28 15:29:53 +08:00
qian.wang
dfa59a5c00 ENH:[Process/Filament] Modify upward_compatible_machine of P2S
Change-Id: I3dd6eea8abb7904391077ad6ca38976661349701
(cherry picked from commit cd015b9fdcdd7c2aa8f166cdf8ad94b9743974a4)
2025-10-28 15:29:53 +08:00
zhou.xu
11345d6b54 NEW:modify svg name
jira: STUDIO-13919
Change-Id: I8a7ae0df8c4203c8f00a0c0da83e98c1ec7be605
(cherry picked from commit 926809b06fe15e486f24c671af576d0a4dd13c37)
2025-10-28 15:29:53 +08:00
zhou.xu
38faa0ae46 FIX:support different picture for different machine
jira: STUDIO-13919
Change-Id: I391887c637345795d3af82b3d274fb995c03b190
(cherry picked from commit 8979c2fbc10f49e257aa30b660ef9d09f00c90a1)
2025-10-28 15:29:52 +08:00
shsst
66263839dc ENH:[Process/Filament] modify P2S end/start/filament_change.gcode Profile Edited by yuran.wang
Change-Id: I36a21e14e2b67fc8db8c53820d1b1294ed2417cb
(cherry picked from commit a2810f510386234ca344df9d7b5abdba6cbfd715)
2025-10-28 15:29:51 +08:00
zhou.xu
59c2e222d8 FIX:Fix the image error of the hot bed
jira: STUDIO-14278
Change-Id: I3d0ee519b7ab057480cfde88be6b52d4f902b522
(cherry picked from commit af66ccee4e63074d4242f05792c1bc927c9ea2f8)
2025-10-28 15:29:49 +08:00
qian.wang
4f12f83ba1 ENH:[Process/Filament] sync p2s profile file with master branch Profile Edited by qian.wang
Change-Id: I86385ec154ad4c2a2e4cb4e637221b3289881651
(cherry picked from commit 3c80e8a8b85109a215ad4b1d0fdb579333f553ff)
2025-10-28 15:29:49 +08:00
zhimin.zeng
7fc8992978 ENH: add P2S parameter config files
jira: none
Change-Id: I619c9a2859759caaeeebf38b54983c093e1d6cad
(cherry picked from commit cc0d9d35d39474015d6ee31de92aa1cf108ffd3b)
2025-10-28 15:29:49 +08:00
Noisyfox
2fa386cbdb Treat extruder_clearance_max_radius as extruder_clearance_radius, and raise error if both options are present 2025-10-11 16:34:58 +08:00
Noisyfox
6b4975da72 Sync with latest bbl profiles 2025-10-09 20:37:31 +08:00
Noisyfox
4897fd5ea2 Apply extend_default_config_length to system profiles too
so we don't need to worry about default values for different variants
2025-10-08 15:19:25 +08:00
Noisyfox
fb4bb83546 Fix issue that when swtiching to other printer from H2D/H2S, an empty preset dirty dialog will pop up 2025-10-06 20:25:34 +08:00
shsst
093367a58e ENH:[Process/Filament] MOD:[H2D/H2DP][start] increase z avoid distance to avoid impact Profile Edited by xuanquan.liang
Change-Id: I8f8b5d9d27e204615c9380898da86d4d7ae4b132
(cherry picked from commit 0c6e34feec768e9a00aebf54d4b2d9f75773607f)
2025-10-04 23:59:20 +08:00
qian.wang
bac1473116 FIX:correct param length err
Change-Id: Ifbbdaa465d75cf39f224d7030b4910a7db87eb84
(cherry picked from commit a57dbe82cb65570ebc12bc80c648a9c09c556844)
2025-10-03 23:11:14 +08:00
shsst
f46c456a49 ENH:[Process/Filament] [H2S] Supports independent setting of flushing temperature and speed; Add a retraction after the extrusion compensation is complete; Supports foreign object detection on areas other than the textured plate. Profile Edited by haowen.wu
Change-Id: I475334e300ae0776936b74d673245c3dff74ca01
(cherry picked from commit 8ca2907df46c36337ff1f0ce48b64076671550a6)
2025-10-03 23:08:56 +08:00
qian.wang
574f597382 ENH:batch modify upward_compatible_machine of x/p/a
Change-Id: I58d15781591fc0a382f55bf53e67e74dd7a08988
(cherry picked from commit 686393c2cd4471cb33d8b7d3e13b285305f1a862)
2025-10-03 23:08:55 +08:00
shsst
ae8c59edc9 ENH:[Process/Filament] [O1S][start]Add a coordinate switch to prevent coordinates from being previously altered by other functions. Profile Edited by haowen.wu
Change-Id: I286ad96d34b993e0931df09cace0ad5eb58f2413
(cherry picked from commit 8f2ae3099518bd812e1e9101c20dc662cc871e90)
2025-10-03 23:08:54 +08:00
shsst
b8f3ff070d ENH:[Process/Filament] modify filament_flush_volumetric_speed/filament_flush_temp of o1s Profile Edited by shsst
Change-Id: I25f0bdaf48e503a3321532fcf84f5389217c3da8
(cherry picked from commit bf9da4391198eb429a1913203766620a08a42aa5)
2025-10-03 23:08:54 +08:00
shsst
ed7ef5cb9d ENH:[Process/Filament] [O1S][start]TPU Extrusion Force Anomaly Detection Profile Edited by haowen.wu
Change-Id: Idfac4a7c0d265044033c45564a017782a88b5823
(cherry picked from commit 304a94f77cedcb140f0bc5f228d6b52fb1645dc5)
2025-10-03 23:08:54 +08:00
xun.zhang
874a13180e ENH: update nozzle volume for H2S
1.Update nozzle volume and printer extruder id
2.Also remove uncessary cover image for H2S

jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I73c349ce7126e02b55c9aecef22ab3741b0c399f
(cherry picked from commit e579f65fdc5a241684676d69a0131b9900a9012f)
2025-10-03 23:08:53 +08:00
shsst
2c4d422d30 ENH:[Process/Filament] H2S Parameters Profile Edited by lianhu.xiong
Change-Id: If0437b3ec5a65a95911b587cec7b352ee0f85ef7
(cherry picked from commit 67164886f9ddff90ab4d1f295e21dbc988de323a)
2025-10-03 23:08:50 +08:00
shsst
d8dc560f7a ENH:[Process/Filament][O1DSE][start] modify gcode of H2S Profile Edited by haowen.wu
Change-Id: I3e46386d450127f9aef86eea052ad2e88bacc336
jira: None
(cherry picked from commit adce900ab331c68e944575c7a71a9c3298713c52)
2025-10-03 23:08:47 +08:00
xun.zhang
26a9cec304 FIX: display the minimum flush data
1. Use the minimum flush between nozzle volume and flush in datalist
2. Add a new param to decide the datalist to use
3. set for o1s

github:7445

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I7b3b69ee06f984b279ae4be47f70f5a472703b15
(cherry picked from commit 036fa80eea9ef8e02d9c9c9e6e7974d5a9a08131)
2025-10-03 23:08:47 +08:00
qian.wang
49befe4306 ENH:[filament] add H2 z_hop_types params
Change-Id: I721471737eca1e2d59ffae05a2a7df399bec9e9d
(cherry picked from commit b1001961e9b5a985e1a6ebcc1e5e2ca828ea991a)
2025-10-03 22:33:34 +08:00
qian.wang
8b3c8fddb1 ENH:[filament/process/machine] Rename H2 to H2S
Change-Id: I180fe8b9c13cae3027f0dc7bfcfd38d6a66166c3
(cherry picked from commit 66c0856928557f7deda784b9f2b9c4a94440925b)
2025-10-03 22:33:12 +08:00
xun.zhang
5499007bc3 FIX: solve the conflict
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: If3862fbf7a543283ff77d4511d7c321a6e24d38b
(cherry picked from commit 162b5ac65f74cc8ec8c5bfa285d630d165aee437)
2025-10-03 22:32:45 +08:00
shsst
c30459f1c6 ENH:[Process/Filament] update timelapse and layer change gcode for h2 Profile Edited by xun.zhang
Change-Id: Iee59e70854b80f592384cfa3593feb304aad3257
(cherry picked from commit a181fd229c03de59a055001aa11ed64844f2396a)
2025-10-03 22:32:41 +08:00
zhou.xu
d0448eb0da FIX:modify right icons offset bed for O1S
jira: STUDIO-12673
Change-Id: I5136c0ee1ce1fa30038d7c9951e2eb72fecc7b5b
(cherry picked from commit d24429e64668f703b66c297549dfa962c0f1c2cb)
2025-10-03 22:32:22 +08:00
shsst
ca74440d9d ENH:[Process/Filament] update timelapse gcode for H2 Profile Edited by xun.zhang
1.Update timelapse

Change-Id: I824029b1c912a6e1e6252c9d5d9222b1acbd09bd
(cherry picked from commit 68e41e3a00958608b06d5eb83cbfb07ffb427f38)
2025-10-03 22:32:04 +08:00