From 851264f150c4366e0486204e0bcd0fb69f4841e8 Mon Sep 17 00:00:00 2001 From: supermerill Date: Tue, 2 Jun 2020 17:44:34 +0200 Subject: [PATCH] resolving calibration issues cleaning options not ready --- .../calibration/bridge_flow/bridge_flow.html | 28 +++++++++--------- resources/calibration/cube/cube.html | 4 +-- .../filament_flow/filament_flow.html | 4 +-- .../filament_temp/filament_temp.html | 18 +++++------ .../filament_temp/temp_tower_180.jpg | Bin 0 -> 4780 bytes .../filament_temp/temp_tower_195.jpg | Bin 0 -> 4240 bytes .../filament_temp/temp_tower_210.jpg | Bin 0 -> 4348 bytes .../filament_temp/temp_tower_225.jpg | Bin 0 -> 4519 bytes .../filament_temp/temp_tower_240.jpg | Bin 0 -> 4228 bytes src/slic3r/GUI/CalibrationAbstractDialog.cpp | 4 +-- src/slic3r/GUI/CalibrationAbstractDialog.hpp | 2 +- src/slic3r/GUI/CalibrationBridgeDialog.cpp | 6 ++-- src/slic3r/GUI/CalibrationBridgeDialog.hpp | 2 +- src/slic3r/GUI/CalibrationCubeDialog.cpp | 2 +- src/slic3r/GUI/CalibrationFlowDialog.cpp | 4 +-- src/slic3r/GUI/CalibrationFlowDialog.hpp | 2 +- .../GUI/CalibrationOverBridgeDialog.hpp | 2 +- 17 files changed, 37 insertions(+), 41 deletions(-) create mode 100644 resources/calibration/filament_temp/temp_tower_180.jpg create mode 100644 resources/calibration/filament_temp/temp_tower_195.jpg create mode 100644 resources/calibration/filament_temp/temp_tower_210.jpg create mode 100644 resources/calibration/filament_temp/temp_tower_225.jpg create mode 100644 resources/calibration/filament_temp/temp_tower_240.jpg diff --git a/resources/calibration/bridge_flow/bridge_flow.html b/resources/calibration/bridge_flow/bridge_flow.html index 1adb699fe..dea34d663 100644 --- a/resources/calibration/bridge_flow/bridge_flow.html +++ b/resources/calibration/bridge_flow/bridge_flow.html @@ -8,21 +8,21 @@

Bridge flow calibration

You need to do the bed level calibration and the filament flow calibration before this one. It's better if you have done the filament temperature calibration also.

This test will print tests samples with various level of bridge flow ratio. It starts at your current setting, so you may want to set them to 100% before clicking on the button.

-

Results

- - -

Exemple:

- - - - - - -
TODO
TODO
+ + + + + + + + + + + -

Advice

-

TODO

- + + +

Notes

This test set the setting "complete individual objects" to true, so you may want to reset your print settings afterwards, or diable this setting if your bed is too small

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

diff --git a/resources/calibration/cube/cube.html b/resources/calibration/cube/cube.html index 38ae86f35..68def41f4 100644 --- a/resources/calibration/cube/cube.html +++ b/resources/calibration/cube/cube.html @@ -11,8 +11,8 @@

You have to print two cubes, with different sizes. If the dimensional inaccuracy scale with the size of the cubes, then it's the steps/mm of your steppers that needs some adjustments (note: if it's the case, you should also adjust the flow, and maybe redo some calibrations if the change is big). If it doesn't scale, you can correct it by adjusting your xy compensation (slicing tab). With the voron cube, you can also test the hole calibration, as these are often too small.

Goal: infill/perimeter overlap

This test is about to see if the pattern of the infill can be seen on the perimeters. Try to reduce it as low as you can but check the top solid fill, as it can create artifacts if it's too low. It's better with the standard cube, as you have a larger top surface.

-

Goal: external perimeter overlap

-

As the external perimeter is printed last, the real position depends on the position and flow of the whole layer. So you have to be sure that your flow is perfect before doing this test. The main difference is between solid infill layers and sparse infill layers, as the solid one can push the external perimeter outwards. Decreasing the infill/perimeter overlap, decreasing the external perimeter overlap can help to reduce this effect.

