Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GitHub master 0 #6140

Merged
merged 115 commits into from
Mar 25, 2025
Merged

GitHub master 0 #6140

merged 115 commits into from
Mar 25, 2025

Conversation

lanewei120
Copy link
Collaborator

sync codes

Haidiye00 and others added 30 commits March 22, 2025 19:41
jira: none
Change-Id: I05ca283329648f0ed0ac45c9a9242da59128d7fe
Jira: STUDIO-8686 8681
Change-Id: Ie32eaeb807b25605d668c16c55ecbacf167a38e3
(cherry picked from commit 6b36c305d86fe8ef37b34b16d960ca90c8a07a5f)
jira: studio-8687 8683
Change-Id: Ic730957bf8c1e96c0464791cce60cb097d1a4dc9
(cherry picked from commit af174cb8b64e870929f926d3957d3471d0b09e29)
GITHUB: #4943
Change-Id: Ic8c6cf64c801e6c95e3f7e9e6959ed1a369ed3a3
(cherry picked from commit e723c87d8c41c195e980e11051f7beded9420d2a)
GITHUB: #5431
Change-Id: Ia5911b1e24f09e385a66c3a0cdb3fe83fb090f57
(cherry picked from commit 1f419489f76209e47babe6b378c436178fcb3264)
Github: 5376

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I64a0612ec4bf1ead099029db5f8e9f59e0b704af
jira: nojira
Change-Id: I92c49e1459509bfd5caaf0f1067faf6efaad7f2e
GITHUB: #5305
Change-Id: I2d1268027e11f71ee43ba0ca13bcbefc0581df4a
jira: none
Change-Id: I41471a2f02dab3532621974a24693b019adb22bf
jira: none
Change-Id: I0e973d48b23162f5a790c7ffc85f19be86f47647
(cherry picked from commit 9c0f70e552a06dddbc71b8d8a0287610aab6acf9)
jira: none
Change-Id: I682c737398f347a3243b6202132aae65d5415bdf
jira: none
Change-Id: I6d1e80320a2d234f875385f8f747f22d42d1112d
jira: none
Change-Id: I8ffa72f5898292dbb8c539b743acd18d12e8dbb7
double extruder machine
jira:none

