Commit Graph

6034 Commits

Author SHA1 Message Date
zhimin.zeng aff19b857d FIX: add plate_set_filament_map.svg
jira:none

Change-Id: I45480fadc8ed9fe5f3da92184c488956a16fd270
2025-03-22 20:40:25 +08:00
tao.wang 78c5928194 ENH:support set ams filament
jira:[for 2nozzle setting]

Change-Id: Ib9e20bcdf6d8ea1bf5dd5e8624a68730e05e69ad
2025-03-22 20:40:25 +08:00
tao.wang 62624e2a13 FIX:fixed amscontrol issue-2
jira:[for fixed amscontrol issue2]

Change-Id: Iefd80b4dbdeb1330c6a6a5695b5ceca45c99137a
2025-03-22 20:40:25 +08:00
hang.xu 93a9b16494 FIX: fix crash
jira: NONE

Change-Id: I95ef9a8aefbbb8de7caa9c9b46de7cb3f60e0989
2025-03-22 20:40:25 +08:00
hang.xu fe1d241a16 FIX: Device page fails to display
jira: NONE

Change-Id: Ie8f88c4c5f585486bda2786d9c6a5ad7f89615ef
2025-03-22 20:40:25 +08:00
xun.zhang ad65cdb909 ENH: add filament saved by multi extruder
1.Add filament flush,filament change count reduced by multi
extruder

NTOE: cases when printing by object haven't been handled

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Iaaea5f8ffae2345df5a6f1dc605342d835974d48
2025-03-22 20:40:25 +08:00
lane.wei 3a55a3a1ee FIX: context: fix the .gcode.3mf not shown issue
filament_self_index difference caused

JIRA: no-jira

Change-Id: Ia70fe8a8095b8067fe13bbfc9e5c39d9f3ee05d3
2025-03-22 20:40:25 +08:00
tao.wang 55898ab88e FIX:fixed some amscontrol issue
jira:[for fix amscontrol issue]

Change-Id: Id62ffd047403bf80f6aba732b8ce31d782bcea57
2025-03-22 20:40:24 +08:00
hang.xu 3e8fe435e3 FIX: Ams road display
jira: [Ams road display]

Change-Id: I1669bb588c969fe1cee7149d0d900cda3758deb3
2025-03-22 20:36:49 +08:00
chunmao.guo f722334f3b ENH: extruder switch for 'Motion ability'
Change-Id: Ib327b3f4362cafa8f2425785b7184acf27df89a2
Jira: none
2025-03-22 20:36:49 +08:00
chunmao.guo 7280429583 FIX: filament filter dirty options
Change-Id: I00e0df4c2f9dc43f12b38e52c87a353b3f3e38fd
Jira: STUDIO-7643
2025-03-22 20:36:49 +08:00
tao wang b78fa4c11c ENH:refactoring the modules of amscontrol
JIRA:[amscontrol 2.0]

Change-Id: Ica66500506cfe89f2eac3ae0a58fb7ff30d1da9a
2025-03-22 20:36:45 +08:00
xun.zhang 3167e34e60 ENH: add greedy algorithm for filament reorder
1.When n becomes large,the original algorithm to get best filament
sequence will cost too much time and memory.Use a greedy algorithm
instead.Always select the next filament with fewest flush

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Iabc924e1bdb0a07af0a6ef0bbdd62e54ce54f052
2025-03-22 20:32:28 +08:00
xun.zhang adf208dbb9 FIX: multi extruder percent param
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I98d2f1df419bbf815efa5a2f0f48656a71ef15ab
2025-03-22 20:32:28 +08:00
lane.wei f122c4f4ef ENH: config: refine some small logic
1. always resize filament count when not matched in full_fff_print
2. remove no-use codes in Preset::normalize

jira: no-jira
Change-Id: Ie15a5977d28f28e0f63ba84f27f98f77d16665c0
2025-03-22 20:32:28 +08:00
xun.zhang 7ce2bb70df FIX: mistake in profiles
1.Spelling mistake in long retraction
2.Some params length change to 4

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I8952df7a1bbf060471e24a19eaeddde017d17d82
2025-03-22 20:32:28 +08:00
chunmao.guo 1745657e22 FIX: filament variant index & override nil value
Change-Id: I828fff09df39a60d59af516c969466d9b09e503f
Jira: none
2025-03-22 20:32:28 +08:00
tao wang e746035f31 FIX:Fix some multi nozzle issues
jira:[for multi nozzle]

Change-Id: Ibb9dafc3e664adb3a9058766f47f2d28938d6a0b
2025-03-22 20:32:28 +08:00
zhimin.zeng fe9e88f1c8 FIX: edit filament dialog crash after ams sync
jira: none
Change-Id: Ia551fa75400cef217e6d630aee76d00a06449b1a
2025-03-22 20:32:28 +08:00
xun.zhang e95179427f FIX: unable to custom first layer filament order
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I0107ebf6a85ea0deba93ff558835138981365670
2025-03-22 20:32:28 +08:00
hang.xu 8b4182d0c1 FIX: Ext auto fill when mapping item is empty
jira: [Ext auto fill]

Change-Id: I4a8844555e33fcf9f7054fc2e0e254621dec0a1d
2025-03-22 20:32:27 +08:00
xun.zhang 16cadec565 ENH: add grab length
1.During the filament change, the extruder will extrude an extra length
of grap_length for the corresponding detection, so the purge volume can
reduce this length.

jira:NEW

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I14f55a3200c1dd48b1603e50280d0c29e1319ebe
2025-03-22 20:32:27 +08:00
xun.zhang 887ca8f45f ENH: enable long retraction for multi_extruder
jira:NEW

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I41daa7a5f1eabf0a805a86d72d00544c8f4edb4a
2025-03-22 20:32:27 +08:00
zhimin.zeng da32b878b3 ENH: add extruder_ams_count behavior
1. save to appconfig and project setting
2. use it to group
jira: none

Change-Id: Id4048fc1b47f6904b2e9c0154aaa3a2b03590437
2025-03-22 20:32:27 +08:00
tao wang 6c02c7bc8c ENH:support parse new print data
jira:[for new print data]

Change-Id: Iac6747e9ade690fcdf3b7b11239fe183bc7c3796
2025-03-22 20:32:27 +08:00
zhimin.zeng 67f67d7688 NEW: Add FilamentMapDialog
support drag drop to modify the filament map
jira: none

Change-Id: I0ed3180a0fa8e95e7c871bb039eb844faccd1344
2025-03-22 20:32:27 +08:00
xun.zhang cffb4a8564 ENH: optimize filament group algorithm
1.When filament <10, do the reorder with next layer.This can reduce
10% flush in some cases
2.Support custom filament seq
3.Use caches to speed the algorithm

jira:NEW

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ie1af9841f7165802d350eae962efe8febafbb357
2025-03-22 20:32:27 +08:00
hang.xu 9166c1d0c4 FIX:Ams cannot mapping
jira: [ams mapping]

Change-Id: I17b88b169c30e7c567e5e505bd7f7c56357466eb
2025-03-22 20:32:27 +08:00
Mack 91ea29eb56 FIX: inconsistent colour arrange display at different resolutions
JIRA: no
Change-Id: Id838bf68c8a58d9075994052af10fa31bacc2ed3
2025-03-22 20:32:27 +08:00
chunmao.guo a1491f432e ENH: Synchronize the modification of parameters to another extruder.
Change-Id: Ieac8dce3f4edec310a51d8e3af90df81a2abcbdb
Jira: none
2025-03-22 20:32:27 +08:00
chunmao.guo 0d31c1d512 ENH: filament variant combobox
Change-Id: I6015bc7682cbf3209b03392c0ab4727e66d12ab1
Jira: none
2025-03-22 20:32:27 +08:00
xun.zhang cddf8cae27 ENH: add filament group strategy
1.When capacity is greater than the num of filaments, always choose the
map result that can be accommodated
2.In BestFit strategy,always try to fill up the existing capacity
3.In BestCost strategy, just try the group with fewest flush

jira:NEW

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ifd6d64b77774039e57ffff26cf2243a4d3f89054
2025-03-22 20:32:26 +08:00
zhimin.zeng 8232a716e6 FIX: fix bug when delete filament
update filament of HeightRange
jira: none

Change-Id: I62cb21a65ecdfc36e8bc7d0915a85ecba578e49f
2025-03-22 20:32:26 +08:00
zhimin.zeng a6ad5c8be8 FIX: update filament map of plate when switching preset
that has different nozzle nums
jira:none

