Commit Graph

203 Commits

Author SHA1 Message Date
zhimin.zeng 66bb5bc4b6 FIX: fix bug for flow ratio
Change-Id: Id683301dd260c202a37560c771dff01acd63681a
2023-07-07 17:52:43 +08:00
zhimin.zeng af770a87b8 ENH: AMSSetting dialog can select pa cali result
Change-Id: I4d3649d904a5e9e93e93a0555186319cec65fa10
(cherry picked from commit 4ddaaf8e9dd552930653c93d97e677a5acd6982e)
2023-07-07 17:29:08 +08:00
Stone Li 633d206732 FIX: fix a status synchronizing issue
Change-Id: Iefec80b8a48d0e86e4cf2d15ca00b9bfdb7b0c4a
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-07-07 17:29:08 +08:00
chunmao.guo a20229f222 FIX: tunnel mqtt compatible with C12
Change-Id: Ibff24003603ed5e4bd9ed2872eac4ff38fb6f5d7
2023-07-07 17:29:08 +08:00
zhimin.zeng e6a03b48ad ENH: get result for pa and flow ratio cali
Change-Id: I78c967abcdaf8c75fe6b31f1697377b72ad10e06
(cherry picked from commit fb6cd5a7c71fe6e5c4e9fed71f0c61f3a7a0c8e4)
2023-07-07 17:29:08 +08:00
maosheng.wei ca1facfaa0 FIX: [STUDIO-3157] AMS material blacklist, prompt without translation
Change-Id: Id4ec08aea568680d2f08346bf18782830bebf205
2023-07-07 17:29:08 +08:00
chunmao.guo ac4f641222 FIX: media error message
Change-Id: I6fb9879b03fee6fab3b0aa2123cfe67c9b5916dc
2023-07-07 17:29:08 +08:00
tao wang 50aa952f3a ENH:delete old subscription when switching printers
Change-Id: If56bb376cf2a4cbd35a6954f9cf8d1a1e590ca73
2023-07-07 17:29:08 +08:00
tao wang 7c651c6ba6 ENH:add protection to ota version
Change-Id: Iae4c7d6f766c40e5339e608c1378dbd707b5e7c1
2023-07-07 17:29:08 +08:00
chunmao.guo ac57ac41ab FIX: c11 tunnel mqtt
Change-Id: I550978822998fe9ef5b17ba76374fb5f7688fc7e
2023-07-07 17:29:08 +08:00
Stone Li 030b3f0c58 ENH: compatible with old firmware in mqtt keep alive
Change-Id: Iaee3401d8dd26553169da7a9a627b31357c3d302
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-07-07 17:29:08 +08:00
zhimin.zeng 6ea3259d05 ENH: Improve some details for pa calib
Change-Id: I5d4e1b6a3385f28b616989e2a23cfda627eb79d8
(cherry picked from commit 01827ef8ede395d4bed856585e9ef6b316ee1d2c)
2023-07-07 17:29:08 +08:00
chunmao.guo 2ccf0a84d8 FIX: not handle print sequence id in mqtt message
Change-Id: I2d097cc23b165a2c8c7e85cd38a34b314f7b0bb5
2023-07-07 17:29:08 +08:00
chunmao.guo 134c4a0815 FIX: request pushall when mqtt message lost
Change-Id: I178c071f5920ce5a2c5872994ccd0563c01ae3a4
2023-07-07 17:29:08 +08:00
Stone Li bc1dff84df ENH: support transparent filament in ams mapping
Change-Id: I5495b9f8f62a8317acdf6feff33c6b338076a61c
2023-07-07 17:29:08 +08:00
tao wang 2d8ddca1d6 ENH:synchronize different codes
Change-Id: I011b39ee85eecbb9da99d1c4fe1f2875267acc32
2023-07-07 17:25:51 +08:00
tao wang 6f2839b641 ENH:display error msg when connecting to the printer fails
Change-Id: I483d6c00bdd623e34bce5b087bfbcb9a5e876fa3
2023-07-07 17:25:51 +08:00
liz.li d53bd3394a ENH:calibration
1.adjust interaction of calibration
    add select my device
    add select multi-amstray
    modify ams selector
2.add some x1c calibration command

