diff --git a/resources/profiles/BBL.json b/resources/profiles/BBL.json index 4c62c0a35..aed9cbe87 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.06.00.13", + "version": "01.06.00.14", "force_update": "0", "description": "the initial version of BBL configurations", "machine_model_list": [ @@ -289,6 +289,14 @@ "name": "fdm_filament_pa", "sub_path": "filament/fdm_filament_pa.json" }, + { + "name": "fdm_filament_hips", + "sub_path": "filament/fdm_filament_hips.json" + }, + { + "name": "Generic HIPS @base", + "sub_path": "filament/Generic HIPS @base.json" + }, { "name": "Bambu TPU 95A @base", "sub_path": "filament/Bambu TPU 95A @base.json" @@ -972,6 +980,14 @@ { "name": "Bambu ASA @BBL X1C 0.4 nozzle", "sub_path": "filament/Bambu ASA @BBL X1C 0.4 nozzle.json" + }, + { + "name": "Generic HIPS @BBL X1C", + "sub_path": "filament/Generic HIPS @BBL X1C.json" + }, + { + "name": "Generic HIPS @BBL X1C 0.2 nozzle", + "sub_path": "filament/Generic HIPS @BBL X1C 0.2 nozzle.json" } ], "machine_list": [ diff --git a/resources/profiles/BBL/filament/Generic HIPS @BBL X1C 0.2 nozzle.json b/resources/profiles/BBL/filament/Generic HIPS @BBL X1C 0.2 nozzle.json new file mode 100644 index 000000000..c40cbabf7 --- /dev/null +++ b/resources/profiles/BBL/filament/Generic HIPS @BBL X1C 0.2 nozzle.json @@ -0,0 +1,16 @@ +{ + "type": "filament", + "setting_id": "GFSS98_01", + "name": "Generic HIPS @BBL X1C 0.2 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "Generic HIPS @base", + "filament_max_volumetric_speed": [ + "0.5" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.2 nozzle", + "Bambu Lab X1 0.2 nozzle", + "Bambu Lab P1P 0.2 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Generic HIPS @BBL X1C.json b/resources/profiles/BBL/filament/Generic HIPS @BBL X1C.json new file mode 100644 index 000000000..5b16d012e --- /dev/null +++ b/resources/profiles/BBL/filament/Generic HIPS @BBL X1C.json @@ -0,0 +1,19 @@ +{ + "type": "filament", + "setting_id": "GFSS98_00", + "name": "Generic HIPS @BBL X1C", + "from": "system", + "instantiation": "true", + "inherits": "Generic HIPS @base", + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab X1 Carbon 0.6 nozzle", + "Bambu Lab X1 Carbon 0.8 nozzle", + "Bambu Lab X1 0.6 nozzle", + "Bambu Lab X1 0.8 nozzle", + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.6 nozzle", + "Bambu Lab P1P 0.8 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Generic HIPS @base.json b/resources/profiles/BBL/filament/Generic HIPS @base.json new file mode 100644 index 000000000..030daa118 --- /dev/null +++ b/resources/profiles/BBL/filament/Generic HIPS @base.json @@ -0,0 +1,14 @@ +{ + "type": "filament", + "filament_id": "GFS98", + "name": "Generic HIPS @base", + "from": "system", + "instantiation": "false", + "inherits": "fdm_filament_hips", + "filament_vendor": [ + "Generic" + ], + "filament_is_support": [ + "1" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/fdm_filament_hips.json b/resources/profiles/BBL/filament/fdm_filament_hips.json new file mode 100644 index 000000000..be50ef8fc --- /dev/null +++ b/resources/profiles/BBL/filament/fdm_filament_hips.json @@ -0,0 +1,85 @@ +{ + "type": "filament", + "name": "fdm_filament_hips", + "from": "system", + "instantiation": "false", + "inherits": "fdm_filament_common", + "cool_plate_temp": [ + "0" + ], + "eng_plate_temp": [ + "90" + ], + "hot_plate_temp": [ + "90" + ], + "textured_plate_temp": [ + "90" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp_initial_layer": [ + "90" + ], + "hot_plate_temp_initial_layer": [ + "90" + ], + "textured_plate_temp_initial_layer": [ + "90" + ], + "fan_cooling_layer_time": [ + "10" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "filament_type": [ + "HIPS" + ], + "filament_density": [ + "1.06" + ], + "filament_cost": [ + "22.99" + ], + "nozzle_temperature_initial_layer": [ + "240" + ], + "fan_max_speed": [ + "60" + ], + "fan_min_speed": [ + "0" + ], + "overhang_fan_threshold": [ + "25%" + ], + "overhang_fan_speed": [ + "80" + ], + "nozzle_temperature": [ + "240" + ], + "nozzle_temperature_range_low": [ + "220" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "slow_down_min_speed": [ + "20" + ], + "slow_down_layer_time": [ + "6" + ], + "temperature_vitrification": [ + "100" + ], + "required_nozzle_HRC": [ + "3" + ], + "additional_cooling_fan_speed":[ + "0" + ] +} \ No newline at end of file diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp index ec732c901..8faa1bc44 100644 --- a/src/libslic3r/GCode.cpp +++ b/src/libslic3r/GCode.cpp @@ -3490,7 +3490,7 @@ std::string GCode::extrude_loop(ExtrusionLoop loop, std::string description, dou // if polyline was shorter than the clipping distance we'd get a null polyline, so // we discard it in that case double clip_length = m_enable_loop_clipping ? - scale_(EXTRUDER_CONFIG(nozzle_diameter)) * m_config.seam_gap.value : + scale_(EXTRUDER_CONFIG(nozzle_diameter)) * ( m_config.seam_gap.value / 100 ) : 0; // get paths diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp index ee6cf880e..7a807fef0 100644 --- a/src/libslic3r/Print.cpp +++ b/src/libslic3r/Print.cpp @@ -885,7 +885,8 @@ static std::map filament_is_high_temp { {"PA-CF", true}, {"PET-CF", true}, {"PC", true}, - {"ASA", true} + {"ASA", true}, + {"HIPS", true} }; //BBS: this function is used to check whether multi filament can be printed diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 151ecda87..10d9f5984 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -1031,7 +1031,7 @@ void PrintConfigDef::init_fff_params() def->set_default_value(new ConfigOptionEnum(ipRectilinear)); def = this->add("internal_solid_infill_pattern", coEnum); - def->label = L("Internal solid infill Pattern"); + def->label = L("Internal solid infill pattern"); def->category = L("Strength"); def->tooltip = L("Line pattern of internal solid infill. if the detect nattow internal solid infill be enabled, the concentric pattern will be used for the small area."); def->enum_keys_map = &ConfigOptionEnum::get_enum_values(); @@ -1293,6 +1293,7 @@ void PrintConfigDef::init_fff_params() def->enum_values.push_back("PET-CF"); def->enum_values.push_back("PETG-CF"); def->enum_values.push_back("PVA"); + def->enum_values.push_back("HIPS"); def->mode = comSimple; def->set_default_value(new ConfigOptionStrings { "PLA" }); @@ -2475,13 +2476,13 @@ void PrintConfigDef::init_fff_params() def->mode = comSimple; def->set_default_value(new ConfigOptionEnum(spAligned)); - def = this->add("seam_gap", coFloat); + def = this->add("seam_gap", coPercent); def->label = L("Seam gap"); - def->tooltip = L("In order to reduce the visibility of the seam in a closed loop extrusion, the loop is interrupted and shortened by a specified amount.\n" "This amount can be specified in millimeters or as a percentage of the current extruder diameter. The default value for this parameter is 0.15"); - def->sidetext = L("mm"); + def->tooltip = L("In order to reduce the visibility of the seam in a closed loop extrusion, the loop is interrupted and shortened by a specified amount.\n" "This amount as a percentage of the current extruder diameter. The default value for this parameter is 15"); + def->sidetext = L("%"); def->min = 0; def->mode = comDevelop; - def->set_default_value(new ConfigOptionFloat(0.15)); + def->set_default_value(new ConfigOptionPercent(15)); def = this->add("wipe_speed", coPercent); def->label = L("Wipe speed"); diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index 696ca569e..f8c33ed8f 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -701,7 +701,7 @@ PRINT_CONFIG_CLASS_DEFINE( ((ConfigOptionBool, only_one_wall_top)) ((ConfigOptionBool, only_one_wall_first_layer)) // OrcaSlicer - ((ConfigOptionFloat, seam_gap)) + ((ConfigOptionPercent, seam_gap)) ((ConfigOptionPercent, wipe_speed)) )