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

merge bambu master #2

Merged
merged 122 commits into from
Sep 20, 2024
Merged

merge bambu master #2

merged 122 commits into from
Sep 20, 2024

Conversation

MackBambu
Copy link
Owner

No description provided.

penguineer and others added 30 commits August 20, 2024 09:50
When using `DockerRun.sh` stale containers were left over after closing
the application. These containers would also not be re-used.

Add the `--rm` flag to make Docker delete the containers after running
the application, since they are re-created for each run anyways.
JIRA:STUDIO-7170
GITHUB:#4158

Can't find the git command in the debain

Change-Id: I0a0de9691f6ed6a6c3a056fd3470bf4be5f4e4eb
(cherry picked from commit da0267305a2cc2f28e37b0da58c929307c3aeee2)
JIRA: none
Change-Id: I4ca521439cbd1a9cd9e80a0991365409ed74ce04
Change-Id: Id63823d1f49a3bf925487734b324863bbf451b6a
Jira: none

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I7a59885629164c96b6407944d2cee32dd61a3c89
Change-Id: Ieed001d73859878e0723c4d0114ae792ea9b739a
jira:none
(cherry picked from commit bc2db297fb4e27a881e998fd0831b32ffe73b85c)
(cherry picked from commit 907c24c94c02fd7fde070a6abec691d6c861fd39)
Change-Id: I6c29658a051144dda772b42603db6585ea58816b
jira: none
(cherry picked from commit d1e4b98db6ed0f8e1e29d7e8bdcdda96948d10dd)
(cherry picked from commit 76e3e210e0d22592172e236609f83fcbebea65ea)
JIRA: no-jira
Change-Id: Ib3886beb3fd60c4ce9e491f9e4c7e14ef05973a9
jira: none
Change-Id: I8bc5d4a1eea116305037b8194ff1d2e8aab83ce9
(cherry picked from commit 7df9f9d27d174b30a54ed27756d4a4a157557019)
jira: no-jira
Change-Id: If9e698d60b71e8835a3ae46c75e9c8c2878556a7
(cherry picked from commit a2b2ec9cb80e3bafabd07a377aff9e11188be346)
Jira: none

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Iee3acc3e54939ee88ce524d34dffdbddabb72576
JIRA: no-jira
Change-Id: I2c2a880e64b844a9dbed0d62bbe749f3f7e85753
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I5dca8238f274c1d41a448e5b9a703bd04aabfcc1
JIRA: none
Change-Id: Ib8566df069192036b28aafa055a7f67a47f38d65
(cherry picked from commit e7613a7b157f1fa0554f3ec8ea4c8a68475e9b10)
JIRA: STUDIO-7535
Change-Id: I78525ba171402e3d29bd64cbbed7d72bfeff0639
(cherry picked from commit ebecebb25bb4cd1dacd3b4efea283eff4a6c0693)
jira: STUDIO-7361
Change-Id: I0541d2cdd3bcef059f50ad3accf92bf4bdeaa670
Change-Id: I4ed193184d2e8787d44d52d9bfa568e3ceb5de3b
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ie46e077d22b458a50a6d2ecb5163d990f669bd13
JIRA: no-jira
Change-Id: I86efafe3aefac85d56879a68f864a52c0e62fca5
(cherry picked from commit cdf0859e78e8d62c2de13f2f9bf56a216a79a12a)
JIRA: no-jira
Change-Id: Ib4fd7aa7d997b85953d9a7062d4683392ac434fc
1.replace petg basic for petg hf as default filament

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ibb82527e0fc373a50da7df287dc27b5998ee5510
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I214b8067327567765f3be094975c7894c621f0d1
JIRA: no jira
Change-Id: Id57be2e53c411a1397e26dda3cb3b31721cb0df2
(cherry picked from commit e5341c39f2cfe8a4aabd366f4a55115a42b9cc2c)
JIRA: no-jira
Change-Id: I1f7f55265ed9aedde3cf626d088477a89a67a208
(cherry picked from commit 2b121b468cb8c1abecf4d2ebf2a80ff34260647f)
(cherry picked from commit 9635928d255b4dded919006f26123c56bdd79d3b)
wrong first_filament_id used

