Commit Graph

56 Commits

Author SHA1 Message Date
SoftFever
0267e2f230 Merge branch 'master-remote' into feature/merge_remote_1.3
# Conflicts:
#	bbl/i18n/zh_cn/BambuStudio_zh_CN.po
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/profiles/Voron.json
#	resources/profiles/Voron/filament/Voron Generic ABS.json
#	resources/profiles/Voron/filament/Voron Generic ASA.json
#	resources/profiles/Voron/filament/Voron Generic PA-CF.json
#	resources/profiles/Voron/filament/Voron Generic PA.json
#	resources/profiles/Voron/filament/Voron Generic PC.json
#	resources/profiles/Voron/filament/Voron Generic PETG.json
#	resources/profiles/Voron/filament/Voron Generic PLA-CF.json
#	resources/profiles/Voron/filament/Voron Generic PLA.json
#	resources/profiles/Voron/filament/Voron Generic PVA.json
#	resources/profiles/Voron/filament/Voron Generic TPU.json
#	resources/profiles/Voron/filament/fdm_filament_abs.json
#	resources/profiles/Voron/filament/fdm_filament_asa.json
#	resources/profiles/Voron/filament/fdm_filament_common.json
#	resources/profiles/Voron/filament/fdm_filament_pa.json
#	resources/profiles/Voron/filament/fdm_filament_pc.json
#	resources/profiles/Voron/filament/fdm_filament_pet.json
#	resources/profiles/Voron/filament/fdm_filament_pla.json
#	resources/profiles/Voron/filament/fdm_filament_pva.json
#	resources/profiles/Voron/filament/fdm_filament_tpu.json
#	resources/profiles/Voron/machine/Voron 0.1 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron 0.1.json
#	resources/profiles/Voron/machine/Voron 2.4 250 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron 2.4 250.json
#	resources/profiles/Voron/machine/Voron 2.4 300 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron 2.4 300.json
#	resources/profiles/Voron/machine/Voron 2.4 350 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron 2.4 350.json
#	resources/profiles/Voron/machine/Voron Trident 250 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron Trident 250.json
#	resources/profiles/Voron/machine/Voron Trident 300 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron Trident 300.json
#	resources/profiles/Voron/machine/Voron Trident 350 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron Trident 350.json
#	resources/profiles/Voron/machine/fdm_klipper_common.json
#	resources/profiles/Voron/process/0.08mm Extra Fine @Voron.json
#	resources/profiles/Voron/process/0.12mm Fine @Voron.json
#	resources/profiles/Voron/process/0.15mm Optimal @Voron.json
#	resources/profiles/Voron/process/0.20mm Standard @Voron.json
#	resources/profiles/Voron/process/0.24mm Draft @Voron.json
#	resources/profiles/Voron/process/0.28mm Extra Draft @Voron.json
#	resources/profiles/Voron/process/fdm_process_voron_common.json
#	src/libslic3r/Preset.cpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/PrintObject.cpp
#	src/slic3r/GUI/BackgroundSlicingProcess.cpp
#	src/slic3r/GUI/Field.cpp
#	src/slic3r/GUI/GLToolbar.cpp
#	src/slic3r/GUI/GLToolbar.hpp
#	src/slic3r/GUI/MainFrame.cpp
#	src/slic3r/GUI/MainFrame.hpp
#	src/slic3r/GUI/NotificationManager.cpp
#	src/slic3r/GUI/PhysicalPrinterDialog.cpp
#	src/slic3r/GUI/PhysicalPrinterDialog.hpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/Plater.hpp
#	src/slic3r/GUI/PrintHostDialogs.cpp
#	src/slic3r/GUI/PrintHostDialogs.hpp
#	src/slic3r/Utils/PrintHost.cpp
2022-10-20 23:12:00 +08:00
chunmao.guo
a75f1c6027 FIX: auto scroll to visible focus child in params panel
Change-Id: Ib3f7b7528c7fd221a824719d2199b4c85451fe67
2022-10-20 19:34:37 +08:00
tao.jin
13b8754e87 ENH: refine UI of sending 3rd-party printer task
Change-Id: I47cd1682a495eb7aa6f230dfa41ee4f5c321fc72
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-10-20 19:34:37 +08:00
zhimin.zeng
59ebdc51e0 FIX: allow smooth timelapse without wipe tower
Change-Id: I60d487faa96641dbf88f5502d2fa9ccb83e622c6
(cherry picked from commit 0286a7add9c698a2efd6d40910d72a83f06edba5)
2022-10-20 19:34:37 +08:00
salt.wei
92fc59500e ENH: add custom gcode back
Add custom gcode back, which can be inserted in
gcode viewer layer slider.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I270cc438bedf11b30f07f8f9bad6ae5436d5a2dd
2022-10-20 19:34:37 +08:00
qing.zhang
ba604e9b6b NEW: add link to infill pattern
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I4a06d1443fc82efeff0ba3e94179914692b284c6
(cherry picked from commit 9e239305474d849343774a0af51876f4f82bcf99)
2022-10-20 19:34:37 +08:00
Stone Li
c5f1793f1b NEW: support send gcode to third-party printer
Thanks SoftForever for your works to support
sending a gcode file to third-party printer

