diff --git a/BuildLinux.sh b/BuildLinux.sh index 3fb83005a2..1461e63b80 100755 --- a/BuildLinux.sh +++ b/BuildLinux.sh @@ -222,9 +222,9 @@ then fi if [[ -n "$BUILD_DEBUG" ]] then - BUILD_ARGS="${BUILD_ARGS} -DCMAKE_BUILD_TYPE=Debug" + BUILD_ARGS="${BUILD_ARGS} -DCMAKE_BUILD_TYPE=Debug -DBBL_INTERNAL_TESTING=1" else - BUILD_ARGS="${BUILD_ARGS} -DBBL_RELEASE_TO_PUBLIC=1" + BUILD_ARGS="${BUILD_ARGS} -DBBL_RELEASE_TO_PUBLIC=1 -DBBL_INTERNAL_TESTING=0" fi # cmake diff --git a/resources/profiles/BBL.json b/resources/profiles/BBL.json index ee6ae98e48..8cd6772411 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.17", + "version": "01.05.00.19", "force_update": "0", "description": "the initial version of BBL configurations", "machine_model_list": [ @@ -361,6 +361,10 @@ "name": "Generic PLA", "sub_path": "filament/Generic PLA.json" }, + { + "name": "Generic PLA Silk @base", + "sub_path": "filament/Generic PLA Silk @base.json" + }, { "name": "Generic PLA Silk", "sub_path": "filament/Generic PLA Silk.json" @@ -441,6 +445,18 @@ "name": "Generic PETG-CF @BBL P1P", "sub_path": "filament/P1P/Generic PETG-CF @BBL P1P.json" }, + { + "name": "Bambu PETG-CF @base", + "sub_path": "filament/Bambu PETG-CF @base.json" + }, + { + "name": "Bambu PETG-CF @BBL X1C", + "sub_path": "filament/Bambu PETG-CF @BBL X1C.json" + }, + { + "name": "Bambu PETG-CF @BBL P1P", + "sub_path": "filament/P1P/Bambu PETG-CF @BBL P1P.json" + }, { "name": "Generic PVA @0.2 nozzle", "sub_path": "filament/Generic PVA @0.2 nozzle.json" @@ -804,6 +820,14 @@ { "name":"Bambu PLA-CF @BBL P1P 0.8 nozzle", "sub_path":"filament/P1P/Bambu PLA-CF @BBL P1P 0.8 nozzle.json" + }, + { + "name": "Bambu PET-CF @BBL X1C", + "sub_path": "filament/Bambu PET-CF @BBL X1C.json" + }, + { + "name": "Bambu PET-CF @BBL P1P", + "sub_path": "filament/P1P/Bambu PET-CF @BBL P1P.json" } ], "machine_list": [ diff --git a/resources/profiles/BBL/filament/Bambu PET-CF @BBL X1C.json b/resources/profiles/BBL/filament/Bambu PET-CF @BBL X1C.json index cee8aaa10d..d44d01115d 100644 --- a/resources/profiles/BBL/filament/Bambu PET-CF @BBL X1C.json +++ b/resources/profiles/BBL/filament/Bambu PET-CF @BBL X1C.json @@ -1,6 +1,6 @@ { "type": "filament", - "setting_id": "GFST00", + "setting_id": "GFST01", "name": "Bambu PET-CF @BBL X1C", "from": "system", "instantiation": "true", @@ -11,9 +11,6 @@ "reduce_fan_stop_start_freq": [ "0" ], - "fan_cooling_layer_time": [ - "4" - ], "slow_down_min_speed": [ "20" ], @@ -22,6 +19,10 @@ ], "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", - "Bambu Lab X1 0.4 nozzle" + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab X1 Carbon 0.6 nozzle", + "Bambu Lab X1 0.6 nozzle", + "Bambu Lab X1 Carbon 0.8 nozzle", + "Bambu Lab X1 0.8 nozzle" ] } diff --git a/resources/profiles/BBL/filament/Bambu PET-CF @base.json b/resources/profiles/BBL/filament/Bambu PET-CF @base.json index 1b8dc18c4b..325f991443 100644 --- a/resources/profiles/BBL/filament/Bambu PET-CF @base.json +++ b/resources/profiles/BBL/filament/Bambu PET-CF @base.json @@ -1,10 +1,58 @@ { "type": "filament", - "filament_id": "GFT00", + "filament_id": "GFT01", "name": "Bambu PET-CF @base", "from": "system", "instantiation": "false", "inherits": "fdm_filament_pet", + "temperature_vitrification": [ + "185" + ], + "overhang_fan_threshold": [ + "0%" + ], + "overhang_fan_speed": [ + "40" + ], + "fan_max_speed": [ + "30" + ], + "fan_min_speed": [ + "10" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "slow_down_layer_time": [ + "2" + ], + "fan_cooling_layer_time": [ + "5" + ], + "cool_plate_temp" : [ + "0" + ], + "eng_plate_temp" : [ + "80" + ], + "hot_plate_temp" : [ + "100" + ], + "textured_plate_temp" : [ + "100" + ], + "cool_plate_temp_initial_layer" : [ + "0" + ], + "eng_plate_temp_initial_layer" : [ + "80" + ], + "hot_plate_temp_initial_layer" : [ + "100" + ], + "textured_plate_temp_initial_layer" : [ + "100" + ], "required_nozzle_HRC": [ "40" ], @@ -14,16 +62,22 @@ "filament_type": [ "PET-CF" ], + "filament_cost": [ + "84.99" + ], + "filament_density": [ + "1.29" + ], "nozzle_temperature_range_low": [ "260" ], "nozzle_temperature_range_high": [ - "300" + "290" ], "nozzle_temperature_initial_layer": [ - "280" + "270" ], "nozzle_temperature": [ - "280" + "270" ] } diff --git a/resources/profiles/BBL/filament/Bambu PETG-CF @BBL X1C.json b/resources/profiles/BBL/filament/Bambu PETG-CF @BBL X1C.json new file mode 100644 index 0000000000..7a0a106668 --- /dev/null +++ b/resources/profiles/BBL/filament/Bambu PETG-CF @BBL X1C.json @@ -0,0 +1,16 @@ +{ + "type": "filament", + "setting_id": "GFSG50_01", + "name": "Bambu PETG-CF @BBL X1C", + "from": "system", + "instantiation": "true", + "inherits": "Bambu PETG-CF @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" + ] +} diff --git a/resources/profiles/BBL/filament/Bambu PETG-CF @base.json b/resources/profiles/BBL/filament/Bambu PETG-CF @base.json new file mode 100644 index 0000000000..d037da45d4 --- /dev/null +++ b/resources/profiles/BBL/filament/Bambu PETG-CF @base.json @@ -0,0 +1,83 @@ +{ + "type": "filament", + "filament_id": "GFG50", + "name": "Bambu PETG-CF @base", + "from": "system", + "instantiation": "false", + "inherits": "fdm_filament_pet", + "temperature_vitrification": [ + "75" + ], + "overhang_fan_threshold": [ + "25%" + ], + "overhang_fan_speed": [ + "90" + ], + "cool_plate_temp" : [ + "0" + ], + "eng_plate_temp" : [ + "70" + ], + "hot_plate_temp" : [ + "70" + ], + "textured_plate_temp" : [ + "70" + ], + "cool_plate_temp_initial_layer" : [ + "0" + ], + "eng_plate_temp_initial_layer" : [ + "70" + ], + "hot_plate_temp_initial_layer" : [ + "70" + ], + "textured_plate_temp_initial_layer" : [ + "70" + ], + "required_nozzle_HRC": [ + "40" + ], + "filament_vendor": [ + "Bambu Lab" + ], + "filament_type": [ + "PETG-CF" + ], + "nozzle_temperature_range_low": [ + "240" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "nozzle_temperature_initial_layer": [ + "255" + ], + "nozzle_temperature": [ + "255" + ], + "filament_cost": [ + "34.99" + ], + "filament_density": [ + "1.25" + ], + "fan_max_speed": [ + "30" + ], + "fan_min_speed": [ + "0" + ], + "filament_max_volumetric_speed": [ + "14" + ], + "slow_down_layer_time": [ + "6" + ], + "fan_cooling_layer_time": [ + "20" + ] +} diff --git a/resources/profiles/BBL/filament/Bambu PLA-CF @BBL X1C.json b/resources/profiles/BBL/filament/Bambu PLA-CF @BBL X1C.json index c93d5803da..a6cd2e53ae 100644 --- a/resources/profiles/BBL/filament/Bambu PLA-CF @BBL X1C.json +++ b/resources/profiles/BBL/filament/Bambu PLA-CF @BBL X1C.json @@ -8,9 +8,6 @@ "filament_max_volumetric_speed": [ "15" ], - "slow_down_layer_time": [ - "2" - ], "nozzle_temperature_initial_layer": [ "230" ], diff --git a/resources/profiles/BBL/filament/Bambu PLA-CF @base.json b/resources/profiles/BBL/filament/Bambu PLA-CF @base.json index 23eea64440..c9d8349c4d 100644 --- a/resources/profiles/BBL/filament/Bambu PLA-CF @base.json +++ b/resources/profiles/BBL/filament/Bambu PLA-CF @base.json @@ -20,6 +20,9 @@ "required_nozzle_HRC": [ "40" ], + "slow_down_layer_time": [ + "8" + ], "nozzle_temperature_range_low": [ "210" ], diff --git a/resources/profiles/BBL/filament/Generic PETG-CF @base.json b/resources/profiles/BBL/filament/Generic PETG-CF @base.json index c52b122a90..69538b3ae9 100644 --- a/resources/profiles/BBL/filament/Generic PETG-CF @base.json +++ b/resources/profiles/BBL/filament/Generic PETG-CF @base.json @@ -1,10 +1,43 @@ { "type": "filament", - "filament_id": "GFG50", + "filament_id": "GFG98", "name": "Generic PETG-CF @base", "from": "system", "instantiation": "false", "inherits": "fdm_filament_pet", + "temperature_vitrification": [ + "75" + ], + "overhang_fan_threshold": [ + "25%" + ], + "overhang_fan_speed": [ + "90" + ], + "cool_plate_temp" : [ + "0" + ], + "eng_plate_temp" : [ + "70" + ], + "hot_plate_temp" : [ + "70" + ], + "textured_plate_temp" : [ + "70" + ], + "cool_plate_temp_initial_layer" : [ + "0" + ], + "eng_plate_temp_initial_layer" : [ + "70" + ], + "hot_plate_temp_initial_layer" : [ + "70" + ], + "textured_plate_temp_initial_layer" : [ + "70" + ], "required_nozzle_HRC": [ "40" ], @@ -30,7 +63,7 @@ "34.99" ], "filament_density": [ - "1.04" + "1.25" ], "fan_max_speed": [ "30" @@ -39,7 +72,7 @@ "0" ], "filament_max_volumetric_speed": [ - "16" + "10" ], "slow_down_layer_time": [ "6" diff --git a/resources/profiles/BBL/filament/Generic PLA Silk @base.json b/resources/profiles/BBL/filament/Generic PLA Silk @base.json new file mode 100644 index 0000000000..cf7e7b080a --- /dev/null +++ b/resources/profiles/BBL/filament/Generic PLA Silk @base.json @@ -0,0 +1,20 @@ +{ + "type": "filament", + "filament_id": "GFA05", + "name": "Generic PLA Silk @base", + "from": "system", + "instantiation": "false", + "inherits": "fdm_filament_pla", + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "slow_down_layer_time": [ + "8" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif};Prevent PLA from jamming" + ] +} diff --git a/resources/profiles/BBL/filament/Generic PLA Silk.json b/resources/profiles/BBL/filament/Generic PLA Silk.json index 16dc0cc49b..b836780578 100644 --- a/resources/profiles/BBL/filament/Generic PLA Silk.json +++ b/resources/profiles/BBL/filament/Generic PLA Silk.json @@ -4,7 +4,7 @@ "name": "Generic PLA Silk", "from": "system", "instantiation": "true", - "inherits": "Generic PLA @base", + "inherits": "Generic PLA Silk @base", "filament_max_volumetric_speed": [ "7.5" ], diff --git a/resources/profiles/BBL/filament/P1P/Bambu PET-CF @BBL P1P.json b/resources/profiles/BBL/filament/P1P/Bambu PET-CF @BBL P1P.json new file mode 100644 index 0000000000..649cda5ae0 --- /dev/null +++ b/resources/profiles/BBL/filament/P1P/Bambu PET-CF @BBL P1P.json @@ -0,0 +1,25 @@ +{ + "type": "filament", + "setting_id": "GFST01_10", + "name": "Bambu PET-CF @BBL P1P", + "from": "system", + "instantiation": "true", + "inherits": "Bambu PET-CF @base", + "slow_down_for_layer_cooling": [ + "1" + ], + "reduce_fan_stop_start_freq": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "slow_down_layer_time": [ + "2" + ], + "compatible_printers": [ + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.6 nozzle", + "Bambu Lab P1P 0.8 nozzle" +] +} diff --git a/resources/profiles/BBL/filament/P1P/Bambu PETG-CF @BBL P1P.json b/resources/profiles/BBL/filament/P1P/Bambu PETG-CF @BBL P1P.json new file mode 100644 index 0000000000..bd49859717 --- /dev/null +++ b/resources/profiles/BBL/filament/P1P/Bambu PETG-CF @BBL P1P.json @@ -0,0 +1,13 @@ +{ + "type": "filament", + "setting_id": "GFSG50_11", + "name": "Bambu PETG-CF @BBL P1P", + "from": "system", + "instantiation": "true", + "inherits": "Bambu PETG-CF @base", + "compatible_printers": [ + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.6 nozzle", + "Bambu Lab P1P 0.8 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/P1P/Bambu PLA-CF @BBL P1P.json b/resources/profiles/BBL/filament/P1P/Bambu PLA-CF @BBL P1P.json index 66eca224d2..18536780ed 100644 --- a/resources/profiles/BBL/filament/P1P/Bambu PLA-CF @BBL P1P.json +++ b/resources/profiles/BBL/filament/P1P/Bambu PLA-CF @BBL P1P.json @@ -8,9 +8,6 @@ "filament_max_volumetric_speed": [ "15" ], - "slow_down_layer_time": [ - "2" - ], "hot_plate_temp" : [ "65" ], diff --git a/resources/profiles/BBL/filament/P1P/Generic PETG @BBL P1P 0.2 nozzle.json b/resources/profiles/BBL/filament/P1P/Generic PETG @BBL P1P 0.2 nozzle.json index a45a05b9bb..d2e0801e06 100644 --- a/resources/profiles/BBL/filament/P1P/Generic PETG @BBL P1P 0.2 nozzle.json +++ b/resources/profiles/BBL/filament/P1P/Generic PETG @BBL P1P 0.2 nozzle.json @@ -17,6 +17,9 @@ "textured_plate_temp_initial_layer" : [ "80" ], + "filament_max_volumetric_speed": [ + "1" + ], "compatible_printers": [ "Bambu Lab P1P 0.2 nozzle" ] diff --git a/resources/profiles/BBL/filament/P1P/Generic PLA Silk @BBL P1P.json b/resources/profiles/BBL/filament/P1P/Generic PLA Silk @BBL P1P.json index a6498fb75c..3654126f28 100644 --- a/resources/profiles/BBL/filament/P1P/Generic PLA Silk @BBL P1P.json +++ b/resources/profiles/BBL/filament/P1P/Generic PLA Silk @BBL P1P.json @@ -4,7 +4,7 @@ "name": "Generic PLA Silk @BBL P1P", "from": "system", "instantiation": "true", - "inherits": "Generic PLA @BBL P1P", + "inherits": "Generic PLA Silk @base", "filament_max_volumetric_speed": [ "7.5" ], diff --git a/src/libslic3r/GCode/WipeTower.cpp b/src/libslic3r/GCode/WipeTower.cpp index 4467cf51a8..604f207157 100644 --- a/src/libslic3r/GCode/WipeTower.cpp +++ b/src/libslic3r/GCode/WipeTower.cpp @@ -49,7 +49,7 @@ public: { // adds tag for analyzer: std::ostringstream str; - str << ";" << GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Height) << m_layer_height << "\n"; // don't rely on GCodeAnalyzer knowing the layer height - it knows nothing at priming + str << ";" << GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Height) << std::to_string(m_layer_height) << "\n"; // don't rely on GCodeAnalyzer knowing the layer height - it knows nothing at priming str << ";" << GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Role) << ExtrusionEntity::role_to_string(erWipeTower) << "\n"; m_gcode += str.str(); change_analyzer_line_width(line_width); @@ -58,7 +58,7 @@ public: WipeTowerWriter& change_analyzer_line_width(float line_width) { // adds tag for analyzer: std::stringstream str; - str << ";" << GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Width) << line_width << "\n"; + str << ";" << GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Width) << std::to_string(line_width) << "\n"; m_gcode += str.str(); return *this; } diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 5fc2730266..63326e8e90 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -4404,7 +4404,8 @@ void GUI_App::start_sync_user_preset(bool load_immediately, bool with_progress_d void GUI_App::stop_sync_user_preset() { - remove_user_presets(); + if (!wxGetApp().m_is_closing) + remove_user_presets(); enable_user_preset_folder(false); if (!enable_sync) diff --git a/version.inc b/version.inc index 448f796723..df7cb40cf2 100644 --- a/version.inc +++ b/version.inc @@ -10,5 +10,5 @@ endif() if(NOT DEFINED BBL_INTERNAL_TESTING) set(BBL_INTERNAL_TESTING "1") endif() -set(SLIC3R_VERSION "01.05.00.59") -set(SoftFever_VERSION "1.4.5") +set(SoftFever_VERSION "1.5.0_beta") +set(SLIC3R_VERSION "01.05.00.60")