diff --git a/resources/calibration/bridge_flow/bridge_flow.html b/resources/calibration/bridge_flow/bridge_flow.html index 6e5f46b2c..1adb699fe 100644 --- a/resources/calibration/bridge_flow/bridge_flow.html +++ b/resources/calibration/bridge_flow/bridge_flow.html @@ -7,7 +7,7 @@

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, and then you can also tune your bridge overlap ratio, if lines of bridges are too far apart from each other. It start at your current setting, so you may want to set them to 100% before clicking on the button.

+

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

@@ -24,7 +24,7 @@

TODO

Notes

-

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

+

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

\ No newline at end of file diff --git a/resources/calibration/over-bridge_tuning/100.jpg b/resources/calibration/over-bridge_tuning/100.jpg new file mode 100644 index 000000000..b4adaaff2 Binary files /dev/null and b/resources/calibration/over-bridge_tuning/100.jpg differ diff --git a/resources/calibration/over-bridge_tuning/105.jpg b/resources/calibration/over-bridge_tuning/105.jpg new file mode 100644 index 000000000..a452e6d7d Binary files /dev/null and b/resources/calibration/over-bridge_tuning/105.jpg differ diff --git a/resources/calibration/over-bridge_tuning/110.jpg b/resources/calibration/over-bridge_tuning/110.jpg new file mode 100644 index 000000000..1474da25b Binary files /dev/null and b/resources/calibration/over-bridge_tuning/110.jpg differ diff --git a/resources/calibration/over-bridge_tuning/115.jpg b/resources/calibration/over-bridge_tuning/115.jpg new file mode 100644 index 000000000..f348627a1 Binary files /dev/null and b/resources/calibration/over-bridge_tuning/115.jpg differ diff --git a/resources/calibration/over-bridge_tuning/120.jpg b/resources/calibration/over-bridge_tuning/120.jpg new file mode 100644 index 000000000..f8bab4134 Binary files /dev/null and b/resources/calibration/over-bridge_tuning/120.jpg differ diff --git a/resources/calibration/over-bridge_tuning/125.jpg b/resources/calibration/over-bridge_tuning/125.jpg new file mode 100644 index 000000000..12a7808ef Binary files /dev/null and b/resources/calibration/over-bridge_tuning/125.jpg differ diff --git a/resources/calibration/over-bridge_tuning/over-bridge_tuning.html b/resources/calibration/over-bridge_tuning/over-bridge_tuning.html index 3c560432a..11c005324 100644 --- a/resources/calibration/over-bridge_tuning/over-bridge_tuning.html +++ b/resources/calibration/over-bridge_tuning/over-bridge_tuning.html @@ -13,12 +13,21 @@

Exemple:

- + + + + + - + + + + +
TODO
TODOnot flatnot flatnot flatflatFlat
+Hee, we can see that artifact exists until the over-brodge flow was set to 115. It was flat from the flow calibration, if it's not now, it's because the bridges below the top surfaces are dropping a bit, and so there are more volume to fill afterwards. Here, 115 should be enough, but 120 is a more safe bet.

Advice

TODO