Change-Id: I371e7c6bcbf174ffda8966b05c7f4abe74a7771f
(cherry picked from commit 07757be0c70112e86550f5cdae3393313e7d3582)
jira: no-jira
Change-Id: Ied11676ec1d173b6d80d12b72a0d6dc18d130efc
Change-Id: I3ebff6d697be1856935b578d964f4541e89072a3
jira: STUDIO-7351
github: #4313
Change-Id: I5a99f88883ec68ab424613fd8b5fdd0d09ef829b
(cherry picked from commit 0b0c3fcd5bec5ee7f4519d936b31f3fb2926919c)
jira: STUDIO-7424
github: #4318
Change-Id: Icccf56b129c4910f3b0a49d69871b8df1375a6d9
(cherry picked from commit 99211cde5f2114fd64e2724069540577793f889a)
github: 4029
Change-Id: Ic7d7d961be11783254d79c8736e265a30fd2af87
(cherry picked from commit 8097610796f9538893189d1633bb4c347cf117a6)
zorro.zhang and others added 29 commits September 18, 2024 21:27
JIRA: none
Change-Id: I62baf32ec4ebb3130fe1721dbecbae8ed2533423
JIRA: STUDIO-8116

Change-Id: I66a75de8e4c2c7ba12e26b4057f9b150c58df31b
Signed-off-by: Stone Li <stone.li@bambulab.com>
Change-Id: I1d1c0a99845bee1a2f0d171c7daac0ec68e4cc20
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I0c853de6b1938c7e2addbaab5a45b35daf5a32fa
1.Caused by round(), if purge volume is small, flush count may be 0 due
to round()

Github:#4738

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I382ab3021761c2fcc84d3537a18bd619637985b8
Change-Id: Ie8ed7865719652998577d2801ad71bc7da1f634f
Jira: none
Change-Id: I06dcc2a6ae469df8c39c1dc6c8626f66bc778f81
Jira: none
Change-Id: Icc8668fefcdbdd8bf767dddee0226413a089c2c9
Jira: none
Change-Id: I924f0a370a2a8d6a9b5aa082cbe791fc2e1a18c5
Jira: STUDIO-7991
jira: STUDIO-7382

Change-Id: I1fa33be48d34265efaf4757ff31683a983f1d421
(cherry picked from commit c497eea1eacfa34db2703844fb3575a21297388c)
jira: new

Change-Id: I6230588700d01e5b9599cb408713e63bf01a144a
(cherry picked from commit d67a977969bb5731de8c0f7fb47d60211183e243)
JIRA: none
Change-Id: I1298400ed5f563a9eb46565b9bd428f878fea6a8
jira:[for send gcode]

Change-Id: I0774ca97043e25ce1f731371739052921f721087
(cherry picked from commit 0dda96f91ee68c89b16f0f2622902817a1171798)
(cherry picked from commit 73b45f347bba8654fa5a415b673beb0d3ab1f5bf)
Change-Id: I5137eb673d157bf080fd0e97b0748ae1fa47e113
Jira: XXXX

Change-Id: I68d13df943b29cb9464f04651ed3fa9ec7511789
(cherry picked from commit e4f4720a249559c6a3c98872338ca7dbe4c73044)
Change-Id: I1fbaa853c1427fa24dc4538bad78fd55e7a66ded
JIRA: STUDIO-9551

Change-Id: Ife612ddd24a7b3247167be04c3fbfa9219a15777
Signed-off-by: Stone Li <stone.li@bambulab.com>
(cherry picked from commit c66e4e54096c93aaa56956b1d59859fa6e602961)
JIRA: STUDIO-8195

Change-Id: I8d2bed7b6b2789879d802a95566c47d5006e4069
Signed-off-by: Stone Li <stone.li@bambulab.com>
Change-Id: I815eddd44c825d9648ad036c7015e268acdb769a
Jira: none
1.Add accurate filament usage stats to gcode after processing gcode

github:#3090

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I8eb20c0cf1b9c70f540d4549e2d65b8c79908952
Change-Id: Ib748c1b6f71cecd8d2048dd179ee3a1d7151e441
Change-Id: If5676c26017f9698fd3708b39e8c40efef9d7c3c
jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ib463a6438173396f441446571638c4f455d90937
JIRA: none
Change-Id: I27bcb071235cd628982533c06d4fdfad58dc0651
Change-Id: I0bfcee7c2aab12880f66eb1f6592efe6276d5bbb
Change-Id: I6d3d4d0e21ac2382dc4c03852c93c365c358bba0
Change-Id: Iea11ca53d6772613e0941afd6cd2cbdce82a9b24
Change-Id: Ib28bdbf60f08fd193be818d1daaa89bea7080096
@MackBambu MackBambu merged commit e16947c into MackBambu:master Sep 20, 2024
5 of 6 checks passed
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.