Change-Id: Iaf4118fb00641537838dae7cc5fdaaf07ccc9851
(cherry picked from commit a8d6c9fe8976dbcb79c1f89efb7107073cb17856)
jira: github 5195
Change-Id: I0726b183257604336c274e60d8cc76a3f81877b7
jira:none
code is from OrcaSlicer, thanks for OrcaSlicer and Noisyfox
commit bf4d59a6764ddadd23ae566bf178f98e06bc3b5c
Author: Noisyfox <timemanager.rick@gmail.com>
Date:   Tue Feb 27 21:57:31 2024 +0800

    QoL: 3D navigator (#4181)

Change-Id: I19f83d6dd7244c4daaa9c9993378cbd90333c3b9
(cherry picked from commit 74903968fdc8bd25ab48a722f893c38c801417d3)
Change-id:I1e0c3ccccb8f8c72c90e86b85661197a5da111ce
jira:none
(cherry picked from commit a180ab8aca00a62a4ef5e17ba152e53d5ddf4486)

Change-Id: I0a6c882908ba2afde8e65e80c8bd41909ba6b126
Change-Id: If9695a7c0117aefb9e91d10e8224eb21314c166d
jira:[for 2 extruder]

Change-Id: Ie03eae17d600bc68451511a0179f20d1919ff6ea
jira:[support new mapping]

Change-Id: I88e5d3b6966d4ed1e8098d13fe9335fecf6e01c4
Jira: none

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Id5da64626b7343a71dcb38c06f5b5caf43ec40e2
jira:[STUDIO-7347]

Change-Id: Iba306c4a1b5ae59e406a6862428b425a48002870
jira:[support new mapping]

Change-Id: Iaf88f7bd57177df772a926ad162bd3b5a141327a
jira: none
Change-Id: I5c973a29e5b983e3f480d55aeeb2b14d13e950ee
jira: none

Change-Id: I169f672b99088b0a0a0132265d958e3239051744
Change-Id: I7bc4209b311360c3357e3974f0e66a51daa78232
Change-Id: I5f7224f646729cba94505487d00015a8e48443c5
1. add nozzle_volume_type
2. add extruder_variant_list
3. add printer_extruder_variant,print_extruder_variant, filament_extruder_variant
4. construct backend fullprintconfig

Change-Id: I50659634e2cde363112ff5ded6c199d7548c6f2f
Jira: none

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I906b106aa4c73272a418528db0e964d9130b0dd7
jira: none
Change-Id: I05b3040b176374deee3e95bc52364fe7b33bb257
walterwongbbl and others added 28 commits March 22, 2025 20:32
jira:[for multi nozzle]

Change-Id: Ibb9dafc3e664adb3a9058766f47f2d28938d6a0b
Change-Id: I828fff09df39a60d59af516c969466d9b09e503f
Jira: none
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
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
jira: NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I98d2f1df419bbf815efa5a2f0f48656a71ef15ab
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
JIRA:[amscontrol 2.0]

Change-Id: Ica66500506cfe89f2eac3ae0a58fb7ff30d1da9a
Change-Id: I00e0df4c2f9dc43f12b38e52c87a353b3f3e38fd
Jira: STUDIO-7643
Change-Id: Ib327b3f4362cafa8f2425785b7184acf27df89a2
Jira: none
jira: [Ams road display]

Change-Id: I1669bb588c969fe1cee7149d0d900cda3758deb3
jira:[for fix amscontrol issue]

Change-Id: Id62ffd047403bf80f6aba732b8ce31d782bcea57
filament_self_index difference caused

JIRA: no-jira

Change-Id: Ia70fe8a8095b8067fe13bbfc9e5c39d9f3ee05d3
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
jira: NONE

Change-Id: Ie8f88c4c5f585486bda2786d9c6a5ad7f89615ef
jira: NONE

Change-Id: I95ef9a8aefbbb8de7caa9c9b46de7cb3f60e0989
jira:[for fixed amscontrol issue2]

Change-Id: Iefd80b4dbdeb1330c6a6a5695b5ceca45c99137a
jira:[for 2nozzle setting]

Change-Id: Ib9e20bcdf6d8ea1bf5dd5e8624a68730e05e69ad
jira:none

Change-Id: I45480fadc8ed9fe5f3da92184c488956a16fd270
after change the filament maps, we should invalidate state
jira:none

Change-Id: If2923d959f5120bd80c5bdf3933609cf8b282523
jira: 7686
Change-Id: Ic95d0789582e0a9dbb0edc2421ee076fdadb3572
1. reset exclude areas when there is no triangles
2. set o1d size with no offset

jira: no-jira

Change-Id: Ic6add0db0a93a7a6b44fc59524d4e93543251957
jira: none
Change-Id: Ib0b04584748181cce8b23dc44b247f2ade225a26
jira: none
Change-Id: I54beabbdc3d1e4ba74d1d00e8e14b917f53be722
Change-Id: If332da20427177bf593a9ba22f31a76e1ed1a303
Jira: STUDIO-7717, STUDIO-7716, STUDIO-7706
1.Use forcast when filament num in current layer and next layer both
smaller than limit number

jira:NEW

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ia21bb22ce353f0c74eeaf748c6d9f9c4b315ec18
Change-Id: Ifd021461d23b385b71dedbe9cc864eeee1a2541b
Jira: STUDIO-7711
jira: none
Change-Id: Id643d1efad26eb2719f873543c2e451fe59dc5bb
1.Should calculate cost if filament used in that layer is 1,because
we should consider the last filament used in previous layer

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I5838af77f1d73bfa07c65bd6ee12ae352dc3b571
@lanewei120 lanewei120 merged commit 0756b51 into master Mar 25, 2025
4 of 10 checks passed
@lanewei120 lanewei120 deleted the github_master_0 branch March 25, 2025 13:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.