mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-06-15 00:13:00 +00:00
* ENH: Show Recent File Image Keep Scale Change-Id: Ib8a6cf916eaee8e353bf858bc4f2ea503705809e * FIX: wipetower position problem jira: STUDIO-4914 Change-Id: I7b05d3c53931ed8ce3d4603ff21ee6ef675611e5 * FIX: dailytips adapts screen scale jira: STUDIO-5019 STUDIO-5026 STUDIO-5027 STUDIO-5028 STUDIO-5025 Change-Id: I63d3af1870218ba8e0f048a6ef03fb29fabe27cb * FIX: generate process preset based on template Jira: XXXX Change-Id: I50adf0790dc239307d236a4cebece860ef6beb16 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * FIX: object list plate name edit Change-Id: I61d3dcd7d9598d759a3a0b44cc77d2af2adca25a Jira: STUDIO-4937 * ENH:no longer checking nozzle type jira:[for nozzle type check] Change-Id: I0e88445a264f21b0c11519e9a22a165d05611d14 * ENH: improve first layer tree support First layer support can't be top interface, and min brim width of auto mode should be larger than 0. Jira: STUDIO-5010 Change-Id: I02f8b017b535f8a47965387e8679f692b1966e04 (cherry picked from commit 3e7d54abe352e8ab5f9d6492b5a86a96f9067f94) * ENH: version: bumped to 1.8 JIRA: no jira Change-Id: I50903098b59f1dd9a6b6cf7656cec7d388f3ff17 * ENH:try again after subscription failure jira:[Try again after subscription failure] Change-Id: Ibfb1e8e26eb166d786a372632a86ef98030db034 * ENH:display msg dialog once jira:[for http error msg] Change-Id: I12e9c155fdb567cac99c35b6feeef650269ba75d * ENH:remove config.json file Change-Id: Idfcf3a63fefe968e88153c26fb691fd05cd83dc4 * ENH:add protection in threads jira:[for random crash] Change-Id: I6286012dd77abccba461f7cd72a6fc531a84c95f * FIX: add protection for get_model_task_thread thread Jira: XXXX Change-Id: I3cbc17d181a0e13c658f31eaeb6a4df878e6df41 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * FIX: delete all compatible presets when delete third printer Jira: XXXX Change-Id: I1a294402627e7ab7a8c6701f20679b3d04aff059 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * ci: update build version to 01.08.00.51 Change-Id: I20a01adacbdb5fe69c106b9efd029f7308136e10 * ENH: default open support_interface_not_for_body jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I48e084deb18633f9ec47a8ec4ec643163bf66318 * ENH:modified text with too low version jira:[for low version] Change-Id: I862a0defda976a35f326a8805e002330f2ed7fdf * NEW:update printer config file version Change-Id: I9a46b29b03beb67a3da0b8f76d8b5c4b3c482928 * FIX:The plane should rotate around the world coordinate system Jira: STUDIO-5054 Change-Id: I16e484b38d79cabd9473acf1abf3c5c6b0adc4c6 * ENH:translate for limit file size and so on Jira: STUDIO-5007 Change-Id: I2c279eb690841aa51cd8128f8028266cbc17e977 * ENH:use on_render_rotate_gizmos() replace GLGizmoRotate3D::on_render() Jira: STUDIO-4227 Change-Id: If9b9ea5596e59472d5fa87ac56aeb7f6ecc65643 * FIX: some mistakes in filament profiles jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Ibe7f3650f2d9cf47561dd5f2ec591a5f6c553503 * FIX: fix shard_ptr is null Change-Id: I0187cf64ffbb08a2265a11900b5c865e9ac9678f * FIX:N1 printer image in dark mode JIRA:STUDIO-4057 Change-Id: I22c001d96839daf213d5096f6ff6e3d6398fa8c4 * FIX: create printer issue Jira: 5034 5059 5053 5034 create printer but filament is repeat 5039 create successful dialog remove to center 5053 create existing printer copywriting adjustments and preset updates Delete printer secondary confirmation dialog Change-Id: Ifb3822d1e168459d2af11e02b31ecaf3719d338a Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * ENH:just don't check the nozzle diameter jira:[for nozzle check] Change-Id: I678e7d62832eaa14b9be47d6dce70f29ebd601f6 * NEW:p1 and x1 series added motor noise calibration JIRA: 5085 Change-Id: Id73cc2d34b6130f215d81ffcdc39ba6b241445bf * ci: update build version to 01.08.00.52 Change-Id: I93d800b413f2751d132fac53fbd9b191603d0352 * FIX: ObjectSetting changed when search plate JIRA: STUDIO-5095 Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com> Change-Id: I39b1ad997d51ac4224ff5ad2b3555f56da4bd911 * FIX: invalid support params in 3rd party profiles Many params are not right.Just use default jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I5c4a1e8b046940e174f5681a79031b5f20fcafc5 * ENH: update A1 mini start gcode Change x-axis freq sweep amp 5->10 jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I2e731cc6392c0204d5e4467bf4b933ab233bc157 * FIX: [STUDIO-4946] use utf8 path to create sub process Change-Id: I5873c114e8cd36978a7d50bf13c3aa7bf8b740ca Jira: STUDIO-4946 * FIX: fix a plate state not correct issue JIRA: no-jira the object and instance states lost after undo Change-Id: I527df9a7d426d994501a4ed5bbb198c7bbac810b * FIX: some translation Jira: 5096 5089 5036 5004 Change-Id: I4f1bd6e352b11451f5caf02cbc4eeb31dfa03eee Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * FIX: [STUDIO-4935] plate name edit in object list Change-Id: I271fa217281d0c7ceca61166497136628a66681e Jira: STUDIO-4935 * FIX: take custom root as AMS sync candicate Change-Id: I9c71babcd74238d1533b15d77a978b19997c70c0 Jira: none * FIX: modify some default support params in code 1. Modify default values of some supports params, so 3rd party profiles are easier to setup. 3. Fix a bug that organic support may cause crash. Jira: none Change-Id: Icae348d8fe5985f4287404e96089198a499283f2 (cherry picked from commit 8889cfc703b72e142f288e525b89c87619f2213c) * FIX: do not generate sheath for normal support Jira: none Change-Id: I8f3f3e39171055f8d18c06ceee8e245594273238 (cherry picked from commit 93bc7ecf4346f179f502bebc3cf47b0030b56e2c) * FIX: push_notification on GUI thread Change-Id: Iaec347f5684fe0f65d6418759518189b67033c42 Jira: STUDIO-5106 * ENH: CLI: add some params to support more functions 1. uptodate_filaments to support update the original filaments to newest config 2. allow_rotations/avoid_extrusion_cali_region for auto-arrange 3. skip_modified_gcodes to support skip modified gcodes JIRA: STUDIO-5112 Change-Id: I95c09af1b5462cce3bf27aea32228d6d1d1d201d * FIX: missed manually entered values for secondary processing Jira: STUDIO-4964 Change-Id: I5cf0da1ae77cccd34de05b4a0318a751ac9f6753 * FIX: Z hop is still enabled when upper boundary is zero. Jira: STUDIO-4893 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I5f46a02e1fbb15ff43e253e3a184aa6cc38e7598 * ENH: update default filaments for Bambu printers jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Ic6380f39e546854ad0b7dc36929a8605c9ab3acc * ENH: dailytips modification 1. modify closing behavior 2. dailytips can adjust self size according to the canvas size. And also adjust GodeViewer legend window size 3. fix a button text encoding bug 4. support vertical/horizontal layout(horizontal layout currently not used) jira: new Change-Id: I8e0b6e85c455d0608d7388fb441829c1991ad01f * FIX: [4857 5097] export list and del preset two confirm issue Jira: 4857 5097 Change-Id: If7cc4967a663f575527a227e9c4ac31e0491930c * FIX: UUID conflict issue when referencing volume Jira: XXXX 3mf file standard Change-Id: I953a87294684ea85d03a95e7d2843c096904aeae Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * FIX: [4483 5003 5109] create printer and edit filament issue Jira: 4483 5003 5109 4483 dialog blink 5003 preset list too long 5109 encode Change-Id: I190e12272ca09f36b841f2f85a6cf60f2c2614bd Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * FIX: cloud use presets limit notify Change-Id: I6cc7b4e560cb83db0fc30921633b10531957128e Jira: STUDIO-5091, STUDIO-5104 * FIX: do user preset sync later on startup Change-Id: I0653a0438477b1c803ce1cddc66ef47f95616dae Jira: STUDIO-5106 * FIX: linux: pressing enter in height range will crash jira: STUDIO-4391 Change-Id: I6bf990951d1456f5b2605b8d62a05bceb3cc4c10 * FIX: failed to limit the max width of DropDown Jira: STUDIO-4503 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: Id9352d16f4bc016daade72a9c8d3d90164a1cb3d * FIX: not jump to preview after first wizard Change-Id: I8c94d66a91aa15a7874441a300b40438638bd33b Jira: STUDIO-5018 * ENH: CLI: clear custom gcodes when skip_modified_gcodes JIRA: STUDIO-5112 Change-Id: I2e7346d2ac57519029a4e80e5492c34d3d91ed77 * FIX: [4492 4851 4883 5121] create printer issue Jira: 4492 4851 4883 5121 Change-Id: If252b5f30be0403f79410aa8c00fc14b066d5bbd Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * ENH: add 'edit preset' and 'delete preset' btn for each preset Jira: 5200 5113 Change-Id: I208ad63eb4b895306fa76db424da2e1df10a582e Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * FIX: add skip label before tool change Jira: 5074 github: 2776 Signed-off-by: qing.zhang <qing.zhang@bambulab.com> Change-Id: Icaafd3b45da1e78c1a82e7d17d7505d9439b9100 * FIX:Network test dark mode adaptation JIRA:STUDIO-2468 Change-Id: I20cb7f1fd8eca3ce852acb563c1cc87978e216dc * FIX:n1 external feed prompt pop-up without retry button JIRA: STUDIO-4696 Change-Id: I31069c72e29d3398469d71cdbc2a344a5430fc2c * FIX: not show device page when switch printer preset Change-Id: I00d8524625a4682b6a39876ddb66bf8bd928dbef Jira: none * ENH: Check the nozzle diameter when sending calibration Jira: 4977 Change-Id: Iabbba44583bbd9fbaaa889ca546ee0ccbb2aa77f * FIX: Generate UUID from objectID and volumeIndex Jira: XXXX Change-Id: I65147ef9b695f8af8de260d722e604b0e0bab563 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * FIX: disable filament_typep Jira: XXXX Change-Id: Ib605b33e4474525fbe49e70596fc09aa356f478a Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * ci: update build version to 01.08.00.53 Change-Id: I1d574fa2cf2a4d0eb63a38eb8ced7587d06a4272 * ENH: refine display logic of param 1. Refine the display logic of "support_interface_not_for_body".Only toggle if support_filament is default and support_interface_filament is specified jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Ia2af030c4531ad6b04a198bfe8a1677b3d20a800 * FIX: user preset sync token Change-Id: Id2aa865b778ee9ac4cfddb68ceef0374507b519b Jira: none * FIX: Bitmap cache not take effect Change-Id: I972098fdbda0b4542c6c759a8f5e1f0f2a30852b Jira: STUDIO-4991 * NEW: Open HotModel Link With GetParam-From bambustudio JIRA: NO JIRA Change-Id: I4ac49bac5ee0c50988c76a38b00b7ba7dc3201f5 * NEW:AmsMaterialsSetting Support for user-preset JIRA: STUDIO-5135 Change-Id: If848047cd5dbd059d440de30989c505c361305a7 * FIX: upload custom root preset fail Change-Id: I621c8d542dd604b07cc5df63d97d7a31558d3aba Jira: none * FIX: show custom filament in AMS filament list Change-Id: I79b9f8f2f08db8c52bbed76f1ea133baff383c00 Jira: none * FIX: dailytips window and gcodeviwer legend window size issue reset to original logic of dailytips and legend window size jira: new Change-Id: Iacb016bb222ba3f87317cfbe1f2b003802d773a5 * ENH: add text translation jira: new Change-Id: I780cfb8a0a64d806b5e0a414b6598e3b7bdf52dc * FIX: Delete and search object outside the plate JIRA: 1. STUDIO-5132 Deleting object outside the plate will crash 2. STUDIO-5146 The search function cannot search for object outside the plate Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com> Change-Id: I84cb3fe990a9c2a182e7434c262466a70545280e * FIX: [5149 5142 5141 5140 5136] create printer and filament issue Jira: 5149 5142 5141 5140 5136 5149 process preset name can not show all 5142 improt configs combobox not update 5141 disable modify filament_vendor 5140 disable input Bambu and Generic vendor 5136 preset list window adjust Change-Id: I111a23996146cc16cc7f533c8616d50223d34c40 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * ci: update build version to 01.08.00.54 Change-Id: Ifd69c01a82f627a9c6cf4fe0d48a759563ee90e7 * FIX: print model from sdcard with p1p Change-Id: If85383ba762022ead3dd754ae02a08817b891114 Jira: none * FIX: dailytips text translation jira: STUDIO-2556 Change-Id: If44e503615b09ee1692f42ba1f998918ec5bd691 * FIX: clone shortcut key conflict with quit in macos jira: STUDIO-5166 Change-Id: I548f275bb68d3b0e6bb3cfad6fe93df09d507da3 * FIX:User preset material settings dependent on firmware JIRA: 5167 Change-Id: I82cf26848594b01155883ad0aa2e9ee77d371fb2 * ENH:update the description of nozzle detection Change-Id: Id27b25c69dc11fcf66fc82053af705906ae8c370 * FIX: [5159 5165 5171 5172] create printer and filament issue Jira: 5159 5165 5171 5172 5159 create printer dialog no refresh 5165 create printer 2 step dialog no refersh 5171 change font 5172 edit filament dialog darkUI issue input special character is prohibited '/' in preset name translate to '-' update printer combobox Change-Id: I5fa27836dab7f604f1a065c65efa099c7a2f0f96 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * ci: update build version to 01.08.00.55 Change-Id: If1865d561cf274719204662314de163497759e89 * FIX:fix GLmodel deconstruction causing section not to be rendered Jira: STUDIO-5156 Change-Id: Ibb2f459920989ee54f7b827352dc8893424b4de6 * FIX: missing unlock cause device or resource busy Change-Id: I87563312ea9c6ce4e4e471da7ce7a02b53b64762 * FIX: some translation Change-Id: I9758cbc758030b5a3945697a50ca4898af9fcb1b * ci: update build version to 01.08.00.56 Change-Id: Id5ee53dd2ebb0b37b6927dc58b3cca94a1f66a83 * ENH: remove PLA GLOW in A1 mini jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Id99c1bbd4248e28df9150a85eecec831f6f32856 * ci: update build version to 01.08.00.57 Change-Id: Ib4dfa60f097128b76b95bb14ca04978619021b56 * Allow line width of nozzle diameter * 2.5 As it were, 1 mm would be disallowed but 0.99 would be allowed for 0.4 nozzle. 1 mm is the sane maximum and 0.99 is unnecessary tedious to write. * Russian translation update Russian translation Bambu Studio_v1.8.0 Beta * FIX: scale problem in needs_retraction jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Idfbe954b22fa6aa5769c55e46874fa6a80ecbf45 (cherry picked from commit 4e853f50b748e3af11e2d64862b6ee557fda361b) * ENH: CLI: support load_assemble_list JIRA: STUDIO-4848 Change-Id: Ife11533740988331ea71eac86c370e625970cb8b * FIX: align to Y not working This is a bug introduced in 7fbb650 when solving jira STUDIO-4695. Now we use a more decent way to solve it. Change-Id: I92deffcb9fe53e8a24c93fe973446ae37df07375 (cherry picked from commit bd98430dbd15eb6c9bb4b447990e0dcf8a50eef0) * ENH: Add buried points for cut and meshboolean JIRA: NONE Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com> Change-Id: I67ce498d0c335dd7a8582f56b880c2c8314f8541 * FIX: 5092 edit filament add scrolled window Jira: 5092 Change-Id: I53ae996b04e4e2f1b1ddce6a858d505001b11615 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * FIX: can not select user preset when create filament Jira: XXXX github: 1936 and fix add preset for printer dialog can not show selected printer Change-Id: Id4308c6bdca17d52d4aa321db359941aa87e0e45 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * ENH: template filament don't be show in filament list and sort Jira: 5160 5179 Change-Id: I56a7e1897e1ef3c061dc66d318896413ca25b76b Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * FIX: [5174] export configs dialog issue filament name too long to can not show all Jira: 5174 Change-Id: I92018c9d7f86009b78b533592d899b4b5d78c3c8 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * ENH: add filament Bambu TPU 95A HF 1.As title jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I752ec43da6297a6c172679997ce68f2318a7b8fb * ENH: modify some params with filaments 1.Modify the PEI bed temperature of PLA Basic, Matte, and Tough to 65 in A1 mini. Set the bed temperature for the first layer of Bambu PETG-CF to 65 and 70 for the other layers jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Ia902bbb7f824082d5346709d781cac64296f47a8 * ENH: add more status during printing JIRA: STUDIO-5195 Change-Id: I85b3107839c6e2fdecbc10d90a876463e284468c Signed-off-by: Stone Li <stone.li@bambulab.com> * FIX:cut imgui has overlapping rendering on Apple Jira: STUDIO-5150 Change-Id: I7969e19dc189cd617026a183067dad628208955c * FIX:not TakeSnapshot for m_start_dragging_m Jira: STUDIO-5176 Change-Id: Ia03e3e2c2664dbdcffa19ec8d0fa97dfd95e6d35 * FIX: rendered color changes Jira: STUDIO-4956 during the drag processin connectors editing state Change-Id: I3027176ea9f93a9ba9d6a2052f41aaa4adef79f1 * FIX: merge the patch from Prusa Thanks for PrusaSlicer and YuSanka Jira:STUDIO-5175 commit 510d59687b3b19c4a0f4e6540620d0694dd1b7ac Author: YuSanka <yusanka@gmail.com> Date: Thu Oct 5 14:13:14 2023 +0200 Follow-up 1b451cdf: Fixed #11415 - Connectors disappear when slicing => only when using multiple cut planes AND excluding parts Change-Id: I9ccd5b85f482d723d21fccf5e104c9e0a9cc4849 * FIX:Press ESC directly to exit after entering the profile rendering rendering is not normal,Code from PrusaSlicer,thanks for PrusaSlicer and enricoturri1966 commit a078627552f54497ed0518dc7bc349d243576d19 Author: enricoturri1966 <enricoturri@seznam.cz> Date: Mon Jan 30 14:00:02 2023 +0100 Follow-up of 1218103fd620b319c56fd08116f81b581c537188 - Fixed gizmo missbehavior when closing a gizmo by resetting the selection clicking on the scene Jira: STUDIO-5164 Change-Id: I261da9dba2a5ac37f3e263c175fbccd80d8045bd * FIX: correct the strings and move create printer dialog center Jira: 5221 5183 Change-Id: Ida4eba63f0e962ffcc8000fcc04cf20849577217 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * ENH: CLI: skip layer height limit validate when slicing for existing models JIRA: no jira Change-Id: I1444a28b500ca7d08ed2606eecfa5cfaf261105e * ENH:update the translation of auto refill jira:[for translation] Change-Id: Iaa7b4f3d7cd88c8b4f69a3db721ebd8ca8986eea * FIX: icon issue for copying Jira: STUDIO-4168 Icon issue when filling bed with copies Change-Id: I61a03ecae02b75602c236ed2810e9c9cfe5a19f9 (cherry picked from commit b5079f8a2e79f19f65803f23ef4fd83aff17c84a) * ENH: update some filament params 1. Modify texture bed temp to 65 2. Modify max-v-speed for ABS 3. Modify some params in Generic PA 4. Modify PLA,PVA params jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I42584a6015b8526f6bbb93024316968198bd76ce * FIX: 3770 printable checkbox incorrect display in darkUI Jira: 3770 Change-Id: I97f67d7a0ffc41f6ee625abeecc52ee4e73cf318 * FIX:Display garbled code in AmsMaterialsSetting pop-up Change-Id: I50531e939afa7715ae376bac47172ccf7b248114 * ENH:Modifying the Line Color of Transparent Materials JIRA: STUDIO-4311,5088,4983 Change-Id: I9e63413dc9cd7d523f0f7f1a2e32c4537a84467a * FIX: crash when async delete printer file Change-Id: I92c5e812d04da263338fb0eea2fd7583cf9ecde0 Jira: STUDIO-5222 * FIX: 3733 backup time not effective Jira: 3733 Change-Id: I50c2ce156fcbd0a17aa8a6777bce04aa6093c830 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * FIX: enable edit and delete preset btn and fix issue Jira: XXXX Change-Id: I724d7236b28fcc4746698f094531948a8fbb5d93 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * FIX:send print job,file name displays error JIRA:3137 Change-Id: I1c113025d274a13fba1b845a58aada14058fadd4 * FIX: skip hold user preset from sync Change-Id: I2252246e19bd80903ad82170782ea49535d30d05 Jira: STUDIO-5185 * FIX: 5115 translations Jira: 5115 Change-Id: I21b03bdd4d28c0bb097226143177e763cf8c777f Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * FIX: add link for ironing parameter Change-Id: I451f5549db3ac2205aa5703a2e5edc831e946af8 * FIX: scale problem in lift type decide 1. Scale the travel threshhold jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Ib594d640fe63b0919bc9318af88577513f7dbf30 * ENH: add small perimeter speed and threshold The original param is added by Prusa. Thanks orca for adding threshold. 1. Re add small perimeter speed and threhold. github: #2221 Change-Id: I35b269b26f085d80f0edca28650bb21fc04898d7 * FIX: modify the picture of pa manual cali Jira: STUDIO-5102 Change-Id: Id87898959ad4461b7bd2505b159271f2aa589c36 * FIX: Filament preset is the same with the first one Jira: STUDIO-4519 Filament preset is the same wit the first one, it should align with the last one. Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I304d0ff0fbc1c8948d410ea552e4d42b6a4e8fd9 * FIX: scoreDailog dark mode issue Jira: 4570 Change-Id: I8be97b306a1494f73e3bba678ecc864e7ff88ca3 * FIX: CLI: fix the slicing issue while only one object with multicolor using seq-print JIRA: no-jira Change-Id: Iea2d23ff8e484bf2fd58aa2f596a8e4e4292fe39 * ENH: open support wall count for normal support 1. open support wall count for normal support Enabling this option makes normal support stronger and gives better overhang quality, but also more difficult to removal. Jira: STUDIO-5192 2. fix a bug where tree support (hybrid style) may get overlapped extrusions near the walls. 3. fix a bug where raft layers can't be 1 in tree support Jira: STUDIO-5261 Change-Id: Iadc0c67a9b50b5b221c8e83d5aa22ed282018cf8 (cherry picked from commit c0bb0084e386cb70ed6e16edf93190e4b38f5b90) * FIX: compiling error on linux jira: none Change-Id: I1a4563503b5ddf74a1979cc0cee7a15b8aced904 (cherry picked from commit de52c6ca62c9f3a6314ddf5a856c1d8534329886) * ENH: add translation for small perimeter jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I95013649e4e0c07c0f04b89a91488814c8d228cc * FIX: clone shortcut key issue on macos jira: STUDIO-5166 Change-Id: I1967da1d443ed43bd750dad8e11560688d7bd533 * FIX: custom gcode window cannot paste/ navigate jira: STUDIO-5208、STUDIO-5070 Change-Id: I4ecb9d06cf5db0ae53a4678181aae9298bac106b * ENH: modify dailytips collapse & expand interaction jira: STUDIO-5209、STUDIO-5210 Change-Id: Ifb0b998e5004d4b49390ba5a250eaf4743bf3471 * ENH:Add shortcut keys and lists for objects search JIRA: STUDIO-5157 STUDIO-5158 STUDIO-5240 Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com> Change-Id: Ic7cfaaa9b4bb8a85208bafab7fe3bafdb78f0045 * FIX:Re-calculate button with White Box displayed in dark mode JIRA: STUDIO-5098 Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com> Change-Id: I07cc6c72d5dbd03b72573cd27dd5938bb0e6a29a * NEW: display plate index when printing a task JIRA: STUDIO-2689 display on the thumbnail of the current task Change-Id: I5f1f46c56e9d1e9120a66d491551908dfad099d6 Signed-off-by: Stone Li <stone.li@bambulab.com> * ENH:fixed incorrect path prefix jira:[for file path prefix] Change-Id: Ie9e3999f02b78272e528ceceb479e746d46a7e6c * FIX: thumbnail is not clear in dark mode JIRA: STUDIO-5087 Change-Id: Ie86493ed71b5554095927f061509a1f551758b61 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> * FIX: translation Jira: XXXX Change-Id: Id03f0d704aa852632a907ea628d1277400112062 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * ENH: first nozzle change to 0.4 and nozzle change to mm Jira: XXXX Change-Id: I14defd36442dbd7008e46782b08415b6244224f1 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * ENH:editing_window_width's value is small on the laptop Jira: STUDIO-5238 STUDIO-5265 apply_selected_connectors should check_and_update_connectors_state Change-Id: I8c2c1c920cc4d197d1908815a3e62f4962335451 * FIX: fix new_bed_shape's calculation process Jira: STUDIO-5122 Change-Id: I5f3e6a301a297123af28692c90bef6759f425b06 * ENH:update some translations jira:[STUDIO-5262] Change-Id: Idb1d3586888043ac325f272bc7a2b788adb3e9e5 * FIX: edit text command resets object settings Jira: STUDIO-4655 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: Iac25c4e40f1d0d32e6d1f40e62226cc22bc96042 * ci: update build version to 01.08.00.58 Change-Id: Iacfec02aa50c617e4c9fe566319b07b30d47dce1 * FIX: remove GetUserAgent Change-Id: I92886e1f0dcb091109231a10da8c19d51178e13b Jira: STUDIO-5205 * FIX: nozzle_diameter_map data structure adjustment Change-Id: Ifb724afc0fcf974e6d331e73ecac723107a102cf * ENH:add _A and _B for perform_with_groove Jira: STUDIO-5267 Change-Id: Iee3310dfa1cd8e6680310f0af0eff5c817490813 * ENH:is_equal for min_z and max_z Jira: STUDIO-5267 Change-Id: I9493883d8be9d44e26ddc9afe62b7e9eb09c5052 * ci: update build version to 01.08.00.59 Change-Id: Ie8ed29ccf5d6c94594eb2ab8b717416fbeace3bd * FIX:Image display unclear in light mode JIRA:5161 Change-Id: I134cc64a2af0dfff60c47d0ff09d78d9c0f86b3f * FIX:fix bugs of non manifold edge Jira: STUDIO-5267 Change-Id: I8ac9a2cf96da0bc07ee00b309e65611b92fd174d * ENH:nozzle type detection jira:[STUDIO-5246] Change-Id: Ic41a2161a0e41d23f56af93ad8ec34cc83ada0e3 * ENH: upadte P1S start gcode 1.turn on MC board fan by default on P1S jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I5b2f7868e350942fb8b7baf7d429e22a0987184a (cherry picked from commit e866a575b6b7d9552f7412f84272f4b48dfc3961) * ENH: improve support style's tooltip jira: none Change-Id: I8ee858d7052f04ce7ea6b226a500c7d1bf8a482f (cherry picked from commit 665f31c4fcde22bd894cbb4a5fb160635947f2a4) * ENH: set layer range error to warning 1. If layer range exceeds maximum/minimum layer range in printer settings,pop up a window to warn jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I0304ee790e557ecf967f355c171993d1f51b5057 * ENH: CLI: remove the warning of layer height JIRA: no jira Change-Id: Idaceee4f52611479fc3f4238d016d891b4dc8cd1 * FIX: the word search is not translated Jira: STUDIO-5224 The world search in the device panel is not translated. Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: Ia3d651c2159a3aad94e10cd0a6da98848f53ee2a (cherry picked from commit 4a46a0a4750d82d49c9523f4b668a1a00c41ed83) * FIX: Bitmap will flash when sending printing task Jira: STUDIO-5278 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: Ib0c8710b8d5d6b98fad043c950f054aa35bea965 * ENH:display the euler angle of rotation plane Jira: STUDIO-5268 Change-Id: I6b7b431931d60f1a9a832908400417781798c472 * ci: update build version to 01.08.00.60 Change-Id: I1c15b5c6437554c43327cd6b537f7a5860dba5a0 * ENH:cancel EnterReturnsTrue for imgui in cut Jira: STUDIO-5269 Change-Id: I2832e1dccaf9755448debe7b2bd56426f90dfe0d * ci: update build version to 01.08.00.61 Change-Id: Ib03e664a20990322c788686550c491d0139d8237 * FIX: some translation problems jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: If9f2af53b4f0bfa9469e84bcba68cc182df4a473 * add: Ukrainian lang support for 1.8 * fix linux * fix some string and colors * fix linux build error 2 * fix .gitignore * FIX: calibration selected preset is null in some case jira: STUDIO-5258 Change-Id: Iee63593c5f833c5a43e3b1d1c9ddb82f8c69569a * FIX: create filament issue Jira: 5296 5297 5295 5302 5311 5276 5296 create filament: list has same printer 5297 create filament: filament combobox has blank options 5298 edit filament: delete last preset prompt users 5302 create filament: filament combox has cili preset 5311 create filament: printer name too long to can not show all 5276 edit filament: PLA Aero filament type filter issue add prusa vendor Revised copy Change-Id: I5dcc615ce0951b1a9953fa12283f6090f5069045 * FIX: some translation Change-Id: Icb8614a0af18f96d15f3b97c17e0f6f708296847 * FIX:cancel is_equal for slicing function Jira: STUDIO-5267 Change-Id: I66d759aa2c968f8a28a6a5d8378929754f2db689 * FIX:UI stuck due to pop-up window with wrong chamber temperature JIRA: 5304 Change-Id: I1a49a7219b7a6f5700243704c348724e7930ce1a * FIX: allow input '+' and hide edit preset btn Change-Id: I97aec7c3ac4cc8b9d6c535f0126aaa1926553d86 * ENH: handle printer direct close and not retry Change-Id: I5dd55f8085cf6383a8420ab41e614ea6ae210c78 Jira: STUDIO-5305 * ci: update build version to 01.08.00.62 Change-Id: I09716bf79354b503197c751272fd3171e0abc8fd * add: new translation to ukr for AirFlow and Prusa * add: Texture Plate name fix * add new feature to localization .de, fix .it (#2876) * FIX:add slice_facet_for_cut_mesh api for cut tool and modify section_vertices_map 's traverse Jira: STUDIO-5267 Change-Id: Ifc4b183a4e4c4fdb4f47742f14f70a1ed93fa056 Change-Id: I52bfaef8926ef967b78a6cb712a1731a1b528a24 * FIX: Make the front smaller for Czech in device panel Jira: STUDIO-5151 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I315174b55f923da069854fb4fed8cf3937b82074 * FIX: there is no object can be jumped to in notification jira: new Change-Id: Ib81bf49236952ede24a2de126051572d63916e01 * FIX: add height range, modifier in Preview pane will crash jira: STUDIO-5340 1. fix crash at add height range, modifiers in Preview from objectList 2. fix an assert hit when slicing 3. fix an assert hit when enter AssembleView 4. forbidden popup menu by right-click objectList in Preview Change-Id: I444bc76b1a4307999b387e4f60386b2d272bd308 * FIX: Black spot in the sending printing task page Jira: STUDIO-5307 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I3bd97c063ec5f0faf7d12047da39f60ce55cae4b * FIX: reset_cut_by_contours should update_buffer_data Jira: STUDIO-5376 Change-Id: I5aacb1f7b65822031d7138abd61a45b09c743531 * ENH:editing_window_width's value is small on the laptop Jira: STUDIO-5238 STUDIO-5265 Change-Id: Ia958772bcb081817da621115f99328bb62770cd5 * ENH: bumped version to 1.8.1 Change-Id: I9d25403daa5b7b8ca415c0b364670da9e0f932b0 * FIX: create filament dialog: create btn can not show all Jira: 5310 5331 Change-Id: I185272c90d9ff1c3d6b47abbefbf488d0d965cca * FIX:update custom_texture when new_shape=false Jira: STUDIO-5287 Change-Id: I3add95f9f9345c14a48cc7467513d1b3ce95f4c9 * ENH:editing_window_width's value is small on the laptop Jira: STUDIO-5238 Change-Id: I9044129f4e0c8ca7469db05b3e547fca4754342a * FIX:add slash_to_back_slash for saving file path Jira: STUDIO-5287 Change-Id: I9f3c176cd0831c793958f08601c63efac98176a4 * FIX: a button color didn't response to dark mode change jira: STUDIO-5315 Change-Id: I95489f01ccd1f77b9e95b0d0f69e5398d2e88487 * FIX: height range layers displayed in wrong position jira: STUDIO-5341 Change-Id: I83918b4624f367efa54321f1898e1176cdb04ea9 * FIX: auto arranging issues with locked plates 1. global auto arranging may put items overlap with wipe tower if some plates are locked jira: STUDIO-5329 2. items outside bed may overlap with plate boundary if it's rotated jira: STUDIO-5329 3. plate-wise auto arranging uses wrong min_obj_distance if the plate is by-layer printing but global setting is by-object printing jira: STUDIO-5330 Change-Id: I5dba2f1317e183c9aeec1cb2bd227fbddf4316e6 (cherry picked from commit db1eac41efff5f1e8d5ac0af74c6fc7ab59fc253) * FIX: a mistake in upward machine jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Ibdb26c3d904634f322aef0dc0c7b8867d9fb5854 * FIX:a blank pop-up appears JIRA:XXXX Change-Id: Ice92b55204e4897fec024a6d99412eb810bddd4a * FIX:fixed failure in updating nozzle type jira:[STUDIO-5248] Change-Id: Iad37b5d5b76d37cb1723ef21d7c39b1e3fcaf8d7 * FIX:fixed issue with AI monitoring settings jira:[STUDIO-5082] Change-Id: I967fe3c1e9da61a55bcbfaa2a8e067dd5af18f72 * FIX:fixed issue with lan mode jira:[STUDIO-5189] Change-Id: I1d0a05f19dcea154cf3ef2b61ed0546d3581905e * FIX:update text for loading or unloading filaments jira:[STUDIO-5231] Change-Id: Ic7729c3ec012485b3d87e3d01f11e87502c67895 * FIX: Revert "ENH: do not leave a gap for top... Revert "ENH: do not leave a gap for top interface if the top z distance is 0" This reverts commit 79ea32c7cbbdb7e689637980af7c36caf42284c9. Revert reason: the supports are impossible to remove in some cases. jira: STUDIO-5385 Change-Id: I376a6f4dfd78da6dfea68b9ac3d552cddd0b4272 (cherry picked from commit 34e38b705fde7f5d7f9a3a89c96a3627ce0c998e) * ENH: improve normal support's quality 1. Add a base_interface_layer when using Supp.W 2. Fix a bug where base_angle and interface_angle are wong jira: STUDIO-5386 Change-Id: I52ab32c63b3cd1e6e2ba6463b01ae26699cf13d3 (cherry picked from commit 92ddd4a10b793572a1fa009da5b9e44fcdf81de2) * NEW:tracking stl model files jira:[STUDIO-5372] Change-Id: Idb1275b07441f0cd06c24588d5f7c20f81f1556c * FIX: edit filament dialog: preset name too long to del btn nan't show Jira: 5336 5174 and verify string normalization Change-Id: I380c3bed2bf43d01094b68979a8b67f4187c0b93 * FIX: some translation Jira: 5232 5300 5334 Change-Id: Ie474ca823011e81aab82a9809af3d6e42980496b * FIX: some translation Change-Id: Iaabe6087bed3b7d47d911cf4fb51c770804e72fb * ENH: change default tree_support_wall_count to 0 Now normal support also uses this option, so we can't default it to 1, otherwise normal supports will be too hard to remove. jira: none Change-Id: Ic5700af5c17e3a7b265c8915f28b0db35c6e06e6 (cherry picked from commit 6b84a9826da108b76569e686bd9def0b23ae29fd) * FIX:The name of the material in the error prompt is empty JIRA:STUDIO-4907 Change-Id: I3cf44f099256a51f21a44a89c89c000f734d1f36 * ci: update build version to 01.08.01.51 Change-Id: Ib20f5a12b65472102befec0a2adf82744fc29c46 * FIX: imgui textinput cannot paste on macos jira: STUDIO-5070、STUDIO-5365 Change-Id: Iea8f41e12744ecda0fbb95c1a8f2e014a7cdc384 * FIX: not cache printer file list on error Change-Id: I99843aedbf14d3d1d553ccac9b0bd26403274a82 Jira: none * FIX: thread of close BBLUserPresetExceedLimit notify Change-Id: I9698134ba1cc91fc83eac441f900d68c4c4b556a * ENH: Resolve non manifold edges by fixing model interfaces Jira: STUDIO-5124 Change-Id: I7ea86be44acb80b6c4762a76208b4a031acd0b27 * FIX:nozzle type sync jira:[STUDIO-5248] Change-Id: I63d48628832473d8d371ed643dc8528b00382531 * FIX: array bound happen in TriangleSelector::deserialize Jira: STUDIO-5170 Change-Id: I92b72a887845b462fad208f13607293b44d3d333 * FIX:cropping rendering without considering assembly views Jira: STUDIO-5260 Change-Id: Ia56cf80b305ae05f25f06ec277f85b3c5430a6df * FIX: PA for custom filament not available in BL Studio github: 2971 Change-Id: I6ccd36a183e7367d69557300f7242f5403f4bb33 * FIX: Bitmap is way too small on Mac Jira: STUDIO-5393 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I6b550669fa8cd5fc9bfa6ed96d64d19a949f01b2 * FIX: move shutdown wait to OnExit Change-Id: I70d9a2bb686525ae5273aa9d63e25691da4ab65c Jira: STUDIO-2884 * FIX: calibration manage result dialog issue on macos jira: STUDIO-4949 STUDIO-5378 Change-Id: I00abefd45a0d274a4b68bb1ab18debe8f91d169e * FIX: adjust bed shape dialog button UI style fix that button text is hard to see in dark mode jira: STUDIO-5247 Change-Id: I2cf5b3cdd2eff9b821bdf5525bec4f329fc58dd1 * FIX: 5331 rescale btn Jira: STUDIO-5331 Change-Id: If153424b8480e64b166018e3cd98c17db557d0a8 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * FIX: support do not generate jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Ide9709d95203185538e280517f7aa6136beeda44 * FIX: remove not match printer config ota cache Change-Id: Ib73fc2ea31fa2186061cfcb5a170bc59b9db84ca Jira: none * FIX:cancel the variable of "checkbox_size" as a fixed value Jira: STUDIO-5150 Change-Id: I30d876d141b8b35ab4a3fee4889993d87b7c1741 * ENH:add reset_cut_by_contours in on_load function Jira:STUDIO-5269 m_connector_size_tolerance default value is 0.1f Change-Id: I6c67fff3cb0c1190e9141ed6f68fbfa848679f35 * ENH:cancel EnterReturnsTrue for imgui in cut Jira: STUDIO-5269 Change-Id: Ifc4b183a4e4c4fdb4f47742f14f70a1ed93fa056 Signed-off-by: zhou.xu <zhou.xu@bambulab.com> * FIX: dailytips should not change content frequently when slicing all jira: STUDIO-5234 Change-Id: Icb7e9c28404d9db8ebed58d937e13f89c5403b5c * FIX: objectList clone shortcut key issue jira: new Change-Id: Ia75bf58a7d53f962e1af6c2fd97497270b7eea84 * ENH:handling cases without msgs jira:[STUDIO-5401 STUDIO-5399] Change-Id: Iae651d5a19a45b0138a6aa621326a8b4a9649824 * ENH: optimize param description jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Id0ca9224227a716b21fc0b8430722264dc319344 * ENH: add translation jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I3b1f04fee3cd6322793794ad8b8707859f6c7d26 * FIX: close edit preset paramsDialog, mac unresponsive Jira: 5298 Change-Id: I021e00567354cfb1f2f5f1f2bf6ba1fc35b164c5 * ENH:disable AI monitoring on the p1p series Change-Id: I514bb1fb1ced6c03dd619230a9adac3be63f2de2 * ci: update build version to 01.08.01.52 Change-Id: I9f5e30d3fc4b7ef9321c522d3c18fce98f03742f * FIX: close edit preset paramsDialog, mac unresponsive Change-Id: Ic816754a20b7f6a5cdb46475750eb301fec3ad3a * FIX: organic support not work with raft only There is no raft generated when only raft enabled but no support needed. jira: none Change-Id: Ic0c9269e2f98038d85c9bc54e4a85f892dc5d764 * FIX: CLI: add object config when assemble JIRA: no jira Change-Id: I945f820fb58f2f643170b4b0b66742f6bbbdfd29 * FIX: delete preset prompt Jira: XXXX Change-Id: I6511c806c56393d4f6bd72d1c506da59675d49ff * FIX:Reorganize the assignment of variables of "m_editing_window_width" Jira: STUDIO-5238 Change-Id: If369916f3f5c21510f5f297bfd05c1230bdda7a4 * ENH: CLI: re-compute flush_volumes_matrix when it is missed Change-Id: Ie8f53c6bef003b1434de02ea14de5787b376484f * FIX: some translation for delete filament Change-Id: Ib46a8eba33f2e21016476aaab4a57a740e86b1b8 * FIX: scrolled window / del preset / edit filament issue Jira: 5092 GitHub: 1936 edit filament: just one preset, the scroll bar obscures the preset name edit filament: delete selected preset, click no, but preset be deleted from UI edit filament: serial sometimes displays incorrectly Change-Id: Ibc91609e252179de0c05ca065099756da6631165 * ci: update build version to 01.08.01.53 Change-Id: I5563a2c0812ab9a0d7727df27e17e681066ffa08 --------- Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com> Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Signed-off-by: qing.zhang <qing.zhang@bambulab.com> Signed-off-by: Stone Li <stone.li@bambulab.com> Signed-off-by: zhou.xu <zhou.xu@bambulab.com> Co-authored-by: zorro.zhang <zorro.zhang@bambulab.com> Co-authored-by: liz.li <liz.li@bambulab.com> Co-authored-by: maosheng.wei <maosheng.wei@bambulab.com> Co-authored-by: chunmao.guo <chunmao.guo@bambulab.com> Co-authored-by: tao wang <tao.wang@bambulab.com> Co-authored-by: Arthur <arthur.tang@bambulab.com> Co-authored-by: lane.wei <lane.wei@bambulab.com> Co-authored-by: gerrit <gerrit@bambulab.com> Co-authored-by: xun.zhang <xun.zhang@bambulab.com> Co-authored-by: zhou.xu <zhou.xu@bambulab.com> Co-authored-by: hu.wang <hu.wang@bambulab.com> Co-authored-by: Kunlong Ma <kunlong.ma@bambulab.com> Co-authored-by: wenjie.guo <wenjie.guo@bambulab.com> Co-authored-by: qing.zhang <qing.zhang@bambulab.com> Co-authored-by: zhimin.zeng <zhimin.zeng@bambulab.com> Co-authored-by: the Raz <rasmus@abc.se> Co-authored-by: Andy <andylg@yandex.ru> Co-authored-by: Stone Li <stone.li@bambulab.com> Co-authored-by: enricoturri1966 <enricoturri@seznam.cz> Co-authored-by: Dmytro Chystiakov <dlchistyakov@gmail.com> Co-authored-by: Heiko Liebscher <hliebscher@idn.de>
1745 lines
72 KiB
C++
1745 lines
72 KiB
C++
#include "WipeTower.hpp"
|
|
|
|
#include <cassert>
|
|
#include <iostream>
|
|
#include <vector>
|
|
#include <numeric>
|
|
#include <sstream>
|
|
#include <iomanip>
|
|
|
|
#include "GCodeProcessor.hpp"
|
|
#include "BoundingBox.hpp"
|
|
#include "LocalesUtils.hpp"
|
|
|
|
|
|
namespace Slic3r
|
|
{
|
|
|
|
inline float align_round(float value, float base)
|
|
{
|
|
return std::round(value / base) * base;
|
|
}
|
|
|
|
inline float align_ceil(float value, float base)
|
|
{
|
|
return std::ceil(value / base) * base;
|
|
}
|
|
|
|
inline float align_floor(float value, float base)
|
|
{
|
|
return std::floor((value) / base) * base;
|
|
}
|
|
|
|
static bool is_valid_gcode(const std::string &gcode)
|
|
{
|
|
int str_size = gcode.size();
|
|
int start_index = 0;
|
|
int end_index = 0;
|
|
bool is_valid = false;
|
|
while (end_index < str_size) {
|
|
if (gcode[end_index] != '\n') {
|
|
end_index++;
|
|
continue;
|
|
}
|
|
|
|
if (end_index > start_index) {
|
|
std::string line_str = gcode.substr(start_index, end_index - start_index);
|
|
line_str.erase(0, line_str.find_first_not_of(" "));
|
|
line_str.erase(line_str.find_last_not_of(" ") + 1);
|
|
if (!line_str.empty() && line_str[0] != ';') {
|
|
is_valid = true;
|
|
break;
|
|
}
|
|
}
|
|
|
|
start_index = end_index + 1;
|
|
end_index = start_index;
|
|
}
|
|
|
|
return is_valid;
|
|
}
|
|
|
|
class WipeTowerWriter
|
|
{
|
|
public:
|
|
WipeTowerWriter(float layer_height, float line_width, GCodeFlavor flavor, const std::vector<WipeTower::FilamentParameters>& filament_parameters) :
|
|
m_current_pos(std::numeric_limits<float>::max(), std::numeric_limits<float>::max()),
|
|
m_current_z(0.f),
|
|
m_current_feedrate(0.f),
|
|
m_layer_height(layer_height),
|
|
m_extrusion_flow(0.f),
|
|
m_preview_suppressed(false),
|
|
m_elapsed_time(0.f),
|
|
#if ENABLE_GCODE_VIEWER_DATA_CHECKING
|
|
m_default_analyzer_line_width(line_width),
|
|
#endif // ENABLE_GCODE_VIEWER_DATA_CHECKING
|
|
m_gcode_flavor(flavor),
|
|
m_filpar(filament_parameters)
|
|
{
|
|
// adds tag for analyzer:
|
|
std::ostringstream str;
|
|
str << ";" << GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Height) << std::to_string(m_layer_height) << "\n"; // don't rely on GCodeAnalyzer knowing the layer height - it knows nothing at priming
|
|
str << ";" << GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Role) << ExtrusionEntity::role_to_string(erWipeTower) << "\n";
|
|
m_gcode += str.str();
|
|
change_analyzer_line_width(line_width);
|
|
}
|
|
|
|
WipeTowerWriter& change_analyzer_line_width(float line_width) {
|
|
// adds tag for analyzer:
|
|
std::stringstream str;
|
|
str << ";" << GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Width) << std::to_string(line_width) << "\n";
|
|
m_gcode += str.str();
|
|
return *this;
|
|
}
|
|
|
|
#if ENABLE_GCODE_VIEWER_DATA_CHECKING
|
|
WipeTowerWriter& change_analyzer_mm3_per_mm(float len, float e) {
|
|
static const float area = float(M_PI) * 1.75f * 1.75f / 4.f;
|
|
float mm3_per_mm = (len == 0.f ? 0.f : area * e / len);
|
|
// adds tag for processor:
|
|
std::stringstream str;
|
|
str << ";" << GCodeProcessor::Mm3_Per_Mm_Tag << mm3_per_mm << "\n";
|
|
m_gcode += str.str();
|
|
return *this;
|
|
}
|
|
#endif // ENABLE_GCODE_VIEWER_DATA_CHECKING
|
|
|
|
WipeTowerWriter& set_initial_position(const Vec2f &pos, float width = 0.f, float depth = 0.f, float internal_angle = 0.f) {
|
|
m_wipe_tower_width = width;
|
|
m_wipe_tower_depth = depth;
|
|
m_internal_angle = internal_angle;
|
|
m_start_pos = this->rotate(pos);
|
|
m_current_pos = pos;
|
|
return *this;
|
|
}
|
|
|
|
WipeTowerWriter& set_initial_tool(size_t tool) { m_current_tool = tool; return *this; }
|
|
|
|
WipeTowerWriter& set_z(float z)
|
|
{ m_current_z = z; return *this; }
|
|
|
|
WipeTowerWriter& set_extrusion_flow(float flow)
|
|
{ m_extrusion_flow = flow; return *this; }
|
|
|
|
WipeTowerWriter& set_y_shift(float shift) {
|
|
m_current_pos.y() -= shift-m_y_shift;
|
|
m_y_shift = shift;
|
|
return (*this);
|
|
}
|
|
|
|
WipeTowerWriter& disable_linear_advance() {
|
|
if (m_gcode_flavor == gcfKlipper)
|
|
m_gcode += "SET_PRESSURE_ADVANCE ADVANCE=0\n";
|
|
else if (m_gcode_flavor == gcfRepRapFirmware)
|
|
m_gcode += std::string("M572 D") + std::to_string(m_current_tool) + " S0\n";
|
|
else
|
|
m_gcode += "M900 K0\n";
|
|
|
|
return *this;
|
|
}
|
|
|
|
// Suppress / resume G-code preview in Slic3r. Slic3r will have difficulty to differentiate the various
|
|
// filament loading and cooling moves from normal extrusion moves. Therefore the writer
|
|
// is asked to suppres output of some lines, which look like extrusions.
|
|
#if ENABLE_GCODE_VIEWER_DATA_CHECKING
|
|
WipeTowerWriter& suppress_preview() { change_analyzer_line_width(0.f); m_preview_suppressed = true; return *this; }
|
|
WipeTowerWriter& resume_preview() { change_analyzer_line_width(m_default_analyzer_line_width); m_preview_suppressed = false; return *this; }
|
|
#else
|
|
WipeTowerWriter& suppress_preview() { m_preview_suppressed = true; return *this; }
|
|
WipeTowerWriter& resume_preview() { m_preview_suppressed = false; return *this; }
|
|
#endif // ENABLE_GCODE_VIEWER_DATA_CHECKING
|
|
|
|
WipeTowerWriter& feedrate(float f)
|
|
{
|
|
if (f != m_current_feedrate) {
|
|
m_gcode += "G1" + set_format_F(f) + "\n";
|
|
m_current_feedrate = f;
|
|
}
|
|
return *this;
|
|
}
|
|
|
|
const std::string& gcode() const { return m_gcode; }
|
|
const std::vector<WipeTower::Extrusion>& extrusions() const { return m_extrusions; }
|
|
float x() const { return m_current_pos.x(); }
|
|
float y() const { return m_current_pos.y(); }
|
|
const Vec2f& pos() const { return m_current_pos; }
|
|
const Vec2f start_pos_rotated() const { return m_start_pos; }
|
|
const Vec2f pos_rotated() const { return this->rotate(m_current_pos); }
|
|
float elapsed_time() const { return m_elapsed_time; }
|
|
float get_and_reset_used_filament_length() { float temp = m_used_filament_length; m_used_filament_length = 0.f; return temp; }
|
|
|
|
// Extrude with an explicitely provided amount of extrusion.
|
|
WipeTowerWriter& extrude_explicit(float x, float y, float e, float f = 0.f, bool record_length = false, bool limit_volumetric_flow = true)
|
|
{
|
|
if (x == m_current_pos.x() && y == m_current_pos.y() && e == 0.f && (f == 0.f || f == m_current_feedrate))
|
|
// Neither extrusion nor a travel move.
|
|
return *this;
|
|
|
|
float dx = x - m_current_pos.x();
|
|
float dy = y - m_current_pos.y();
|
|
float len = std::sqrt(dx*dx+dy*dy);
|
|
if (record_length)
|
|
m_used_filament_length += e;
|
|
|
|
// Now do the "internal rotation" with respect to the wipe tower center
|
|
Vec2f rotated_current_pos(this->pos_rotated());
|
|
Vec2f rot(this->rotate(Vec2f(x,y))); // this is where we want to go
|
|
|
|
if (! m_preview_suppressed && e > 0.f && len > 0.f) {
|
|
#if ENABLE_GCODE_VIEWER_DATA_CHECKING
|
|
change_analyzer_mm3_per_mm(len, e);
|
|
#endif // ENABLE_GCODE_VIEWER_DATA_CHECKING
|
|
// Width of a squished extrusion, corrected for the roundings of the squished extrusions.
|
|
// This is left zero if it is a travel move.
|
|
float width = e * m_filpar[0].filament_area / (len * m_layer_height);
|
|
// Correct for the roundings of a squished extrusion.
|
|
width += m_layer_height * float(1. - M_PI / 4.);
|
|
if (m_extrusions.empty() || m_extrusions.back().pos != rotated_current_pos)
|
|
m_extrusions.emplace_back(WipeTower::Extrusion(rotated_current_pos, 0, m_current_tool));
|
|
m_extrusions.emplace_back(WipeTower::Extrusion(rot, width, m_current_tool));
|
|
}
|
|
|
|
m_gcode += "G1";
|
|
if (std::abs(rot.x() - rotated_current_pos.x()) > (float)EPSILON)
|
|
m_gcode += set_format_X(rot.x());
|
|
|
|
if (std::abs(rot.y() - rotated_current_pos.y()) > (float)EPSILON)
|
|
m_gcode += set_format_Y(rot.y());
|
|
|
|
|
|
if (e != 0.f)
|
|
m_gcode += set_format_E(e);
|
|
|
|
if (f != 0.f && f != m_current_feedrate) {
|
|
if (limit_volumetric_flow) {
|
|
float e_speed = e / (((len == 0.f) ? std::abs(e) : len) / f * 60.f);
|
|
f /= std::max(1.f, e_speed / m_filpar[m_current_tool].max_e_speed);
|
|
}
|
|
m_gcode += set_format_F(f);
|
|
}
|
|
|
|
m_current_pos.x() = x;
|
|
m_current_pos.y() = y;
|
|
|
|
// Update the elapsed time with a rough estimate.
|
|
m_elapsed_time += ((len == 0.f) ? std::abs(e) : len) / m_current_feedrate * 60.f;
|
|
m_gcode += "\n";
|
|
return *this;
|
|
}
|
|
|
|
WipeTowerWriter& extrude_explicit(const Vec2f &dest, float e, float f = 0.f, bool record_length = false, bool limit_volumetric_flow = true)
|
|
{ return extrude_explicit(dest.x(), dest.y(), e, f, record_length); }
|
|
|
|
// Travel to a new XY position. f=0 means use the current value.
|
|
WipeTowerWriter& travel(float x, float y, float f = 0.f)
|
|
{ return extrude_explicit(x, y, 0.f, f); }
|
|
|
|
WipeTowerWriter& travel(const Vec2f &dest, float f = 0.f)
|
|
{ return extrude_explicit(dest.x(), dest.y(), 0.f, f); }
|
|
|
|
// Extrude a line from current position to x, y with the extrusion amount given by m_extrusion_flow.
|
|
WipeTowerWriter& extrude(float x, float y, float f = 0.f)
|
|
{
|
|
float dx = x - m_current_pos.x();
|
|
float dy = y - m_current_pos.y();
|
|
return extrude_explicit(x, y, std::sqrt(dx*dx+dy*dy) * m_extrusion_flow, f, true);
|
|
}
|
|
|
|
WipeTowerWriter& extrude(const Vec2f &dest, const float f = 0.f)
|
|
{ return extrude(dest.x(), dest.y(), f); }
|
|
|
|
WipeTowerWriter& rectangle(const Vec2f& ld,float width,float height,const float f = 0.f)
|
|
{
|
|
Vec2f corners[4];
|
|
corners[0] = ld;
|
|
corners[1] = ld + Vec2f(width,0.f);
|
|
corners[2] = ld + Vec2f(width,height);
|
|
corners[3] = ld + Vec2f(0.f,height);
|
|
int index_of_closest = 0;
|
|
if (x()-ld.x() > ld.x()+width-x()) // closer to the right
|
|
index_of_closest = 1;
|
|
if (y()-ld.y() > ld.y()+height-y()) // closer to the top
|
|
index_of_closest = (index_of_closest==0 ? 3 : 2);
|
|
|
|
travel(corners[index_of_closest].x(), y()); // travel to the closest corner
|
|
travel(x(),corners[index_of_closest].y());
|
|
|
|
int i = index_of_closest;
|
|
do {
|
|
++i;
|
|
if (i==4) i=0;
|
|
extrude(corners[i], f);
|
|
} while (i != index_of_closest);
|
|
return (*this);
|
|
}
|
|
|
|
WipeTowerWriter &rectangle_fill_box(const WipeTower* wipe_tower, const Vec2f &ld, float width, float height, const float f = 0.f)
|
|
{
|
|
bool need_change_flow = wipe_tower->need_thick_bridge_flow(ld.y());
|
|
|
|
Vec2f corners[4];
|
|
corners[0] = ld;
|
|
corners[1] = ld + Vec2f(width, 0.f);
|
|
corners[2] = ld + Vec2f(width, height);
|
|
corners[3] = ld + Vec2f(0.f, height);
|
|
int index_of_closest = 0;
|
|
if (x() - ld.x() > ld.x() + width - x()) // closer to the right
|
|
index_of_closest = 1;
|
|
if (y() - ld.y() > ld.y() + height - y()) // closer to the top
|
|
index_of_closest = (index_of_closest == 0 ? 3 : 2);
|
|
|
|
travel(corners[index_of_closest].x(), y()); // travel to the closest corner
|
|
travel(x(), corners[index_of_closest].y());
|
|
|
|
int i = index_of_closest;
|
|
bool flow_changed = false;
|
|
do {
|
|
++i;
|
|
if (i == 4) i = 0;
|
|
if (need_change_flow) {
|
|
if (i == 1) {
|
|
// using bridge flow in bridge area, and add notes for gcode-check when flow changed
|
|
set_extrusion_flow(wipe_tower->extrusion_flow(0.2));
|
|
append(";" + GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Height) + std::to_string(0.2) + "\n");
|
|
flow_changed = true;
|
|
} else if (i == 2 && flow_changed) {
|
|
set_extrusion_flow(wipe_tower->get_extrusion_flow());
|
|
append(";" + GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Height) + std::to_string(m_layer_height) + "\n");
|
|
}
|
|
}
|
|
extrude(corners[i], f);
|
|
} while (i != index_of_closest);
|
|
return (*this);
|
|
}
|
|
|
|
WipeTowerWriter& rectangle(const WipeTower::box_coordinates& box, const float f = 0.f)
|
|
{
|
|
rectangle(Vec2f(box.ld.x(), box.ld.y()),
|
|
box.ru.x() - box.lu.x(),
|
|
box.ru.y() - box.rd.y(), f);
|
|
return (*this);
|
|
}
|
|
|
|
WipeTowerWriter& load(float e, float f = 0.f)
|
|
{
|
|
if (e == 0.f && (f == 0.f || f == m_current_feedrate))
|
|
return *this;
|
|
m_gcode += "G1";
|
|
if (e != 0.f)
|
|
m_gcode += set_format_E(e);
|
|
if (f != 0.f && f != m_current_feedrate)
|
|
m_gcode += set_format_F(f);
|
|
m_gcode += "\n";
|
|
return *this;
|
|
}
|
|
|
|
WipeTowerWriter& retract(float e, float f = 0.f)
|
|
{ return load(-e, f); }
|
|
|
|
// Loads filament while also moving towards given points in x-axis (x feedrate is limited by cutting the distance short if necessary)
|
|
WipeTowerWriter& load_move_x_advanced(float farthest_x, float loading_dist, float loading_speed, float max_x_speed = 50.f)
|
|
{
|
|
float time = std::abs(loading_dist / loading_speed); // time that the move must take
|
|
float x_distance = std::abs(farthest_x - x()); // max x-distance that we can travel
|
|
float x_speed = x_distance / time; // x-speed to do it in that time
|
|
|
|
if (x_speed > max_x_speed) {
|
|
// Necessary x_speed is too high - we must shorten the distance to achieve max_x_speed and still respect the time.
|
|
x_distance = max_x_speed * time;
|
|
x_speed = max_x_speed;
|
|
}
|
|
|
|
float end_point = x() + (farthest_x > x() ? 1.f : -1.f) * x_distance;
|
|
return extrude_explicit(end_point, y(), loading_dist, x_speed * 60.f, false, false);
|
|
}
|
|
|
|
// Elevate the extruder head above the current print_z position.
|
|
WipeTowerWriter& z_hop(float hop, float f = 0.f)
|
|
{
|
|
m_gcode += std::string("G1") + set_format_Z(m_current_z + hop);
|
|
if (f != 0 && f != m_current_feedrate)
|
|
m_gcode += set_format_F(f);
|
|
m_gcode += "\n";
|
|
return *this;
|
|
}
|
|
|
|
// Lower the extruder head back to the current print_z position.
|
|
WipeTowerWriter& z_hop_reset(float f = 0.f)
|
|
{ return z_hop(0, f); }
|
|
|
|
// Move to x1, +y_increment,
|
|
// extrude quickly amount e to x2 with feed f.
|
|
WipeTowerWriter& ram(float x1, float x2, float dy, float e0, float e, float f)
|
|
{
|
|
extrude_explicit(x1, m_current_pos.y() + dy, e0, f, true, false);
|
|
extrude_explicit(x2, m_current_pos.y(), e, 0.f, true, false);
|
|
return *this;
|
|
}
|
|
|
|
// Let the end of the pulled out filament cool down in the cooling tube
|
|
// by moving up and down and moving the print head left / right
|
|
// at the current Y position to spread the leaking material.
|
|
WipeTowerWriter& cool(float x1, float x2, float e1, float e2, float f)
|
|
{
|
|
extrude_explicit(x1, m_current_pos.y(), e1, f, false, false);
|
|
extrude_explicit(x2, m_current_pos.y(), e2, false, false);
|
|
return *this;
|
|
}
|
|
|
|
WipeTowerWriter& set_tool(size_t tool)
|
|
{
|
|
m_current_tool = tool;
|
|
return *this;
|
|
}
|
|
|
|
// Set extruder temperature, don't wait by default.
|
|
WipeTowerWriter& set_extruder_temp(int temperature, bool wait = false)
|
|
{
|
|
m_gcode += "M" + std::to_string(wait ? 109 : 104) + " S" + std::to_string(temperature) + "\n";
|
|
return *this;
|
|
}
|
|
|
|
// Wait for a period of time (seconds).
|
|
WipeTowerWriter& wait(float time)
|
|
{
|
|
if (time==0.f)
|
|
return *this;
|
|
m_gcode += "G4 S" + Slic3r::float_to_string_decimal_point(time, 3) + "\n";
|
|
return *this;
|
|
}
|
|
|
|
// Set speed factor override percentage.
|
|
WipeTowerWriter& speed_override(int speed)
|
|
{
|
|
m_gcode += "M220 S" + std::to_string(speed) + "\n";
|
|
return *this;
|
|
}
|
|
|
|
// Let the firmware back up the active speed override value.
|
|
WipeTowerWriter& speed_override_backup()
|
|
{
|
|
// BBS: BBL machine don't support speed backup
|
|
#if 0
|
|
if (m_gcode_flavor == gcfMarlinLegacy || m_gcode_flavor == gcfMarlinFirmware)
|
|
m_gcode += "M220 B\n";
|
|
#endif
|
|
return *this;
|
|
}
|
|
|
|
// Let the firmware restore the active speed override value.
|
|
WipeTowerWriter& speed_override_restore()
|
|
{
|
|
// BBS: BBL machine don't support speed restore
|
|
#if 0
|
|
if (m_gcode_flavor == gcfMarlinLegacy || m_gcode_flavor == gcfMarlinFirmware)
|
|
m_gcode += "M220 R\n";
|
|
#endif
|
|
return *this;
|
|
}
|
|
|
|
// Set digital trimpot motor
|
|
WipeTowerWriter& set_extruder_trimpot(int current)
|
|
{
|
|
// BBS: don't control trimpot
|
|
#if 0
|
|
if (m_gcode_flavor == gcfRepRapSprinter || m_gcode_flavor == gcfRepRapFirmware)
|
|
m_gcode += "M906 E";
|
|
else
|
|
m_gcode += "M907 E";
|
|
m_gcode += std::to_string(current) + "\n";
|
|
#endif
|
|
return *this;
|
|
}
|
|
|
|
WipeTowerWriter& flush_planner_queue()
|
|
{
|
|
m_gcode += "G4 S0\n";
|
|
return *this;
|
|
}
|
|
|
|
// Reset internal extruder counter.
|
|
WipeTowerWriter& reset_extruder()
|
|
{
|
|
m_gcode += "G92 E0\n";
|
|
return *this;
|
|
}
|
|
|
|
WipeTowerWriter& comment_with_value(const char *comment, int value)
|
|
{
|
|
m_gcode += std::string(";") + comment + std::to_string(value) + "\n";
|
|
return *this;
|
|
}
|
|
|
|
|
|
WipeTowerWriter& set_fan(unsigned speed)
|
|
{
|
|
if (speed == m_last_fan_speed)
|
|
return *this;
|
|
if (speed == 0)
|
|
m_gcode += "M107\n";
|
|
else
|
|
m_gcode += "M106 S" + std::to_string(unsigned(255.0 * speed / 100.0)) + "\n";
|
|
m_last_fan_speed = speed;
|
|
return *this;
|
|
}
|
|
|
|
WipeTowerWriter& append(const std::string& text) { m_gcode += text; return *this; }
|
|
|
|
const std::vector<Vec2f>& wipe_path() const
|
|
{
|
|
return m_wipe_path;
|
|
}
|
|
|
|
WipeTowerWriter& add_wipe_point(const Vec2f& pt)
|
|
{
|
|
m_wipe_path.push_back(rotate(pt));
|
|
return *this;
|
|
}
|
|
|
|
WipeTowerWriter& add_wipe_point(float x, float y)
|
|
{
|
|
return add_wipe_point(Vec2f(x, y));
|
|
}
|
|
|
|
private:
|
|
Vec2f m_start_pos;
|
|
Vec2f m_current_pos;
|
|
std::vector<Vec2f> m_wipe_path;
|
|
float m_current_z;
|
|
float m_current_feedrate;
|
|
size_t m_current_tool;
|
|
float m_layer_height;
|
|
float m_extrusion_flow;
|
|
bool m_preview_suppressed;
|
|
std::string m_gcode;
|
|
std::vector<WipeTower::Extrusion> m_extrusions;
|
|
float m_elapsed_time;
|
|
float m_internal_angle = 0.f;
|
|
float m_y_shift = 0.f;
|
|
float m_wipe_tower_width = 0.f;
|
|
float m_wipe_tower_depth = 0.f;
|
|
unsigned m_last_fan_speed = 0;
|
|
int current_temp = -1;
|
|
#if ENABLE_GCODE_VIEWER_DATA_CHECKING
|
|
const float m_default_analyzer_line_width;
|
|
#endif // ENABLE_GCODE_VIEWER_DATA_CHECKING
|
|
float m_used_filament_length = 0.f;
|
|
GCodeFlavor m_gcode_flavor;
|
|
const std::vector<WipeTower::FilamentParameters>& m_filpar;
|
|
|
|
std::string set_format_X(float x)
|
|
{
|
|
m_current_pos.x() = x;
|
|
return " X" + Slic3r::float_to_string_decimal_point(x, 3);
|
|
}
|
|
|
|
std::string set_format_Y(float y) {
|
|
m_current_pos.y() = y;
|
|
return " Y" + Slic3r::float_to_string_decimal_point(y, 3);
|
|
}
|
|
|
|
std::string set_format_Z(float z) {
|
|
return " Z" + Slic3r::float_to_string_decimal_point(z, 3);
|
|
}
|
|
|
|
std::string set_format_E(float e) {
|
|
return " E" + Slic3r::float_to_string_decimal_point(e, 4);
|
|
}
|
|
|
|
std::string set_format_F(float f) {
|
|
char buf[64];
|
|
sprintf(buf, " F%d", int(floor(f + 0.5f)));
|
|
m_current_feedrate = f;
|
|
return buf;
|
|
}
|
|
|
|
WipeTowerWriter& operator=(const WipeTowerWriter &rhs);
|
|
|
|
// Rotate the point around center of the wipe tower about given angle (in degrees)
|
|
Vec2f rotate(Vec2f pt) const
|
|
{
|
|
pt.x() -= m_wipe_tower_width / 2.f;
|
|
pt.y() += m_y_shift - m_wipe_tower_depth / 2.f;
|
|
double angle = m_internal_angle * float(M_PI/180.);
|
|
double c = cos(angle);
|
|
double s = sin(angle);
|
|
return Vec2f(float(pt.x() * c - pt.y() * s) + m_wipe_tower_width / 2.f, float(pt.x() * s + pt.y() * c) + m_wipe_tower_depth / 2.f);
|
|
}
|
|
|
|
}; // class WipeTowerWriter
|
|
|
|
|
|
|
|
WipeTower::ToolChangeResult WipeTower::construct_tcr(WipeTowerWriter& writer,
|
|
bool priming,
|
|
size_t old_tool,
|
|
bool is_finish,
|
|
float purge_volume) const
|
|
{
|
|
ToolChangeResult result;
|
|
result.priming = priming;
|
|
result.initial_tool = int(old_tool);
|
|
result.new_tool = int(m_current_tool);
|
|
result.print_z = m_z_pos;
|
|
result.layer_height = m_layer_height;
|
|
result.elapsed_time = writer.elapsed_time();
|
|
result.start_pos = writer.start_pos_rotated();
|
|
result.end_pos = priming ? writer.pos() : writer.pos_rotated();
|
|
result.gcode = std::move(writer.gcode());
|
|
result.extrusions = std::move(writer.extrusions());
|
|
result.wipe_path = std::move(writer.wipe_path());
|
|
result.is_finish_first = is_finish;
|
|
// BBS
|
|
result.purge_volume = purge_volume;
|
|
return result;
|
|
}
|
|
|
|
// BBS
|
|
const std::map<float, float> WipeTower::min_depth_per_height = {
|
|
{100.f, 20.f}, {250.f, 40.f}
|
|
};
|
|
|
|
WipeTower::WipeTower(const PrintConfig& config, int plate_idx, Vec3d plate_origin, const float prime_volume, size_t initial_tool, const float wipe_tower_height) :
|
|
m_semm(config.single_extruder_multi_material.value),
|
|
m_wipe_tower_pos(config.wipe_tower_x.get_at(plate_idx), config.wipe_tower_y.get_at(plate_idx)),
|
|
m_wipe_tower_width(float(config.prime_tower_width)),
|
|
// BBS
|
|
m_wipe_tower_height(wipe_tower_height),
|
|
m_wipe_tower_rotation_angle(float(config.wipe_tower_rotation_angle)),
|
|
m_wipe_tower_brim_width(float(config.prime_tower_brim_width)),
|
|
m_y_shift(0.f),
|
|
m_z_pos(0.f),
|
|
//m_bridging(float(config.wipe_tower_bridging)),
|
|
m_bridging(10.f),
|
|
m_no_sparse_layers(config.wipe_tower_no_sparse_layers),
|
|
m_gcode_flavor(config.gcode_flavor),
|
|
m_travel_speed(config.travel_speed),
|
|
m_current_tool(initial_tool),
|
|
//wipe_volumes(flush_matrix)
|
|
m_wipe_volume(prime_volume),
|
|
m_enable_timelapse_print(config.timelapse_type.value == TimelapseType::tlSmooth)
|
|
{
|
|
// Read absolute value of first layer speed, if given as percentage,
|
|
// it is taken over following default. Speeds from config are not
|
|
// easily accessible here.
|
|
const float default_speed = 60.f;
|
|
m_first_layer_speed = config.get_abs_value("initial_layer_speed");
|
|
if (m_first_layer_speed == 0.f) // just to make sure autospeed doesn't break it.
|
|
m_first_layer_speed = default_speed / 2.f;
|
|
|
|
// If this is a single extruder MM printer, we will use all the SE-specific config values.
|
|
// Otherwise, the defaults will be used to turn off the SE stuff.
|
|
// BBS: remove useless config
|
|
#if 0
|
|
if (m_semm) {
|
|
m_cooling_tube_retraction = float(config.cooling_tube_retraction);
|
|
m_cooling_tube_length = float(config.cooling_tube_length);
|
|
m_parking_pos_retraction = float(config.parking_pos_retraction);
|
|
m_extra_loading_move = float(config.extra_loading_move);
|
|
m_set_extruder_trimpot = config.high_current_on_filament_swap;
|
|
}
|
|
#endif
|
|
// Calculate where the priming lines should be - very naive test not detecting parallelograms etc.
|
|
const std::vector<Vec2d>& bed_points = config.printable_area.values;
|
|
BoundingBoxf bb(bed_points);
|
|
m_bed_width = float(bb.size().x());
|
|
m_bed_shape = (bed_points.size() == 4 ? RectangularBed : CircularBed);
|
|
|
|
if (m_bed_shape == CircularBed) {
|
|
// this may still be a custom bed, check that the points are roughly on a circle
|
|
double r2 = std::pow(m_bed_width/2., 2.);
|
|
double lim2 = std::pow(m_bed_width/10., 2.);
|
|
Vec2d center = bb.center();
|
|
for (const Vec2d& pt : bed_points)
|
|
if (std::abs(std::pow(pt.x()-center.x(), 2.) + std::pow(pt.y()-center.y(), 2.) - r2) > lim2) {
|
|
m_bed_shape = CustomBed;
|
|
break;
|
|
}
|
|
}
|
|
|
|
m_bed_bottom_left = m_bed_shape == RectangularBed
|
|
? Vec2f(bed_points.front().x(), bed_points.front().y())
|
|
: Vec2f::Zero();
|
|
}
|
|
|
|
|
|
|
|
void WipeTower::set_extruder(size_t idx, const PrintConfig& config)
|
|
{
|
|
//while (m_filpar.size() < idx+1) // makes sure the required element is in the vector
|
|
m_filpar.push_back(FilamentParameters());
|
|
|
|
m_filpar[idx].material = config.filament_type.get_at(idx);
|
|
m_filpar[idx].is_soluble = config.filament_soluble.get_at(idx);
|
|
// BBS
|
|
m_filpar[idx].is_support = config.filament_is_support.get_at(idx);
|
|
m_filpar[idx].nozzle_temperature = config.nozzle_temperature.get_at(idx);
|
|
m_filpar[idx].nozzle_temperature_initial_layer = config.nozzle_temperature_initial_layer.get_at(idx);
|
|
|
|
// If this is a single extruder MM printer, we will use all the SE-specific config values.
|
|
// Otherwise, the defaults will be used to turn off the SE stuff.
|
|
// BBS: remove useless config
|
|
#if 0
|
|
if (m_semm) {
|
|
m_filpar[idx].loading_speed = float(config.filament_loading_speed.get_at(idx));
|
|
m_filpar[idx].loading_speed_start = float(config.filament_loading_speed_start.get_at(idx));
|
|
m_filpar[idx].unloading_speed = float(config.filament_unloading_speed.get_at(idx));
|
|
m_filpar[idx].unloading_speed_start = float(config.filament_unloading_speed_start.get_at(idx));
|
|
m_filpar[idx].delay = float(config.filament_toolchange_delay.get_at(idx));
|
|
m_filpar[idx].cooling_moves = config.filament_cooling_moves.get_at(idx);
|
|
m_filpar[idx].cooling_initial_speed = float(config.filament_cooling_initial_speed.get_at(idx));
|
|
m_filpar[idx].cooling_final_speed = float(config.filament_cooling_final_speed.get_at(idx));
|
|
}
|
|
#endif
|
|
|
|
m_filpar[idx].filament_area = float((M_PI/4.f) * pow(config.filament_diameter.get_at(idx), 2)); // all extruders are assumed to have the same filament diameter at this point
|
|
float nozzle_diameter = float(config.nozzle_diameter.get_at(idx));
|
|
m_filpar[idx].nozzle_diameter = nozzle_diameter; // to be used in future with (non-single) multiextruder MM
|
|
|
|
float max_vol_speed = float(config.filament_max_volumetric_speed.get_at(idx));
|
|
if (max_vol_speed!= 0.f)
|
|
m_filpar[idx].max_e_speed = (max_vol_speed / filament_area());
|
|
|
|
m_perimeter_width = nozzle_diameter * Width_To_Nozzle_Ratio; // all extruders are now assumed to have the same diameter
|
|
// BBS: remove useless config
|
|
#if 0
|
|
if (m_semm) {
|
|
std::istringstream stream{config.filament_ramming_parameters.get_at(idx)};
|
|
float speed = 0.f;
|
|
stream >> m_filpar[idx].ramming_line_width_multiplicator >> m_filpar[idx].ramming_step_multiplicator;
|
|
m_filpar[idx].ramming_line_width_multiplicator /= 100;
|
|
m_filpar[idx].ramming_step_multiplicator /= 100;
|
|
while (stream >> speed)
|
|
m_filpar[idx].ramming_speed.push_back(speed);
|
|
}
|
|
#endif
|
|
|
|
m_used_filament_length.resize(std::max(m_used_filament_length.size(), idx + 1)); // makes sure that the vector is big enough so we don't have to check later
|
|
}
|
|
|
|
|
|
|
|
// Returns gcode to prime the nozzles at the front edge of the print bed.
|
|
std::vector<WipeTower::ToolChangeResult> WipeTower::prime(
|
|
// print_z of the first layer.
|
|
float initial_layer_print_height,
|
|
// Extruder indices, in the order to be primed. The last extruder will later print the wipe tower brim, print brim and the object.
|
|
const std::vector<unsigned int> &tools,
|
|
// If true, the last priming are will be the same as the other priming areas, and the rest of the wipe will be performed inside the wipe tower.
|
|
// If false, the last priming are will be large enough to wipe the last extruder sufficiently.
|
|
bool /*last_wipe_inside_wipe_tower*/)
|
|
{
|
|
return std::vector<ToolChangeResult>();
|
|
}
|
|
|
|
WipeTower::ToolChangeResult WipeTower::tool_change(size_t tool, bool extrude_perimeter, bool first_toolchange_to_nonsoluble)
|
|
{
|
|
size_t old_tool = m_current_tool;
|
|
|
|
float wipe_depth = 0.f;
|
|
float wipe_length = 0.f;
|
|
float purge_volume = 0.f;
|
|
|
|
// Finds this toolchange info
|
|
if (tool != (unsigned int)(-1))
|
|
{
|
|
for (const auto &b : m_layer_info->tool_changes)
|
|
if ( b.new_tool == tool ) {
|
|
wipe_length = b.wipe_length;
|
|
wipe_depth = b.required_depth;
|
|
purge_volume = b.purge_volume;
|
|
break;
|
|
}
|
|
}
|
|
else {
|
|
// Otherwise we are going to Unload only. And m_layer_info would be invalid.
|
|
}
|
|
|
|
box_coordinates cleaning_box(
|
|
Vec2f(m_perimeter_width, m_perimeter_width),
|
|
m_wipe_tower_width - 2 * m_perimeter_width,
|
|
(tool != (unsigned int)(-1) ? wipe_depth + m_depth_traversed - m_perimeter_width
|
|
: m_wipe_tower_depth - m_perimeter_width));
|
|
|
|
WipeTowerWriter writer(m_layer_height, m_perimeter_width, m_gcode_flavor, m_filpar);
|
|
writer.set_extrusion_flow(m_extrusion_flow)
|
|
.set_z(m_z_pos)
|
|
.set_initial_tool(m_current_tool)
|
|
.set_y_shift(m_y_shift + (tool!=(unsigned int)(-1) && (m_current_shape == SHAPE_REVERSED) ? m_layer_info->depth - m_layer_info->toolchanges_depth(): 0.f))
|
|
.append(";--------------------\n"
|
|
"; CP TOOLCHANGE START\n")
|
|
.comment_with_value(" toolchange #", m_num_tool_changes + 1); // the number is zero-based
|
|
|
|
|
|
if (tool != (unsigned)(-1))
|
|
writer.append(std::string("; material : " + (m_current_tool < m_filpar.size() ? m_filpar[m_current_tool].material : "(NONE)") + " -> " + m_filpar[tool].material + "\n").c_str())
|
|
.append(";--------------------\n");
|
|
|
|
writer.speed_override_backup();
|
|
writer.speed_override(100);
|
|
|
|
Vec2f initial_position = cleaning_box.ld + Vec2f(0.f, m_depth_traversed);
|
|
writer.set_initial_position(initial_position, m_wipe_tower_width, m_wipe_tower_depth, m_internal_rotation);
|
|
|
|
// Increase the extruder driver current to allow fast ramming.
|
|
//BBS
|
|
//if (m_set_extruder_trimpot)
|
|
// writer.set_extruder_trimpot(750);
|
|
|
|
// Ram the hot material out of the melt zone, retract the filament into the cooling tubes and let it cool.
|
|
if (tool != (unsigned int)-1){ // This is not the last change.
|
|
writer.append(";" + GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Wipe_Tower_Start) + "\n");
|
|
toolchange_Unload(writer, cleaning_box, m_filpar[m_current_tool].material,
|
|
is_first_layer() ? m_filpar[tool].nozzle_temperature_initial_layer : m_filpar[tool].nozzle_temperature);
|
|
toolchange_Change(writer, tool, m_filpar[tool].material); // Change the tool, set a speed override for soluble and flex materials.
|
|
toolchange_Load(writer, cleaning_box);
|
|
// BBS
|
|
//writer.travel(writer.x(), writer.y()-m_perimeter_width); // cooling and loading were done a bit down the road
|
|
if (extrude_perimeter) {
|
|
box_coordinates wt_box(Vec2f(0.f, (m_current_shape == SHAPE_REVERSED) ? m_layer_info->toolchanges_depth() - m_layer_info->depth : 0.f),
|
|
m_wipe_tower_width, m_layer_info->depth + m_perimeter_width);
|
|
// align the perimeter
|
|
wt_box = align_perimeter(wt_box);
|
|
writer.rectangle(wt_box);
|
|
writer.travel(initial_position);
|
|
}
|
|
|
|
if (first_toolchange_to_nonsoluble) {
|
|
writer.travel(Vec2f(0, 0));
|
|
writer.travel(initial_position);
|
|
}
|
|
toolchange_Wipe(writer, cleaning_box, wipe_length); // Wipe the newly loaded filament until the end of the assigned wipe area.
|
|
writer.append(";" + GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Wipe_Tower_End) + "\n");
|
|
++ m_num_tool_changes;
|
|
} else
|
|
toolchange_Unload(writer, cleaning_box, m_filpar[m_current_tool].material, m_filpar[m_current_tool].nozzle_temperature);
|
|
|
|
m_depth_traversed += wipe_depth;
|
|
|
|
//BBS
|
|
//if (m_set_extruder_trimpot)
|
|
// writer.set_extruder_trimpot(550); // Reset the extruder current to a normal value.
|
|
writer.speed_override_restore();
|
|
writer.feedrate(m_travel_speed * 60.f)
|
|
.flush_planner_queue()
|
|
.reset_extruder()
|
|
.append("; CP TOOLCHANGE END\n"
|
|
";------------------\n"
|
|
"\n\n");
|
|
|
|
// Ask our writer about how much material was consumed:
|
|
if (m_current_tool < m_used_filament_length.size())
|
|
m_used_filament_length[m_current_tool] += writer.get_and_reset_used_filament_length();
|
|
|
|
return construct_tcr(writer, false, old_tool, false, purge_volume);
|
|
}
|
|
|
|
|
|
// Ram the hot material out of the melt zone, retract the filament into the cooling tubes and let it cool.
|
|
void WipeTower::toolchange_Unload(
|
|
WipeTowerWriter &writer,
|
|
const box_coordinates &cleaning_box,
|
|
const std::string& current_material,
|
|
const int new_temperature)
|
|
{
|
|
// BBS: toolchange unload is done in change_filament_gcode
|
|
#if 0
|
|
float xl = cleaning_box.ld.x() + 1.f * m_perimeter_width;
|
|
float xr = cleaning_box.rd.x() - 1.f * m_perimeter_width;
|
|
|
|
const float line_width = m_perimeter_width * m_filpar[m_current_tool].ramming_line_width_multiplicator; // desired ramming line thickness
|
|
const float y_step = line_width * m_filpar[m_current_tool].ramming_step_multiplicator * m_extra_spacing; // spacing between lines in mm
|
|
|
|
writer.append("; CP TOOLCHANGE UNLOAD\n")
|
|
.change_analyzer_line_width(line_width);
|
|
|
|
unsigned i = 0; // iterates through ramming_speed
|
|
m_left_to_right = true; // current direction of ramming
|
|
float remaining = xr - xl ; // keeps track of distance to the next turnaround
|
|
float e_done = 0; // measures E move done from each segment
|
|
|
|
writer.travel(xl, cleaning_box.ld.y() + m_depth_traversed + y_step/2.f ); // move to starting position
|
|
|
|
// if the ending point of the ram would end up in mid air, align it with the end of the wipe tower:
|
|
if (m_layer_info > m_plan.begin() && m_layer_info < m_plan.end() && (m_layer_info-1!=m_plan.begin() || !m_adhesion )) {
|
|
|
|
// this is y of the center of previous sparse infill border
|
|
float sparse_beginning_y = 0.f;
|
|
if (m_current_shape == SHAPE_REVERSED)
|
|
sparse_beginning_y += ((m_layer_info-1)->depth - (m_layer_info-1)->toolchanges_depth())
|
|
- ((m_layer_info)->depth-(m_layer_info)->toolchanges_depth()) ;
|
|
else
|
|
sparse_beginning_y += (m_layer_info-1)->toolchanges_depth() + m_perimeter_width;
|
|
|
|
float sum_of_depths = 0.f;
|
|
for (const auto& tch : m_layer_info->tool_changes) { // let's find this toolchange
|
|
if (tch.old_tool == m_current_tool) {
|
|
sum_of_depths += tch.ramming_depth;
|
|
float ramming_end_y = sum_of_depths;
|
|
ramming_end_y -= (y_step/m_extra_spacing-m_perimeter_width) / 2.f; // center of final ramming line
|
|
|
|
if ( (m_current_shape == SHAPE_REVERSED && ramming_end_y < sparse_beginning_y - 0.5f*m_perimeter_width ) ||
|
|
(m_current_shape == SHAPE_NORMAL && ramming_end_y > sparse_beginning_y + 0.5f*m_perimeter_width ) )
|
|
{
|
|
writer.extrude(xl + tch.first_wipe_line-1.f*m_perimeter_width,writer.y());
|
|
remaining -= tch.first_wipe_line-1.f*m_perimeter_width;
|
|
}
|
|
break;
|
|
}
|
|
sum_of_depths += tch.required_depth;
|
|
}
|
|
}
|
|
|
|
writer.disable_linear_advance();
|
|
|
|
// now the ramming itself:
|
|
while (i < m_filpar[m_current_tool].ramming_speed.size())
|
|
{
|
|
const float x = volume_to_length(m_filpar[m_current_tool].ramming_speed[i] * 0.25f, line_width, m_layer_height);
|
|
const float e = m_filpar[m_current_tool].ramming_speed[i] * 0.25f / filament_area(); // transform volume per sec to E move;
|
|
const float dist = std::min(x - e_done, remaining); // distance to travel for either the next 0.25s, or to the next turnaround
|
|
const float actual_time = dist/x * 0.25f;
|
|
writer.ram(writer.x(), writer.x() + (m_left_to_right ? 1.f : -1.f) * dist, 0.f, 0.f, e * (dist / x), dist / (actual_time / 60.f));
|
|
remaining -= dist;
|
|
|
|
if (remaining < WT_EPSILON) { // we reached a turning point
|
|
writer.travel(writer.x(), writer.y() + y_step, 7200);
|
|
m_left_to_right = !m_left_to_right;
|
|
remaining = xr - xl;
|
|
}
|
|
e_done += dist; // subtract what was actually done
|
|
if (e_done > x - WT_EPSILON) { // current segment finished
|
|
++i;
|
|
e_done = 0;
|
|
}
|
|
}
|
|
Vec2f end_of_ramming(writer.x(),writer.y());
|
|
writer.change_analyzer_line_width(m_perimeter_width); // so the next lines are not affected by ramming_line_width_multiplier
|
|
|
|
// Retraction:
|
|
float old_x = writer.x();
|
|
float turning_point = (!m_left_to_right ? xl : xr );
|
|
if (m_semm && (m_cooling_tube_retraction != 0 || m_cooling_tube_length != 0)) {
|
|
float total_retraction_distance = m_cooling_tube_retraction + m_cooling_tube_length/2.f - 15.f; // the 15mm is reserved for the first part after ramming
|
|
writer.suppress_preview()
|
|
.retract(15.f, m_filpar[m_current_tool].unloading_speed_start * 60.f) // feedrate 5000mm/min = 83mm/s
|
|
.retract(0.70f * total_retraction_distance, 1.0f * m_filpar[m_current_tool].unloading_speed * 60.f)
|
|
.retract(0.20f * total_retraction_distance, 0.5f * m_filpar[m_current_tool].unloading_speed * 60.f)
|
|
.retract(0.10f * total_retraction_distance, 0.3f * m_filpar[m_current_tool].unloading_speed * 60.f)
|
|
.resume_preview();
|
|
}
|
|
// Wipe tower should only change temperature with single extruder MM. Otherwise, all temperatures should
|
|
// be already set and there is no need to change anything. Also, the temperature could be changed
|
|
// for wrong extruder.
|
|
if (m_semm) {
|
|
if (new_temperature != 0 && (new_temperature != m_old_temperature || is_first_layer()) ) { // Set the extruder temperature, but don't wait.
|
|
// If the required temperature is the same as last time, don't emit the M104 again (if user adjusted the value, it would be reset)
|
|
// However, always change temperatures on the first layer (this is to avoid issues with priming lines turned off).
|
|
writer.set_extruder_temp(new_temperature, false);
|
|
m_old_temperature = new_temperature;
|
|
}
|
|
}
|
|
|
|
// Cooling:
|
|
const int& number_of_moves = m_filpar[m_current_tool].cooling_moves;
|
|
if (number_of_moves > 0) {
|
|
const float& initial_speed = m_filpar[m_current_tool].cooling_initial_speed;
|
|
const float& final_speed = m_filpar[m_current_tool].cooling_final_speed;
|
|
|
|
float speed_inc = (final_speed - initial_speed) / (2.f * number_of_moves - 1.f);
|
|
|
|
writer.suppress_preview()
|
|
.travel(writer.x(), writer.y() + y_step);
|
|
old_x = writer.x();
|
|
turning_point = xr-old_x > old_x-xl ? xr : xl;
|
|
for (int i=0; i<number_of_moves; ++i) {
|
|
float speed = initial_speed + speed_inc * 2*i;
|
|
writer.load_move_x_advanced(turning_point, m_cooling_tube_length, speed);
|
|
speed += speed_inc;
|
|
writer.load_move_x_advanced(old_x, -m_cooling_tube_length, speed);
|
|
}
|
|
}
|
|
|
|
// let's wait is necessary:
|
|
writer.wait(m_filpar[m_current_tool].delay);
|
|
// we should be at the beginning of the cooling tube again - let's move to parking position:
|
|
writer.retract(-m_cooling_tube_length/2.f+m_parking_pos_retraction-m_cooling_tube_retraction, 2000);
|
|
|
|
// this is to align ramming and future wiping extrusions, so the future y-steps can be uniform from the start:
|
|
// the perimeter_width will later be subtracted, it is there to not load while moving over just extruded material
|
|
writer.travel(end_of_ramming.x(), end_of_ramming.y() + (y_step/m_extra_spacing-m_perimeter_width) / 2.f + m_perimeter_width, 2400.f);
|
|
|
|
writer.resume_preview()
|
|
.flush_planner_queue();
|
|
#endif
|
|
}
|
|
|
|
// Change the tool, set a speed override for soluble and flex materials.
|
|
void WipeTower::toolchange_Change(
|
|
WipeTowerWriter &writer,
|
|
const size_t new_tool,
|
|
const std::string& new_material)
|
|
{
|
|
// Ask the writer about how much of the old filament we consumed:
|
|
if (m_current_tool < m_used_filament_length.size())
|
|
m_used_filament_length[m_current_tool] += writer.get_and_reset_used_filament_length();
|
|
|
|
// This is where we want to place the custom gcodes. We will use placeholders for this.
|
|
// These will be substituted by the actual gcodes when the gcode is generated.
|
|
writer.append("[filament_end_gcode]\n");
|
|
writer.append("[change_filament_gcode]\n");
|
|
|
|
// BBS: do travel in GCode::append_tcr() for lazy_lift
|
|
#if 0
|
|
// Travel to where we assume we are. Custom toolchange or some special T code handling (parking extruder etc)
|
|
// gcode could have left the extruder somewhere, we cannot just start extruding. We should also inform the
|
|
// postprocessor that we absolutely want to have this in the gcode, even if it thought it is the same as before.
|
|
Vec2f current_pos = writer.pos_rotated();
|
|
writer.feedrate(m_travel_speed * 60.f)
|
|
.append(std::string("G1 X") + Slic3r::float_to_string_decimal_point(current_pos.x())
|
|
+ " Y" + Slic3r::float_to_string_decimal_point(current_pos.y())
|
|
+ never_skip_tag() + "\n");
|
|
#endif
|
|
|
|
// The toolchange Tn command will be inserted later, only in case that the user does
|
|
// not provide a custom toolchange gcode.
|
|
writer.set_tool(new_tool); // This outputs nothing, the writer just needs to know the tool has changed.
|
|
writer.append("[filament_start_gcode]\n");
|
|
|
|
writer.flush_planner_queue();
|
|
m_current_tool = new_tool;
|
|
}
|
|
|
|
void WipeTower::toolchange_Load(
|
|
WipeTowerWriter &writer,
|
|
const box_coordinates &cleaning_box)
|
|
{
|
|
// BBS: tool load is done in change_filament_gcode
|
|
#if 0
|
|
if (m_semm && (m_parking_pos_retraction != 0 || m_extra_loading_move != 0)) {
|
|
float xl = cleaning_box.ld.x() + m_perimeter_width * 0.75f;
|
|
float xr = cleaning_box.rd.x() - m_perimeter_width * 0.75f;
|
|
float oldx = writer.x(); // the nozzle is in place to do the first wiping moves, we will remember the position
|
|
|
|
// Load the filament while moving left / right, so the excess material will not create a blob at a single position.
|
|
float turning_point = ( oldx-xl < xr-oldx ? xr : xl );
|
|
float edist = m_parking_pos_retraction+m_extra_loading_move;
|
|
|
|
writer.append("; CP TOOLCHANGE LOAD\n")
|
|
.suppress_preview()
|
|
.load(0.2f * edist, 60.f * m_filpar[m_current_tool].loading_speed_start)
|
|
.load_move_x_advanced(turning_point, 0.7f * edist, m_filpar[m_current_tool].loading_speed) // Fast phase
|
|
.load_move_x_advanced(oldx, 0.1f * edist, 0.1f * m_filpar[m_current_tool].loading_speed) // Super slow*/
|
|
|
|
.travel(oldx, writer.y()) // in case last move was shortened to limit x feedrate
|
|
.resume_preview();
|
|
|
|
// Reset the extruder current to the normal value.
|
|
if (m_set_extruder_trimpot)
|
|
writer.set_extruder_trimpot(550);
|
|
}
|
|
#endif
|
|
}
|
|
|
|
// Wipe the newly loaded filament until the end of the assigned wipe area.
|
|
void WipeTower::toolchange_Wipe(
|
|
WipeTowerWriter &writer,
|
|
const box_coordinates &cleaning_box,
|
|
float wipe_length)
|
|
{
|
|
// Increase flow on first layer, slow down print.
|
|
writer.set_extrusion_flow(m_extrusion_flow * (is_first_layer() ? 1.15f : 1.f))
|
|
.append("; CP TOOLCHANGE WIPE\n");
|
|
|
|
// BBS: add the note for gcode-check, when the flow changed, the width should follow the change
|
|
if (is_first_layer()) {
|
|
writer.append(";" + GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Width) + std::to_string(1.15 * m_perimeter_width) + "\n");
|
|
}
|
|
|
|
const float& xl = cleaning_box.ld.x();
|
|
const float& xr = cleaning_box.rd.x();
|
|
|
|
// Variables x_to_wipe and traversed_x are here to be able to make sure it always wipes at least
|
|
// the ordered volume, even if it means violating the box. This can later be removed and simply
|
|
// wipe until the end of the assigned area.
|
|
|
|
float x_to_wipe = wipe_length;
|
|
float dy = m_layer_info->extra_spacing * m_perimeter_width;
|
|
|
|
const float target_speed = is_first_layer() ? std::min(m_first_layer_speed * 60.f, 4800.f) : 4800.f;
|
|
float wipe_speed = 0.33f * target_speed;
|
|
|
|
float start_y = writer.y();
|
|
|
|
#if 0
|
|
// if there is less than 2.5*m_perimeter_width to the edge, advance straightaway (there is likely a blob anyway)
|
|
if ((m_left_to_right ? xr-writer.x() : writer.x()-xl) < 2.5f*m_perimeter_width) {
|
|
writer.travel((m_left_to_right ? xr-m_perimeter_width : xl+m_perimeter_width),writer.y()+dy);
|
|
m_left_to_right = !m_left_to_right;
|
|
}
|
|
#endif
|
|
|
|
m_left_to_right = true;
|
|
|
|
// BBS: do not need to move dy
|
|
#if 0
|
|
if (m_depth_traversed != 0)
|
|
writer.travel(xl, writer.y() + dy);
|
|
#endif
|
|
|
|
bool need_change_flow = false;
|
|
// now the wiping itself:
|
|
for (int i = 0; true; ++i) {
|
|
if (i!=0) {
|
|
if (wipe_speed < 0.34f * target_speed) wipe_speed = 0.375f * target_speed;
|
|
else if (wipe_speed < 0.377 * target_speed) wipe_speed = 0.458f * target_speed;
|
|
else if (wipe_speed < 0.46f * target_speed) wipe_speed = 0.875f * target_speed;
|
|
else wipe_speed = std::min(target_speed, wipe_speed + 50.f);
|
|
}
|
|
|
|
// BBS: check the bridging area and use the bridge flow
|
|
if (need_change_flow || need_thick_bridge_flow(writer.y())) {
|
|
writer.set_extrusion_flow(extrusion_flow(0.2));
|
|
writer.append(";" + GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Height) + std::to_string(0.2) + "\n");
|
|
need_change_flow = true;
|
|
}
|
|
|
|
if (m_left_to_right)
|
|
writer.extrude(xr + 0.25f * m_perimeter_width, writer.y(), wipe_speed);
|
|
else
|
|
writer.extrude(xl - 0.25f * m_perimeter_width, writer.y(), wipe_speed);
|
|
|
|
// BBS: recover the flow in non-bridging area
|
|
if (need_change_flow) {
|
|
writer.set_extrusion_flow(m_extrusion_flow);
|
|
writer.append(";" + GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Height) + std::to_string(m_layer_height) + "\n");
|
|
}
|
|
|
|
if (writer.y() - float(EPSILON) > cleaning_box.lu.y())
|
|
break; // in case next line would not fit
|
|
|
|
x_to_wipe -= (xr - xl);
|
|
if (x_to_wipe < WT_EPSILON) {
|
|
// BBS: Delete some unnecessary travel
|
|
//writer.travel(m_left_to_right ? xl + 1.5f*m_perimeter_width : xr - 1.5f*m_perimeter_width, writer.y(), 7200);
|
|
break;
|
|
}
|
|
// stepping to the next line:
|
|
writer.extrude(writer.x(), writer.y() + dy);
|
|
m_left_to_right = !m_left_to_right;
|
|
}
|
|
|
|
float end_y = writer.y();
|
|
|
|
// We may be going back to the model - wipe the nozzle. If this is followed
|
|
// by finish_layer, this wipe path will be overwritten.
|
|
//writer.add_wipe_point(writer.x(), writer.y())
|
|
// .add_wipe_point(writer.x(), writer.y() - dy)
|
|
// .add_wipe_point(! m_left_to_right ? m_wipe_tower_width : 0.f, writer.y() - dy);
|
|
// BBS: modify the wipe_path after toolchange
|
|
writer.add_wipe_point(writer.x(), writer.y())
|
|
.add_wipe_point(! m_left_to_right ? m_wipe_tower_width : 0.f, writer.y());
|
|
|
|
if (m_layer_info != m_plan.end() && m_current_tool != m_layer_info->tool_changes.back().new_tool)
|
|
m_left_to_right = !m_left_to_right;
|
|
|
|
writer.set_extrusion_flow(m_extrusion_flow); // Reset the extrusion flow.
|
|
// BBS: add the note for gcode-check when the flow changed
|
|
if (is_first_layer()) {
|
|
writer.append(";" + GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Width) + std::to_string(m_perimeter_width) + "\n");
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// BBS
|
|
WipeTower::box_coordinates WipeTower::align_perimeter(const WipeTower::box_coordinates& perimeter_box)
|
|
{
|
|
box_coordinates aligned_box = perimeter_box;
|
|
|
|
float spacing = m_extra_spacing * m_perimeter_width;
|
|
float up = perimeter_box.lu(1) - m_perimeter_width;
|
|
up = align_ceil(up, spacing);
|
|
up += m_perimeter_width;
|
|
up = std::min(up, m_wipe_tower_depth);
|
|
|
|
float down = perimeter_box.ld(1) - m_perimeter_width;
|
|
down = align_floor(down, spacing);
|
|
down += m_perimeter_width;
|
|
down = std::max(down, -m_y_shift);
|
|
|
|
aligned_box.lu(1) = aligned_box.ru(1) = up;
|
|
aligned_box.ld(1) = aligned_box.rd(1) = down;
|
|
|
|
return aligned_box;
|
|
}
|
|
|
|
WipeTower::ToolChangeResult WipeTower::finish_layer(bool extrude_perimeter, bool extruder_fill)
|
|
{
|
|
assert(! this->layer_finished());
|
|
m_current_layer_finished = true;
|
|
|
|
size_t old_tool = m_current_tool;
|
|
|
|
WipeTowerWriter writer(m_layer_height, m_perimeter_width, m_gcode_flavor, m_filpar);
|
|
writer.set_extrusion_flow(m_extrusion_flow)
|
|
.set_z(m_z_pos)
|
|
.set_initial_tool(m_current_tool)
|
|
.set_y_shift(m_y_shift - (m_current_shape == SHAPE_REVERSED ? m_layer_info->toolchanges_depth() : 0.f));
|
|
|
|
writer.append(";" + GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Wipe_Tower_Start) + "\n");
|
|
|
|
// Slow down on the 1st layer.
|
|
bool first_layer = is_first_layer();
|
|
// BBS: speed up perimeter speed to 90mm/s for non-first layer
|
|
float feedrate = first_layer ? std::min(m_first_layer_speed * 60.f, 5400.f) : std::min(60.0f * m_filpar[m_current_tool].max_e_speed / m_extrusion_flow, 5400.f);
|
|
float fill_box_y = m_layer_info->toolchanges_depth() + m_perimeter_width;
|
|
box_coordinates fill_box(Vec2f(m_perimeter_width, fill_box_y),
|
|
m_wipe_tower_width - 2 * m_perimeter_width, m_layer_info->depth - fill_box_y);
|
|
|
|
writer.set_initial_position((m_left_to_right ? fill_box.ru : fill_box.lu), // so there is never a diagonal travel
|
|
m_wipe_tower_width, m_wipe_tower_depth, m_internal_rotation);
|
|
|
|
bool toolchanges_on_layer = m_layer_info->toolchanges_depth() > WT_EPSILON;
|
|
|
|
// inner perimeter of the sparse section, if there is space for it:
|
|
if (fill_box.ru.y() - fill_box.rd.y() > m_perimeter_width - WT_EPSILON)
|
|
writer.rectangle_fill_box(this, fill_box.ld, fill_box.rd.x() - fill_box.ld.x(), fill_box.ru.y() - fill_box.rd.y(), feedrate);
|
|
|
|
// we are in one of the corners, travel to ld along the perimeter:
|
|
// BBS: Delete some unnecessary travel
|
|
//if (writer.x() > fill_box.ld.x() + EPSILON) writer.travel(fill_box.ld.x(), writer.y());
|
|
//if (writer.y() > fill_box.ld.y() + EPSILON) writer.travel(writer.x(), fill_box.ld.y());
|
|
|
|
// Extrude infill to support the material to be printed above.
|
|
const float dy = (fill_box.lu.y() - fill_box.ld.y() - m_perimeter_width);
|
|
float left = fill_box.lu.x() + 2*m_perimeter_width;
|
|
float right = fill_box.ru.x() - 2 * m_perimeter_width;
|
|
std::vector<Vec2f> finish_rect_wipe_path;
|
|
if (extruder_fill && dy > m_perimeter_width)
|
|
{
|
|
writer.travel(fill_box.ld + Vec2f(m_perimeter_width * 2, 0.f))
|
|
.append(";--------------------\n"
|
|
"; CP EMPTY GRID START\n")
|
|
.comment_with_value(" layer #", m_num_layer_changes + 1);
|
|
|
|
// Is there a soluble filament wiped/rammed at the next layer?
|
|
// If so, the infill should not be sparse.
|
|
bool solid_infill = m_layer_info+1 == m_plan.end()
|
|
? false
|
|
: std::any_of((m_layer_info+1)->tool_changes.begin(),
|
|
(m_layer_info+1)->tool_changes.end(),
|
|
[this](const WipeTowerInfo::ToolChange& tch) {
|
|
return m_filpar[tch.new_tool].is_soluble
|
|
|| m_filpar[tch.old_tool].is_soluble;
|
|
});
|
|
solid_infill |= first_layer && m_adhesion;
|
|
|
|
if (solid_infill) {
|
|
float sparse_factor = 1.5f; // 1=solid, 2=every other line, etc.
|
|
if (first_layer) { // the infill should touch perimeters
|
|
left -= m_perimeter_width;
|
|
right += m_perimeter_width;
|
|
sparse_factor = 1.f;
|
|
}
|
|
float y = fill_box.ld.y() + m_perimeter_width;
|
|
int n = dy / (m_perimeter_width * sparse_factor);
|
|
float spacing = (dy-m_perimeter_width)/(n-1);
|
|
int i=0;
|
|
for (i=0; i<n; ++i) {
|
|
writer.extrude(writer.x(), y, feedrate)
|
|
.extrude(i%2 ? left : right, y);
|
|
y = y + spacing;
|
|
}
|
|
writer.extrude(writer.x(), fill_box.lu.y());
|
|
} else {
|
|
// Extrude an inverse U at the left of the region and the sparse infill.
|
|
writer.extrude(fill_box.lu + Vec2f(m_perimeter_width * 2, 0.f), feedrate);
|
|
|
|
const int n = 1+int((right-left)/m_bridging);
|
|
const float dx = (right-left)/n;
|
|
for (int i=1;i<=n;++i) {
|
|
float x=left+dx*i;
|
|
writer.travel(x,writer.y());
|
|
writer.extrude(x,i%2 ? fill_box.rd.y() : fill_box.ru.y());
|
|
}
|
|
// BBS: add wipe_path for this case: only with finish rectangle
|
|
finish_rect_wipe_path.emplace_back(writer.pos());
|
|
finish_rect_wipe_path.emplace_back(Vec2f(left + dx * n, n % 2 ? fill_box.ru.y() : fill_box.rd.y()));
|
|
}
|
|
|
|
writer.append("; CP EMPTY GRID END\n"
|
|
";------------------\n\n\n\n\n\n\n");
|
|
}
|
|
|
|
// outer perimeter (always):
|
|
// BBS
|
|
box_coordinates wt_box(Vec2f(0.f, (m_current_shape == SHAPE_REVERSED ? m_layer_info->toolchanges_depth() : 0.f)),
|
|
m_wipe_tower_width, m_layer_info->depth + m_perimeter_width);
|
|
wt_box = align_perimeter(wt_box);
|
|
if (extrude_perimeter) {
|
|
writer.rectangle(wt_box, feedrate);
|
|
}
|
|
|
|
// brim chamfer
|
|
float spacing = m_perimeter_width - m_layer_height * float(1. - M_PI_4);
|
|
// How many perimeters shall the brim have?
|
|
int loops_num = (m_wipe_tower_brim_width + spacing / 2.f) / spacing;
|
|
const float max_chamfer_width = 3.f;
|
|
if (!first_layer) {
|
|
// stop print chamfer if depth changes
|
|
if (m_layer_info->depth != m_plan.front().depth) {
|
|
loops_num = 0;
|
|
}
|
|
else {
|
|
// limit max chamfer width to 3 mm
|
|
int chamfer_loops_num = (int)(max_chamfer_width / spacing);
|
|
int dist_to_1st = m_layer_info - m_plan.begin() - m_first_layer_idx;
|
|
loops_num = std::min(loops_num, chamfer_loops_num) - dist_to_1st;
|
|
}
|
|
}
|
|
|
|
if (loops_num > 0) {
|
|
box_coordinates box = wt_box;
|
|
for (size_t i = 0; i < loops_num; ++i) {
|
|
box.expand(spacing);
|
|
writer.rectangle(box);
|
|
}
|
|
|
|
if (first_layer) {
|
|
// Save actual brim width to be later passed to the Print object, which will use it
|
|
// for skirt calculation and pass it to GLCanvas for precise preview box
|
|
m_wipe_tower_brim_width_real = wt_box.ld.x() - box.ld.x() + spacing / 2.f;
|
|
}
|
|
wt_box = box;
|
|
}
|
|
|
|
// Now prepare future wipe. box contains rectangle that was extruded last (ccw).
|
|
Vec2f target = (writer.pos() == wt_box.ld ? wt_box.rd :
|
|
(writer.pos() == wt_box.rd ? wt_box.ru :
|
|
(writer.pos() == wt_box.ru ? wt_box.lu :
|
|
wt_box.ld)));
|
|
|
|
// BBS: add wipe_path for this case: only with finish rectangle
|
|
if (finish_rect_wipe_path.size() == 2 && finish_rect_wipe_path[0] == writer.pos())
|
|
target = finish_rect_wipe_path[1];
|
|
|
|
writer.add_wipe_point(writer.pos())
|
|
.add_wipe_point(target);
|
|
|
|
writer.append(";" + GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Wipe_Tower_End) + "\n");
|
|
|
|
// Ask our writer about how much material was consumed.
|
|
// Skip this in case the layer is sparse and config option to not print sparse layers is enabled.
|
|
if (! m_no_sparse_layers || toolchanges_on_layer)
|
|
if (m_current_tool < m_used_filament_length.size())
|
|
m_used_filament_length[m_current_tool] += writer.get_and_reset_used_filament_length();
|
|
|
|
return construct_tcr(writer, false, old_tool, true, 0.f);
|
|
}
|
|
|
|
// Appends a toolchange into m_plan and calculates neccessary depth of the corresponding box
|
|
void WipeTower::plan_toolchange(float z_par, float layer_height_par, unsigned int old_tool,
|
|
unsigned int new_tool, float wipe_volume, float purge_volume)
|
|
{
|
|
assert(m_plan.empty() || m_plan.back().z <= z_par + WT_EPSILON); // refuses to add a layer below the last one
|
|
|
|
if (m_plan.empty() || m_plan.back().z + WT_EPSILON < z_par) // if we moved to a new layer, we'll add it to m_plan first
|
|
m_plan.push_back(WipeTowerInfo(z_par, layer_height_par));
|
|
|
|
if (m_first_layer_idx == size_t(-1) && (! m_no_sparse_layers || old_tool != new_tool))
|
|
m_first_layer_idx = m_plan.size() - 1;
|
|
|
|
if (old_tool == new_tool) // new layer without toolchanges - we are done
|
|
return;
|
|
|
|
// this is an actual toolchange - let's calculate depth to reserve on the wipe tower
|
|
float depth = 0.f;
|
|
float width = m_wipe_tower_width - 2 * m_perimeter_width;
|
|
|
|
// BBS: if the wipe tower width is too small, the depth will be infinity
|
|
if (width <= EPSILON)
|
|
return;
|
|
|
|
// BBS: remove old filament ramming and first line
|
|
#if 0
|
|
float length_to_extrude = volume_to_length(0.25f * std::accumulate(m_filpar[old_tool].ramming_speed.begin(), m_filpar[old_tool].ramming_speed.end(), 0.f),
|
|
m_perimeter_width * m_filpar[old_tool].ramming_line_width_multiplicator,
|
|
layer_height_par);
|
|
depth = (int(length_to_extrude / width) + 1) * (m_perimeter_width * m_filpar[old_tool].ramming_line_width_multiplicator * m_filpar[old_tool].ramming_step_multiplicator);
|
|
float ramming_depth = depth;
|
|
length_to_extrude = width*((length_to_extrude / width)-int(length_to_extrude / width)) - width;
|
|
float first_wipe_line = -length_to_extrude;
|
|
length_to_extrude += volume_to_length(wipe_volume, m_perimeter_width, layer_height_par);
|
|
length_to_extrude = std::max(length_to_extrude,0.f);
|
|
|
|
depth += (int(length_to_extrude / width) + 1) * m_perimeter_width;
|
|
depth *= m_extra_spacing;
|
|
|
|
m_plan.back().tool_changes.push_back(WipeTowerInfo::ToolChange(old_tool, new_tool, depth, ramming_depth, first_wipe_line, wipe_volume));
|
|
#else
|
|
float length_to_extrude = volume_to_length(wipe_volume, m_perimeter_width, layer_height_par);
|
|
|
|
depth += std::ceil(length_to_extrude / width) * m_perimeter_width;
|
|
//depth *= m_extra_spacing;
|
|
|
|
m_plan.back().tool_changes.push_back(WipeTowerInfo::ToolChange(old_tool, new_tool, depth, 0.f, 0.f, wipe_volume, length_to_extrude, purge_volume));
|
|
#endif
|
|
}
|
|
|
|
|
|
|
|
void WipeTower::plan_tower()
|
|
{
|
|
// BBS
|
|
// calculate extra spacing
|
|
float max_depth = 0.f;
|
|
for (auto& info : m_plan)
|
|
max_depth = std::max(max_depth, info.toolchanges_depth());
|
|
|
|
float min_wipe_tower_depth = 0.f;
|
|
auto iter = WipeTower::min_depth_per_height.begin();
|
|
while (iter != WipeTower::min_depth_per_height.end()) {
|
|
auto curr_height_to_depth = *iter;
|
|
|
|
// This is the case that wipe tower height is lower than the first min_depth_to_height member.
|
|
if (curr_height_to_depth.first >= m_wipe_tower_height) {
|
|
min_wipe_tower_depth = curr_height_to_depth.second;
|
|
break;
|
|
}
|
|
|
|
iter++;
|
|
|
|
// If curr_height_to_depth is the last member, use its min_depth.
|
|
if (iter == WipeTower::min_depth_per_height.end()) {
|
|
min_wipe_tower_depth = curr_height_to_depth.second;
|
|
break;
|
|
}
|
|
|
|
// If wipe tower height is between the current and next member, set the min_depth as linear interpolation between them
|
|
auto next_height_to_depth = *iter;
|
|
if (next_height_to_depth.first > m_wipe_tower_height) {
|
|
float height_base = curr_height_to_depth.first;
|
|
float height_diff = next_height_to_depth.first - curr_height_to_depth.first;
|
|
float min_depth_base = curr_height_to_depth.second;
|
|
float depth_diff = next_height_to_depth.second - curr_height_to_depth.second;
|
|
|
|
min_wipe_tower_depth = min_depth_base + (m_wipe_tower_height - curr_height_to_depth.first) / height_diff * depth_diff;
|
|
break;
|
|
}
|
|
}
|
|
|
|
{
|
|
if (m_enable_timelapse_print && max_depth < EPSILON)
|
|
max_depth = min_wipe_tower_depth;
|
|
|
|
if (max_depth + EPSILON < min_wipe_tower_depth)
|
|
m_extra_spacing = min_wipe_tower_depth / max_depth;
|
|
else
|
|
m_extra_spacing = 1.f;
|
|
|
|
for (int idx = 0; idx < m_plan.size(); idx++) {
|
|
auto& info = m_plan[idx];
|
|
if (idx == 0 && m_extra_spacing > 1.f + EPSILON) {
|
|
// apply solid fill for the first layer
|
|
info.extra_spacing = 1.f;
|
|
for (auto& toolchange : info.tool_changes) {
|
|
float x_to_wipe = volume_to_length(toolchange.wipe_volume, m_perimeter_width, info.height);
|
|
float line_len = m_wipe_tower_width - 2 * m_perimeter_width;
|
|
float x_to_wipe_new = x_to_wipe * m_extra_spacing;
|
|
x_to_wipe_new = std::floor(x_to_wipe_new / line_len) * line_len;
|
|
x_to_wipe_new = std::max(x_to_wipe_new, x_to_wipe);
|
|
|
|
int line_count = std::ceil((x_to_wipe_new - WT_EPSILON) / line_len);
|
|
toolchange.required_depth = line_count * m_perimeter_width;
|
|
toolchange.wipe_volume = x_to_wipe_new / x_to_wipe * toolchange.wipe_volume;
|
|
toolchange.wipe_length = x_to_wipe_new;
|
|
}
|
|
}
|
|
else {
|
|
info.extra_spacing = m_extra_spacing;
|
|
for (auto& toolchange : info.tool_changes) {
|
|
toolchange.required_depth *= m_extra_spacing;
|
|
toolchange.wipe_length = volume_to_length(toolchange.wipe_volume, m_perimeter_width, info.height);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// Calculate m_wipe_tower_depth (maximum depth for all the layers) and propagate depths downwards
|
|
m_wipe_tower_depth = 0.f;
|
|
for (auto& layer : m_plan)
|
|
layer.depth = 0.f;
|
|
|
|
float max_depth_for_all = 0;
|
|
for (int layer_index = int(m_plan.size()) - 1; layer_index >= 0; --layer_index)
|
|
{
|
|
float this_layer_depth = std::max(m_plan[layer_index].depth, m_plan[layer_index].toolchanges_depth());
|
|
if (m_enable_timelapse_print && this_layer_depth < EPSILON)
|
|
this_layer_depth = min_wipe_tower_depth;
|
|
|
|
m_plan[layer_index].depth = this_layer_depth;
|
|
|
|
if (this_layer_depth > m_wipe_tower_depth - m_perimeter_width)
|
|
m_wipe_tower_depth = this_layer_depth + m_perimeter_width;
|
|
|
|
for (int i = layer_index - 1; i >= 0 ; i--)
|
|
{
|
|
if (m_plan[i].depth - this_layer_depth < 2*m_perimeter_width )
|
|
m_plan[i].depth = this_layer_depth;
|
|
}
|
|
|
|
if (m_enable_timelapse_print && layer_index == 0)
|
|
max_depth_for_all = m_plan[0].depth;
|
|
}
|
|
|
|
if (m_enable_timelapse_print) {
|
|
for (int i = int(m_plan.size()) - 1; i >= 0; i--) {
|
|
m_plan[i].depth = max_depth_for_all;
|
|
}
|
|
}
|
|
}
|
|
|
|
void WipeTower::save_on_last_wipe()
|
|
{
|
|
for (m_layer_info=m_plan.begin();m_layer_info<m_plan.end();++m_layer_info) {
|
|
set_layer(m_layer_info->z, m_layer_info->height, 0, m_layer_info->z == m_plan.front().z, m_layer_info->z == m_plan.back().z);
|
|
if (m_layer_info->tool_changes.size()==0) // we have no way to save anything on an empty layer
|
|
continue;
|
|
|
|
// Which toolchange will finish_layer extrusions be subtracted from?
|
|
// BBS: consider both soluable and support properties
|
|
int idx = first_toolchange_to_nonsoluble_nonsupport(m_layer_info->tool_changes);
|
|
|
|
for (int i=0; i<int(m_layer_info->tool_changes.size()); ++i) {
|
|
auto& toolchange = m_layer_info->tool_changes[i];
|
|
tool_change(toolchange.new_tool);
|
|
|
|
if (i == idx) {
|
|
float width = m_wipe_tower_width - 3*m_perimeter_width; // width we draw into
|
|
float length_to_save = finish_layer().total_extrusion_length_in_plane();
|
|
float length_to_wipe = volume_to_length(toolchange.wipe_volume,
|
|
m_perimeter_width, m_layer_info->height) - toolchange.first_wipe_line - length_to_save;
|
|
|
|
length_to_wipe = std::max(length_to_wipe,0.f);
|
|
float depth_to_wipe = m_perimeter_width * (std::floor(length_to_wipe/width) + ( length_to_wipe > 0.f ? 1.f : 0.f ) ) * m_extra_spacing;
|
|
|
|
toolchange.required_depth = toolchange.ramming_depth + depth_to_wipe;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
// BBS: consider both soluable and support properties
|
|
// Return index of first toolchange that switches to non-soluble and non-support extruder
|
|
// ot -1 if there is no such toolchange.
|
|
int WipeTower::first_toolchange_to_nonsoluble_nonsupport(
|
|
const std::vector<WipeTowerInfo::ToolChange>& tool_changes) const
|
|
{
|
|
for (size_t idx=0; idx<tool_changes.size(); ++idx)
|
|
if (! m_filpar[tool_changes[idx].new_tool].is_soluble && ! m_filpar[tool_changes[idx].new_tool].is_support)
|
|
return idx;
|
|
return -1;
|
|
}
|
|
|
|
static WipeTower::ToolChangeResult merge_tcr(WipeTower::ToolChangeResult& first,
|
|
WipeTower::ToolChangeResult& second)
|
|
{
|
|
assert(first.new_tool == second.initial_tool);
|
|
WipeTower::ToolChangeResult out = first;
|
|
if (first.end_pos != second.start_pos)
|
|
out.gcode += "G1 X" + Slic3r::float_to_string_decimal_point(second.start_pos.x(), 3)
|
|
+ " Y" + Slic3r::float_to_string_decimal_point(second.start_pos.y(), 3)
|
|
+ " F7200\n";
|
|
out.gcode += second.gcode;
|
|
out.extrusions.insert(out.extrusions.end(), second.extrusions.begin(), second.extrusions.end());
|
|
out.end_pos = second.end_pos;
|
|
out.wipe_path = second.wipe_path;
|
|
out.initial_tool = first.initial_tool;
|
|
out.new_tool = second.new_tool;
|
|
|
|
// BBS
|
|
out.purge_volume += second.purge_volume;
|
|
return out;
|
|
}
|
|
|
|
|
|
// Processes vector m_plan and calls respective functions to generate G-code for the wipe tower
|
|
// Resulting ToolChangeResults are appended into vector "result"
|
|
void WipeTower::generate(std::vector<std::vector<WipeTower::ToolChangeResult>> &result)
|
|
{
|
|
if (m_plan.empty())
|
|
return;
|
|
|
|
m_extra_spacing = 1.f;
|
|
|
|
plan_tower();
|
|
// BBS
|
|
#if 0
|
|
for (int i=0;i<5;++i) {
|
|
save_on_last_wipe();
|
|
plan_tower();
|
|
}
|
|
#endif
|
|
|
|
m_layer_info = m_plan.begin();
|
|
|
|
// we don't know which extruder to start with - we'll set it according to the first toolchange
|
|
for (const auto& layer : m_plan) {
|
|
if (!layer.tool_changes.empty()) {
|
|
m_current_tool = layer.tool_changes.front().old_tool;
|
|
break;
|
|
}
|
|
}
|
|
|
|
for (auto& used : m_used_filament_length) // reset used filament stats
|
|
used = 0.f;
|
|
|
|
m_old_temperature = -1; // reset last temperature written in the gcode
|
|
|
|
std::vector<WipeTower::ToolChangeResult> layer_result;
|
|
for (auto layer : m_plan)
|
|
{
|
|
set_layer(layer.z, layer.height, 0, false/*layer.z == m_plan.front().z*/, layer.z == m_plan.back().z);
|
|
// BBS
|
|
//m_internal_rotation += 180.f;
|
|
|
|
if (m_layer_info->depth < m_perimeter_width)
|
|
continue;
|
|
|
|
if (m_layer_info->depth < m_wipe_tower_depth - m_perimeter_width) {
|
|
// align y shift to perimeter width
|
|
float dy = m_extra_spacing * m_perimeter_width;
|
|
m_y_shift = (m_wipe_tower_depth - m_layer_info->depth) / 2.f;
|
|
m_y_shift = align_round(m_y_shift, dy);
|
|
}
|
|
|
|
// BBS: consider both soluable and support properties
|
|
int idx = first_toolchange_to_nonsoluble_nonsupport (layer.tool_changes);
|
|
ToolChangeResult finish_layer_tcr;
|
|
ToolChangeResult timelapse_wall;
|
|
|
|
if (idx == -1) {
|
|
// if there is no toolchange switching to non-soluble, finish layer
|
|
// will be called at the very beginning. That's the last possibility
|
|
// where a nonsoluble tool can be.
|
|
if (m_enable_timelapse_print) {
|
|
timelapse_wall = only_generate_out_wall();
|
|
}
|
|
finish_layer_tcr = finish_layer(m_enable_timelapse_print ? false : true, layer.extruder_fill);
|
|
}
|
|
|
|
for (int i=0; i<int(layer.tool_changes.size()); ++i) {
|
|
if (i == 0 && m_enable_timelapse_print) {
|
|
timelapse_wall = only_generate_out_wall();
|
|
}
|
|
|
|
if (i == idx) {
|
|
layer_result.emplace_back(tool_change(layer.tool_changes[i].new_tool, m_enable_timelapse_print ? false : true));
|
|
// finish_layer will be called after this toolchange
|
|
finish_layer_tcr = finish_layer(false, layer.extruder_fill);
|
|
}
|
|
else {
|
|
if (idx == -1 && i == 0) {
|
|
layer_result.emplace_back(tool_change(layer.tool_changes[i].new_tool, false, true));
|
|
} else {
|
|
layer_result.emplace_back(tool_change(layer.tool_changes[i].new_tool));
|
|
}
|
|
}
|
|
}
|
|
|
|
if (layer_result.empty()) {
|
|
// there is nothing to merge finish_layer with
|
|
layer_result.emplace_back(std::move(finish_layer_tcr));
|
|
}
|
|
else {
|
|
if (idx == -1)
|
|
layer_result[0] = merge_tcr(finish_layer_tcr, layer_result[0]);
|
|
else if (is_valid_gcode(finish_layer_tcr.gcode))
|
|
layer_result[idx] = merge_tcr(layer_result[idx], finish_layer_tcr);
|
|
}
|
|
|
|
if (m_enable_timelapse_print) {
|
|
layer_result.insert(layer_result.begin(), std::move(timelapse_wall));
|
|
}
|
|
|
|
result.emplace_back(std::move(layer_result));
|
|
}
|
|
}
|
|
|
|
WipeTower::ToolChangeResult WipeTower::only_generate_out_wall()
|
|
{
|
|
size_t old_tool = m_current_tool;
|
|
|
|
WipeTowerWriter writer(m_layer_height, m_perimeter_width, m_gcode_flavor, m_filpar);
|
|
writer.set_extrusion_flow(m_extrusion_flow)
|
|
.set_z(m_z_pos)
|
|
.set_initial_tool(m_current_tool)
|
|
.set_y_shift(m_y_shift - (m_current_shape == SHAPE_REVERSED ? m_layer_info->toolchanges_depth() : 0.f));
|
|
|
|
// Slow down on the 1st layer.
|
|
bool first_layer = is_first_layer();
|
|
// BBS: speed up perimeter speed to 90mm/s for non-first layer
|
|
float feedrate = first_layer ? std::min(m_first_layer_speed * 60.f, 5400.f) : std::min(60.0f * m_filpar[m_current_tool].max_e_speed / m_extrusion_flow, 5400.f);
|
|
float fill_box_y = m_layer_info->toolchanges_depth() + m_perimeter_width;
|
|
box_coordinates fill_box(Vec2f(m_perimeter_width, fill_box_y), m_wipe_tower_width - 2 * m_perimeter_width, m_layer_info->depth - fill_box_y);
|
|
|
|
writer.set_initial_position((m_left_to_right ? fill_box.ru : fill_box.lu), // so there is never a diagonal travel
|
|
m_wipe_tower_width, m_wipe_tower_depth, m_internal_rotation);
|
|
|
|
bool toolchanges_on_layer = m_layer_info->toolchanges_depth() > WT_EPSILON;
|
|
|
|
// we are in one of the corners, travel to ld along the perimeter:
|
|
// BBS: Delete some unnecessary travel
|
|
//if (writer.x() > fill_box.ld.x() + EPSILON) writer.travel(fill_box.ld.x(), writer.y());
|
|
//if (writer.y() > fill_box.ld.y() + EPSILON) writer.travel(writer.x(), fill_box.ld.y());
|
|
writer.append(";" + GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Wipe_Tower_Start) + "\n");
|
|
// outer perimeter (always):
|
|
// BBS
|
|
box_coordinates wt_box(Vec2f(0.f, (m_current_shape == SHAPE_REVERSED ? m_layer_info->toolchanges_depth() : 0.f)), m_wipe_tower_width, m_layer_info->depth + m_perimeter_width);
|
|
wt_box = align_perimeter(wt_box);
|
|
writer.rectangle(wt_box, feedrate);
|
|
|
|
// Now prepare future wipe. box contains rectangle that was extruded last (ccw).
|
|
Vec2f target = (writer.pos() == wt_box.ld ? wt_box.rd : (writer.pos() == wt_box.rd ? wt_box.ru : (writer.pos() == wt_box.ru ? wt_box.lu : wt_box.ld)));
|
|
writer.add_wipe_point(writer.pos()).add_wipe_point(target);
|
|
|
|
writer.append(";" + GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Wipe_Tower_End) + "\n");
|
|
|
|
// Ask our writer about how much material was consumed.
|
|
// Skip this in case the layer is sparse and config option to not print sparse layers is enabled.
|
|
if (!m_no_sparse_layers || toolchanges_on_layer)
|
|
if (m_current_tool < m_used_filament_length.size()) m_used_filament_length[m_current_tool] += writer.get_and_reset_used_filament_length();
|
|
|
|
return construct_tcr(writer, false, old_tool, true, 0.f);
|
|
}
|
|
|
|
bool WipeTower::get_floating_area(float &start_pos_y, float &end_pos_y) const {
|
|
if (m_layer_info == m_plan.begin() || (m_layer_info - 1) == m_plan.begin())
|
|
return false;
|
|
|
|
float last_layer_fill_box_y = (m_layer_info - 1)->toolchanges_depth() + m_perimeter_width;
|
|
float last_layer_wipe_depth = (m_layer_info - 1)->depth;
|
|
if (last_layer_wipe_depth - last_layer_fill_box_y <= 2 * m_perimeter_width)
|
|
return false;
|
|
|
|
start_pos_y = last_layer_fill_box_y + m_perimeter_width;
|
|
end_pos_y = last_layer_wipe_depth - m_perimeter_width;
|
|
|
|
return true;
|
|
}
|
|
|
|
bool WipeTower::need_thick_bridge_flow(float pos_y) const {
|
|
if (m_extrusion_flow >= extrusion_flow(0.2))
|
|
return false;
|
|
|
|
float y_min = 0., y_max = 0.;
|
|
if (get_floating_area(y_min, y_max)) {
|
|
return pos_y > y_min && pos_y < y_max;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
} // namespace Slic3r
|