Commit Graph

485 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
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
milk
72a64d7966 FIX:add interface line draft
jira:[STUDIO-13716][STUDIO-13717]

Change-Id: Ib8a4d919ebfab85e07b80e60c80e9271013d05b9
(cherry picked from commit cf3c37abc2629165bfcdb1eee5b00567acde3c83)
2025-10-03 23:08:55 +08:00
zhimin.zeng
62d94b1a73 ENH: support new auto cali method
jira: STUDIO-10798
Change-Id: Icb47d8502739f0d4217486e2d1805cd609cee67b
(cherry picked from commit 6c2841e57f083cbc6d75eea2af55a8f78d2fa8df)
2025-10-03 23:08:55 +08:00
xun.zhang
a543a55e01 ENH: some post commit after merge h2s commit
jira: none

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: If0a36a4698c843a8a690f0fa0fcbbe5f6fafca79
(cherry picked from commit 9fcd26efff2d4b3f3e77faa11ab842664d25b75f)
2025-10-03 23:08:53 +08:00
hemai
bb43e312b3 ENH: support E3D nozzle flow type
Jira: [STUDIO-13934]
Change-Id: I3818c3881e8a926209f2bac321550f3c7a1a9f0d
(cherry picked from commit 5bb1c2e66ad5bddfcba6898d9bc330217e912e48)
2025-10-03 22:18:20 +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
milk
2ac6ffa631 FIX:Synchronization information table
jira:[none]

Change-Id: Ia5f13645db7bc6ce92c7eb928ec36e2cad54e51e
(cherry picked from commit 79c929493ffbe3702615299c2cddf7b3645c8d88)
2025-10-02 18:12:02 +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
d1d7e87f86 FIX: Skip the command result of other platform
JIRA: [STUDIO-13607]
Change-Id: Icfb87214278baccb4b97582ba46e4e439ffcdc02
(cherry picked from commit 09dfade232459f5663bebcadc39c90c3f132e6cf)
2025-10-02 09:45:49 +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
Noisyfox
d05420615b Fix crash when dismissing print error dialog 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
maosheng.wei
26dcf805e6 FIX: Reset Filament only when the preset is deleted from the current Studio
Jira: none

Change-Id: I2a8e17b17a97644d69013e38f50bb7b060b17e57
(cherry picked from commit 0c7e6b6676a1fc595e9b99e22d6c9cd00608c314)
2025-09-30 14:11:46 +08:00
hemai
5f1ff2f9a9 FIX: change AMS n3s ams_id & tray_id from 512 to 128
Jira: [STUDIO-13477]
Change-Id: I3844cb59df18220a22d8ff7524216b9fff2b6632
(cherry picked from commit 8c7b66d24b1e795c3070883f3f439cf160b38037)
2025-09-30 14:08:47 +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
tao wang
28f5c3e952 ENH:support printer connection in farm mode
jira:[none]

Change-Id: I05a67e5ff508d21ed9aa1659147c510bd1700b10
(cherry picked from commit 0cf5ca920851735f946b5dd733472009f4dc17de)
2025-09-30 10:50:53 +08:00
milk
73220b4df6 ENH:Syncing print action text
jira:[STUDIO-11406]

Change-Id: I8ef48345ee57cc66868a05f9e468f857a66d4feb
(cherry picked from commit 0e9e4a2f32c0b3ce38eb7e9bf9a0d0bcd3e39e66)
2025-09-30 10:09:03 +08:00
xin.zhang
1331e51dae FIX: The value maybe string or int
JIRA: [STUDIO-13018]
Change-Id: I4af161431fb51e1e0234bc37de8346b45f3ca4b7
(cherry picked from commit 4e2934685033c352ea2c3baded585381c285a90d)
2025-09-30 09:41:45 +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
zhimin.zeng
ba4cc19e6c FIX: the info cannot displayed in Chinese language
jira: STUDIO-12985
Change-Id: Ic2d52bc94129c2c568ebc4b3dc2b0a3fe5a65907
(cherry picked from commit 209c29400ca203e4ccd26863d2b78d5802275131)
2025-09-28 14:58:53 +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
zhimin.zeng
7667e188d7 FIX: flowrate cali adapt to new protocol
jira: STUDIO-12834
Change-Id: I892219350d6dd46bc92037c146af1911214d598d
(cherry picked from commit b86677be4e5771da4362ea41dfeb3a161fcc33f7)
2025-09-28 11:36:07 +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
ddf6ed00c5 ENH: if nothing selected then disable aplly btn && update plate index parse
Jira: [STUDIO-13299]
Change-Id: I1ce7271d005f7fec4d71ece9db13916a9fcc1e1d
(cherry picked from commit b2386964814dee68a1936da912eea339f5317ddc)
2025-09-26 14:30:21 +08:00
hemai
7d147cc550 FIX: parts file download failed && canvas display error
Jira: [STUDIO-13253]
Change-Id: I6ce11c0ceb1c4f7ed49c41eb9c6d7a6d96e866f9
(cherry picked from commit 37f742007bc168d8a3365ca617c7bd27bafca038)
2025-09-26 14:30:07 +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
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
xin.zhang
cc358aa945 ENH: update the log trivial for parse_json
jira: [none]
Change-Id: I66fd48435ddd6164f848f324ffb210d24e42857c
(cherry picked from commit aa1cad57f95602a53c57043be2bf3a11b627223f)
2025-09-25 17:36:50 +08:00
xin.zhang
3c4e28eb6c ENH: Filter the AIR_DUCT_EXHAUST mode in Studio
jira: [STUDIO-12796]
Change-Id: I1ba64436a3b8ad4a244e9a7674c65af0b5043e50
(cherry picked from commit 79165fbad8f8654153f7dcc362ab386b00a335dc)
2025-09-25 17:22:18 +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
hemai
39360790c7 ENH: add new error message for AMS change filament
jira: STUDIO-12391

Change-Id: I358f8b09f0ce5d7d0efe91eb6dea1d89509033da
(cherry picked from commit 811823be0f5ef0e919f1084eac84c491e27971ac)
2025-09-25 17:17:34 +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
7044bf0022 FIX: check the null pointer
jira: [STUDIO-12264]
Change-Id: Icd0a64168576f45f91ac0d9090c838a17b86b1ae
(cherry picked from commit 3950ec7454ab236d88cb27681e065c510d71998d)
2025-09-25 15:57:36 +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
zhimin.zeng
91329da2e9 FIX: TPU cannot be set on left nozzle
jira: STUDIO-12390
Change-Id: I752a53e7cc989038d16e9d7e06f130e6a1eb72a0
(cherry picked from commit d21d27d6fb2bc8d95921b12665868eceef564e08)
2025-09-24 11:15:48 +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
zhimin.zeng
edf92dfffc FIX: error printable filament check for H2D
jira: STUDIO-12252
Change-Id: Iea8107d29b3ae46c49a04a30046573b1c8b6e97f
(cherry picked from commit 6680fdffe4d25376c8f4c288ccf2b475d1b7e082)
2025-09-24 09:41:45 +08:00
xin.zhang
d4fd53763e ENH: update the filaments_blacklist functions
jira: [STUDIO-11883]
Change-Id: Ib75383f4e75a0bcd566dcf555695f2a9f45f0cba
(cherry picked from commit 6a12adb7f0b83c025ad09e7e59e68d07a0ea8335)
2025-09-23 21:44: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