+ +

Notes

These tests should be the last ones.

Default size of the standard cube is 20mm and the standard size of the voron cube is 30mm.

diff --git a/resources/calibration/filament_flow/filament_flow.html b/resources/calibration/filament_flow/filament_flow.html index 9c5f7a9ac..7c81d7e8c 100644 --- a/resources/calibration/filament_flow/filament_flow.html +++ b/resources/calibration/filament_flow/filament_flow.html @@ -9,9 +9,9 @@

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 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

+

Exemple:

-

Exemple:

@@ -29,9 +29,9 @@

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%:

-

Second step, starting from +20%:

diff --git a/resources/calibration/filament_temp/filament_temp.html b/resources/calibration/filament_temp/filament_temp.html index 7f17e995b..11afe7dcf 100644 --- a/resources/calibration/filament_temp/filament_temp.html +++ b/resources/calibration/filament_temp/filament_temp.html @@ -14,36 +14,32 @@
- - - - -
- - - + - + + + + +
too cold, it can't be extruded
good
good
too hot, you can see some ooze
too hot, you can see some ooze
-

Here, you can see that the 210 degree is the hottest we can print without problems (at least not heat-dependant, bad quality is due to high speed). Also, i succeed to break (with difficulty) a chunk of the 195 degree, so it's a bit too cold.

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

-

Change the temperature in your filament setting (extruder -> other layers), then save it. The first layer temperature is often 5°C higher to help with bed adhesion, so you should also change it, especially if it's lower than the new one.

+

Change the temperature in your filament setting (extruder -> other layers), then save it. The first layer temperature is often 5 degree higher to help with bed adhesion, so you should also change it, especially if it's lower than the new one.

Notes

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