Change-Id: I403446cc0cd3ae5e1dec5d2dc97920ff334522da
2023-07-07 17:25:51 +08:00
chunmao.guo fa71bcccdc FIX: [STUDIO-2759] handle sequence of mqtt message, support tunnel
Change-Id: I69df95e38001c10dd4af5ef808d7945b4e33168a
2023-07-07 17:25:51 +08:00
tao wang 0d9c0c1c12 ENH:C12 printer adds cloud only print settings
Change-Id: I8d2e7ad036bf67a7541c20e7a9b52580eb047773
2023-07-07 17:25:51 +08:00
chunmao.guo ddabc14676 FIX: C12(P1S) tunnel proto compatible
Change-Id: Ibbf39b4fefe7e73e35f6096ac6989afbb531db03
2023-07-07 17:25:51 +08:00
Stone Li 6e5e947aa2 FIX: disable micro lidar in P1P
Change-Id: Idec534e783319c51c19f3b1bafce633c29a13a71
2023-07-07 17:25:51 +08:00
chunmao.guo e4d4ac01d6 FIX: rstp proto mode & tutk state
Change-Id: I3d8b4a278426644bb716f18d7b8259032d22e444
2023-07-07 17:25:51 +08:00
chunmao.guo 3dc94b6f12 FIX: [STUDIO-2940] prefer use remote tunnel for liveview
Change-Id: I23708989e6d5ab38724e5da2cff2fe9d648bf730
2023-07-07 17:25:51 +08:00
tao wang c351ac54aa ENH:do not write to config file when user access code is empty
Change-Id: I180e20b7d26fd337eef09ff4267cd4c2c61b6518
2023-07-07 17:25:51 +08:00
tao wang 7af252fa99 NEW:support for sending print job from SD card view
Change-Id: I8366345ae4323c1b568bfd267d036e2474ff969a
2023-07-07 17:25:51 +08:00
chunmao.guo 5a7aa74e62 ENH: printer compatible for tunnel protos
Change-Id: Ic409ad967da43ad696b75a6c97e90e1f70e7610d
2023-07-07 17:25:51 +08:00
chunmao.guo d8517991e4 FIX: [STUDIO-2767] retry with remote tunnel when local failed
Change-Id: Id0172239d752508227729e81bee6c1a6ff4d3e9d
2023-07-07 17:25:51 +08:00
chunmao.guo b5663b25c9 FIX: is_support_remote_tunnel P1P >= 01.03.00.00
Change-Id: I97e7a38f7bd3d42f61fb4c56b3757b36805a28bf
2023-07-07 17:25:51 +08:00
tao wang a64e0b2f82 NEW:support the display of profile info in the mall model
Change-Id: Idab6bb5a4ef50df665ab7c8e5891efc5a8253eba
2023-07-07 17:25:51 +08:00
tao wang d930667103 FIX:fixed sending print to LAN printer will crash
Change-Id: I067724e8ebef3425a84f6a230685c48fe48ed055
2023-04-17 15:39:02 +08:00
Stone Li a8a057e514 FIX: compible with old firmware
Change-Id: I66803f95c73ffb82f539c2bfb509266ba9fdb846
2023-04-17 15:39:02 +08:00
Stone Li bc0fe0c8bc ENH: compatible with filament unload of new firmware
Change-Id: I0b01a549929e716f0ac05176ba5dc05c360c081b
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-04-17 15:39:02 +08:00
Stone Li 415fb2989d ENH: modify Support W/G display name
Change-Id: I8fbdea4411073a74df804cbcc466027b1c3e941f
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-04-17 15:39:02 +08:00
tao wang 5e6cfb069a NEW:hide the entrance of filaments backup
Change-Id: I383de6ced5efb20a19ca8171f981370bf8fcc3aa
2023-04-17 15:39:02 +08:00
Stone Li 4174f361f1 FIX: fix crash when no sec_link
Change-Id: I41aa905b0dcac3d5b162fea5b19a1d2c6aa72b68
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-04-17 15:39:02 +08:00
tao wang f06b214c30 ENH:optimize ams settings and virtual tray
1. separate virtual tray and extrustion calibrations
2. only when confirming will the disabled materials be checked
3. uptimize ams style