Change-Id: I3cba43c8bd878f1f1c2fd5fae202ed4d922e8727
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-10-20 19:34:37 +08:00
salt.wei
ee43d82045 ENH: set some settings to be readonly when printer vendor is Bambu Lab
It's meaningless to edit some settings, for example, machine limits
of Bambu Lab printer.

Set these settings to be read-only for Bambu Lab printer.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I61a21cfa2a2f574f690725125e226f4f258aa92f
2022-10-20 19:34:37 +08:00
tao wang
f94e056836 FIX:fixed clicking on first item has no effect in search dialog
Change-Id: Ifdbbf06a8b5c780155e394003470f6fa39a2b4c2
2022-10-20 19:34:37 +08:00
Arthur
74669625bc ENH: move extruder clearance settings to machine setting
Change-Id: Id6d550548f8fb8639349450a4b12c6eef4f441cd
(cherry picked from commit bd4420e4af9626772c90d553bf1f3bb7fd2e20c4)
2022-10-20 19:34:37 +08:00
SoftFever
9c6f90b70a z lift type 2022-10-19 17:02:19 +08:00
SoftFever
0865d2f85b Merge branch 'SoftFever' into feature/more_parameters 2022-10-18 18:06:39 +08:00
SoftFever
8214dfc48f more moonraker support 2022-10-18 18:06:28 +08:00
SoftFever
86d83b8599 wip 2022-10-16 16:39:45 +08:00
SoftFever
4868ab851c bridge angle 2022-10-14 17:58:23 +08:00
SoftFever
925c824c74 file format customization 2022-10-13 22:34:00 +08:00
SoftFever
8eff6e6641 Merge mainstream changes 2022-10-04 13:51:34 +08:00
SoftFever
caa41fbe65 tweak some messages 2022-10-04 12:12:37 +08:00
SoftFever
fdbcee5679 Add following options:
1. Travel acceleration control
2. X Y jerk control for different parts
3. Manually Linear Advance control
2022-10-03 11:26:48 +08:00
Tao Wang
c5a16709b8 FIX:fixed the blocking module of linux
Change-Id: I06b357f9592631a729208514a3239f944a98cc96
2022-09-29 11:16:43 +08:00
chunmao.guo
043d0672af FIX: remove compare preset button in Tab
Change-Id: I268327bd2ea791de46d2972f08d528883d63da87
2022-09-29 11:16:43 +08:00
salt.wei
f73c1c1d57 ENH: some change for external bridge
1 move thick bridge from support to quality page

2 Fix the issue that some times the external bridge angle
is not the best, and the bridge line is not the shortest one.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ie26570fb289898f6b62960f9333e79aa92c08ae4
2022-09-29 11:16:43 +08:00
chunmao.guo
e8da687e00 ENH: icon for param group
Change-Id: I435830615747aa850ed82621349f5fedfc29d860
2022-09-29 11:16:43 +08:00
Arthur
c377015634 NEW: add support_critical_regions_only for tree support
When this option enabled, only generate supports for sharp tail, cantilever,
thin pillar (not well supported). So holes are safe from unnessary supports.

Currently only works for tree supports, will need to copied to normal
supports if it works fine.

