diff --git a/resources/profiles/BBL.json b/resources/profiles/BBL.json index f9e4543cc2..015b03af13 100644 --- a/resources/profiles/BBL.json +++ b/resources/profiles/BBL.json @@ -1,7 +1,7 @@ { "name": "Bambulab", "url": "http://www.bambulab.com/Parameters/vendor/BBL.json", - "version": "01.05.00.20", + "version": "01.06.00.00", "force_update": "0", "description": "the initial version of BBL configurations", "machine_model_list": [ diff --git a/resources/profiles/BBL/bbl-3dp-logo_cali_lines.svg b/resources/profiles/BBL/bbl-3dp-logo_cali_lines.svg new file mode 100644 index 0000000000..6957324c68 --- /dev/null +++ b/resources/profiles/BBL/bbl-3dp-logo_cali_lines.svg @@ -0,0 +1,353 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/profiles/BBL/machine/Bambu Lab P1P 0.4 nozzle.json b/resources/profiles/BBL/machine/Bambu Lab P1P 0.4 nozzle.json index 575ed0d922..1bdf451dc1 100644 --- a/resources/profiles/BBL/machine/Bambu Lab P1P 0.4 nozzle.json +++ b/resources/profiles/BBL/machine/Bambu Lab P1P 0.4 nozzle.json @@ -34,5 +34,6 @@ "upward_compatible_machine":[ "Bambu Lab X1 0.4 nozzle", "Bambu Lab X1 Carbon 0.4 nozzle" - ] + ], + "bbl_calib_mark_logo": "0" } diff --git a/resources/profiles/BBL/machine/Bambu Lab X1 Carbon.json b/resources/profiles/BBL/machine/Bambu Lab X1 Carbon.json index d07b2f8e63..9bae6a8a6f 100644 --- a/resources/profiles/BBL/machine/Bambu Lab X1 Carbon.json +++ b/resources/profiles/BBL/machine/Bambu Lab X1 Carbon.json @@ -7,7 +7,7 @@ "machine_tech": "FFF", "family": "BBL-3DP", "bed_model": "bbl-3dp-X1.stl", - "bed_texture": "bbl-3dp-logo.svg", + "bed_texture": "bbl-3dp-logo_cali_lines.svg", "hotend_model": "bbl-3dp-hotend.stl", "default_materials": "Generic PLA Silk;Generic PLA;Bambu PLA Matte @BBL X1C;Bambu PLA Basic @BBL X1C;Bambu ABS @BBL X1C;Bambu PC @BBL X1C;Bambu Support W @BBL X1C;Bambu TPU 95A @BBL X1C;PolyTerra PLA @BBL X1C;PolyLite PLA @BBL X1C;" } diff --git a/resources/profiles/BBL/machine/Bambu Lab X1.json b/resources/profiles/BBL/machine/Bambu Lab X1.json index bb36dcb722..5a5aff3eea 100644 --- a/resources/profiles/BBL/machine/Bambu Lab X1.json +++ b/resources/profiles/BBL/machine/Bambu Lab X1.json @@ -7,7 +7,7 @@ "machine_tech": "FFF", "family": "BBL-3DP", "bed_model": "bbl-3dp-X1.stl", - "bed_texture": "bbl-3dp-logo.svg", + "bed_texture": "bbl-3dp-logo_cali_lines.svg", "hotend_model": "bbl-3dp-hotend.stl", "default_materials": "Generic PLA Silk;Generic PLA;Bambu PLA Matte @BBL X1;Bambu PLA Basic @BBL X1;Bambu ABS @BBL X1C;Bambu PC @BBL X1C;Bambu Support W @BBL X1;Bambu TPU 95A @BBL X1;PolyTerra PLA @BBL X1;PolyLite PLA @BBL X1;" } diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp index d627479111..378586d38c 100644 --- a/src/libslic3r/Preset.cpp +++ b/src/libslic3r/Preset.cpp @@ -806,9 +806,8 @@ static std::vector s_Preset_printer_options { "host_type", "print_host", "printhost_apikey", "print_host_webui", "printhost_cafile","printhost_port","printhost_authorization_type", - "printhost_user", "printhost_password", "printhost_ssl_ignore_revoke", - "thumbnails", "use_firmware_retraction", "use_relative_e_distances" -}; + "printhost_user", "printhost_password", "printhost_ssl_ignore_revoke", "thumbnails", + "use_firmware_retraction", "use_relative_e_distances", "bbl_calib_mark_logo"}; static std::vector s_Preset_sla_print_options { "layer_height", diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 9ffcda51a0..4e45b85e80 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -2224,7 +2224,7 @@ void PrintConfigDef::init_fff_params() def->tooltip = L("Volume of nozzle between the cutter and the end of nozzle"); def->sidetext = L("mm³"); def->mode = comAdvanced; - def->readonly = true; + def->readonly = false; def->set_default_value(new ConfigOptionFloat { 0.0 }); def = this->add("start_end_points", coPoints); @@ -2503,6 +2503,12 @@ void PrintConfigDef::init_fff_params() def->mode = comAdvanced; def->set_default_value(new ConfigOptionBool(false)); + def = this->add("bbl_calib_mark_logo", coBool); + def->label = L("Show auto-calibration marks"); + def->tooltip = ""; + def->mode = comAdvanced; + def->set_default_value(new ConfigOptionBool(true)); + def = this->add("seam_position", coEnum); def->label = L("Seam position"); def->category = L("Quality"); diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index a7b4847f4d..a9c695c91b 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -881,6 +881,7 @@ PRINT_CONFIG_CLASS_DEFINE( ((ConfigOptionBool, accel_to_decel_enable)) ((ConfigOptionPercent, accel_to_decel_factor)) ((ConfigOptionFloatOrPercent, initial_layer_travel_speed)) + ((ConfigOptionBool, bbl_calib_mark_logo)) ) diff --git a/src/slic3r/GUI/ConfigManipulation.cpp b/src/slic3r/GUI/ConfigManipulation.cpp index 3ba8806294..f1cfea6d63 100644 --- a/src/slic3r/GUI/ConfigManipulation.cpp +++ b/src/slic3r/GUI/ConfigManipulation.cpp @@ -698,7 +698,7 @@ void ConfigManipulation::toggle_print_fff_options(DynamicPrintConfig *config, co if(gcflavor == gcfKlipper) toggle_field("accel_to_decel_factor", config->opt_bool("accel_to_decel_enable")); - toggle_field("exclude_object", gcflavor == gcfKlipper); + toggle_line("exclude_object", gcflavor == gcfKlipper); } diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 0fd751dd7c..afea7de50a 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -1644,8 +1644,10 @@ void Tab::on_presets_changed() wxGetApp().plater()->sidebar().update_presets(m_type); bool is_bbl_vendor_preset = wxGetApp().preset_bundle->printers.get_edited_preset().is_bbl_vendor_preset(wxGetApp().preset_bundle); + auto& printer_cfg = wxGetApp().preset_bundle->printers.get_edited_preset().config; if (is_bbl_vendor_preset) - wxGetApp().plater()->get_partplate_list().set_render_option(true, true); + wxGetApp().plater()->get_partplate_list().set_render_option( + !printer_cfg.option("bbl_calib_mark_logo")->value, true); else wxGetApp().plater()->get_partplate_list().set_render_option(false, true); @@ -2818,14 +2820,17 @@ void TabFilament::toggle_options() m_preset_bundle); } - if (m_active_page->title() == "Cooling") - { - bool cooling = m_config->opt_bool("slow_down_for_layer_cooling", 0); - toggle_option("slow_down_min_speed", cooling); + if (m_active_page->title() == "Cooling") { + bool cooling = m_config->opt_bool("slow_down_for_layer_cooling", 0); + toggle_option("slow_down_min_speed", cooling); - bool has_enable_overhang_bridge_fan = m_config->opt_bool("enable_overhang_bridge_fan", 0); - for (auto el : { "overhang_fan_speed", "overhang_fan_threshold" }) + bool has_enable_overhang_bridge_fan = m_config->opt_bool("enable_overhang_bridge_fan", 0); + for (auto el : {"overhang_fan_speed", "overhang_fan_threshold"}) toggle_option(el, has_enable_overhang_bridge_fan); + + toggle_option( + "additional_cooling_fan_speed", + m_preset_bundle->printers.get_edited_preset().config.option("auxiliary_fan")->value); } if (m_active_page->title() == "Filament") { @@ -2938,6 +2943,7 @@ void TabPrinter::build_fff() optgroup->append_single_option_line(option); // optgroup->append_single_option_line("printable_area"); optgroup->append_single_option_line("printable_height"); + optgroup->append_single_option_line("bbl_calib_mark_logo"); optgroup->append_single_option_line("nozzle_volume"); // BBS #if 0 @@ -3603,8 +3609,6 @@ void TabPrinter::toggle_options() //} if (m_active_page->title() == "Basic information") { toggle_option("single_extruder_multi_material", have_multiple_extruders); - // Hide relative extrusion option for BBL printers - toggle_line("use_relative_e_distances", !is_BBL_printer); auto flavor = m_config->option>("gcode_flavor")->value; bool is_marlin_flavor = flavor == gcfMarlinLegacy || flavor == gcfMarlinFirmware; @@ -3616,14 +3620,12 @@ void TabPrinter::toggle_options() // SoftFever: hide BBL specific settings for (auto el : - {"scan_first_layer", "machine_load_filament_time", - "machine_unload_filament_time", "nozzle_type"}) + {"scan_first_layer", "machine_load_filament_time", "machine_unload_filament_time", "nozzle_type", "bbl_calib_mark_logo"}) toggle_line(el, is_BBL_printer); // SoftFever: hide non-BBL settings - for (auto el : - { "use_firmware_retraction" }) - toggle_line(el, !is_BBL_printer); + for (auto el : {"use_firmware_retraction", "use_relative_e_distances"}) + toggle_line(el, !is_BBL_printer); } wxString extruder_number;