Change-Id: Ie435555d0cad45fbc0cb1bf7e1706985ec1aaa78
2023-04-17 15:39:02 +08:00
Stone Li 464af822e1 ENH: add print error in cmd clean_print_error
Change-Id: I22328a8be58c9896c40eb5f270e8a08e4469bd7d
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-04-17 15:39:02 +08:00
tao wang 00e1c50947 NEW:AMS supports ams filament backup
Change-Id: I0bc84f52bcd88dbbc1b9614b15474433c748cc14
2023-04-17 15:39:02 +08:00
Stone Li 82ee622ce3 ENH: avoid to crash log when parsing sequence_id
Change-Id: I14ff7167cf4291a09d955d1ac295197470734546
2023-04-17 15:39:02 +08:00
Stone Li 9606a04117 NEW: support clean print error
Change-Id: I0d0b6b5dae22bf5ee793d748d3afb5d45fbf744a
2023-04-17 15:39:02 +08:00
Stone Li 8675815fb3 ENH: do not use_open_ssl for engineer machine
Change-Id: Ie4b8384324c25f9f402aa78b19e1140492dbef19
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-04-17 15:39:02 +08:00
tao wang 8d6c56e4aa NEW:AMS control supports gradient color filaments display
Change-Id: I38d8a313d84b3acf643b489a1e62ebd073b35c1d
2023-04-17 15:39:02 +08:00
Stone Li 0a1c597da0 NEW: add track for cmd ack
Change-Id: Ibf2c9874bfac0b7a83506a7de2418ef8f3650dc3
2023-04-17 15:39:02 +08:00
Stone Li 1f1e5894bb ENH: add sec_link field to start_bind
Change-Id: Ia48592f096b14ea0fe4de20126287c6f885d73a5
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-04-17 15:39:02 +08:00
Stone Li c9635174bd ENH:display info when in slicing queue
Change-Id: I0dc2645e5679af310c8c0558c8ae47c9d62958e1
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-04-17 15:39:02 +08:00
tao wang d9395e6405 ENH:optimize the switching of multiple AMS and vams
Change-Id: I031e3248164aa2fc243c6ebf7418c535119e7ffc
2023-04-17 15:39:02 +08:00
Stone Li 6827b41eb3 NEW: add track events for debugging network
Change-Id: I671f91b4af00277236ca71014f8d667109756d00
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-04-17 15:39:02 +08:00
tao wang ede8a2dc30 ENH:disconnect lan mode printer when switing other printers
Change-Id: Ibd2d80e248b8a25a103cec75fdc9cd11b84e8b48
2023-04-17 15:39:02 +08:00
tao wang 9420de5931 FIX:fixed Lan mode printer will disconnection after connection
Change-Id: Ifa81f35f4d4f58626fc74f9d092a8a1b4d10fb0d
2023-03-01 15:58:50 +08:00
Stone Li 4da6149845 FIX: disconnect printer when reselect same printer
Change-Id: If47a3cfa2409f77dc583922fdb416f93d295f03f
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-28 18:44:28 +08:00
Stone Li 4a580d37df ENH: send print job through cloud only for P1P
Change-Id: Id89a0a60be91f415eb6d586ac11f70849c9cb01f
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-24 09:23:57 +08:00
Stone Li 29b03d5e53 FIX: disconnect lan mode printer when switch another printer
Change-Id: I6480c5c24d97c5e25eaa0878732590e6c1412bdd
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
Stone Li a48c36fde1 ENH: refine load/unload for spool holder filament
update ams load/unload gcode

