Commit Graph

305 Commits

Author SHA1 Message Date
Noisyfox
b2047ba563 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
zhimin.zeng
2d273b43b6 FIX: the display name of auto cali is incorrect
jira: none
Change-Id: I873a6a74babe63ad05bc7f74eaa698b08987d375
(cherry picked from commit 316829c8de708b8b555fd1ca176aae834253cd65)
2025-10-05 00:07:30 +08:00
haolin.tian
90830ab2ea 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
eb1eb7e81a ENH: add new part: extinguish
JIRA: [STUDIO-11578]
Change-Id: I39dc15fe022f38d8c775c2675120bbbce05f95f3
(cherry picked from commit 25dc4e37e3681a840df9af7d98bbb134082492ab)
2025-10-03 21:45:14 +08:00
haolin.tian
6121a420f1 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
ac4b3696ab 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
4a787f6ff8 ENH: clean codes about device
JIRA: [STUDIO-13609]
Change-Id: I591de7033360b9570600006cfbce2148a8d031d5
(cherry picked from commit e9c774be8f4c89b8dafa14ef56913612fb68bd0c)
2025-10-02 09:30:48 +08:00
haolin.tian
e17c8bfb80 FIX: remove legacy MQTT optimizations; disconnect previous printer on switch
jira: STUDIO-13455

Change-Id: I88f48801f443b3830fbd2bccbc53577f615e6d96
(cherry picked from commit 562ac1a3e7e75e1cab5e42ab09cec719bf698184)
(cherry picked from commit 5143086c5efb4d974e27ba4f55bd82752ded0a93)
2025-10-01 23:32:08 +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
xin.zhang
a5c6450cc5 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
haolin.tian
d6e87fc0b7 ENH: delete useless function, delay start_device_subscribe after mqtt_connect called
jira: [STUDIO-13135]

Change-Id: Ibce80b043d08f6c1c7baa6611c3cfa2f0c85f2f5
(cherry picked from commit c2ff073525937fb571ea8d3bfae55231adaa691d)
2025-09-30 09:11:39 +08:00
zhimin.zeng
7f71c59490 FIX: Upgraded P1P to P1S shows up again as a P1P
jira: STUDIO-12944
Change-Id: If234cbd96cffa547e9cae47a71875efd1b097a25
(cherry picked from commit 2fa053dadef5750d1888743866ebca2867c85f7a)
2025-09-29 23:46:13 +08:00
hemai
a7ad18e66e ENH: support multi-color with external
Jira: [STUDIO-12520]
Change-Id: I34c88b6a84514a0e56e65723f91d1a2940128e8d
(cherry picked from commit b8879ec648e038080628190fc363251229bbd5ee)
2025-09-28 17:13:54 +08:00
xin.zhang
fcbad94b91 FIX: check filament type instead of filament id
jira: [STUDIO-12954]
Change-Id: Iab008c698e6c71a6df2ac4a81801681eb4b94d6c
(cherry picked from commit 295a6d51ab2f59bfeef84e9ff33dac3c0aea1d93)
2025-09-28 14:57:48 +08:00
milk
7a59122f7a ENH:refine printer function option
jira:[STUDIO-12357]

Change-Id: Ie48fb2302279795f41f8b65856bd64b64d2b14f3
(cherry picked from commit 1af87a5309a311e1c2d2c96d757ed7723bd373fb)
2025-09-28 11:39:53 +08:00
xin.zhang
1e9febbe4d ENH: add some support for fan control
jira: [STUDIO-12076] [STUDIO-12373]
Change-Id: I04e23acc802987dc7a657274074abb961f692896
(cherry picked from commit 359d52c9139b7a1aae59b990dc03f45ce4a1bc89)
(cherry picked from commit 9e16d9a4a6ce059dc134ffd388b753490dff0946)
(cherry picked from commit 4cdd1937fea90c3dd1cf0c73a7cd5172346abb40)
2025-09-28 11:35:50 +08:00
hemai
5bc21568cf 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
df5bf0ae29 ENH: support parts skipping function
Jira: STUDIO-12687
Change-Id: I244cb611954590bd5e741f0d2701f359426a33a2
(cherry picked from commit e7e90e0f8ca0106a51d18d83efa0de56b332ddc0)
2025-09-26 10:55:19 +08:00
milk
10428f71c0 ENH:Optimization of File Transfer System Part2
jira: [STUDIO-11777]