Change-Id: I5eb86484a5b503149e3bfdee8ce73f76a0a849e4
2022-09-29 11:16:43 +08:00
chunmao.guo
21e449459d ENH: sync with ams filament
Change-Id: Ifa8b9487c934a18ad1003f380bbb53fa9288e387
2022-09-29 11:16:43 +08:00
SoftFever
5548587e07 Allow users to set acceleration for outer/inner walls 2022-09-22 23:46:01 +08:00
SoftFever
14b0239ca1 allow users to adjust bottom infill flowrate 2022-09-19 16:57:26 +08:00
SoftFever
6e26309d76 Allow user to adjust top solid infill flowrate 2022-09-12 00:22:38 +08:00
SoftFever
a09ffa2131 Merge remote-tracking branch 'remote/master' into SoftFever
# Conflicts:
#	src/libslic3r/Preset.cpp
2022-09-09 21:54:57 +08:00
chunmao.guo
5af1047516 FIX: timelapse wiki url
Change-Id: I7d82c7ef1585cc5bd907f36bc7592449131efe6f
2022-09-09 19:59:27 +08:00
zhimin.zeng
0a967e936a FIX: modify the text
Change-Id: If9d6d629288f9016b5d8abfaff5ee44c99d90e30
2022-09-09 19:59:27 +08:00
zhimin.zeng
2abb598028 ENH: add traditional timelapse without wipe tower
Change-Id: I77792fb1a7af2ee95242c6f2501371dc0745287f
(cherry picked from commit f6d434cc8b6c8d11d16bbabf9600c2f2b63868db)
2022-09-08 21:49:36 +08:00
salt.wei
035bd856a3 ENH: wipe_distance should not to be 0 or negative value
As title, fix github issue #220

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: If63c839da1341ac2e16bbfa287c4e32564284d59
2022-09-08 21:49:36 +08:00
salt.wei
46ce67b1bc ENH: add slice_closing_radius back
For github issue #182

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I38c69bed03b6d70cb21d58b5f724b4dc3a8992a4
2022-09-08 21:49:36 +08:00
chunmao.guo
ff70ea2ef0 FIX: add authors to param links
Change-Id: Ibcbd1d58e6201e1a668f350891eb1beda9fe4d12
2022-09-08 21:49:36 +08:00
SoftFever
2e2263d7b7 Merge remote-tracking branch 'remote/master' into SoftFever 2022-09-03 00:17:59 +08:00
chunmao.guo
021b7692cb ENH: params web link to wifi pages
Change-Id: Id79c65a973840cdc23cdf1b1c353d29da2216750
2022-09-02 13:16:54 +08:00
zhimin.zeng
49aca26497 ENH: Add Textured PEI Plate
Change-Id: I08178e86a8ccb23844cca00bc9d265df7507f910
(cherry picked from commit 8f101963ecab1352e2721ead83928b327d6c0dbd)
2022-09-02 12:52:18 +08:00
zhimin.zeng
3d60720234 FIX: enhance interaction of timelapse
Change-Id: Iac13a485d0f5a458a435137619caddce39ad61fb
2022-09-02 12:52:18 +08:00
SoftFever
b6c1f101f8 Merge remote-tracking branch 'remote/master' into SoftFever
# Conflicts:
#	src/libslic3r/PerimeterGenerator.cpp
2022-08-28 12:03:49 +08:00
zhimin.zeng
297262d9db ENH: Optimize and design the time-lapse wiper tower
Multiplex existing wipe tower and revert old time-lapse wipe tower code

Change-Id: Ia1cba9808647ea900f691b2c5d5887077be12d89
(cherry picked from commit 61f41df572d11b7cc738c34f2624fd123cd9a6df)
2022-08-26 09:25:59 +08:00
chunmao.guo
9e962c5bc0 FIX: wxWidgets asserts
Change-Id: I583edbde501c2bfe8adfa8fdb525479a379a4cb8
2022-08-26 09:25:59 +08:00
chunmao.guo
f1ff2f6ebe FIX: background color of title labels in sidebar
Change-Id: If71fdca36518129cdfdd1cdf939fb62592ec56c1
2022-08-26 09:25:59 +08:00
SoftFever
2671e3969d Profile rework (#4)
* default BBL profile

* voron

* wip

* Voron profile

* Prusa MK3S

* add Prusa mk3s

* fix an issue that print_host value was not retrieved.

* add chamber temperature option for filament

* slightly adjust thumbernail angle

* Revert "slightly adjust thumbernail angle"

This reverts commit 6ad38efb36c66abe82c7fdeb23f6a24aac43654e.

* add `one wall on first layer` option

* save preset for connection

* remove unused options

* set default 3000 accl for MK3S

* tweak profile

* update Voron logo

* UI twwaks

* Readme update

* change abs default nozzle temp

* misc

* tweak profiles

* Update README
2022-08-24 15:40:43 +08:00
SoftFever
707b3085b3 Support upload g-code to third-party printers
* wip

* fix cmake warning

* add UI and config options for Moonraker connection

* wip: copy whole print host UI from PS

* add more needed options

* wip 2

* fix string issue on Mac

* wip3

* fix cmake warning

* working
need tweaks

* cleanup

* support thumbnail

* fix DNS resolving issue in Windows

* code clean up
2022-08-20 23:06:41 +08:00
SoftFever
ec43ca2e1a Revert "Support upload g-code to third-party printers (#2)"
This reverts commit dc5e0eed34.
2022-08-20 23:05:25 +08:00
SoftFever
e843afab61 Support upload g-code to third-party printers (#2)
* wip

* fix cmake warning

* add UI and config options for Moonraker connection

* wip: copy whole print host UI from PS

* add more needed options

* wip 2

* fix string issue on Mac

* wip3
2022-08-20 15:09:05 +08:00
xiangdong.yang
2a6ef390d5 FIX:fix image error during startup
Change-Id: I9aaca80622ef22b35f30c5b1e6072e983014139f
(cherry picked from commit e9abc0eea926a62fe519525c269c1ce33245df65)
2022-08-05 16:11:42 +08:00
chunmao.guo
9ce94f7711 FIX: layout in sidebar
Change-Id: I8f76d4f035c7458b98f285405e01404f2629df65
2022-08-05 16:11:42 +08:00
salt.wei
a1dbe37f4f ENH: add extruder offset for X1 and X1 carbon
The extruder offset of X1 and X1C is (0,2).
All generated gcode should minus this value.

Also change the min speed of cooling buffer for
better cooling for small area(from pineapple)

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I06e58a26f8736ae24fa9da02477a9d19114daeca
2022-08-05 16:11:42 +08:00