Change-Id: If78571ddf4fa7ac17e7dcf47013075821b8567a6
2025-03-22 20:32:26 +08:00
zhimin.zeng ed98163973 FIX: save filament_maps to slice_info
and fix bug when switching printer preset between single-nozzle and double-nozzle, prompt the modification of extruder_count
jira:none

Change-Id: I1d5f0b2f002493378d2f482d08cfd5a72b35b99f
2025-03-22 20:32:26 +08:00
lane.wei 3179fd416e ENH: config: add logic to apply params to object/region config with multi-extruder
JIRA: no-jira
Change-Id: Ieab98cd8d031e5ca82a3aad2d0b89d8ae4a794f1
2025-03-22 20:32:26 +08:00
Arthur c9736865ef ENH: disable encoding check by default
encoding check is useless other than wasting your time.

jira: none
Change-Id: If06535091ed0cc7666812b375a6d930cdd201b98
2025-03-22 20:32:26 +08:00
xun.zhang cc81e57ac9 FIX: compatible with one extruder reorder
jira:NEW

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I7e350ba8728ac4b3dd34093ff4e9647d0a2ba671
2025-03-22 20:32:26 +08:00
chunmao.guo 579e84e5d2 ENH: toggle print options with variant index
Change-Id: I80136f27cf81557106101107ccea1db51032066d
Jira: none
2025-03-22 20:32:26 +08:00
xun.zhang 7128e2925a FIX: logic error in filament change
jira:NEW

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I7e2b1333d4b82e4495375fcf4daec3aea08be445
2025-03-22 20:32:26 +08:00
lane.wei 0434853bf3 ENH: config: remove unused custome_defined logic
also improve project_embedded
1. remove unused is_custom_defined
2. improve project_embedded to support multi-extruder diff

jira: no-jira

Change-Id: I1db28c3cfd59ccc31c6855af30305396c71c4e9a
2025-03-22 20:32:26 +08:00
zhimin.zeng ad03fae1eb FIX: Clean up the code
1. Refactor recommended code for print by object
2. Calibration adaptation sends print command

jira: none

Change-Id: I24fd92d6aca07a7067e09bb200854e5bec72a324
2025-03-22 20:32:26 +08:00
xun.zhang 1ab2964ee3 ENH: alternate multi-head printing sequence
jira:NEW

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I739438e8c411b638571d5291f3e5ad3d54650a73
2025-03-22 20:32:26 +08:00
xun.zhang f1b0805ed1 FIX: wrong flush logic
1.Fix flush calc logic
2.Rename m_extruder in GCodeWriter

jira:NEW

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I38f023fbad983305632ca62cbfb3909759013c25
2025-03-22 20:32:25 +08:00
xun.zhang 9ec276d3d7 ENH: new filament group algorithm
1.When n<10, calc all case cost
2.When n>10, first k-medoids algorithm first
3.Enable setting group size

jira:NEW

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I625f47e0235c70e440c6d489b052a156fbffca3f
2025-03-22 20:32:25 +08:00
zhimin.zeng 326d7d28b4 FIX: fix build error
jira: none
Change-Id: I97df69b728fc3871b7c33e1fd3ba068e741d51c7
2025-03-22 20:32:25 +08:00
zhimin.zeng 21e6271e59 ENH: calib support multi_extruder
1. backend support multi_extrude data structure
2. Compatible with third-party calibration
3. fix bug when get extruder in gocde export process

Change-Id: I5dac9abdd9907a521a1ba9b480f9e05640591bc1
2025-03-22 20:32:25 +08:00
hang.xu 0924fce685 NEW:change mapping popup layout for multi nozzles.
jira:[Popup for multi nozzles]

Change-Id: I07e6d8f0469d2dcf0037d53e2ca8e22de78ca233
2025-03-22 20:32:25 +08:00
lane.wei 7b7ebf1b95 ENH: config: add the extruder variant apply logic in Print::Apply()
we need to keep the original values and update after pre-slice
jira: no-jira

Change-Id: I232d3c43340b4a23bc42121bd05380746e736f20
2025-03-22 20:32:25 +08:00
Mack 3321277f86 FIX:gcode viewer color arrangement recommendation
1.Limit of four filaments per row

2.Fix incorrect data

3.Add filament id display

4.Optimised layout

Change-Id: I9ac3701c99597a5ed243dac0e3e371cf9aca4066
2025-03-22 20:31:45 +08:00