diff --git a/resources/profiles/Creality.ini b/resources/profiles/Creality.ini index b1075a684..d93aeeb68 100644 --- a/resources/profiles/Creality.ini +++ b/resources/profiles/Creality.ini @@ -313,7 +313,7 @@ extra_perimeters_odd_layers = 0 only_one_perimeter_top = 1 elefant_foot_compensation = -0.05 extruder_clearance_height = 20 -extruder_clearance_radius = 20 +extruder_clearance_radius = 25 fill_angle = 45 fill_density = 13% fill_pattern = gyroid diff --git a/src/slic3r/GUI/CalibrationBridgeDialog.cpp b/src/slic3r/GUI/CalibrationBridgeDialog.cpp index 345abf24a..99abf61c6 100644 --- a/src/slic3r/GUI/CalibrationBridgeDialog.cpp +++ b/src/slic3r/GUI/CalibrationBridgeDialog.cpp @@ -40,10 +40,10 @@ void CalibrationBridgeDialog::create_buttons(wxStdDialogButtonSizer* buttons){ wxButton* bt = new wxButton(this, wxID_FILE1, _(L("Test Flow Ratio"))); bt->Bind(wxEVT_BUTTON, &CalibrationBridgeDialog::create_geometry_flow_ratio, this); buttons->Add(bt); - buttons->AddSpacer(15); - bt = new wxButton(this, wxID_FILE1, _(L("Test Overlap"))); - bt->Bind(wxEVT_BUTTON, &CalibrationBridgeDialog::create_geometry_overlap, this); - buttons->Add(bt); + //buttons->AddSpacer(15); + //bt = new wxButton(this, wxID_FILE1, _(L("Test Overlap"))); + //bt->Bind(wxEVT_BUTTON, &CalibrationBridgeDialog::create_geometry_overlap, this); + //buttons->Add(bt); } void CalibrationBridgeDialog::create_geometry(std::string setting_to_test, bool add) { @@ -58,7 +58,7 @@ void CalibrationBridgeDialog::create_geometry(std::string setting_to_test, bool std::vector items; for (size_t i = 0; i < nb_items; i++) - items.emplace_back("./resources/calibration/bridge_flow/bridge_test.amf"); + items.emplace_back(Slic3r::resources_dir()+"/calibration/bridge_flow/bridge_test.amf"); std::vector objs_idx = plat->load_files(items, true, false); assert(objs_idx.size() == nb_items); @@ -107,6 +107,8 @@ void CalibrationBridgeDialog::create_geometry(std::string setting_to_test, bool /// --- custom config --- for (size_t i = 0; i < nb_items; i++) { + model.objects[objs_idx[i]]->config.set_key_value("brim_width", new ConfigOptionFloat(std::max (print_config->option("brim_width")->value, nozzle_diameter * 5.))); + model.objects[objs_idx[i]]->config.set_key_value("brim_ears", new ConfigOptionBool(false)); 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)); diff --git a/src/slic3r/GUI/CalibrationBridgeDialog.hpp b/src/slic3r/GUI/CalibrationBridgeDialog.hpp index 0c67584d7..ed6d49839 100644 --- a/src/slic3r/GUI/CalibrationBridgeDialog.hpp +++ b/src/slic3r/GUI/CalibrationBridgeDialog.hpp @@ -16,8 +16,8 @@ public: protected: void create_buttons(wxStdDialogButtonSizer* buttons) override; void create_geometry(std::string setting_key, bool add); - void CalibrationBridgeDialog::create_geometry_flow_ratio(wxCommandEvent& event_args) { create_geometry("bridge_flow_ratio", false); } - void CalibrationBridgeDialog::create_geometry_overlap(wxCommandEvent& event_args) { create_geometry("bridge_overlap", true); } + void create_geometry_flow_ratio(wxCommandEvent& event_args) { create_geometry("bridge_flow_ratio", false); } + void create_geometry_overlap(wxCommandEvent& event_args) { create_geometry("bridge_overlap", true); } wxComboBox* steps; wxComboBox* nb_tests; diff --git a/src/slic3r/GUI/CalibrationOverBridgeDialog.cpp b/src/slic3r/GUI/CalibrationOverBridgeDialog.cpp index 23aa8be6b..a0ea0c3b6 100644 --- a/src/slic3r/GUI/CalibrationOverBridgeDialog.cpp +++ b/src/slic3r/GUI/CalibrationOverBridgeDialog.cpp @@ -32,12 +32,12 @@ void CalibrationOverBridgeDialog::create_geometry(wxCommandEvent& event_args) { Model& model = plat->model(); plat->reset(); std::vector objs_idx = plat->load_files(std::vector{ - "./resources/calibration/over-bridge_tuning/over-bridge_flow_ratio_test.amf", - "./resources/calibration/over-bridge_tuning/over-bridge_flow_ratio_test.amf", - "./resources/calibration/over-bridge_tuning/over-bridge_flow_ratio_test.amf", - "./resources/calibration/over-bridge_tuning/over-bridge_flow_ratio_test.amf", - "./resources/calibration/over-bridge_tuning/over-bridge_flow_ratio_test.amf", - "./resources/calibration/over-bridge_tuning/over-bridge_flow_ratio_test.amf"}, true, false); + Slic3r::resources_dir()+"/calibration/over-bridge_tuning/over-bridge_flow_ratio_test.amf", + Slic3r::resources_dir()+"/calibration/over-bridge_tuning/over-bridge_flow_ratio_test.amf", + Slic3r::resources_dir()+"/calibration/over-bridge_tuning/over-bridge_flow_ratio_test.amf", + Slic3r::resources_dir()+"/calibration/over-bridge_tuning/over-bridge_flow_ratio_test.amf", + Slic3r::resources_dir()+"/calibration/over-bridge_tuning/over-bridge_flow_ratio_test.amf", + Slic3r::resources_dir()+"/calibration/over-bridge_tuning/over-bridge_flow_ratio_test.amf"}, true, false); assert(objs_idx.size() == 6); const DynamicPrintConfig* printConfig = this->gui_app->get_tab(Preset::TYPE_PRINT)->get_config();