Noisyfox
|
a49c7a24a4
|
Merge branch 'main' into dev/h2d-2
# Conflicts:
# localization/i18n/list.txt
# src/slic3r/GUI/CalibrationWizardPresetPage.cpp
# src/slic3r/GUI/DeviceManager.cpp
# src/slic3r/GUI/DeviceManager.hpp
# src/slic3r/GUI/Printer/PrinterFileSystem.cpp
# src/slic3r/GUI/Printer/PrinterFileSystem.h
# src/slic3r/GUI/SelectMachine.hpp
# src/slic3r/GUI/SendToPrinter.cpp
# src/slic3r/GUI/SendToPrinter.hpp
# src/slic3r/GUI/StatusPanel.hpp
# src/slic3r/GUI/Widgets/AnimaController.cpp
|
2025-10-24 09:59:00 +08:00 |
|
Noisyfox
|
05aedd6d92
|
Update color
|
2025-10-05 16:02:17 +08:00 |
|
haolin.tian
|
b3ca57f8a4
|
FIX: Sync AMS settings after device certificate installation
jira: STUDIO-14191
Change-Id: If4a02ed6f2c5ef111f0c7086b138e3dabc8ed1dd
(cherry picked from commit 172824c4b93f6b3eb197481efc38a262774ef313)
|
2025-10-05 00:03:56 +08:00 |
|
xin.zhang
|
359ef804fb
|
ENH: update O1S files
jira: [STUDIO-11919]
Change-Id: Iab2e6b8a7162a718c69ccf5e043b3a87ee7d606d
(cherry picked from commit 4fcb5f4a4cfc5268165e2194c22454ffff2e14eb)
|
2025-10-03 22:33:25 +08:00 |
|
xin.zhang
|
11dc225913
|
NEW: add images for O1S
JIRA: [STUDIO-11919]
Change-Id: I43f39dbd87514fea5ad8f43dbadb142cec1cfd46
(cherry picked from commit 9bc62966fbb2a931cafe16290b17f087cf1450d6)
|
2025-10-03 22:32:32 +08:00 |
|
zhimin.zeng
|
dcb1f44f73
|
FIX: modify cali thumbnail for O1S
jira: none
Change-Id: I7e255ce35e52fcf4a5e5d840edac24c339373454
(cherry picked from commit 46f09b97eaaa56da135ed4128d49e9d6927ec9cf)
(cherry picked from commit 89f5b517989a56fc77451b349e0a0b254c2117ee)
|
2025-10-03 22:29:30 +08:00 |
|
hemai
|
ce19cf92cb
|
FIX: solve merge conflic about statusPanel.cpp
Jira: [STUDIO-12798]
Change-Id: I5e79dabc5207e5dbdc6767fe823d06c3ff48b542
(cherry picked from commit f320e1f9b9e58d89dcf1fe163ab0c618075a9352)
|
2025-10-03 22:16:35 +08:00 |
|
hemai
|
8b1c851aed
|
ENH: apply DeviceErrorDialog to project
Jira: [STUDIO-12798]
Change-Id: I7b3518736bbb106e76fcbc16d0aaa5e08f65c202
(cherry picked from commit f8dbe74fc17ccc81b3fadf638caa108b6f96fdba)
|
2025-10-03 22:16:27 +08:00 |
|
Kunlong Ma
|
7686d1acb7
|
FIX: fix wrong layout in error code dialog in mac
JIRA: STUDIO-8677
Change-Id: I16e267495c753d8015e7dda47147b630e9e92c8a
(cherry picked from commit ebf05c718e64657665445e6eeff03f3f9c8cfae6)
|
2025-10-03 22:15:38 +08:00 |
|
haolin.tian
|
225e33e2f7
|
FIX: hide mqtt source in public version
jira: [STUDIO-13803]
Change-Id: I1cf256e1b1b4ffd7f6cd5c2b33042502d4f58e0b
(cherry picked from commit 75d32fe7a71ac4289ee9f21a52c3f26fd27f89b4)
|
2025-10-02 18:26:31 +08:00 |
|
hemai
|
96482adbd6
|
FIX: set nozzle target temp in update temp
Jira: [STUDIO-13891]
Change-Id: I7d6705157b290d3b7d49bac47f985d31be8beae5
(cherry picked from commit 0be1e49a42e48c02258fa952b3be5c67ba2265e0)
|
2025-10-02 18:12:16 +08:00 |
|
xin.zhang
|
285113d37c
|
ENH: HMS add action 39; modify display of 29
JIRA: [STUDIO-13191]
Change-Id: I411fb4c56b395d576aaca7b610aa613e4f6cf806
(cherry picked from commit 45f756d5353f84814a2c7baa3290879a7bef3d6f)
|
2025-10-02 14:08:21 +08:00 |
|
haolin.tian
|
3ba6b3defe
|
ENH: add text to specify active tunnel
JIRA: [STUDIO-13803]
Change-Id: Ia6af5ba881c93a1d284295b244d19b39aee2ae91
(cherry picked from commit cb6c6afeee3e519aca87ac82eacc4b85fda63f65)
|
2025-10-02 13:46:23 +08:00 |
|
xin.zhang
|
f826ec176f
|
FIX: check axis at home
jira: [STUDIO-13678]
Change-Id: If9363485ce2ccd434f5c22c0484c6420bbfb67c8
(cherry picked from commit 04e7e8d00f885fbe4ce4ff86ea2897c61e909881)
|
2025-10-02 10:00:13 +08:00 |
|
xin.zhang
|
1647cfbc6c
|
ENH: close the error dialog if cleared
JIRA: [STUDIO-12441]
Change-Id: Ie75cc9c1242f0e0e66ef4789debd554b089b90a0
(cherry picked from commit 9432aff5fa171da081171b58613c570bea6e4d94)
|
2025-10-02 09:45:54 +08:00 |
|
xin.zhang
|
aae50ecd58
|
ENH: clean codes about device
JIRA: [STUDIO-13609]
Change-Id: I591de7033360b9570600006cfbce2148a8d031d5
(cherry picked from commit e9c774be8f4c89b8dafa14ef56913612fb68bd0c)
|
2025-10-02 09:30:48 +08:00 |
|
xin.zhang
|
c369c200f1
|
ENH: support command error dialog; support clean print error; support stop ams drying
JIRA: [STUDIO-12441] [STUDIO-13123] [STUDIO-12372]
Change-Id: I87170f1f51c1e24f6eee61deb07d06ff6b53a884
(cherry picked from commit 1ec5382f14ebf06d8f3ed128e377243665434ca6)
|
2025-09-30 11:27:16 +08:00 |
|
Erwin Ried
|
63fecf07a1
|
Update StatusPanel.cpp
(cherry picked from commit bf8fa891587c80bd2bbc6562d683392a04a2d106)
|
2025-09-30 11:17:04 +08:00 |
|
zhimin.zeng
|
93b806de5d
|
FIX: The device page keeps sending cali commands
jira: none
Change-Id: I55a116e471e4d40c8033aaefd3b7e22e9ccaab06
(cherry picked from commit 21cbafd52a393960e5b7b84d6e5259c829aa50c5)
|
2025-09-30 09:34:34 +08:00 |
|
xin.zhang
|
20661701a2
|
ENH: remove the unnecessary line
jira: [STUDIO-13300]
Change-Id: Icdcca33b350a07268dd8e7a8a1791599a7a4fad5
(cherry picked from commit 9a4e88e366c78eee3ea31339599f01f7552172cf)
|
2025-09-30 09:27:49 +08:00 |
|
milk
|
89f585ca5f
|
FIX:Reset calibration picture when sdcard print
jira:[STUDIO-12656]
Change-Id: I3c96d88b50bb4638a0c094e5766fb3c6877f597e
(cherry picked from commit 5958ba55842557560e70772bcf1321000c5fbf2f)
|
2025-09-30 09:22:32 +08:00 |
|
milk
|
d73f02cdaa
|
FIX:Optimize the pop-up promote for turning off the lights
jira:[STUDIO-12654]
Change-Id: I5a1e2056f530b8c73ef93031308facfe966e3e62
(cherry picked from commit 735e8a3259544bf2d8ac02a7ac6ca271d4506da1)
|
2025-09-28 15:02:25 +08:00 |
|
xin.zhang
|
0d993c1ae0
|
ENH: Add label if the button can not be used
jira: [STUDIO-12929]
Change-Id: Ia4026282a44fd1a83a4292d7a7d11d43ed035db6
(cherry picked from commit e65755a474bc36bee0f22b7a6fb9c7eb5f86be65)
|
2025-09-28 15:00:22 +08:00 |
|
xin.zhang
|
b358b3bac3
|
ENH: suite to DPI change for score panel
jira: [STUDIO-12923]
Change-Id: I22bb0d8ebd13d23f46bd785d3a4848669185175d
(cherry picked from commit 187040d70c9416f5f3ca9dbe74f1d1d09cb23218)
|
2025-09-28 11:38:17 +08:00 |
|
Noisyfox
|
b2f0357bcb
|
Update layout
|
2025-09-26 15:21:23 +08:00 |
|
hemai
|
86e1320bff
|
FIX: printer file system network reconnect bug && invalid obj bug
Jira: [STUDIO-13295]
Change-Id: I3b0c907ab4357d09ad592a0d937d83aaa15e8680
(cherry picked from commit 928d6b4c6a8c3ea8c9bd179c51afdb7dc55f45ce)
|
2025-09-26 14:31:47 +08:00 |
|
hemai
|
cd9dc94f8f
|
FIX: partskip button display bug && cavas update bug
Jira: [STUDIO-12687]
Change-Id: Ibb42dab945be9b9b4b8b8ac8f2c268960d553325
(cherry picked from commit 15d8fb70c93d243a1592c050302e76867ed6582c)
|
2025-09-26 14:28:27 +08:00 |
|
hemai
|
57369450f8
|
ENH: advance part skip dialog
Jira: [STUDIO-12687]
Change-Id: Ie6805c57f478ae5a10f81b49dc5a4e45fb40dbc7
(cherry picked from commit 8ed17efc32f8c635dc50e27bf7146fd2eb70941d)
|
2025-09-26 14:25:55 +08:00 |
|
hemai
|
08b92cdca1
|
ENH: support parts skipping function
Jira: STUDIO-12687
Change-Id: I244cb611954590bd5e741f0d2701f359426a33a2
(cherry picked from commit e7e90e0f8ca0106a51d18d83efa0de56b332ddc0)
|
2025-09-26 10:55:19 +08:00 |
|
xin.zhang
|
f390be59e1
|
FIX: update the scale of ColorPicker
jira: [STUDIO-12704]
Change-Id: Iac12a24fcb880b0c5db6f62b1b0e38a9c5d60e9d
(cherry picked from commit c8bb7fb3acfc65312cacb4b38f0a7ba62810046a)
|
2025-09-25 17:22:24 +08:00 |
|
xin.zhang
|
6b4b61bbe1
|
FIX: studio can not control lamp if not FDM mode
jira: [STUDIO-12573]
Change-Id: Ibc51cf6e1024fb25026ad61e7a71398451603cef
(cherry picked from commit d9bdf975663712b80c2d96b50ffb94632fd380cc)
|
2025-09-25 16:25:48 +08:00 |
|
tao wang
|
34abc0d392
|
ENH:Reduce the number of page faults in AMS
Change-Id: I4bfb048ec62c35b515eecbb70c175fa0975d7f92
(cherry picked from commit 791be195475bd834c937fb63341713529e4f41b8)
|
2025-09-25 16:23:18 +08:00 |
|
xin.zhang
|
3553cdcfab
|
FIX: Revert "NEW: add HMS action to stop AMS drying"
This reverts commit 60328ef7d1400c19e9895a47d8e98d901d3401fd.
jira: [STUDIO-12372]
Change-Id: I7c2da5fa5a96d9fe00389e80535a9983dd581a2d
(cherry picked from commit 11c9efb2a2562e0a7094e4f3da1fa8af48aa7879)
|
2025-09-25 09:03:36 +08:00 |
|
xin.zhang
|
6fb4bbfc8c
|
FIX: do not use protocol to check fan control
jira: [STUDIO-12435]
Change-Id: I6d5334d8eb2979f07866e4e985db6bc5179a4c18
(cherry picked from commit 3d16a94fa514c2cef118c65d788318876ea5cd91)
|
2025-09-24 13:12:55 +08:00 |
|
xin.zhang
|
c01edeb02d
|
NEW: add HMS action to stop AMS drying
jira: [STUDIO-12372]
Change-Id: Ic6a818487fdfdde206b63708303dfe8af6e79dbf
(cherry picked from commit 092de0c43f7e3f4702f529c28a637a5b3d78e20a)
|
2025-09-24 13:12:55 +08:00 |
|
xin.zhang
|
27acc3d6f8
|
FIX: the layout problem
jira: [STUDIO-12368]
Change-Id: Ifb49271f5daff80c28ae64f984b512d6a6519e28
(cherry picked from commit ba8691b1c429f1071ac7043bd6b58febc3b78c2d)
|
2025-09-24 11:14:47 +08:00 |
|
xin.zhang
|
2b516f8d25
|
FIX: update the sizer policy
jira: [STUDIO-12294]
Change-Id: I549f5fcb0df426428650785e3e47468f3caef077
(cherry picked from commit c95a900a09cfac7e031b7cbcb0712b2b9734b1e0)
|
2025-09-24 09:43:27 +08:00 |
|
milk
|
59991fe0b4
|
ENH:Extruder feed/retract popup size optimization
jira:[STUDIO-12217]
Change-Id: I69f55f129408039952524753a67b15869f670214
(cherry picked from commit d3ac9a4b9d746c7a1193fd3aef09da13f61c40d2)
|
2025-09-24 09:41:19 +08:00 |
|
xin.zhang
|
9b8df52caf
|
FIX: update extruder control check dialog
jira: [STUDIO-12092]
Change-Id: I8a12c92e39c8fd7fb4bde1feb8d70b309ecff060
(cherry picked from commit 3a6f58ebf0e720caf05a8482e3a1d69ca277e5b6)
|
2025-09-23 09:19:23 +08:00 |
|
xin.zhang
|
aced25b58f
|
REF: remove useless codes
jira: [none]
Change-Id: I86202fdaa09c5953d9bb4f21cc6dd9d9609c0a7f
(cherry picked from commit e9d8a6c8352628e3f7bb33e2ffaa38e03ebe929b)
|
2025-09-23 09:03:17 +08:00 |
|
xin.zhang
|
9068d745da
|
ENH: support close lamp check
jira: [STUDIO-11982]
Change-Id: Ic0211b9895f9a75c4bcbfd64772f99d81f510d56
(cherry picked from commit 039d11ca8862c7c799638f0bdbde0569326e15ad)
|
2025-09-21 16:26:05 +08:00 |
|
xin.zhang
|
627f3d77a3
|
FIX: fix crash and blank page while cancel printing at 75 percent
jira: [STUDIO-11861]
Change-Id: I142df41ade73558849183fd245163cb5a7367f9c
(cherry picked from commit ddf4e9bc9f73b5cf7c50e74b66a98716d0f81d16)
|
2025-09-21 13:48:03 +08:00 |
|
xin.zhang
|
11c138043c
|
FIX: update the hold impl of PrintOptionDialog
jira: [STUDIO-10972]
Change-Id: Ie62d0f4ec7e08087c422ddb38768df99c1f0d5f9
(cherry picked from commit 4f144417030fdd54b05e22c3c6eaad7e66cdeeff)
|
2025-09-21 13:48:02 +08:00 |
|
xin.zhang
|
c4b30c98e3
|
ENH: update the functions
jira: [STUDIO-11664]
Change-Id: I3c2c23cb9f8db0b3fec848616bb1d434759fa1d8
(cherry picked from commit ff62a7fe61be7f47168af094232476a7d8712229)
|
2025-09-21 13:48:02 +08:00 |
|
tao wang
|
300bc22506
|
FIX:fixed the issue of incorrect display of calibration information
jira:[STUDIO-11515]
Change-Id: I4cd62b06ead3fc43917cee7fbc68b2575a0d8133
(cherry picked from commit 6d1b7b8d806530c80e72f266c733e0207e7ac27a)
|
2025-09-21 13:48:02 +08:00 |
|
xin.zhang
|
7be645fe8d
|
ENH: support the react of actions for HMS actions
jira: [STUDIO-11664]
Change-Id: I5444748946e5baa219d6d413efd4e954dc578064
(cherry picked from commit 69f0bafd8a3f0d639fa85a83deec10baac1bac22)
|
2025-09-21 13:48:02 +08:00 |
|
xin.zhang
|
2c742869ef
|
ENH: do not popup if at heating mode
jira: [STUDIO-11471]
Change-Id: Ic7a6b33b84cf0880a7f4c2581c9ccdd1ef752cec
(cherry picked from commit 1480c97ffac75afb422fd8fb2cc21cbec6b2de72)
|
2025-09-21 13:48:01 +08:00 |
|
xin.zhang
|
4d70165dbb
|
ENH: add action RETRY_PROBLEM_SOLVED
jira: [STUDIO-11634]
Change-Id: I53d1f0cce4236b57101c65f90d05918f348ef508
(cherry picked from commit 51142db51c77d1b64e515b498220d84cbb9df5c7)
|
2025-09-21 13:48:00 +08:00 |
|
zhou.xu
|
1958890a52
|
FIX:Add a protection for m_thumbnail_bmp_display
jira: none
Change-Id: Idc830eec7fcf5dfa93b4aaca50a8ae726e5c8cc0
(cherry picked from commit e3d4563720ec8aaf91cf13678d956c99cc8e9e82)
|
2025-09-21 13:47:56 +08:00 |
|
unknown
|
4408f1292b
|
ENH:move pipe position
jira：STUDIO-10956
Change-Id: I5d19974684dc0c65b7a0974b77e42e65dd165a41
(cherry picked from commit 9b8845174ce703d84ddab1f894a6a155a4cd914d)
|
2025-09-21 13:47:56 +08:00 |
|