diff --git a/resources/calibration/filament_temp/temp_tower_180.jpg b/resources/calibration/filament_temp/temp_tower_180.jpg new file mode 100644 index 0000000000000000000000000000000000000000..9b60ab950b120706437f135468a4edf9aeb75a25 GIT binary patch literal 4780 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 S{NYWLh0zB6v#KWC>Hh-N#r`e; literal 0 HcmV?d00001 diff --git a/resources/calibration/filament_temp/temp_tower_195.jpg b/resources/calibration/filament_temp/temp_tower_195.jpg new file mode 100644 index 0000000000000000000000000000000000000000..f1e552e26a9f17bede8574e89fa0b353514ffbe1 GIT binary patch literal 4240 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 WEjt8G!^r##iDXuLe6Zd2%l`qoDI{G0 literal 0 HcmV?d00001 diff --git a/resources/calibration/filament_temp/temp_tower_225.jpg b/resources/calibration/filament_temp/temp_tower_225.jpg new file mode 100644 index 0000000000000000000000000000000000000000..6b625301ee57bd6f1310b85e1fb66b28efcc18bd GIT binary patch literal 4519 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 N5^s>}bnec~{{ee4pgRBn literal 0 HcmV?d00001 diff --git a/resources/calibration/filament_temp/temp_tower_240.jpg b/resources/calibration/filament_temp/temp_tower_240.jpg new file mode 100644 index 0000000000000000000000000000000000000000..c84ef159ae15935f759899f80b62dce2dfcb08c7 GIT binary patch literal 4228 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 literal 0 HcmV?d00001 diff --git a/src/slic3r/GUI/CalibrationAbstractDialog.cpp b/src/slic3r/GUI/CalibrationAbstractDialog.cpp index e9e02221a..3e77a76a7 100644 --- a/src/slic3r/GUI/CalibrationAbstractDialog.cpp +++ b/src/slic3r/GUI/CalibrationAbstractDialog.cpp @@ -39,13 +39,13 @@ namespace GUI { } -void CalibrationAbstractDialog::create(std::string html_path){ +void CalibrationAbstractDialog::create(std::string html_path, wxSize dialog_size){ auto main_sizer = new wxBoxSizer(wxVERTICAL); //html html_viewer = new wxHtmlWindow(this, wxID_ANY, - wxDefaultPosition, wxSize(800, 500), wxHW_SCROLLBAR_AUTO); + wxDefaultPosition, dialog_size, wxHW_SCROLLBAR_AUTO); html_viewer->LoadPage(Slic3r::resources_dir()+ html_path); main_sizer->Add(html_viewer, 1, wxEXPAND | wxALL, 5); diff --git a/src/slic3r/GUI/CalibrationAbstractDialog.hpp b/src/slic3r/GUI/CalibrationAbstractDialog.hpp index 5088bd27e..6e978b074 100644 --- a/src/slic3r/GUI/CalibrationAbstractDialog.hpp +++ b/src/slic3r/GUI/CalibrationAbstractDialog.hpp @@ -24,7 +24,7 @@ public: private: wxPanel* create_header(wxWindow* parent, const wxFont& bold_font); protected: - void create(std::string html_path); + void create(std::string html_path, wxSize dialogsize = wxSize(800, 500)); virtual void create_buttons(wxStdDialogButtonSizer*) = 0; void on_dpi_changed(const wxRect& suggested_rect) override; void closeMe(wxCommandEvent& event_args); diff --git a/src/slic3r/GUI/CalibrationBridgeDialog.cpp b/src/slic3r/GUI/CalibrationBridgeDialog.cpp index 99abf61c6..e0b67a0ee 100644 --- a/src/slic3r/GUI/CalibrationBridgeDialog.cpp +++ b/src/slic3r/GUI/CalibrationBridgeDialog.cpp @@ -22,8 +22,8 @@ namespace Slic3r { namespace GUI { void CalibrationBridgeDialog::create_buttons(wxStdDialogButtonSizer* buttons){ - wxString choices_steps[] = { "2.5","5","10" }; - steps = new wxComboBox(this, wxID_ANY, wxString{ "5" }, wxDefaultPosition, wxDefaultSize, 3, choices_steps); + wxString choices_steps[] = { "5","10","15" }; + steps = new wxComboBox(this, wxID_ANY, wxString{ "10" }, wxDefaultPosition, wxDefaultSize, 3, choices_steps); steps->SetToolTip(_(L("Select the step in % between two tests."))); steps->SetSelection(1); wxString choices_nb[] = { "1","2","3","4","5","6" }; @@ -53,7 +53,7 @@ void CalibrationBridgeDialog::create_geometry(std::string setting_to_test, bool int idx_steps = steps->GetSelection(); int idx_nb = nb_tests->GetSelection(); - size_t step = 5 + (idx_steps == wxNOT_FOUND ? 0 : (idx_steps == 0 ? 2.5f : idx_steps == 1 ? 5.F : 10.f)); + size_t step = 5 + (idx_steps == wxNOT_FOUND ? 0 : idx_steps * 5); size_t nb_items = 1 + (idx_nb == wxNOT_FOUND ? 0 : idx_nb); std::vector items; diff --git a/src/slic3r/GUI/CalibrationBridgeDialog.hpp b/src/slic3r/GUI/CalibrationBridgeDialog.hpp index ed6d49839..1db136c32 100644 --- a/src/slic3r/GUI/CalibrationBridgeDialog.hpp +++ b/src/slic3r/GUI/CalibrationBridgeDialog.hpp @@ -10,7 +10,7 @@ class CalibrationBridgeDialog : public CalibrationAbstractDialog { public: - CalibrationBridgeDialog(GUI_App* app, MainFrame* mainframe) : CalibrationAbstractDialog(app, mainframe, "Bridge calibration") { create("/calibration/bridge_flow/bridge_flow.html"); } + CalibrationBridgeDialog(GUI_App* app, MainFrame* mainframe) : CalibrationAbstractDialog(app, mainframe, "Bridge calibration") { create("/calibration/bridge_flow/bridge_flow.html", wxSize(600, 300)); } virtual ~CalibrationBridgeDialog() { } protected: diff --git a/src/slic3r/GUI/CalibrationCubeDialog.cpp b/src/slic3r/GUI/CalibrationCubeDialog.cpp index 7dda4bea7..eff93eb19 100644 --- a/src/slic3r/GUI/CalibrationCubeDialog.cpp +++ b/src/slic3r/GUI/CalibrationCubeDialog.cpp @@ -26,7 +26,7 @@ void CalibrationCubeDialog::create_buttons(wxStdDialogButtonSizer* buttons){ scale = new wxComboBox(this, wxID_ANY, wxString{ "20mm" }, wxDefaultPosition, wxDefaultSize, 4, choices_scale); scale->SetToolTip(_(L("You can choose the dimension of the cube. It's a simple scale, you can modify it in the right panel yourself if you prefer. It's just quicker to select it here."))); scale->SetSelection(1); - wxString choices_goal[] = { "Dimensional accuracy (default)" , "infill/perimeter overlap", "external perimeter overlap"}; + wxString choices_goal[] = { "Dimensional accuracy (default)" , "infill/perimeter overlap"/*, "external perimeter overlap"*/}; calibrate = new wxComboBox(this, wxID_ANY, wxString{ "Dimensional accuracy (default)" }, wxDefaultPosition, wxDefaultSize, 3, choices_goal); calibrate->SetToolTip(_(L("Select a goal, this will change settings to increase the effects to search."))); calibrate->SetSelection(0); diff --git a/src/slic3r/GUI/CalibrationFlowDialog.cpp b/src/slic3r/GUI/CalibrationFlowDialog.cpp index 75432773a..dfe31fc83 100644 --- a/src/slic3r/GUI/CalibrationFlowDialog.cpp +++ b/src/slic3r/GUI/CalibrationFlowDialog.cpp @@ -22,10 +22,10 @@ namespace Slic3r { namespace GUI { void CalibrationFlowDialog::create_buttons(wxStdDialogButtonSizer* buttons){ - wxButton* bt = new wxButton(this, wxID_FILE1, _(L("Generate 10% intervals"))); + wxButton* bt = new wxButton(this, wxID_FILE1, _(L("Generate 10% intervals around current value"))); bt->Bind(wxEVT_BUTTON, &CalibrationFlowDialog::create_geometry_10, this); buttons->Add(bt); - bt = new wxButton(this, wxID_FILE2, _(L("Generate 2.5% intervals"))); + bt = new wxButton(this, wxID_FILE2, _(L("Generate 2% intervals below current value"))); bt->Bind(wxEVT_BUTTON, &CalibrationFlowDialog::create_geometry_2_5, this); buttons->Add(bt); } diff --git a/src/slic3r/GUI/CalibrationFlowDialog.hpp b/src/slic3r/GUI/CalibrationFlowDialog.hpp index 8e5c31a27..da1a605e7 100644 --- a/src/slic3r/GUI/CalibrationFlowDialog.hpp +++ b/src/slic3r/GUI/CalibrationFlowDialog.hpp @@ -10,7 +10,7 @@ class CalibrationFlowDialog : public CalibrationAbstractDialog { public: - CalibrationFlowDialog(GUI_App* app, MainFrame* mainframe) : CalibrationAbstractDialog(app, mainframe, "Flow calibration") { create("/calibration/filament_flow/filament_flow.html"); } + CalibrationFlowDialog(GUI_App* app, MainFrame* mainframe) : CalibrationAbstractDialog(app, mainframe, "Flow calibration") { create("/calibration/filament_flow/filament_flow.html", wxSize(900, 500)); } virtual ~CalibrationFlowDialog() {} protected: diff --git a/src/slic3r/GUI/CalibrationOverBridgeDialog.hpp b/src/slic3r/GUI/CalibrationOverBridgeDialog.hpp index e1630f94d..2af322db6 100644 --- a/src/slic3r/GUI/CalibrationOverBridgeDialog.hpp +++ b/src/slic3r/GUI/CalibrationOverBridgeDialog.hpp @@ -10,7 +10,7 @@ class CalibrationOverBridgeDialog : public CalibrationAbstractDialog { public: - CalibrationOverBridgeDialog(GUI_App* app, MainFrame* mainframe) : CalibrationAbstractDialog(app, mainframe, "Ironing pattern calibration") { std::cout << " html = /calibration/over-bridge_tuning/over-bridge_tuning.html\n"; create("/calibration/over-bridge_tuning/over-bridge_tuning.html"); } + CalibrationOverBridgeDialog(GUI_App* app, MainFrame* mainframe) : CalibrationAbstractDialog(app, mainframe, "Ironing pattern calibration") { create("/calibration/over-bridge_tuning/over-bridge_tuning.html", wxSize(900, 500)); } virtual ~CalibrationOverBridgeDialog() { } protected: