diff --git a/resources/calibration/bed_leveling/bed_leveling.html b/resources/calibration/bed_leveling/bed_leveling.html index b102b3dcf..74ccd7a36 100644 --- a/resources/calibration/bed_leveling/bed_leveling.html +++ b/resources/calibration/bed_leveling/bed_leveling.html @@ -45,7 +45,8 @@

Notes

After the filament flow calibration, if it appears that the flow was very wrong, you may want to redo this calibration just after.

-

Most of the calibrations need to done is the right order. This one is the first to do.

- +

Most of the calibrations need to done is the right order. This one is the first to do. But ou have to have a "good enough" extruder calibration: when you ask for 100mm of filament, that's ~ what the extruder has to scroll into the nozzle.

+

This test set the setting "complete individual objects" to true, so you may want to reset your print settigns afterwards

+

Licence for models used for this calibration test: CC BY-SA 3.0

\ No newline at end of file diff --git a/resources/calibration/filament_flow/0_v2.jpg b/resources/calibration/filament_flow/0_v2.jpg new file mode 100644 index 000000000..1bdaa8d94 Binary files /dev/null and b/resources/calibration/filament_flow/0_v2.jpg differ diff --git a/resources/calibration/filament_flow/filament_flow.html b/resources/calibration/filament_flow/filament_flow.html index 8e4a93f65..e4a588d33 100644 --- a/resources/calibration/filament_flow/filament_flow.html +++ b/resources/calibration/filament_flow/filament_flow.html @@ -7,7 +7,7 @@

Filament flow calibration

You need to do the bed level calibration before this one.

-

This test will print five tests samples with various level of flow. You can choose the flow difference between each steps. You should start with the 10% one. After verifying the result with the help of the tabel below, you have to modify the filamant extrusion multiplier in your filament preset (if the -20 is the best, change the multiplier from 1 to 0.8, see the formula below). Don't forget to save it afterwards. You can continue with the 2.5 step if you want a bit more precision.

+

This test will print five tests samples with various level of flow. You can choose the flow difference between each steps. You should start with the 10% one. After verifying the result with the help of the table below, you have to modify the filament extrusion multiplier in your filament preset (if the -20 is the best, change the multiplier from 1 to 0.8, see the formula below). Don't forget to save it afterwards. You can continue with the 2.5 step if you want a bit more precision.

Results

@@ -23,18 +23,37 @@ - + -

So here, I should

not flat not flat not flatflat
But the circle
isn't flat enough		flat
But the circle
isn't that good		 Flat surface
and good circle
-

The flow you want to choose is the lowest that don't create gaps in the top surface. Here it seems that the good flow is below +20. So you have to change your extrusion multiplier to 1.2 and print the second set of test (or put 1.15 and call it for now).

+

The flow you want to choose is the lowest that don't create gaps in the top surface. Here it seems that the good flow is below +20. So you have to change your extrusion multiplier to 1.2 and print the second set of test (or put 1.15 and call it a day).

+

Don't look at the surface quality of the letter, it should be only good at the 0, as it's for this flow we calibrated the bed height. Here, going with +20% flow, i should lower the bed a bit (redoing the bed level calibration).

+ + +

Second step, starting from +20%:

+ + + + + + + + + + + + + + +
too low, by fartoo low, by fartoo low, by fartoo low, by fartoo low, by far
Not goodNot goodAlmost goodGood
But the circle
has some
irregularities		Good
+

Here, we can see the loop isn't good in the -8 and -6. The -4 is almost round but not quite, so it indicates that the nozzle has lost pressure. -2 is almost good but the 0 is the only one that can be considered as "good", and even so the loop isn't perfect.

How to tune your printer

-

You have to change the extrusion multiplier for the filament you calibrate for (and save it). Formula for the new extrusion multipler: new_multiplier = ( (100 + choosen_number) / 100 ) * old_multiplier
-Exemple: first step, i choose the -10, so i have ((100-10)/100) * 1 = (0.9) * 1 = 0.9
-second step i chooe +5, so i have ((100+5)/100) * 0.9 = (1.05) * 0.9 = 0.945 +

You have to change the extrusion multiplier for the filament you calibrate for (and save it). Formula for the new extrusion multiplier: new_multiplier = ( (100 + chosen_number) / 100 ) * old_multiplier
+Example: first step, i choose the -10, so i have ((100-10)/100) * 1 = (0.9) * 1 = 0.9
+second step i choose +5, so i have ((100+5)/100) * 0.9 = (1.05) * 0.9 = 0.945

-

If you want to make this change permanent and left your extrusion multipler to 1 in slic3r++, you can change your firmware configuration by mutiplying (or dividing, depends of the firmware/setting) the 'extruder speed setting' (e-step, step_distance) by this extrusion multipler.

+

If you want to make this change permanent and left your extrusion multiplier to 1 in slic3r++, you can change your firmware configuration by multiplying (or dividing, depends of the firmware/setting) the 'extruder speed setting' (e-step, step_distance) by this extrusion multiplier.

Advice

Before doing this test, it's preferable to calibrate your extruder (it's easier on bowden setup):

Notes

-

It's very difficult to tune the flow below the 2% mark, and no filament is consistent enought to warrant it anyway. A filament that have a guarantee of +-0,03mm have a ~7% variation between the low and high end cross section.

+

It's very difficult to tune the flow below the 2% mark, and no filament is consistent enough to warrant it anyway. A filament that have a guarantee of +-0,03mm have a ~7% variation between the low and high end cross section.

Most of the calibrations need to done is the right order. This one should be the second.

You may want to re-do the bed level calibration is the result is below 0.9 or higher than 1.1.

-

Note that the filament extrusion multipler can change with a different filament material, as a softer one can be squished/dented more by the extruder and so have a lower diameter in the extruder gears.

-

If your printer extruder eat the filament and can't complete the top layer, you have to increase the ironing distribution (by 5% increment). (Expert seting, print -> infill)

- +

Note that the filament extrusion multiplier can change with a different filament material, as a softer one can be squished/dented more by the extruder and so have a lower diameter in the extruder gears.

+

