Commit Graph

368 Commits

Author SHA1 Message Date
xun.zhang
ad5abceaa3 ENH: add filament map and filament list in GCode head
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Id214bcf5f76e6c59d4b8bcb55583f96b347630bf
(cherry picked from commit d1e6680f4c19ae19e8328813528f21e63084e577)
2025-09-21 13:48:02 +08:00
Noisyfox
f082f46e42 Merge remote-tracking branch 'remote/main' into dev/h2d
# Conflicts:
#	src/libslic3r/CMakeLists.txt
#	src/slic3r/CMakeLists.txt
2025-09-20 13:10:10 +08:00
coryrc
6658f10764 Fix variable name comment and message (#10302)
As you can see, it's checkin the local variable
`custom_gcode_placeholders` which comes from
`custom_gcode_specific_placeholders()` which is:

```
const std::map<t_custom_gcode_key, t_config_option_keys>& custom_gcode_specific_placeholders()
{
    return s_CustomGcodeSpecificPlaceholders;
}
```

not s_CustomGcodeSpecificOptions
2025-09-19 22:41:25 +08:00
xun.zhang
ff905c03ca ENH: add layer num in filament end GCode
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I6f81b86a7b7391048d70f2c4839733a69015e53b
(cherry picked from commit aafcfd72f40dd221286b757da9d494498d36374c)
2025-09-18 16:40:37 +08:00
zhimin.zeng
1216880fae FIX: fix the error wipe path
jira: none
Change-Id: I34af54711531b208049cbbc3883bca92328b9b5a
(cherry picked from commit da3819f52f5454075342e8565fe9020773aa25ef)
2025-09-18 16:27:37 +08:00
zhimin.zeng
8c7a390a5f FIX: apply unprintable filament type to limit filament map
jira: none
Change-Id: I81e22dc28bc416a1b26c242fab4e054f597b064e
(cherry picked from commit 9b81b9e2d4c6b39329e94efe3e433564c66f6ffe)
2025-09-18 16:14:01 +08:00
zhimin.zeng
916855119e FIX: adjust nozzle_change_gcode before filament_end_gcode
jira: none
Change-Id: I56498d473568ef0f5a7ba7c149befff55016bda1
(cherry picked from commit 310f13f36a96d8b898edd651cfcf75251ab9fd9d)
2025-09-18 16:11:02 +08:00
xun.zhang
9cbe813d10 ENH: add tpu exist flag in place holder
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ieba35adde23e1ce1169b10955bafbbf2bc856663
(cherry picked from commit 5c6264cf9f396cfad30a1275fc779f0877a17919)
2025-09-18 16:03:16 +08:00
xun.zhang
0ab372cf03 FIX: remove duplicated filament change
1.Remove duplicated filament change after machine start GCode
2.Add missing filament change after machine start gcode

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I97e1a3e8dc1ad39c95f763469086c2e360807288
(cherry picked from commit d61d0c7231df949515dce6238ba1e94e01386d03)
2025-09-18 11:29:27 +08:00
Noisyfox
82347f8713 Add missing VT 2025-09-18 11:29:19 +08:00
jiangkai.zhao
bdb64d447e ENH: Use the real prime tower model after slicing.
1. set wipe tower real height
2. fix wipe tower small arc error
3. add rib_width constraint to ensure that the rib wall of the wipetower are attached to the infill.
jira: STUDIO-10540

Change-Id: Idfdc809f0236121d98587ac2a09a2ebbf5caf945
(cherry picked from commit 3a7dcfd23249571224a4d538c55907a0a5c6154d)
2025-09-18 09:33:02 +08:00
jiaxi.chen
6820e6fa82 FIX: use support_interface_material between support_material
jira: STUDIO-10544
Change-Id: Id1bfda49bc5ac2bd6ecbad473d8ee063d3c0f030
(cherry picked from commit e7eb3bd388ddecdb7f9f78bf69cd378b77b231ef)
2025-09-17 23:09:44 +08:00
zhimin.zeng
363e871c69 FIX: fix the unknown object label id
jira: 10699
Change-Id: I50b5b230625be8dd0c36b588e6ae9358eef334ba
(cherry picked from commit c58e5d447d09ed3b62cd6ace0de58dd4fa7d9693)
2025-09-17 22:58:36 +08:00
xun.zhang
353db72b03 ENH: add min vitrification temperature in placeholder
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Id9da8c829a2ed7469a01a887a0f19b0d32f0c36a
(cherry picked from commit 6869abcedac7a3e4ae04467c73656d681a4dda7d)
2025-09-17 21:55:28 +08:00
xun.zhang
3005390054 FIX: wrong bed temp in placeholder
1.Also add a new field to mark whether enable high low temp mix

jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I208e0e7a4ce75feccc8659ecf940447e591d9505
(cherry picked from commit e79ba2f1ec64953100319a3d86ef9105cc7c3567)
2025-09-17 17:24:23 +08:00
zhimin.zeng
4d496ff99a ENH: support skip timelapse gcode when skip all object
jira: none
Change-Id: I31586b1885e92e0eb0005b458e1dbc19f945a929
(cherry picked from commit 01460cae76888aeac4beb0542343c14d835857f5)
2025-09-17 17:07:54 +08:00
zhimin.zeng
00e1fdbacc FIX: the timelapse gcode is not generated in spiral vase mode
jira: none
Change-Id: Ibb73fab7f51e5a81bd32b6e5df18a095f2aa30d3
(cherry picked from commit 22499a552e86f6f458706c3043915130b447de2c)
2025-09-17 16:27:22 +08:00
xun.zhang
30258558f2 ENH: add new way to set bed temperature
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I99a9f67e9b13b2137ad371b22cf0999ccf9c096d
(cherry picked from commit 69c2947daf66eb0a6732b1b980c9b87f597c8da7)
2025-09-17 16:22:05 +08:00
jiangkai.zhao
abdfe249a2 Fix: the generation of the skirt does not take the wipe_tower into account.
jira: STUDIO-10381
Change-Id: I523d366d6d569696de48f872be827d73710cb526
(cherry picked from commit 939b405c35809dbceb65e5efdc65622407065b65)
2025-09-17 14:02:10 +08:00
zhimin.zeng
771d88df6d FIX: the print_z is incorrect when use 0.8 nozzle printer
jira: none
Change-Id: Ie06c0e1b763be7178246e5dae101e650b8534f4b
(cherry picked from commit 3309a40d42726169d6ee952ff31063b654a6fbdf)
2025-09-17 10:53:34 +08:00
zhimin.zeng
ebf5c4e044 FIX: fix wrong retract when change filament
jira: none
Change-Id: I6bf6d4620234d9c7b5246126bfdcdf8b5e1944e3
(cherry picked from commit 0381d5827c031a3e5486d28cd734794485f4ecf0)
2025-09-17 09:37:08 +08:00
jiangkai.zhao
84d1214b65 ENH: add lift after printing the wipe_tower
and reduce the travel speed inside the wipe_tower
jira: none

Change-Id: I3b07ee62623e0cdc2f1824f0011f95776020bee1
(cherry picked from commit 1aad582e08229fad1f935e257c1335dcfdbe406c)
2025-09-16 17:39:16 +08:00
zhimin.zeng
334c984d3c FIX: 1.The gcode started by a space cannot be matched
2. use most used extruder for timelapse without wipe tower
3. apply retract_when_changing_layer for multi_extruder
jira: none

Change-Id: I4ff00573fd8a6ee9fa42877e3e7056d547e4d864
(cherry picked from commit 4715fa14edf2bdfc1170b0461da699903a3078a4)
2025-09-16 17:28:45 +08:00
jiangkai.zhao
ab0a503b91 FIX: fix error path in wipe_tower
jira: none
Change-Id: Ia13ae92c61de0d5a361e7d00ec85ff21a04dfc6c
(cherry picked from commit 8ce8c3ffbb01d29e8a6062d344f3382c7aa886c0)
2025-09-16 17:23:30 +08:00
zhimin.zeng
f60630a1a5 FIX: Detach the timelapse gcode from layer_change_gcode
for X and P machine
2. remove lift and retract in filament_change_gcode and layer_change_gcode
jira: none

Change-Id: I3da2d3ac7f0100d1963dcbb1228323666a060534
(cherry picked from commit 5c3d804b9fbe65532d2717e60b5f1143710b0ecf)
2025-09-16 17:17:41 +08:00
zhimin.zeng
057518f010 FIX: enhance for timelapse gcode
1. support traditional timelapse for H2D when printing by object
2. insert timelapse gcode when close wipe tower
3. remove hard gcode before filament gcode
jira: none

Change-Id: Ib56c21b1f07832f2cbc8ba5ab7f2e8653b3105bf
(cherry picked from commit 7613474cefd210685d16a5585608c0c7cb7efa95)
(cherry picked from commit fff787345625a0031934e609b1b3709e39decd4a)
2025-09-16 16:56:24 +08:00
zhimin.zeng
25f799315e FIX: should not generate timelapse gcode for H2D when by object
jira: none
Change-Id: I7b96d6290632ca40714d5dd06fe801a84924f84d
(cherry picked from commit 88f2784525590b3bb0de1e94bf401857816f26eb)
2025-09-16 14:48:27 +08:00
zhimin.zeng
749c098421 EMH: enhance for rib wall wiper tower
1. fix the slice error status
2. add rendering for wiper tower
3. modify the wipe tower start pos for rib wall wipe tower
jira: none

Change-Id: If554ca0fb30f6c7ce9641014c0ed4a7f23afd6f4
(cherry picked from commit 3ae08b458dea1d04cad33b2787d98407111b038c)
(cherry picked from commit 55772c59126bc4dd5c2ad022e7a959785c29cb4e)
2025-09-12 15:37:46 +08:00
jiangkai.zhao
af5b105e48 ENH:add rib wall wipe tower
jira: none

Change-Id: I9699cc74e206851284949f89230e986435b9e1b7
(cherry picked from commit eabfa6b272590698886ecec33b89207605b91993)
(cherry picked from commit 1d33d1c37d4dada1cd1129ff16fe46d07933ad26)
2025-09-12 15:31:11 +08:00
zhimin.zeng
55c5f70e6a FIX: modify the error code after slice
jira: none
Change-Id: Ie82198d7037d75468d14da435e1df1dbf47d91fc
(cherry picked from commit baf38583c99000006f4ce6177b8b6c852c1d5843)
2025-09-10 16:13:52 +08:00
zhimin.zeng
dc20ed148b ENH: add timelapse warning for multi-extruder printer
jira: none
Change-Id: I09a25f00eef6d3fab6ad948a13c8eb308f134dbb
(cherry picked from commit d7acee50e88812e8a0bd7b9afea7aca5d5826841)
2025-09-10 15:01:19 +08:00
zhimin.zeng
bd5e139bed FIX: fix the drawing problem caused by timelapse gcode
jira: STUDIO-9620
Change-Id: Iaa1af887e646a136e657ccecabe3c8e6824131b3
(cherry picked from commit b028f971d663dcafd63b0ce92cc9b606b7c9cf37)
2025-09-09 15:39:55 +08:00
zhimin.zeng
82b6bc4ee7 FIX: fix error start pos of wipe tower after tool_change
jira: none
Change-Id: I770030fb624e9c9de3bb0f8fcb4f3c29cab4f347
(cherry picked from commit 085995b3aa5dbadd7fd274babb99856f0791882d)
2025-09-07 22:44:47 +08:00
zhimin.zeng
3f1a602de4 FIX add prime_tower_skip_points parameter
jira: none
Change-Id: I696d6ca5d9bccf16b48110157cd6ec44839a05e8
(cherry picked from commit 9b5bbebf311c2d8d68ec89aeda3ddae2b267692e)
2025-09-07 21:55:17 +08:00
zhimin.zeng
783cadee44 FIX: timelapse gcode is not effective when print by object
jira: none
Change-Id: I36298c7c0ddea59f4cc9a5a1a19aeb7124bb2565
(cherry picked from commit e34940024f44ba76d76229346b3c913e6caa14f1)
2025-09-07 21:53:00 +08:00
jiangkai.zhao
a971c5f342 ENH: Add gaps in the outer wall of the wipe_tower
and modify the path of travel to the wipe_tower after flushing

jira:none

Change-Id: Id4b0571fd12372c59cf522c13e256c7cc4ac3565
(cherry picked from commit 17771d0fbf753dd22411ce490586958bd643264e)
2025-09-07 21:47:16 +08:00
zhimin.zeng
cee516dcd0 ENH: add timelapse gcode for multi_extruder
and add most used_extruder for print by object
jira:none

Change-Id: I021069e865992828b098d73c0d704ba7edbd55d8
(cherry picked from commit ae62f7b8e4b4258318c0d941963eddfb70e86c15)
2025-09-07 21:29:19 +08:00
xun.zhang
c5b3a8cb9f ENH: save filament change count in gcode result
1.Save filament change count per filament

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I26e7963c0b5fdcca7c7d0ec5590c3f40c1fc5eed
(cherry picked from commit 759d78dd2bad7157af8d41570ff24e5f7c4a364f)
2025-09-07 00:49:25 +08:00
zhimin.zeng
acd8692dc8 FIX: fix the error travel and wipe path of wipe tower
jira: none
Change-Id: Ib195cfc87a08f367e5d722b4af85cd33b1d1efdc
(cherry picked from commit bb2b81dc992227fe90f33f11f54162925d12d5c9)
2025-09-07 00:13:52 +08:00
xun.zhang
828ca927d0 ENH: seperate statitics for auto for flush mode
1.Compare stats of AutoForFlush with other filament map modes
2.Refine the function signature of filament group

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Iec2aff069d8c44343df8b82f045c61354c7d1c2a
(cherry picked from commit 95e49986f32070756182a31843f4f37f863f07ac)
2025-09-06 23:52:55 +08:00
xun.zhang
a7956a841d FIX: get wrong value in retract params
1.Should get value by filament id instead of extruder id
2.Fix many other issues caused by incorrect usage

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I3278d7de0f8976a97c9e5ccef80bba4a58553f5a
(cherry picked from commit 30c51dd1171fc16ba778308745fab2eb246aedd0)
(cherry picked from commit e9027478f8948352d99d33519994b044ca18a65a)
2025-09-06 23:44:59 +08:00
zhimin.zeng
0eaa3b6a4b FIX: the brim cannot generated on left/right only printable area
jira: none
Change-Id: If1a46773cdbd66ea3ab8484dc5d58ce5bbd3ded2
(cherry picked from commit f127f95335056035f6967b0dff6532d12fe6d316)
2025-09-06 23:02:03 +08:00
xun.zhang
11b7c09251 FIX: use wrong retraction params in tool change
1. Set shared retract length size to 2. Filaments in one extruder
shares the param
2. Move toolchange function before unretract function in append_tcr
to get the correct logic

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I215a542ce36107071fad39f1f9e30234fb19a3a0
(cherry picked from commit c4ef6e9e0950c58a8c5f612662145c6a256884ad)
2025-08-26 20:59:25 +08:00
zhimin.zeng
3c7b05c84b FIX: fix the error retract of nozzle change
jira: none
Change-Id: I4773307263cbbca0955dd44bbf046e45d91f1b5f
(cherry picked from commit 0d55524fca6ea1ea4ca6387df8cfb725a90269c9)
2025-08-26 20:36:53 +08:00
qing.zhang
65dca698ec ENH: match first filaments with physical extruder
Jira: none

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I3907476c4644e2b0c2c097edf2bbf93e3a92cf90
(cherry picked from commit 419ce016984a27f4ec89ee1e2bb0cf272165152c)
2025-08-26 20:34:12 +08:00
qing.zhang
71a3da3226 FIX: set initial one to initial no support extruder
Jira: none

while there is no non support filament
set first print filament to initial_no_support_extruder

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: If2fee560772c9a7cfa1855efc85116fb7df04760
(cherry picked from commit 361d7489929dfc1a3b266951f0302f25cf48edcc)
2025-08-26 20:33:18 +08:00
qing.zhang
abe98c5939 ENH: get first filaments & non support filament
Jira: none

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I9370e48b634f21a2d3fd11d437f699b5cdb5ce43
(cherry picked from commit 666e49e2990cfb8a8855dd80c81c85688d5a0f02)
2025-08-26 19:53:56 +08:00
qing.zhang
c759548417 ENH: get most used extruder id
Jira: none

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I9c498cefb07b3bdf89a17bfd75a3075c2294c934
(cherry picked from commit e0508a9e5136cec6ba69cc8a4d186079802f841a)
2025-08-26 14:25:06 +08:00
xun.zhang
40f930945a ENH: seperate reorder from toolorder construct
1.Only do reorder if requseted.In by object mode,we only need
to collect the filaments in the object for filament grouping

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Id88f2449c6d3c5d45b9ff87513308d997fa72da1
(cherry picked from commit 7b5818fe6c538123373243ec8dfedc3c2fa68e6d)
2025-08-24 23:18:29 +08:00
zhimin.zeng
243abf442d ENH: Add extruder_printable_height
to support different printable height of multi_extruder
jira:none

Change-Id: I265c65e15fc8f598c3456556557bb6977b5de820
(cherry picked from commit 933adbaaf0eaf361e39f131dd5536dca91214d43)
2025-08-24 23:18:29 +08:00