Change-Id: I12744db7d2e3b53425454d632533768c54524677
(cherry picked from commit 4358e9ce351c5784e392a75d1ffcf2f54e1916ec)
2025-09-26 10:55:19 +08:00
milk
32c055ca7a ENH: Optimization of File Transfer System Part1
jira: [STUDIO-11777]

Change-Id: I733fd3532caa19546763ab8a72eb7667d5ffec53
(cherry picked from commit aa52c99076a78e2c8fd8d4e4b0b64de0bc761469)
2025-09-26 10:55:19 +08:00
Kunlong Ma
70c0b116fc FIX: fix some issue in sending files to external storage through cloud
JIRA: STUDIO-9372 STUDIO-9374 STUDIO-9368
If the printer version does not support uploading, the original protocol
will be used

Change-Id: I3d47ac2567c2c6709a5b983ff1ad552d9a8606d4
(cherry picked from commit b8dde8ae7f4f5883fc163c57bb607a08ecdabf2b)
2025-09-26 10:55:19 +08:00
noisyfox
69d5b4ae48 Fix build error when PCH is not used 2025-09-25 20:33:50 +08:00
xin.zhang
8f943486a1 ENH: add wiki for replacing nozzle
jira: [STUDIO-12864]
Change-Id: I3804d3599eb8746902f23b59626fe8c04e949dca
(cherry picked from commit b9428cd32ff8c1c748377cab1e5539fed911177d)
2025-09-25 17:21:47 +08:00
xin.zhang
2d23db7890 ENH: support mqtt control
jira: [STUDIO-12442]
Change-Id: I51e43692c692c910e94d4e67349a70377b057d1c
(cherry picked from commit 5c4c3c7f953a980aebfaed5120a65e81ba79b56f)
2025-09-25 17:18:25 +08:00
xin.zhang
a339677d08 NEW: add some filament check supports for printers
JIRA: [STUDIO-12604]
Change-Id: Ic0e7b517319621907c3c6b8ad82dbcf881c780e8
(cherry picked from commit 55a8c98e9125cdacc801ecebfd82acdcc3e8e7f7)
2025-09-25 16:38:56 +08:00
xin.zhang
363fe39c83 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
d44ad07cfa 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
tao wang
48bc942cc4 ENH:add confirmation pop-up window
jira:[STUDIO-12237]

Change-Id: I255e074f5f4eba4a6d7fdbf8f3a6c1c3751a951c
(cherry picked from commit 6c3e57dd3d3ea0b4cfb1db0754e56d15d8aba826)
2025-09-24 11:41:05 +08:00
xin.zhang
4b6b3cc7bd FIX: the encoding of filament check_ams_filament_valid
jira: [STUDIO-12251]
Change-Id: Idc3d23dce67d3e835f15c47984fdd68041371d61
(cherry picked from commit 42b15b4d41a099c5f1aca9dd59ac592aafba0b43)
2025-09-24 11:14:42 +08:00
tao wang
7012feb672 ENH:prohibit resume2D tasks
jira:[none]

Change-Id: I038928bbe06b9f8f711513dca9021a9a08c92e6f
(cherry picked from commit 573db9bf60bffd053c68b8e5c021dd737de12cee)
2025-09-23 16:38:51 +08:00
Stone Li
3a7703fc67 ENH: add more retry to subscribe
Change-Id: If68249408446aace4a83e4b5beeb0643dce8cb87
(cherry picked from commit 8b0f16d3de8ef6816bf5eb068e007d202f9710c9)
2025-09-23 09:40:04 +08:00
tao wang
0317e0dd88 ENH:auto switch to using local broker for data transmission
jira:[STUDIO-11616]

