609 Commits

Author SHA1 Message Date
SoftFever
3a52fb3b3a Fixed an issue that X2D 0.4 don't have default material 2026-05-11 01:48:18 +08:00
glowstab
9956ad5b48 X2D Support (#13388)
# Description

Adresses #13294 

- Adds the X2D printer definition, machine presets, process presets,
filament presets, BBL profile index entries, CLI config entries,
filament blacklist updates, and printer/load/calibration/cover assets.
- Updates dual-nozzle handling to use configured toolhead labels and
match Bambu X2D hotend placeholders.
- Adds X2D-specific wipe tower cooling placeholder support and 3MF
filament/nozzle change sequence metadata import/export plumbing.

# Note

I own a P2S and an X2D. That's all. I frankly have no idea if my changes
cause regression on other printers, and have no capability to test. I
know that for my X2D, which runs an AMS, .2mm nozzles, SuperTack, and in
LAN mode, this has been working without issue.

# Screenshots/Recordings/Graphs

<img width="606" height="380" alt="Dual nozzle control"
src="https://github.com/user-attachments/assets/0d1c1063-4621-4097-b97c-d739557bf18c"
/>

*Dual nozzle control*

<img width="726" height="260" alt="image"
src="https://github.com/user-attachments/assets/270355b7-ca67-4ca3-ad19-582b8f11411b"
/>

*Multi nozzle filament override*

<img width="416" height="202" alt="X2D Machine config and dual nozzle
support"
src="https://github.com/user-attachments/assets/6a5c07b2-0d20-4819-8f42-d60731313249"
/>

*X2D Machine config and dual nozzle support*

<img width="397" height="142" alt="Filament for Supports test prints"
src="https://github.com/user-attachments/assets/3c7546bd-0e27-4d56-89b7-d9ca18c976f9"
/>

*Filament for Supports has been used in over 20 hours of test prints*

<img width="210" height="263" alt="Left vs Right filament distinction"
src="https://github.com/user-attachments/assets/03322268-b669-4f14-8d77-c4d96843d219"
/>

*Left vs Right filament distinction*

<img width="557" height="327" alt="Custom filament mapping"
src="https://github.com/user-attachments/assets/c1c4396f-7359-474e-80bd-78fec22f9c82"
/>

*Custom filament mapping*

<img width="556" height="314" alt="Auto map"
src="https://github.com/user-attachments/assets/d83e3217-edce-4340-886e-043962003a30"
/>

*Auto map*

<img width="689" height="664" alt="LAN mode send print with X2D preview
and no errors"
src="https://github.com/user-attachments/assets/76009bbf-31d3-4a6c-979c-8643b487c824"
/>

*LAN mode send print with X2D preview and no errors, dual nozzle
selection*


## Tests

- 20 hours of dual-nozzle printing.
- 100% CTest tests passed
- Validated 208 changed JSON files.

<!--
> A guide for users on how to download the artifacts from this PR.
-->

[How to Download Pull Requests Artifacts for
Testing](https://www.orcaslicer.com/wiki/how_to_download_pr_artifacts)
Fix #13294
2026-05-10 02:21:13 +08:00
Misterff1
e5294b1282 Update BBL P2S printer and process profiles (#13355)
* Disable arc fitting by default on BBL P2S

* Update BBL P2S printer profile

* bump the version so that it automatically update the cache

---------

Co-authored-by: SoftFever <softfeverever@gmail.com>
2026-05-09 01:57:47 +08:00
Ian Bassi
dae0694e90 Update profiles identation (#13375) 2026-04-27 15:59:59 -03:00
ericwong-person
04a0fcdf2a feat: add Bambu Lab filament profiles for Beta Filaments (PLA, PETG, ABS, TPU) (#13318)
* add filaments supplier beta

* update beta filament_id

---------

Co-authored-by: SoftFever <softfeverever@gmail.com>
2026-04-26 18:12:34 +08:00
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
Felix14_v2
c3365e0478 Update Russian localization (#12001) 2026-02-26 11:54:46 -03:00
Argo
769fc137c7 Ported Bambu Studio wipe tower interface features (with improved preheat and cooldown behaviour) - NEW (#12266)
Wipe tower interface features and preheat fixes

Fresh PR branch rebuilt on upstream/main (squash of origin/BBL-studio-wipe-tower-merge) to avoid merge-history issues.
2026-02-13 22:53:25 +08:00
Pepe-Polymaker
8670bb65f2 Refactor Polymaker folder within Snapmaker profile directory and add more profiles (#11613)
# Description
* What issue does this PR address or fix?
1. Refactor Polymaker folder within Snapmaker profile directory, so that the structure is more clear.
2. Add more Polymaker filament presets for Snapmaker printers.
* What new features or enhancements does this PR introduce?
1. None
* Are there any breaking changes or dependencies that need to be considered?
1. None
2026-01-05 18:12:56 +08:00
neo-jayfeather
af9688e619 Small Printer Thumbnail Orientation and Typo Fixes (#11807)
# Description
- Centered P2S image and removed unnecessary padding (different source image). 
- Renamed Ginger Additive G1 (ginger --> Ginger, no image change).
- Renamed Magic maker hj SK (sk --> SK, no image change).
- Renamed Wondermaker ZR Ultra S (ULtra --> Ultra, no image change). 
- Replaced Geeetech A10M (to hide spool on top, better framing)
- Edited M3D Enabler so the white background is transparent (same image, edited & cropped).

> [!NOTE]
> All images were edited using GIMP on Linux, are 240x240 px @ 144 dpi. 
> (and no AI was used for this description or image processing, if that matters)
# Screenshots/Recordings/Graphs
| Printer | Old | New |
|----|-----|----|
|P2S|<img width="373" height="203" alt="image" src="https://github.com/user-attachments/assets/49e441b0-b2bf-4ec4-b63d-a6a53736181a" /> | <img width="369" height="208" alt="image" src="https://github.com/user-attachments/assets/ce10d552-d238-453e-8ee0-d1382203c7e7" /> |
|Ginger Additive G1|<img width="185" height="221" alt="image" src="https://github.com/user-attachments/assets/d97998cb-7385-4cca-a747-05860b47ea0f" />|<img width="187" height="207" alt="image" src="https://github.com/user-attachments/assets/07054674-9358-4d50-9db1-690542d66ffb" />|
|Magic Maker hj SK|<img width="170" height="211" alt="image" src="https://github.com/user-attachments/assets/795dfb48-749b-4fbb-8005-49689a11fcc7" />|<img width="189" height="210" alt="image" src="https://github.com/user-attachments/assets/5d0f60d8-8c64-4881-baee-ee7089970c25" />|
|Wondermaker ZR Ultra S|<img width="171" height="208" alt="image" src="https://github.com/user-attachments/assets/40618ef8-ec2e-4dd8-8257-907dab1537eb" />|<img width="178" height="207" alt="image" src="https://github.com/user-attachments/assets/ba5ec44c-9aac-41f6-b8b4-8fd96edb489c" />|
|Geeetech A10 M|<img width="186" height="206" alt="image" src="https://github.com/user-attachments/assets/f5db21c0-e8e1-4f24-bdc7-ac46db8cd646" />|<img width="181" height="205" alt="image" src="https://github.com/user-attachments/assets/b008e2f6-4409-43d4-9463-4258e0b07be7" />|
|M3D Enabler|<img width="204" height="228" alt="image" src="https://github.com/user-attachments/assets/697f0c25-d4de-4e23-94e4-de78b57865cf" />|<img width="209" height="231" alt="image" src="https://github.com/user-attachments/assets/95dc6a0e-bb3d-4c63-bdef-0bdfb7209e50" />|

## Tests

No code was changed, so no logic was tested. I have tested the import UI and have made sure that the images follow previous standards (appears to be 240x240, 144 ppi).
2026-01-02 17:26:27 +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
5197358183 Merge branch 'main' into dev/p2s-pr 2025-11-09 20:47:51 +08:00
Asim Siddiqui
394d1a330d Add official Numakers PLA+ filament profiles (#11303)
* Add official Numakers PLA+ filament profiles

Official Numakers PLA+ filament profiles for Orca Filament Library and BBL X1, P1, A1 series printers
2025-11-09 16:31:47 +08:00
Noisyfox
4efaee4c98 Merge branch 'main' into dev/p2s-pr 2025-11-04 10:26:47 +08:00
yw4z
3c65617139 Fixes / Improvements for Covers & Printer Selection dialog (#11151)
* init

* update

* Crop cover images

* match setup wizard UI

* update

* tiertime

* anycubic

* anycubic

* construct3d

* update

---------

Co-authored-by: SoftFever <softfeverever@gmail.com>
2025-11-04 10:16:06 +08:00
qian.wang
493a92c7c8 ENH:sync petg basic with master branch
Change-Id: If8f5ff4cece198dcc1c921f99424222fb86f98a2
(cherry picked from commit 27d158b41608d9fec07a58986cb7c5ee30467b3a)
2025-10-30 14:56:50 +08:00
qian.wang
6ae4cfb6df Fix:fix inherit err of a1m
Change-Id: I070a3800d513e29191f025a12e03eb930edfeb68
(cherry picked from commit 1adc8b88248711151cd46f167b9fd4e9c117361f)
(cherry picked from commit 0cd4a30a96e75721a180337d006bc7cf882734c8)
2025-10-30 14:56:50 +08:00
qian.wang
7bea0dabee Fix:fix inherit info err
Change-Id: I932c3fc6daf05cd83d800b4183414a8db8fc4879
(cherry picked from commit 387c78d04cb0fd477a9f825ed8b4f34ee153fff1)
(cherry picked from commit d9ff8d4037e0c6af68d3a14f3eefb56051fb41b2)
2025-10-30 14:56:50 +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
shsst
1e71d22cee ENH:[Process/Filament] P2S PLA Silk Cooling Parameters Profile Edited by lianhu.xiong
Change-Id: Icf5a452f2fbc2a9090ca17e77f17b981ae0b7481
(cherry picked from commit 99f4670e53cc14a8a048b550cdc6089235ec7a1c)
2025-10-28 15:30:04 +08:00
shsst
669d53df17 ENH:[Process/Filament] Modify the PETG HF consumables fan of the H2D model Profile Edited by wenwei.huang
Change-Id: I0bd3d2377572d45ff9ecc58b6f401255710a4429
(cherry picked from commit 4b761df1f287a355f04ef3abe392d065686356e8)
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
438d80521b ENH:[Process/Filament] P2S TPU Retraction_Length Profile Edited by lianhu.xiong
jira:none
Change-Id: I2240f2cbe42c75750d46ae5b1781cd177b2f0359
(cherry picked from commit fec0c53059812be103371589d794921d55501caf)
2025-10-28 15:30:02 +08:00
shsst
a561c1bf13 ENH:[Process/Filament] Modify the volumetric flow rate of H2D ABS ASA PC PLA Basic PLA Matte PETG HF consumables Profile Edited by wenwei.huang
Change-Id: Ic357be722985d84e9ad91b2746f196e168f7f47e
(cherry picked from commit 65ee359304e6f634bab435e4e431aad7cb55045f)
2025-10-28 15:30:01 +08:00
shsst
05599d65af ENH:[Process/Filament] Modify H2D high-flow hot-end process parameters Profile Edited by wenwei.huang
Change-Id: Ib8311231756c47f3f1c6ab807cd0cac0772f946a
(cherry picked from commit 9ca7d20318a8ad3a16f9096306e718f3cf30d356)
2025-10-28 15:30:01 +08:00
shsst
34b25be058 ENH:[Process/Filament] H2S Aesthetic Filaments Slow_Down_Layer_Time Profile Edited by lianhu.xiong
Change-Id: Iac19827a9f49164989afaa0e47e5a38e8038e116
(cherry picked from commit 830c0602f7b09efeef0f23e62cc1aeb3c8894437)
2025-10-28 15:30:01 +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
qian.wang
3d482ce4a0 ENH:batch sync eng_plate_temp with textured_plate_temp
Change-Id: Ia504053d12f357f443dddfb140c561c83308dac3
jira: None
(cherry picked from commit 57239bb8f3ea6fe9310ecf98b4af8f76b3c8ba05)
2025-10-28 15:30:00 +08:00
shsst
c52ca2a442 ENH:[Process/Filament] Fixed P2S HF nozzle Profile Speed Profile Edited by xiao.lu
Change-Id: Ifaba95905ca716793fb15404f6192da01d327723
(cherry picked from commit 9f9b0a8eae4b134e56be45572387d87883c35a38)
2025-10-28 15:29:59 +08:00
shsst
e5f08a7173 ENH:[Process/Filament] Fixed P2S Filament HF nozzle Parameters Profile Edited by xiao.lu
Change-Id: Ied9339cac2854b5394ae27aebab4ae0597038da9
(cherry picked from commit 023b79590868d23b169402c7a3f8980e2ade2e22)
2025-10-28 15:29:59 +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
qian.wang
91393cddfb FIX:fix a1m param length err
Change-Id: I833cf95c475c0a1cb4a77157e28fe3402c1ed43f
jira:None
(cherry picked from commit 5677ce89b3a748a447a74af65a6a462a992ddcb7)
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
shsst
f34ee83f69 ENH:[Process/Filament] fix a1m params length err Profile Edited by qian.wang
Change-Id: Iee1538aabaf5f16af507599b978f5958dd72b1f9
(cherry picked from commit 17ffb9abcd78edb4ec0e210ad6a2a2d6a9f6e4cc)
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
qian.wang
4def2e846e ENH:remove third-party filament files for model P2S
Change-Id: I069f0ee3047ed73f065d73220158e1c2a4be25c3
jira:None
(cherry picked from commit 3b0d4699b4ab0a57d9349ac29ebf5ebdbe2eaa23)
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