If your printer extruder eat the filament and can't complete the top layer, you have to increase the ironing distribution (by 5% increment). (Expert setting, print -> infill)

+

This test set the setting "complete individual objects" to true, so you may want to reset your print settings afterwards

+

Licence for models used for this calibration test: CC BY-SA 3.0

\ No newline at end of file diff --git a/resources/calibration/filament_flow/m2.jpg b/resources/calibration/filament_flow/m2.jpg new file mode 100644 index 000000000..c6a36902a Binary files /dev/null and b/resources/calibration/filament_flow/m2.jpg differ diff --git a/resources/calibration/filament_flow/m4.jpg b/resources/calibration/filament_flow/m4.jpg new file mode 100644 index 000000000..3d754a03a Binary files /dev/null and b/resources/calibration/filament_flow/m4.jpg differ diff --git a/resources/calibration/filament_flow/m6.jpg b/resources/calibration/filament_flow/m6.jpg new file mode 100644 index 000000000..5366b1206 Binary files /dev/null and b/resources/calibration/filament_flow/m6.jpg differ diff --git a/resources/calibration/filament_flow/m8.jpg b/resources/calibration/filament_flow/m8.jpg new file mode 100644 index 000000000..bd99241a4 Binary files /dev/null and b/resources/calibration/filament_flow/m8.jpg differ diff --git a/resources/calibration/filament_temp/LICENCE.txt b/resources/calibration/filament_temp/LICENCE.txt new file mode 100644 index 000000000..c3b342fe0 --- /dev/null +++ b/resources/calibration/filament_temp/LICENCE.txt @@ -0,0 +1,77 @@ +Creative Commons +Attribution-ShareAlike 3.0 Unported + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE. + +License + +THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. + +BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. + +1. Definitions + + "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License. + "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License. + "Creative Commons Compatible License" means a license that is listed at https://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License. + "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership. + "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike. + "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License. + "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast. + "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work. + "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation. + "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images. + "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium. + +2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws. + +3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below: + + to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections; + to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified."; + to Distribute and Publicly Perform the Work including as incorporated in Collections; and, + to Distribute and Publicly Perform Adaptations. + + For the avoidance of doubt: + Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; + Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and, + Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License. + +The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved. + +4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions: + + You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested. + You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License. + If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties. + Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise. + +5. Representations, Warranties and Disclaimer + +UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. + +6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. Termination + + This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License. + Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above. + +8. Miscellaneous + + Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License. + Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License. + If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. + No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent. + This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You. + The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law. + + Creative Commons Notice + + Creative Commons is not a party to this License, and makes no warranty whatsoever in connection with the Work. Creative Commons will not be liable to You or any party on any legal theory for any damages whatsoever, including without limitation any general, special, incidental or consequential damages arising in connection to this license. Notwithstanding the foregoing two (2) sentences, if Creative Commons has expressly identified itself as the Licensor hereunder, it shall have all rights and obligations of Licensor. + + Except for the limited purpose of indicating to the public that the Work is licensed under the CCPL, Creative Commons does not authorize the use by either party of the trademark "Creative Commons" or any related trademark or logo of Creative Commons without the prior written consent of Creative Commons. Any permitted use will be in compliance with Creative Commons' then-current trademark usage guidelines, as may be published on its website or otherwise made available upon request from time to time. For the avoidance of doubt, this trademark restriction does not form part of the License. + + Creative Commons may be contacted at https://creativecommons.org/. + +« Back to Commons Deed diff --git a/resources/calibration/filament_temp/Smart_compact_temperature_calibration_item.amf b/resources/calibration/filament_temp/Smart_compact_temperature_calibration_item.amf new file mode 100644 index 000000000..86f3a2f0b Binary files /dev/null and b/resources/calibration/filament_temp/Smart_compact_temperature_calibration_item.amf differ diff --git a/resources/calibration/filament_temp/filament_temp.html b/resources/calibration/filament_temp/filament_temp.html index 2d75a944e..1e472bdc5 100644 --- a/resources/calibration/filament_temp/filament_temp.html +++ b/resources/calibration/filament_temp/filament_temp.html @@ -5,10 +5,12 @@ Filament temperature calibration -

Filament flow calibration

-

You need to do the bed level calibration before this one.

-

This test will print five tests samples with various level of flow. You can choose the flow difference between each steps. You should start with the 10% one. After verifying the result with the help of the tabel below, you have to modify the filamant extrusion multiplier in your filament preset (if the -20 is the best, change the multiplier from 1 to 0.8, see the formula below). Don't forget to save it afterwards. You can continue with the 2.5 step if you want a bit more precision.

-

Results

+

Filament temperature calibration

+

You need to do the bed level calibration before this one, and it's preferable to have also done the flow calibration. This calibration will help you to choose the right temperature with respect of bonding, overhangs and ooze. Note that this test is dependant of the cooling you selected. You can print this multiple times with more or less cooling to find your perfect spot.

+

This test will print a tower of prints printed with a different temperature for each floor. The middle one will be printed with the current temperature selected in your filament configuration. Each other floor will differ by 5°c. You can choose to generate 5 or 9 floors.

+

Results : observation

+

The goal is to choose the highest temperature that doesn't produce artifacts.

+

First, you have to analyse the tower. Each floor has the temperature written on it.

@@ -19,41 +21,30 @@ + + - - - - - - - + + + + + + + + +
too low, by far too low, by far too low, by fartoo low, by fartoo low, by far
not enough flowToo farToo far:
You can spot
a little gap		okokTrap!
It's too near:
check the thickness
of the patch!		Far too near.
Dangerous
for the bed		TODOTODOTODOTODOTODOTODOTODOTODOTODO
-

The flow you want to choose is the lowest that don't create gaps in the top surface.

+

TODO

+

Results: destruction

+

Finally, you want to tear it apart to see if the lower temperature doesn't have adverse effect on layer bonding. It should be impossible to tear it apart with your own hands. If a floor can be easily broken, then this floor temperature is definitely too low (or you put too much cooling = fan are blowing too hard), so you should choose a higher temperature or try again with less cooling. When trying to break one, don't put your hands on the ends of the tower but on the tested floor and the next one, leaving only the bridge gaps between them.