Change-Id: I91066a629684dcff4efc73f310c2e0a7843954f4
(cherry picked from commit ac805e7d9150f56d40ec261fd2ed4007e1413b8e)
2025-09-23 09:20:15 +08:00
xin.zhang
7fcdfe1cfc ENH: support filament soften check
jira: [STUDIO-11922]
Change-Id: I819c47e847ca30120c9fffeab3e9e1955b7f6beb
(cherry picked from commit 5b5489cc95803d1dadc0f6a1246ca39710e9196c)
2025-09-23 09:18:20 +08:00
Noisyfox
c027c00caa Fix includes 2025-09-21 23:01:08 +08:00
xin.zhang
26a7160226 ENH: support close lamp check
jira: [STUDIO-11982]
Change-Id: Ic0211b9895f9a75c4bcbfd64772f99d81f510d56
(cherry picked from commit 039d11ca8862c7c799638f0bdbde0569326e15ad)
2025-09-21 16:26:05 +08:00
zhimin.zeng
119f16c565 ENH: add filament_printable and delete unprintable and printable list
jira: none

Change-Id: I643ab11831ceac1fe0793510f64b288cbd16415a
(cherry picked from commit 3dd5a601547485bfcc4188727343a52c30bb6a73)
2025-09-21 13:48:08 +08:00
七喜
0f08d28556 Revert "NEW: add some parts;modify panel layouts"
This reverts commit e62d66565b2959f4131afe52b3471e7226c42966.

Reason for revert: not ready

Change-Id: I0c5146a19d08315af6816133079e92d902d65044
(cherry picked from commit fda752bb79dd7b9a3312ebac9c5d8479e528982e)
2025-09-21 13:48:07 +08:00
xin.zhang
dd124e7f30 NEW: add some parts;modify panel layouts
jira: [STUDIO-11578]
Change-Id: Ifdcf6d285d763a15ed153508cb4f5f66069144bc
(cherry picked from commit f97931d191ecb7a40af7e6176b80384328d2143b)
2025-09-21 13:48:04 +08:00
milk
9a542b1a0f ENH:Optimization of File Transfer System Part2
jira: [STUDIO-11777]

Change-Id: I12744db7d2e3b53425454d632533768c54524677
(cherry picked from commit 4358e9ce351c5784e392a75d1ffcf2f54e1916ec)
2025-09-21 13:48:03 +08:00
milk
7f471d59a5 ENH: Optimization of File Transfer System Part1
jira: [STUDIO-11777]

Change-Id: I733fd3532caa19546763ab8a72eb7667d5ffec53
(cherry picked from commit aa52c99076a78e2c8fd8d4e4b0b64de0bc761469)
2025-09-21 13:48:03 +08:00
Kunlong Ma
4ef27847cd FIX: fix some issue in sending files to external storage through cloud
JIRA: STUDIO-9372 STUDIO-9374 STUDIO-9368
If the printer version does not support uploading, the original protocol
will be used

Change-Id: I3d47ac2567c2c6709a5b983ff1ad552d9a8606d4
(cherry picked from commit b8dde8ae7f4f5883fc163c57bb607a08ecdabf2b)
2025-09-21 13:48:03 +08:00
xin.zhang
5647312a16 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
15d140d582 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
f36a264569 ENH: remove the lidar cali of some printers
jira: [STUDIO-11816]
Change-Id: Icccdea945e5b085bec76310b12f9b7470e9d0e7d
(cherry picked from commit 9b551a93a94cd46e81d30cd7634c62255f590624)
2025-09-21 13:48:02 +08:00
tao wang
3f46b18032 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
b1a5e66af9 FIX: update the holds of command
jira: [STUDIO-11638]
Change-Id: I1d2fe9fce53b819a0307e0420d0858c0e2c13ce5
(cherry picked from commit fe959f3da34f41a500b66e4d46d268817cbc54fb)
2025-09-21 13:48:02 +08:00
xin.zhang
3654f1e56f 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
6547cb766c ENH: update air condition control
jira: [STUDIO-11373]
Change-Id: Ib25952165ec5489ef51ec7f5472fb319b0328ffc
(cherry picked from commit 307c83bb8434c40a3c7f0678a1c2abf2b361cd7a)
2025-09-21 13:48:01 +08:00
xin.zhang
472a48acc6 ENH: add nozzle type ntTungstenCarbide
jira: [STUDIO-11597]
Change-Id: Ibec41549042d253aeb85ba81e93e7c26a4a56ed2
(cherry picked from commit 1352cff31427eadd2c85ce4c9602ab3379a5ae9e)
2025-09-21 13:48:01 +08:00
xin.zhang
f4eacb6742 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