Noisyfox
3b1a420b4e
Merge remote-tracking branch 'upstream/main' into dev/h2d-2
2025-10-20 09:37:23 +08:00
Ian Bassi
d786aec255
Input Shaping Calib: Types, RepRap + Improvements ( #10913 )
...
Build all / Build All (push) Waiting to run
Build all / Flatpak (push) Waiting to run
Publish docs to Wiki / Publish docs to Wiki (push) Waiting to run
* IS Freq duplicated as Base
* IS jerk to 5
* JD jerk to 0
* Base 1 layer + MINIMUM_CRUISE_RATIO=0
* Tab
* Remove IS BASE
* Update Plater.cpp
* Klipper Jerk 5, Others 10
* JD in Marlin2
* Types
* Horizontal
* Different lists
* RepRap IS writer
* Smart Flavors and axis
* RepRap values lowercase
* Hide Y axix for RepRap
* Max Jerk or JD
* Reorder
* Removed dual list + Default
* RepRap show UpperCase use LowerCase
* RepRap P"type" Type of input shaping to use, not case sensitive.
* RepRap DAA
* Reorder Klipper
* Custom Firmware Note
* Better Display
Co-Authored-By: yw4z <28517890+yw4z@users.noreply.github.com>
* Better notes
* Update + Clean Wiki
Co-Authored-By: gregmatic <60957555+gregmatic@users.noreply.github.com>
* Wiki Update
Update Images
Improve guide
Co-Authored-By: Cameron D <30559428+cdunn95@users.noreply.github.com>
* Fix G-code generation issue and refine input shaping calibration documentation
---------
Co-authored-by: yw4z <28517890+yw4z@users.noreply.github.com>
Co-authored-by: gregmatic <60957555+gregmatic@users.noreply.github.com>
Co-authored-by: Cameron D <30559428+cdunn95@users.noreply.github.com>
Co-authored-by: SoftFever <softfeverever@gmail.com>
2025-10-20 00:31:51 +08:00
zhimin.zeng
b30716a996
FIX: first layer print sequence is incorrect when print by object
...
Change-Id: I6943a2d59eeb10db176dbb5cbe8567b5320d7cb1
(cherry picked from commit e9b33cfcb97a23a09405ce6515d2d5e5d8911964)
2025-10-08 13:04:04 +08:00
weizhen.xie
247a811900
Fix: Modify the string delimiter of parameter “volumetric_speed_coefficients”: change “;” to “ ”
...
Jira: none
Change-Id: Iabe29c14b5d4dadc97d3ea72c4be4104a0e48720
(cherry picked from commit 3a3ed5816b7a70669561d0a33ca6fb9761ab40d2)
2025-10-05 00:00:31 +08:00
weizhen.xie
7bc01c625d
ENH: Add a button to control whether to enable volumetric-speed fitting
...
Jira: None
Change-Id: I8d9fd3468dbfb8904d164b289f9d5223e476145c
(cherry picked from commit 3acf97f1b3cf12d34a3679eef550cc26e03eb86c)
2025-10-03 23:28:58 +08:00
weizhen.xie
38a18dc086
ENH: Polynomial fitting via Gaussian regression for determining the filament_max_volumetric_speed
...
Jira: none
Change-Id: Iab1ef65f0546884c60d2a9e39213a07d76a1f483
(cherry picked from commit 186948cc91b12d547b7168104ba629d40c333d1b)
2025-10-03 23:08:54 +08:00
songwei.li
f0cf58eede
FIX: scratches on the surface in byobject mode
...
When printing by object, not lifted when traveling to the second piece, which causes scratches on the surface of the first piece.
Modify the lift height in GCode.cpp to add a z_hop height to the highest print height to avoid scratches.
jira: STUDIO-14001
Change-Id: I97835fce5b82f405d600f5aa6ce74edae1e97b47
(cherry picked from commit 9282806196e455883b36b17391a404106c4b3c82)
2025-10-03 21:44:48 +08:00
songwei.li
aa9fb1fd34
FIX: Printable area check results in gcode_check_result
...
Added a check for Gcode traces outside the printable area after the backend slicer, allowing command-line slicers to detect abnormal results. The GCodeProcessor's m_result.gcode_check_result.error_code now includes not only dual-head print range checks, but also checks for the machine's plate print range, wrapping detection area, and height violations.
jira: none
Change-Id: I44072ece3b4b525c77328cec2f76e205eb559cc4
(cherry picked from commit 054f936243968687f536170374a233ec912e8e42)
2025-10-02 17:07:21 +08:00
zhimin.zeng
89c58fb4d9
FIX: add clumping detect area parameter
...
1. add wrapping detect area parameter
2. fix spiral retract bug
3. modify the enable parameter to print config
4. close clumping detect for manual cali mode
jira: STUDIO-13761 & STUDIO-13766
Change-Id: Ib597ca48a0342a8ae3930f5e790085987f252374
(cherry picked from commit 698a5e6bc0b281ba77fc1fd7692daec09cb440b4)
2025-10-02 17:07:17 +08:00
zhimin.zeng
1ccdf7b43b
ENH: add wrapping detection
...
jira: STUDIO-13192
Change-Id: I0fb5692b18cdb3b7af624a831dcfb0f635b165f0
(cherry picked from commit 89a8b6ea5e34340cba3750416ce3100dcc39f5c2)
(cherry picked from commit 50bc8c10a7b4ddc0b2dfe9cbab438b9d307b7fc0)
2025-09-30 15:32:44 +08:00
songwei.li
8d1f11495d
FIX:The estimated flushing amount of consumables for multi-color printing is inaccurate.
...
change: Multiply the flush_volumes_matrix in the exported gcode by the coefficient and output the final value.
Also fixed the issue where the flush matrix page was limited to 900, but the Gcode output value could be greater than 900 (the product of the matrix and the multiplier was limited to 900 before storing the value)
jira: STUDIO-13332
Change-Id: I893f27bec206c3b9da3273241d1cd5f1883e55a9
(cherry picked from commit 8aa91cd86c8c75b3736c616bcfbed4872db9734c)
(cherry picked from commit 038fc1c18220cef8c269d272059afea503fb5d5b)
2025-09-30 10:40:09 +08:00
zhimin.zeng
0cb19a2bac
FIX: the layer time of PA line display nan
...
jira: STUDIO-12996
Change-Id: Ib03dc506bfdc8f7f2c0a8cff89ba6e2d4b784988
(cherry picked from commit b8e1be7b3cb9d2948fd2fe45c280b1ec3bcea525)
2025-09-29 23:40:40 +08:00
zhimin.zeng
c945bfa36c
FIX: slice error abort Label object id error
...
jira: STUDIO-13010
Change-Id: Ia1bc287e2d57201e2d28469685490397f5a213b7
(cherry picked from commit 488929eb0850bf6adc300ac133b1cdd7d7b52af7)
2025-09-28 17:30:11 +08:00
xun.zhang
ec295405c1
ENH: do not insert m191 if machine start gcode already has
...
jira:7054
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I10edb3b9cf9f1120dbb1572fa84c7719d57b58f7
(cherry picked from commit 285d83407730b6f9ff4df916fd12db41a2969e15)
(cherry picked from commit 080b9026aea3f616db635554cee0afa661c01ac9)
2025-09-25 17:09:10 +08:00
xun.zhang
b636bbaf2f
ENH: add max print z in placeholder
...
jira: none
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I55caf23b11cc0194f9c155364e6bb02e298f9392
(cherry picked from commit 724c9b0eb5e73517c921ea809bb7f7e82325130b)
2025-09-25 17:02:21 +08:00
zhimin.zeng
4a02669054
FIX: cannot slice when print by object with one multi-color object
...
jira: STUDIO-12518
Change-Id: Ia54f979c69aa19aaa44bf1cb1d83ec973f6eb8f3
(cherry picked from commit 6c48ded6b54bd20cb55ae6e4c2c155dc25473ed7)
2025-09-25 09:03:32 +08:00
xun.zhang
a6084d01bd
ENH: add placeholder to check whether filaments is BBL
...
1.Also add some side texts
jira: STUDIO-12308,STUDIO-12309
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I16f21d001cf0c87620a8d7c93b33af4f63981624
(cherry picked from commit 31451dcd3310720692ec2748962f379ac3c50cf4)
2025-09-24 10:40:45 +08:00
Noisyfox
580414265d
Merge remote-tracking branch 'upstream/main' into dev/h2d-2
...
# Conflicts:
# src/slic3r/GUI/Tab.cpp
2025-09-24 09:15:33 +08:00
xun.zhang
d9b68c6eef
ENH: support curr extruder in timelapse gcode
...
jira: STUDIO-12119
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: If8fd91a6a1d54d3c5f4430c7f5c06685792c3a8e
(cherry picked from commit faacd23e3fba22b290e6fd47bce9de704c1165a1)
2025-09-23 21:39:51 +08:00
xun.zhang
44e62213e9
FIX: potential collsion in by object seq
...
1. update the expand length
2. enhance rod collision detect
jira:STUDIO-12199
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I1350ef5612b833405928e22c542a7a6f0c671105
(cherry picked from commit 7a197af3e0aa6d6c1493768d757ecdc938e49c1d)
2025-09-23 17:22:10 +08:00
xun.zhang
5e8272b0cb
FIX: support flush params in machine start GCode
...
jira: NONE
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I7566b960421b088f1d122936d9bc3974057a1e6b
(cherry picked from commit dd796026b3f869cfc40e8d9c5769c2a40e565441)
2025-09-23 17:12:51 +08:00
xun.zhang
7bd4f85a96
ENH: add params for filament retract when extruder change
...
jira: STUDIO-11965
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Id175e9dbce419d43cf45d6116ed4fa4fd556f606
(cherry picked from commit c7964441719f521d1a20dc9f084a7598bd01a9a5)
2025-09-23 16:38:50 +08:00
xun.zhang
cdf66984dd
ENH: add flush params for multi filament
...
jira: STUDIO-11965
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I2245f22a03c65b570bc60a2792daf4c1683f1ebd
(cherry picked from commit ffe2653341bffd5aee42436e236d45e0b87b56aa)
2025-09-23 14:16:03 +08:00
xun.zhang
ce81f03b6d
FIX: avoid collsion in by object mode
...
jira:STUDIO-11625
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: If5957a919af606934a34aa942f54dc4e7650a7f9
(cherry picked from commit 476c17819fe2e4fb7891b4b46865dde1a0057f33)
2025-09-23 08:55:31 +08:00
SoftFever
b483dff617
Enhance GCode handling for Z-axis movements ( #10803 )
...
* Enhance GCode handling for Z-axis movements
- Updated `travel_to_z` method to include a `force` parameter, allowing forced Z movements.
- Modified GCode generation logic to ensure Z position is restored after unknown last positions.
- Enforce z restoreation after tool changer
* Improve filament_multitool_ramming logic
* fix indent
2025-09-21 22:03:54 +08:00
Arthur
b965d420cf
ENH: do not reverse wipe for supports
...
This might help improve the quality and strength of supports.
jira: STUDIO-11985
Change-Id: I51644c84b9ede018a08a0f2b8fdca5d271d69991
(cherry picked from commit ba5dbc544b65276d772834305fcca6b5f7536d6e)
2025-09-21 13:48:07 +08:00
zhimin.zeng
01ec351df4
FIX: error retract length of prime tower
...
github: 6733
Change-Id: I83cd50b9054de887a89389ccbeeb9fbc6de679d6
(cherry picked from commit 6d2f21ef4c51beab4b614a9ad5f489c8bac742fc)
2025-09-21 13:48:04 +08:00
xun.zhang
b5756d1702
ENH: add timelapse pos picker
...
1. refine code structure
2. prevent moving tool head between camera and object
3. consider raft layer
jira: NONE
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ic0004791bfd4036d4323045a041709d861e5c8d0
(cherry picked from commit 7dc269f99473421162ad89c555bfac7ace0e9a6b)
2025-09-21 13:48:03 +08:00
xun.zhang
01673d1fef
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
c26266dfb6
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
94cc5465f1
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
a0f38f3cfd
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
e011b54d3f
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
bf0f98b0eb
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
0c5c3410d6
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
15a6ac3dbc
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
45dcdb7a7d
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
4427d5bccf
Add missing VT
2025-09-18 11:29:19 +08:00
jiangkai.zhao
5573293582
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
01c6326ed0
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
df8cc32353
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
3f00fd2993
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
dd3c63bef0
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
fa1422127b
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
bde94a6616
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
6f5ea725dc
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
d1d04d395e
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
d375836781
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
c617a6427e
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
595d67761e
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