How to tune your printer

-

You have to change the extrusion multiplier for the filament you calibrate for (and save it). Formula for the new extrusion multipler: new_multiplier = ( (100 + choosen_number) / 100 ) * old_multiplier
-Exemple: first step, i choose the -10, so i have ((100-10)/100) * 1 = (0.9) * 1 = 0.9
-second step i chooe +5, so i have ((100+5)/100) * 0.9 = (1.05) * 0.9 = 0.945 -

-

If you want to make this change permanent and left your extrusion multipler to 1 in slic3r++, you can change your firmware configuration by mutiplying (or dividing, depends of the firmware/setting) the 'extruder speed setting' (e-step, step_distance) by this extrusion multipler.

-

Advice

-

Before doing this test, it's preferable to calibrate your extruder (it's easier on bowden setup):

-

Notes

-

It's very difficult to tune the flow below the 2% mark, and no filament is consistent enought to warrant it anyway. A filament that have a guarantee of +-0,03mm have a ~7% variation between the low and high end cross section.

-

Most of the calibrations need to done is the right order. This one should be the second.

-

You may want to re-do the bed level calibration is the result is below 0.9 or higher than 1.1.

-

Note that the filament extrusion multipler can change with a different filament material, as a softer one can be squished/dented more by the extruder and so have a lower diameter in the extruder gears.

-

If your printer extruder eat the filament and can't complete the top layer, you have to increase the ironing distribution (by 5% increment). (Expert seting, print -> infill)

- +

Most of the calibrations need to done is the right order. This one should be the third.

+

This tower is made with the 3D model created by gaaZolee and available here https://www.thingiverse.com/thing:2729076 with the CC BY-SA 3.0 licence.

+

Licence for models used for this calibration test: CC BY-SA 3.0