Change-Id: Ia3d4a26efb14325c89f0c9f9571268c1834361ae
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
Stone Li b1a310cf74 ENH: parse nozzle_diameter
Change-Id: I408f93cd0e527e0a78714d2140750076a4cc7a81
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
Stone Li b731ac8db8 ENH: support load and edit with virtual tray
Change-Id: I36cd8d9f6da719526c38b7479625ed0fa868f63b
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
Stone Li 71ef9e946c ENH: support ams auto switch filament for P1P
Change-Id: I18df1c962c8289931ba8f8978752c879c13cb648
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
Stone Li 6fee9bcca1 ENH: parse ack of upgrade confirm
Change-Id: I33691749221aac4c83f71d6d76708d7b2d8d6d4d
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
Stone Li 6122f5010a ENH: sync with localazy and fix compile error
Change-Id: I7cae72f24c2fde61e0c1e99c89c21801b7d10125
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
Stone Li fbc4de136f NEW: support to config ftp_folder for printer [P1P]
Change-Id: I6a3b2a67d2950e2c1c5267bb7c65d5594924caec
Signed-off-by: Stone Li <stone.li@bambulab.com>
(cherry picked from commit 176e505bcf5f48971302d9aff14e74b118eeafbe)
2023-02-22 20:09:17 +08:00
tao wang 3f109501ba ENH:optimize the management of access code
Change-Id: If8a3644207d5bca2bb10f49f8ee251b6b6219ce2
2023-02-22 20:09:17 +08:00
tao wang 7c728452a2 NEW:add filaments not supported by detection
Change-Id: I1cabf8631e77fbaf42d2b30ee3e715c8f2459bda
2023-02-22 20:09:17 +08:00
tao wang 33c22bef62 FIX:use the gcode line command to unload the C11 printer
Change-Id: I33eec56b8c02fd605d3c0acb4e1f9d07811cea69
2023-02-22 20:09:17 +08:00
tao wang c000ab2d8a ENH:add network detection for LAN mode printer
Change-Id: I0e3616b08f1a455df05c98c3b194ff9177df3ff1
2023-02-22 20:09:17 +08:00
Stone Li c475527808 NEW: replace gcode of ams load and unload
Change-Id: I89a1f3e6787c4639c2757e31676dbd15b17331ea
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
chunmao.guo dbdef05f2e FIX: [STUDIO-1908] device ftps to implicit_ssl
Change-Id: Iaa347ea17d76b7bafc0ea213217bfbc2b6c916cd
(cherry picked from commit 702d1c1e6605834746b38dedc725fe67ad4edfa6)
(cherry picked from commit 2019750d9c03a97b9b3f746d90e4f1122d81b12c)
2023-02-02 12:14:41 +08:00
chunmao.guo 7fe0ee091f FIX: [STUDIO-1908] add printer cert and version compatible
Change-Id: I6aef8c1169952a0b541516ab3a0d7de2d3e213b3
(cherry picked from commit b0bbb571c7c54e81cd52262d334eb1463c3550e7)
2023-02-02 12:14:41 +08:00
Stone Li 3e8671bcdf FIX: fix lan_file mode for P1P
Change-Id: I71ffdb28363fe45b2d5bab01d34846c2462921a6
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-02 12:14:41 +08:00
Stone Li dc314bf404 FIX: fix bug of status for calibration finished
Change-Id: I774bbea8952340fc983162c10fca4b7ee444c725
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-01 16:24:44 +08:00
tao wang 9a8f832498 ENH:Update IP address input process
Change-Id: Iaf1c187dac117ba10ac16045049a346f7c2b9478
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-01 16:24:44 +08:00
Stone Li a3c34d0629 ENH: refine extrusion_cali_set command for factor k
fix enable status of confirm btn in ams settings dlg

Change-Id: I25c11078bb723647fac6370f966c74c807362e21
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-01 16:24:44 +08:00
Stone Li 3c44badd38 ENH: set timeout for starting extrusion to 20
Change-Id: Iae718e324170028121ca32e9653acac7b7b301f4
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-01 16:24:44 +08:00
Stone Li d25f7535a9 ENH: add tips for P1P when printing all is not supported
Change-Id: I5caa5dbc2d9cd3c57318a2366c8a8ef494d4df31
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-01 16:24:44 +08:00
tao wang 23fb4dba2e ENH:select the first tray when switching AMS
Change-Id: I74487f9bda81df199685b31e6fb7f5dbcaeef607
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-01 16:24:44 +08:00
liz.li 8a3b39345e ENH: adjust ExtrusionCalibration image related
Change-Id: Icca866dc5a164dee7da420f2fc04976bcfb42d04
2023-02-01 16:24:44 +08:00
tao wang 739915e6f6 ENH:Optimize the layout of AMScontrol
Change-Id: Id74c0f14cf17b5d0cbc1077bb3609d7b1c8c6c2b
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-01 16:24:44 +08:00
tao wang 8ab190da48 ENH:add total layer/current layer UI
Change-Id: Ib0ceae161280258d9a9fbf6fb46d34810f24c57a
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-01 16:24:44 +08:00
Stone Li f701b4efd5 FIX: fix check k / n logic
Change-Id: I0f9fe5c95523d79b4c6435555d10f2d641639b13
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-01 16:24:44 +08:00
chunmao.guo 143f9cfe99 ENH: request lan ip if liveview failed with lan tunnel (2)
Change-Id: Ie40c31b8c3600dc30228d931013cc0e12a6b1a78
2023-02-01 16:24:44 +08:00
Stone Li eed072eccf NEW: add extrusion calibration
1. display factor of extrusion calibration
2. add progress to calibration extrusion
3. support ext spool

