diff --git a/resources/profiles/Prusa.json b/resources/profiles/Prusa.json index 0a7f235d49..b023b865b0 100644 --- a/resources/profiles/Prusa.json +++ b/resources/profiles/Prusa.json @@ -10,6 +10,10 @@ } ], "process_list": [ + { + "name": "fdm_process_common", + "sub_path": "process/fdm_process_common.json" + }, { "name": "0.20mm Standard @MK3S", "sub_path": "process/0.20mm Standard @MK3S.json" @@ -53,44 +57,44 @@ "sub_path": "filament/fdm_filament_pa.json" }, { - "name": "Voron Generic PLA", - "sub_path": "filament/Voron Generic PLA.json" + "name": "Prusa Generic PLA", + "sub_path": "filament/Prusa Generic PLA.json" }, { - "name": "Voron Generic PLA-CF", - "sub_path": "filament/Voron Generic PLA-CF.json" + "name": "Prusa Generic PLA-CF", + "sub_path": "filament/Prusa Generic PLA-CF.json" }, { - "name": "Voron Generic PETG", - "sub_path": "filament/Voron Generic PETG.json" + "name": "Prusa Generic PETG", + "sub_path": "filament/Prusa Generic PETG.json" }, { - "name": "Voron Generic ABS", - "sub_path": "filament/Voron Generic ABS.json" + "name": "Prusa Generic ABS", + "sub_path": "filament/Prusa Generic ABS.json" }, { - "name": "Voron Generic TPU", - "sub_path": "filament/Voron Generic TPU.json" + "name": "Prusa Generic TPU", + "sub_path": "filament/Prusa Generic TPU.json" }, { - "name": "Voron Generic ASA", - "sub_path": "filament/Voron Generic ASA.json" + "name": "Prusa Generic ASA", + "sub_path": "filament/Prusa Generic ASA.json" }, { - "name": "Voron Generic PC", - "sub_path": "filament/Voron Generic PC.json" + "name": "Prusa Generic PC", + "sub_path": "filament/Prusa Generic PC.json" }, { - "name": "Voron Generic PVA", - "sub_path": "filament/Voron Generic PVA.json" + "name": "Prusa Generic PVA", + "sub_path": "filament/Prusa Generic PVA.json" }, { - "name": "Voron Generic PA", - "sub_path": "filament/Voron Generic PA.json" + "name": "Prusa Generic PA", + "sub_path": "filament/Prusa Generic PA.json" }, { - "name": "Voron Generic PA-CF", - "sub_path": "filament/Voron Generic PA-CF.json" + "name": "Prusa Generic PA-CF", + "sub_path": "filament/Prusa Generic PA-CF.json" } ], "machine_list": [ diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA-CF.json b/resources/profiles/Prusa/filament/Prusa Generic PA-CF.json index ddfe5608b1..0583ff3478 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA-CF.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PA-CF.json @@ -18,13 +18,7 @@ "filament_max_volumetric_speed": [ "8" ], -"compatible_printers": [ - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 350 0.4 nozzle", - "Voron Trident 250 0.4 nozzle", - "Voron Trident 300 0.4 nozzle", - "Voron Trident 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle" + "compatible_printers": [ + "Prusa MK3S 0.4 nozzle" ] -} +} \ No newline at end of file diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA.json b/resources/profiles/Prusa/filament/Prusa Generic PA.json index 64962e275a..8088e2375a 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PA.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PA.json @@ -15,13 +15,7 @@ "filament_max_volumetric_speed": [ "12" ], -"compatible_printers": [ - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 350 0.4 nozzle", - "Voron Trident 250 0.4 nozzle", - "Voron Trident 300 0.4 nozzle", - "Voron Trident 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle" + "compatible_printers": [ + "Prusa MK3S 0.4 nozzle" ] -} +} \ No newline at end of file diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC.json b/resources/profiles/Prusa/filament/Prusa Generic PC.json index 9147b110d0..7d7fa4f4de 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PC.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PC.json @@ -12,13 +12,7 @@ "filament_flow_ratio": [ "0.94" ], -"compatible_printers": [ - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 350 0.4 nozzle", - "Voron Trident 250 0.4 nozzle", - "Voron Trident 300 0.4 nozzle", - "Voron Trident 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle" + "compatible_printers": [ + "Prusa MK3S 0.4 nozzle" ] -} +} \ No newline at end of file diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF.json b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF.json index eb51ab99f7..68990c5bc3 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA-CF.json @@ -18,13 +18,7 @@ "slow_down_layer_time": [ "7" ], -"compatible_printers": [ - "Voron 2.4 250 0.4 nozzle", - "Voron 2.4 300 0.4 nozzle", - "Voron 2.4 350 0.4 nozzle", - "Voron Trident 250 0.4 nozzle", - "Voron Trident 300 0.4 nozzle", - "Voron Trident 350 0.4 nozzle", - "Voron 0.1 0.4 nozzle" + "compatible_printers": [ + "Prusa MK3S 0.4 nozzle" ] -} +} \ No newline at end of file diff --git a/resources/profiles/Prusa/mk3.svg b/resources/profiles/Prusa/mk3.svg new file mode 100644 index 0000000000..678213ac5f --- /dev/null +++ b/resources/profiles/Prusa/mk3.svg @@ -0,0 +1,930 @@ + + + + + + image/svg+xml + + MK3_bottom + + + + + MK3_bottom + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/profiles/Prusa/mk3_bed.stl b/resources/profiles/Prusa/mk3_bed.stl new file mode 100644 index 0000000000..6aff36f0bc Binary files /dev/null and b/resources/profiles/Prusa/mk3_bed.stl differ diff --git a/resources/profiles/Prusa/process/0.20mm Standard @MK3S.json b/resources/profiles/Prusa/process/0.20mm Standard @MK3S.json index 20be8da519..6376487ed3 100644 --- a/resources/profiles/Prusa/process/0.20mm Standard @MK3S.json +++ b/resources/profiles/Prusa/process/0.20mm Standard @MK3S.json @@ -1,21 +1,20 @@ { - "type": "process", - "setting_id": "MK3S-2", - "name": "0.20mm Standard @MK3S", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_common", - "layer_height": "0.2", - "initial_layer_speed": "20", - "initial_layer_infill_speed": "25", - "outer_wall_speed": "35", - "inner_wall_speed": "60", - "sparse_infill_speed": "200", - "internal_solid_infill_speed": "200", - "top_surface_speed": "50", - "gap_infill_speed": "40", - "travel_speed": "180", - "compatible_printers": [ - "Prusa MK3S 0.4 nozzle" - ] -} + "type": "process", + "setting_id": "MK3S-2", + "name": "0.20mm Standard @MK3S", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "initial_layer_speed": "20", + "initial_layer_infill_speed": "25", + "outer_wall_speed": "35", + "inner_wall_speed": "60", + "sparse_infill_speed": "200", + "internal_solid_infill_speed": "200", + "top_surface_speed": "50", + "gap_infill_speed": "40", + "travel_speed": "180", + "compatible_printers": [ + "Prusa MK3S 0.4 nozzle" + ] +} \ No newline at end of file diff --git a/src/libslic3r/PresetBundle.cpp b/src/libslic3r/PresetBundle.cpp index 394a3fa65d..669149697f 100644 --- a/src/libslic3r/PresetBundle.cpp +++ b/src/libslic3r/PresetBundle.cpp @@ -2788,7 +2788,7 @@ std::pair PresetBundle::load_vendor_configs_ //parse error std::string subfile_path = path + "/" + vendor_name + "/" + subfile.second; BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << boost::format(", got error when parse process setting from %1%") % subfile_path; - throw ConfigurationError((boost::format("Failed loading configuration file %1%\nSuggest cleaning the directory %2% firstly") % subfile_path %vendor_system_path).str()); + throw ConfigurationError((boost::format("Failed loading configuration file %1%\nSuggest cleaning the directory %2% firstly.\nReason: %3%") % subfile_path %vendor_system_path %reason).str()); } }