\ No newline at end of file diff --git a/resources/calibration/filament_temp/overhang_test.amf b/resources/calibration/filament_temp/overhang_test.amf deleted file mode 100644 index 10a992bc9..000000000 Binary files a/resources/calibration/filament_temp/overhang_test.amf and /dev/null differ diff --git a/resources/calibration/filament_temp/t180.amf b/resources/calibration/filament_temp/t180.amf new file mode 100644 index 000000000..bed7d17cf Binary files /dev/null and b/resources/calibration/filament_temp/t180.amf differ diff --git a/resources/calibration/filament_temp/t185.amf b/resources/calibration/filament_temp/t185.amf new file mode 100644 index 000000000..273e414e8 Binary files /dev/null and b/resources/calibration/filament_temp/t185.amf differ diff --git a/resources/calibration/filament_temp/t190.amf b/resources/calibration/filament_temp/t190.amf new file mode 100644 index 000000000..6681ba631 Binary files /dev/null and b/resources/calibration/filament_temp/t190.amf differ diff --git a/resources/calibration/filament_temp/t195.amf b/resources/calibration/filament_temp/t195.amf new file mode 100644 index 000000000..9e9c3329f Binary files /dev/null and b/resources/calibration/filament_temp/t195.amf differ diff --git a/resources/calibration/filament_temp/t200.amf b/resources/calibration/filament_temp/t200.amf new file mode 100644 index 000000000..f26ece1b6 Binary files /dev/null and b/resources/calibration/filament_temp/t200.amf differ diff --git a/resources/calibration/filament_temp/t205.amf b/resources/calibration/filament_temp/t205.amf new file mode 100644 index 000000000..f37a8c075 Binary files /dev/null and b/resources/calibration/filament_temp/t205.amf differ diff --git a/resources/calibration/filament_temp/t210.amf b/resources/calibration/filament_temp/t210.amf new file mode 100644 index 000000000..c024be1f5 Binary files /dev/null and b/resources/calibration/filament_temp/t210.amf differ diff --git a/resources/calibration/filament_temp/t215.amf b/resources/calibration/filament_temp/t215.amf new file mode 100644 index 000000000..7eae4e0a3 Binary files /dev/null and b/resources/calibration/filament_temp/t215.amf differ diff --git a/resources/calibration/filament_temp/t220.amf b/resources/calibration/filament_temp/t220.amf new file mode 100644 index 000000000..32503c6f4 Binary files /dev/null and b/resources/calibration/filament_temp/t220.amf differ diff --git a/resources/calibration/filament_temp/t225.amf b/resources/calibration/filament_temp/t225.amf new file mode 100644 index 000000000..08835290d Binary files /dev/null and b/resources/calibration/filament_temp/t225.amf differ diff --git a/resources/calibration/filament_temp/t230.amf b/resources/calibration/filament_temp/t230.amf new file mode 100644 index 000000000..48b7040b2 Binary files /dev/null and b/resources/calibration/filament_temp/t230.amf differ diff --git a/resources/calibration/filament_temp/t235.amf b/resources/calibration/filament_temp/t235.amf new file mode 100644 index 000000000..440e75158 Binary files /dev/null and b/resources/calibration/filament_temp/t235.amf differ diff --git a/resources/calibration/filament_temp/t240.amf b/resources/calibration/filament_temp/t240.amf new file mode 100644 index 000000000..62aa22e7d Binary files /dev/null and b/resources/calibration/filament_temp/t240.amf differ diff --git a/resources/calibration/filament_temp/t245.amf b/resources/calibration/filament_temp/t245.amf new file mode 100644 index 000000000..7cad69f74 Binary files /dev/null and b/resources/calibration/filament_temp/t245.amf differ diff --git a/resources/calibration/filament_temp/t250.amf b/resources/calibration/filament_temp/t250.amf new file mode 100644 index 000000000..7af2c6586 Binary files /dev/null and b/resources/calibration/filament_temp/t250.amf differ diff --git a/resources/calibration/filament_temp/t255.amf b/resources/calibration/filament_temp/t255.amf new file mode 100644 index 000000000..fa751aefc Binary files /dev/null and b/resources/calibration/filament_temp/t255.amf differ diff --git a/resources/calibration/filament_temp/t260.amf b/resources/calibration/filament_temp/t260.amf new file mode 100644 index 000000000..7ef595dc5 Binary files /dev/null and b/resources/calibration/filament_temp/t260.amf differ diff --git a/resources/calibration/filament_temp/t265.amf b/resources/calibration/filament_temp/t265.amf new file mode 100644 index 000000000..bc3d4ca10 Binary files /dev/null and b/resources/calibration/filament_temp/t265.amf differ diff --git a/resources/calibration/filament_temp/t270.amf b/resources/calibration/filament_temp/t270.amf new file mode 100644 index 000000000..0ead37c22 Binary files /dev/null and b/resources/calibration/filament_temp/t270.amf differ diff --git a/resources/calibration/filament_temp/t275.amf b/resources/calibration/filament_temp/t275.amf new file mode 100644 index 000000000..076bc192a Binary files /dev/null and b/resources/calibration/filament_temp/t275.amf differ diff --git a/resources/calibration/filament_temp/t280.amf b/resources/calibration/filament_temp/t280.amf new file mode 100644 index 000000000..41bc34e69 Binary files /dev/null and b/resources/calibration/filament_temp/t280.amf differ diff --git a/resources/calibration/filament_temp/t285.amf b/resources/calibration/filament_temp/t285.amf new file mode 100644 index 000000000..1fcdd4550 Binary files /dev/null and b/resources/calibration/filament_temp/t285.amf differ diff --git a/resources/calibration/filament_temp/to_break.amf b/resources/calibration/filament_temp/to_break.amf new file mode 100644 index 000000000..c2426b959 Binary files /dev/null and b/resources/calibration/filament_temp/to_break.amf differ diff --git a/src/slic3r/GUI/CalibrationBedDialog.cpp b/src/slic3r/GUI/CalibrationBedDialog.cpp index 6fe4d4f01..1844af154 100644 --- a/src/slic3r/GUI/CalibrationBedDialog.cpp +++ b/src/slic3r/GUI/CalibrationBedDialog.cpp @@ -3,10 +3,11 @@ #include "libslic3r/Utils.hpp" #include "GUI.hpp" #include "GUI_ObjectList.hpp" -#include "tab.hpp" +#include "Tab.hpp" #include #include #include +#include #include "wxExtensions.hpp" #if ENABLE_SCROLLABLE @@ -41,7 +42,6 @@ namespace GUI { auto main_sizer = new wxBoxSizer(wxVERTICAL); //html - std::cout << "display test.html\n"; html_viewer = new wxHtmlWindow(this, wxID_ANY, wxDefaultPosition, wxSize(800, 500), wxHW_SCROLLBAR_AUTO); html_viewer->LoadPage("./resources/calibration/bed_leveling/bed_leveling.html"); @@ -65,7 +65,7 @@ namespace GUI { } void CalibrationBedDialog::closeMe(wxCommandEvent& event_args) { - gui_app->delete_calibration_dialog(); + this->Destroy(); } void CalibrationBedDialog::create_geometry(wxCommandEvent& event_args) { diff --git a/src/slic3r/GUI/CalibrationBedDialog.hpp b/src/slic3r/GUI/CalibrationBedDialog.hpp index 9b48dad70..68fccb324 100644 --- a/src/slic3r/GUI/CalibrationBedDialog.hpp +++ b/src/slic3r/GUI/CalibrationBedDialog.hpp @@ -19,6 +19,7 @@ class CalibrationBedDialog : public DPIDialog public: CalibrationBedDialog(GUI_App* app, MainFrame* mainframe); + virtual ~CalibrationBedDialog() { if (gui_app != nullptr) gui_app->change_calibration_dialog(this, nullptr); } protected: void on_dpi_changed(const wxRect &suggested_rect) override; diff --git a/src/slic3r/GUI/CalibrationBridgeDialog.hpp b/src/slic3r/GUI/CalibrationBridgeDialog.hpp index 6d255d32d..49554cf0a 100644 --- a/src/slic3r/GUI/CalibrationBridgeDialog.hpp +++ b/src/slic3r/GUI/CalibrationBridgeDialog.hpp @@ -19,6 +19,7 @@ class CalibrationBridgeDialog : public DPIDialog public: CalibrationBridgeDialog(GUI_App* app, MainFrame* mainframe); + virtual ~CalibrationBridgeDialog() { if (gui_app != nullptr) gui_app->change_calibration_dialog(this, nullptr); } protected: void on_dpi_changed(const wxRect &suggested_rect) override; diff --git a/src/slic3r/GUI/CalibrationFlowDialog.cpp b/src/slic3r/GUI/CalibrationFlowDialog.cpp index e910e6a94..771546859 100644 --- a/src/slic3r/GUI/CalibrationFlowDialog.cpp +++ b/src/slic3r/GUI/CalibrationFlowDialog.cpp @@ -4,7 +4,7 @@ #include "GLCanvas3D.hpp " #include "GUI.hpp" #include "GUI_ObjectList.hpp" -#include "tab.hpp" +#include "Tab.hpp" #include #include #include @@ -43,8 +43,8 @@ namespace GUI { //html html_viewer = new wxHtmlWindow(this, wxID_ANY, - wxDefaultPosition, wxSize(600, 500), wxHW_SCROLLBAR_AUTO); - html_viewer->SetMinSize(wxSize(1000, 500)); + wxDefaultPosition, wxSize(500, 500), wxHW_SCROLLBAR_AUTO); + html_viewer->SetMinSize(wxSize(900, 500)); html_viewer->LoadPage("./resources/calibration/filament_flow/filament_flow.html"); main_sizer->Add(html_viewer, 1, wxEXPAND | wxALL, 5); @@ -72,7 +72,7 @@ namespace GUI { } void CalibrationFlowDialog::closeMe(wxCommandEvent& event_args) { - gui_app->delete_calibration_dialog(); + this->Destroy(); } void CalibrationFlowDialog::create_geometry_10(wxCommandEvent& event_args) { diff --git a/src/slic3r/GUI/CalibrationFlowDialog.hpp b/src/slic3r/GUI/CalibrationFlowDialog.hpp index ef0693bd1..f466a16f2 100644 --- a/src/slic3r/GUI/CalibrationFlowDialog.hpp +++ b/src/slic3r/GUI/CalibrationFlowDialog.hpp @@ -19,6 +19,7 @@ class CalibrationFlowDialog : public DPIDialog public: CalibrationFlowDialog(GUI_App* app, MainFrame* mainframe); + virtual ~CalibrationFlowDialog() { if (gui_app != nullptr) gui_app->change_calibration_dialog(this, nullptr); } protected: void on_dpi_changed(const wxRect &suggested_rect) override; diff --git a/src/slic3r/GUI/CalibrationTempDialog.cpp b/src/slic3r/GUI/CalibrationTempDialog.cpp index 2d7bea034..a8047ffaf 100644 --- a/src/slic3r/GUI/CalibrationTempDialog.cpp +++ b/src/slic3r/GUI/CalibrationTempDialog.cpp @@ -1,8 +1,10 @@ #include "CalibrationTempDialog.hpp" #include "I18N.hpp" #include "libslic3r/Utils.hpp" +#include "GLCanvas3D.hpp " #include "GUI.hpp" -#include "tab.hpp" +#include "GUI_ObjectList.hpp" +#include "Tab.hpp" #include #include #include @@ -40,120 +42,182 @@ namespace GUI { auto main_sizer = new wxBoxSizer(wxVERTICAL); //html - std::cout << "display test.html\n"; html_viewer = new wxHtmlWindow(this, wxID_ANY, - wxDefaultPosition, wxSize(400, 400), wxHW_SCROLLBAR_AUTO); - html_viewer->LoadPage("./resources/calibration/bed_leveling/bed_leveling.html"); + wxDefaultPosition, wxSize(800, 500), wxHW_SCROLLBAR_AUTO); + html_viewer->LoadPage("./resources/calibration/filament_temp/filament_temp.html"); main_sizer->Add(html_viewer, 1, wxEXPAND | wxALL, 5); - wxStdDialogButtonSizer* buttons = this->CreateStdDialogButtonSizer(wxAPPLY| wxCLOSE); - buttons->GetApplyButton()->Bind(wxEVT_BUTTON, &CalibrationTempDialog::create_geometry, this); - this->SetEscapeId(wxCLOSE); + wxStdDialogButtonSizer* buttons = new wxStdDialogButtonSizer(); + wxButton* bt = new wxButton(this, wxID_FILE1, _(L("Generate +- 10"))); + bt->Bind(wxEVT_BUTTON, &CalibrationTempDialog::create_geometry_2, this); + buttons->Add(bt); + bt = new wxButton(this, wxID_FILE1, _(L("Generate +- 20"))); + bt->Bind(wxEVT_BUTTON, &CalibrationTempDialog::create_geometry_4, this); + buttons->Add(bt); + wxButton* close = new wxButton(this, wxID_CLOSE, _(L("Close"))); + close->Bind(wxEVT_BUTTON, &CalibrationTempDialog::closeMe, this); + buttons->AddButton(close); + close->SetDefault(); + close->SetFocus(); + SetAffirmativeId(wxID_CLOSE); + buttons->Realize(); main_sizer->Add(buttons, 0, wxEXPAND | wxALL, 5); SetSizer(main_sizer); main_sizer->SetSizeHints(this); } -void CalibrationTempDialog::create_geometry(wxCommandEvent& event_args) { +void CalibrationTempDialog::closeMe(wxCommandEvent& event_args) { + this->Destroy(); +} + +ModelObject* CalibrationTempDialog::add_part(ModelObject* model_object, std::string input_file, Vec3d move, Vec3d scale) { + Model model; + try { + model = Model::read_from_file(input_file); + } + catch (std::exception & e) { + auto msg = _(L("Error!")) + " " + input_file + " : " + e.what() + "."; + show_error(this, msg); + exit(1); + } + + for (ModelObject* object : model.objects) { + Vec3d delta = Vec3d::Zero(); + if (model_object->origin_translation != Vec3d::Zero()) + { + object->center_around_origin(); + delta = model_object->origin_translation - object->origin_translation; + } + for (ModelVolume* volume : object->volumes) { + volume->translate(delta + move); + if (scale != Vec3d{ 1,1,1 }) { + volume->scale(scale); + } + ModelVolume* new_volume = model_object->add_volume(*volume); + new_volume->set_type(ModelVolumeType::MODEL_PART); + new_volume->name = boost::filesystem::path(input_file).filename().string(); + + //volumes_info.push_back(std::make_pair(from_u8(new_volume->name), new_volume->get_mesh_errors_count() > 0)); + + // set a default extruder value, since user can't add it manually + new_volume->config.set_key_value("extruder", new ConfigOptionInt(0)); + + //move to bed + /* const TriangleMesh& hull = new_volume->get_convex_hull(); + float min_z = std::numeric_limits::max(); + for (const stl_facet& facet : hull.stl.facet_start) { + for (int i = 0; i < 3; ++i) + min_z = std::min(min_z, Vec3f::UnitZ().dot(facet.vertex[i])); + } + volume->translate(Vec3d(0,0,-min_z));*/ + } + } + assert(model.objects.size() == 1); + return model.objects.empty()?nullptr: model.objects[0]; +} + +void CalibrationTempDialog::create_geometry(uint8_t nb_delta) { Plater* plat = this->main_frame->plater(); Model& model = plat->model(); plat->reset(); std::vector objs_idx = plat->load_files(std::vector{ - "./resources/calibration/bed_leveling/patch.amf", - "./resources/calibration/bed_leveling/patch.amf", - "./resources/calibration/bed_leveling/patch.amf", - "./resources/calibration/bed_leveling/patch.amf", - "./resources/calibration/bed_leveling/patch.amf"}, true, false); + "./resources/calibration/filament_temp/Smart_compact_temperature_calibration_item.amf"}, true, false); - assert(objs_idx.size() == 5); + assert(objs_idx.size() == 1); const DynamicPrintConfig* printConfig = this->gui_app->get_tab(Preset::TYPE_PRINT)->get_config(); + const DynamicPrintConfig* filamentConfig = this->gui_app->get_tab(Preset::TYPE_FILAMENT)->get_config(); const DynamicPrintConfig* printerConfig = this->gui_app->get_tab(Preset::TYPE_PRINTER)->get_config(); + + // -- get temps + const ConfigOptionInts* temperature_config = filamentConfig->option("temperature"); + assert(temperature_config->values.size() >= 1); + int16_t temperature = 5* (temperature_config->values[0]/5); + size_t nb_items = 1 + 2 * nb_delta; /// --- scale --- //model is created for a 0.4 nozzle, scale xy with nozzle size. - const ConfigOptionFloats* nozzle_diameter = printerConfig->option("nozzle_diameter"); - assert(nozzle_diameter->values.size() > 0); - float xyScale = nozzle_diameter->values[0] / 0.4; - //scale z with the first_layer_height - const ConfigOptionFloatOrPercent* first_layer_height = printConfig->option("first_layer_height"); - float zscale = first_layer_height->get_abs_value(nozzle_diameter->values[0]) / 0.2; + const ConfigOptionFloats* nozzle_diameter_config = printerConfig->option("nozzle_diameter"); + assert(nozzle_diameter_config->values.size() > 0); + float nozzle_diameter = nozzle_diameter_config->values[0]; + float xyzScale = nozzle_diameter / 0.4; //do scaling - if (xyScale < 0.9 || 1.2 < xyScale) { + if (xyzScale < 0.9 || 1.1 < xyzScale) { for (size_t i = 0; i < 5; i++) - model.objects[objs_idx[i]]->scale(xyScale, xyScale, zscale); + model.objects[objs_idx[0]]->scale(xyzScale, xyzScale * 0.5, xyzScale); + } else { + xyzScale = 1; + model.objects[objs_idx[0]]->scale(xyzScale, xyzScale * 0.5, xyzScale); } - /// --- rotate --- - const ConfigOptionPoints* bed_shape = printerConfig->option("bed_shape"); - if (bed_shape->values.size() == 4) { - model.objects[objs_idx[0]]->rotate(PI / 4, { 0,0,1 }); - model.objects[objs_idx[1]]->rotate(5 * PI / 4, { 0,0,1 }); - model.objects[objs_idx[3]]->rotate(3 * PI / 4, { 0,0,1 }); - model.objects[objs_idx[4]]->rotate(7 * PI / 4, { 0,0,1 }); - } else { - model.objects[objs_idx[3]]->rotate(PI / 2, { 0,0,1 }); - model.objects[objs_idx[4]]->rotate(PI / 2, { 0,0,1 }); + //add 8 others + std::vectortower; + tower.push_back(model.objects[objs_idx[0]]); + float zshift = (1 - xyzScale) / 2; + if (temperature - (int8_t)nb_delta * 5 > 175 && temperature - (int8_t)nb_delta * 5 < 290) { + tower.push_back(add_part(model.objects[objs_idx[0]], "./resources/calibration/filament_temp/t"+std::to_string(temperature - (int8_t)nb_delta * 5 )+".amf", + Vec3d{ xyzScale * 5, - xyzScale * 2.5, zshift - xyzScale * 2.5}, Vec3d{ xyzScale, xyzScale, xyzScale * 0.43 })); } + for (int16_t i = 1; i < nb_items; i++) { + tower.push_back(add_part(model.objects[objs_idx[0]], "./resources/calibration/filament_temp/Smart_compact_temperature_calibration_item.amf", + Vec3d{ 0,0, zshift + i * 10 }, Vec3d{ xyzScale, xyzScale * 0.5, xyzScale })); + if (temperature - (int8_t)nb_delta * 5 + i * 5 > 175 && temperature - (int8_t)nb_delta * 5 + i * 5 < 290) { + tower.push_back(add_part(model.objects[objs_idx[0]], "./resources/calibration/filament_temp/t" + std::to_string(temperature - (int8_t)nb_delta * 5 + i * 5) + ".amf", + Vec3d{ xyzScale * 5, -xyzScale * 2.5, zshift + xyzScale * (i * 10 - 2.5) }, Vec3d{ xyzScale, xyzScale, xyzScale * 0.43 })); + } + } + /// --- translate --- - //three first will stay with this orientation (top left, middle, bottom right) - //last two with 90deg (top left, middle, bottom right) - //get position for patches + const ConfigOptionPoints* bed_shape = printerConfig->option("bed_shape"); Vec2d bed_size = BoundingBoxf(bed_shape->values).size(); Vec2d bed_min = BoundingBoxf(bed_shape->values).min; - float offsetx = 10 + 10 * xyScale; - float offsety = 10 + 10 * xyScale; - if (bed_shape->values.size() > 4) { - offsetx = bed_size.x() / 2 - bed_size.x() * std::sqrtf(2) / 4 + 10 * xyScale; - offsety = bed_size.y() / 2 - bed_size.y() * std::sqrtf(2) / 4 + 10 * xyScale; - } - bool large_enough = bed_shape->values.size() == 4 ? - (bed_size.x() > offsetx * 3 && bed_size.y() > offsety * 3) : - (bed_size.x() > offsetx * 2 + 10 * xyScale && bed_size.y() > offsety * 2 + 10 * xyScale); - if (!large_enough){ - //problem : too small, use arrange instead and let the user place them. - model.arrange_objects(20); - //TODO add message - } else { - model.objects[objs_idx[0]]->translate({ bed_min.x() + offsetx, bed_min.y() + bed_size.y() - offsety,0 }); - model.objects[objs_idx[1]]->translate({ bed_min.x() + bed_size.x() - offsetx,bed_min.y() + offsety , 0 }); - model.objects[objs_idx[2]]->translate({ bed_min.x() + bed_size.x()/2, bed_min.y() + bed_size.y() / 2, 0 }); - model.objects[objs_idx[3]]->translate({ bed_min.x() + offsetx, bed_min.y() + offsety, 0 }); - model.objects[objs_idx[4]]->translate({ bed_min.x() + bed_size.x() - offsetx,bed_min.y() + bed_size.y() - offsety,0 }); - } + model.objects[objs_idx[0]]->translate({ bed_min.x() + bed_size.x() / 2, bed_min.y() + bed_size.y() / 2, 0 }); /// --- main config, please modify object config when possible --- DynamicPrintConfig new_print_config = *printConfig; //make a copy - new_print_config.set_key_value("complete_objects", new ConfigOptionBool(true)); - new_print_config.set_key_value("skirts", new ConfigOptionInt(0)); + new_print_config.set_key_value("complete_objects", new ConfigOptionBool(false)); + + /// -- generate the heat change gcode + std::string str_layer_gcode = "{if layer_num > 0 and layer_z <= " + std::to_string(2 * xyzScale) + "}\nM104 S" + std::to_string(temperature - (int8_t)nb_delta * 5); + for (int16_t i = 1; i < nb_items; i++) { + str_layer_gcode += "\n{ elsif layer_z >= " + std::to_string(i * 10 * xyzScale) + " and layer_z <= " + std::to_string((1 + i * 10) * xyzScale) + " }\nM104 S" + std::to_string(temperature - (int8_t)nb_delta * 5 + i * 5); + } + str_layer_gcode += "\n{endif}\n"; + DynamicPrintConfig new_printer_config = *printerConfig; //make a copy + new_printer_config.set_key_value("layer_gcode", new ConfigOptionString(str_layer_gcode)); /// --- custom config --- - for (size_t i = 0; i < 5; i++) { - model.objects[objs_idx[i]]->config.set_key_value("perimeters", new ConfigOptionInt(2)); - model.objects[objs_idx[i]]->config.set_key_value("bottom_solid_layers", new ConfigOptionInt(2)); - model.objects[objs_idx[i]]->config.set_key_value("gap_fill", new ConfigOptionBool(false)); - model.objects[objs_idx[i]]->config.set_key_value("first_layer_extrusion_width", new ConfigOptionFloatOrPercent(140, true)); - model.objects[objs_idx[i]]->config.set_key_value("bottom_fill_pattern", new ConfigOptionEnum(ipRectilinearWGapFill)); - } - if (bed_shape->values.size() == 4) { - model.objects[objs_idx[0]]->config.set_key_value("fill_angle", new ConfigOptionFloat(90)); - model.objects[objs_idx[1]]->config.set_key_value("fill_angle", new ConfigOptionFloat(90)); - model.objects[objs_idx[2]]->config.set_key_value("fill_angle", new ConfigOptionFloat(45)); - model.objects[objs_idx[3]]->config.set_key_value("fill_angle", new ConfigOptionFloat(0)); - model.objects[objs_idx[4]]->config.set_key_value("fill_angle", new ConfigOptionFloat(0)); - } else { - for (size_t i = 0; i < 3; i++) - for (size_t i = 3; i < 5; i++) - model.objects[objs_idx[i]]->config.set_key_value("fill_angle", new ConfigOptionFloat(135)); + float brim_width = printConfig->option("brim_width")->value; + if (brim_width < nozzle_diameter * 8) { + model.objects[objs_idx[0]]->config.set_key_value("brim_width", new ConfigOptionFloat(nozzle_diameter * 8)); } + model.objects[objs_idx[0]]->config.set_key_value("brim_ears", new ConfigOptionBool(false)); + model.objects[objs_idx[0]]->config.set_key_value("perimeters", new ConfigOptionInt(1)); + model.objects[objs_idx[0]]->config.set_key_value("extra_perimeters_overhangs", new ConfigOptionBool(true)); + model.objects[objs_idx[0]]->config.set_key_value("bottom_solid_layers", new ConfigOptionInt(2)); + model.objects[objs_idx[0]]->config.set_key_value("top_solid_layers", new ConfigOptionInt(3)); + model.objects[objs_idx[0]]->config.set_key_value("gap_fill", new ConfigOptionBool(false)); + model.objects[objs_idx[0]]->config.set_key_value("thin_perimeters", new ConfigOptionBool(true)); + model.objects[objs_idx[0]]->config.set_key_value("layer_height", new ConfigOptionFloat(nozzle_diameter / 2)); + model.objects[objs_idx[0]]->config.set_key_value("first_layer_height", new ConfigOptionFloatOrPercent(nozzle_diameter / 2, false)); + model.objects[objs_idx[0]]->config.set_key_value("fill_density", new ConfigOptionPercent(7)); + model.objects[objs_idx[0]]->config.set_key_value("solid_fill_pattern", new ConfigOptionEnum(ipRectilinearWGapFill)); + model.objects[objs_idx[0]]->config.set_key_value("top_fill_pattern", new ConfigOptionEnum(ipRectilinearWGapFill)); //update plater this->gui_app->get_tab(Preset::TYPE_PRINT)->load_config(new_print_config); plat->on_config_change(new_print_config); + this->gui_app->get_tab(Preset::TYPE_PRINTER)->load_config(new_printer_config); + plat->on_config_change(new_printer_config); plat->changed_objects(objs_idx); - //if(!plat->is_background_process_update_scheduled()) - // plat->schedule_background_process(); + this->gui_app->get_tab(Preset::TYPE_PRINT)->update_dirty(); + this->gui_app->get_tab(Preset::TYPE_PRINTER)->update_dirty(); + //update everything, easier to code. + ObjectList* obj = this->gui_app->obj_list(); + obj->update_after_undo_redo(); + + plat->reslice(); plat->select_view_3D("Preview"); } diff --git a/src/slic3r/GUI/CalibrationTempDialog.hpp b/src/slic3r/GUI/CalibrationTempDialog.hpp index 2de42fdc4..fcb7c2d5a 100644 --- a/src/slic3r/GUI/CalibrationTempDialog.hpp +++ b/src/slic3r/GUI/CalibrationTempDialog.hpp @@ -19,12 +19,17 @@ class CalibrationTempDialog : public DPIDialog public: CalibrationTempDialog(GUI_App* app, MainFrame* mainframe); + virtual ~CalibrationTempDialog(){ if(gui_app!=nullptr) gui_app->change_calibration_dialog(this, nullptr);} protected: void on_dpi_changed(const wxRect &suggested_rect) override; private: - void create_geometry(wxCommandEvent& event_args); + void closeMe(wxCommandEvent& event_args); + ModelObject* add_part(ModelObject* model_object, std::string input_file, Vec3d move, Vec3d scale = Vec3d{ 1,1,1 }); + void create_geometry_2(wxCommandEvent& event_args) { create_geometry(2); } + void create_geometry_4(wxCommandEvent& event_args) { create_geometry(4); } + void create_geometry(uint8_t nb_delta); wxPanel* create_header(wxWindow* parent, const wxFont& bold_font); wxHtmlWindow* html_viewer; diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 89ba2d4a4..5cd210d0b 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -210,8 +210,6 @@ GUI_App::GUI_App() GUI_App::~GUI_App() { - delete_calibration_dialog(); - if (app_config != nullptr) delete app_config; @@ -539,42 +537,59 @@ void GUI_App::keyboard_shortcuts() dlg.ShowModal(); } -void GUI_App::delete_calibration_dialog() { - if (not_modal_dialog.get() != nullptr) { - not_modal_dialog->Destroy(); +void GUI_App::change_calibration_dialog(const wxDialog* have_to_destroy, wxDialog* new_one){ + std::string str; + if (have_to_destroy == nullptr) { + wxDialog* to_destroy = nullptr; + { + //hove to ensure that this release is "atomic" + std::unique_lock lock(not_modal_dialog_mutex); + to_destroy = not_modal_dialog; + not_modal_dialog = nullptr; + } + if (to_destroy != nullptr) { + to_destroy->Destroy(); + } + } else { + //hove to ensure that these two command are "atomic" + std::unique_lock lock(not_modal_dialog_mutex); + if (not_modal_dialog == have_to_destroy) { + not_modal_dialog = nullptr; + } } - not_modal_dialog.release(); + if (new_one != nullptr) { + { + //hove to ensure that these command are "atomic" + std::unique_lock lock(not_modal_dialog_mutex); + if (not_modal_dialog != nullptr) + not_modal_dialog->Destroy(); + not_modal_dialog = new_one; + } + new_one->Show(); + } + std::cout << str; + } void GUI_App::bed_leveling_dialog() { - delete_calibration_dialog(); - not_modal_dialog.reset(new CalibrationBedDialog(this, mainframe)); - not_modal_dialog->Show(); + change_calibration_dialog(nullptr, new CalibrationBedDialog(this, mainframe)); } void GUI_App::flow_ratio_dialog() { - delete_calibration_dialog(); - not_modal_dialog.reset(new CalibrationFlowDialog(this, mainframe)); - not_modal_dialog->Show(); + change_calibration_dialog(nullptr, new CalibrationFlowDialog(this, mainframe)); } void GUI_App::over_bridge_dialog() { - delete_calibration_dialog(); - not_modal_dialog.reset(new CalibrationFlowDialog(this, mainframe)); - not_modal_dialog->Show(); + change_calibration_dialog(nullptr, new CalibrationFlowDialog(this, mainframe)); } void GUI_App::bridge_tuning_dialog() { - delete_calibration_dialog(); - not_modal_dialog.reset(new CalibrationBridgeDialog(this, mainframe)); - not_modal_dialog->Show(); + change_calibration_dialog(nullptr, new CalibrationBridgeDialog(this, mainframe)); } void GUI_App::filament_temperature_dialog() { - delete_calibration_dialog(); - not_modal_dialog.reset(new CalibrationTempDialog(this, mainframe)); - not_modal_dialog->Show(); + change_calibration_dialog(nullptr, new CalibrationTempDialog(this, mainframe)); } // static method accepting a wxWindow object as first parameter diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp index 068b92613..945411fcf 100644 --- a/src/slic3r/GUI/GUI_App.hpp +++ b/src/slic3r/GUI/GUI_App.hpp @@ -131,7 +131,7 @@ public: void recreate_GUI(); void system_info(); void keyboard_shortcuts(); - void delete_calibration_dialog(); + void change_calibration_dialog(const wxDialog* have_to_destroy = nullptr, wxDialog* new_one = nullptr); void bed_leveling_dialog(); void flow_ratio_dialog(); void filament_temperature_dialog(); @@ -182,7 +182,8 @@ public: PresetUpdater* preset_updater{ nullptr }; MainFrame* mainframe{ nullptr }; Plater* plater_{ nullptr }; - std::unique_ptr not_modal_dialog; + std::mutex not_modal_dialog_mutex; + wxDialog* not_modal_dialog = nullptr; wxNotebook* tab_panel() const ; int extruders_cnt() const; diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index 3bd78e396..c7b2b2d20 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -168,6 +168,9 @@ void MainFrame::shutdown() if (m_plater) m_plater->stop_jobs(); + //close calibration dialog if opened + wxGetApp().change_calibration_dialog(nullptr, nullptr); + // Weird things happen as the Paint messages are floating around the windows being destructed. // Avoid the Paint messages by hiding the main window. // Also the application closes much faster without these unnecessary screen refreshes. @@ -766,10 +769,10 @@ void MainFrame::init_menubar() [this](wxCommandEvent&) { wxGetApp().bed_leveling_dialog(); }); append_menu_item(objectsMenu, wxID_ANY, _(L("Flow tuning")), _(L("Create a test print to help you to set your filament extrusion multiplier.")), [this](wxCommandEvent&) { wxGetApp().flow_ratio_dialog(); }); + append_menu_item(objectsMenu, wxID_ANY, _(L("Filament temperature tuning")), _(L("Create a test print to help you to set your filament temperature.")), + [this](wxCommandEvent&) { wxGetApp().filament_temperature_dialog(); }); //append_menu_item(objectsMenu, wxID_ANY, _(L("Ironing pattern tuning")), _(L("Create a test print to help you to set your over-bridge flow ratio.")), // [this](wxCommandEvent&) { wxGetApp().over_bridge_dialog(); }); - //append_menu_item(objectsMenu, wxID_ANY, _(L("Filament temperature tuning")), _(L("Create a test print to help you to set your filament temperature.")), - // [this](wxCommandEvent&) { wxGetApp().filament_temperature_dialog(); }); //append_menu_item(objectsMenu, wxID_ANY, _(L("Bridge pattern tuning")), _(L("Create a test print to help you to set your over-bridge flow ratio.")), // [this](wxCommandEvent&) { wxGetApp().bridge_tuning_dialog(); });