Change-Id: Ic124a0097f16e6287c09f5f133eea84eeefb4000
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-01 16:24:44 +08:00
chunmao.guo aa880e34a7 ENH: detect printer uses ssl for local connection
Change-Id: I6131bf5ed1f6d44f0bd761ad6bc3a492ba4945b7
(cherry picked from commit c68d48ecf290e5abd37a97654c5b1f7779f061e2)
2023-01-10 19:08:26 +08:00
tao wang 47a46010bd ENH:allows the user to enter a printed IP address
Change-Id: I9d2617d0dd42f53e93d61e98bcf3cc97979a93f6
(cherry picked from commit 24ab56f8568e9637634e97a0632309cfd2762749)
2023-01-10 19:08:26 +08:00
tao wang 030efb339a ENH: hide some functions which are not ready on U2 version
Change-Id: I6ff7f98d55d9734938b65aaa72727320dd3c5f6e
2022-12-26 05:31:54 -05:00
Stone Li 55b6bc5563 ENH: do not show the functions if it is not supported
Change-Id: Iaee9c756f40fd26c376160e9cda305bee88d713b
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-19 06:13:10 -05:00
tao wang 4ee5dbb07f FIX:compatible with v6 printers
Change-Id: If89c57393a27232a5be41efaf95e70568b4b1f46
2022-12-15 04:38:15 -05:00
tao wang e9045c2f4b FIX:optimize the fan gear
Change-Id: I02361a71b56f1527d85b2085f13fb374faacdc32
2022-12-15 04:38:15 -05:00
tao wang b61da88d51 NEW:add fan control
Change-Id: I3b5c7cf638306aaac81459c2f25e37008a5a8a2f
2022-12-15 04:38:15 -05:00
Stone Li 250a359247 NEW: request get version when online version is diff
Change-Id: If096fc6b050da80d4f961660a42a88deb4fe9f7e
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
tao wang b5e38e02fe ENH:display different thumbnails according to the printer type
Change-Id: I1534594923fdcafb231661a1a7fa289221277449
2022-12-15 04:38:15 -05:00
Stone Li 58dab90e53 ENH: refine camera status and settings
Change-Id: I2a8c23ca119ff5d38272dad46347704bf457dee0
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
Stone Li a9938d7676 ENH: display unload filament button when use_ams is false
Change-Id: I4dc7cc17c33e5f92543934c3d003c34fea94b0cb
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
Stone Li 00dfd1e765 ENH: modify diff for github
Change-Id: I3a441dbfa3167de3cee9fdafe62f7860fcb6891c
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
Stone Li db4067a9dc ENH: adjust funtions for P1P
Change-Id: Id8ce17f6cae523f9e6a0ccd9903df6ebefda934e
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
Stone Li dcbe442184 ENH: request start when it stopped by app
Change-Id: I48b8692f87b834e0f96c7c19c4e8651ae7a8fc1e
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
tao.jin 29e6f71402 ENH: refine details of camera setting
Change-Id: Icb8365007f96b7dde372e7b121ec4f6e2ae96d7a
2022-12-15 04:38:15 -05:00
Stone Li 77a37f086d ENH: hide auto switch filament for P1P
show video when printing for P1P

Change-Id: I0f35385b849a0c3081c004916258134ef161982e
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
Stone Li 1c02449201 ENH: refine camera setting logic
Change-Id: I3d80950e8f6a6391b31a06929645af17cc779cb9
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
tao wang 09ab775667 ENH:blocking send/send all on p1p printers
Change-Id: If6ed8056790211d6ffa8237136318768e1a7f5d7
2022-12-15 04:38:15 -05:00
Stone Li 6f7f93b232 ENH: set qos = 1 for get_version cmd
Change-Id: Idc7e210a02739a329a6ae8a7c0489197472e78bb
2022-12-15 04:38:15 -05:00
Stone Li 4700362f10 FIX: do not parse dirty json info
Change-Id: I543ae2818c5b23c351dc355abf115e76d5af75dc
2022-12-15 04:38:15 -05:00