diff --git a/resources/profiles/Prusa.json b/resources/profiles/Prusa.json index 4804beff57b..cd01b944e50 100644 --- a/resources/profiles/Prusa.json +++ b/resources/profiles/Prusa.json @@ -26,13 +26,45 @@ "name": "process_common_mk4", "sub_path": "process/process_common_mk4.json" }, + { + "name": "process_common_mk3", + "sub_path": "process/process_common_mk3.json" + }, + { + "name": "0.05mm UltraDetail @MK3S", + "sub_path": "process/0.05mm UltraDetail @MK3S.json" + }, + { + "name": "0.07mm UltraDetail @MK3S", + "sub_path": "process/0.07mm UltraDetail @MK3S.json" + }, + { + "name": "0.10mm Detail @MK3S", + "sub_path": "process/0.10mm Detail @MK3S.json" + }, + { + "name": "0.15mm Quality @MK3S", + "sub_path": "process/0.15mm Quality @MK3S.json" + }, + { + "name": "0.15mm Speed @MK3S", + "sub_path": "process/0.15mm Speed @MK3S.json" + }, + { + "name": "0.20mm Quality @MK3S", + "sub_path": "process/0.20mm Quality @MK3S.json" + }, { "name": "0.20mm Standard @MK3S", "sub_path": "process/0.20mm Standard @MK3S.json" }, { - "name": "0.20mm Standard @MINI", - "sub_path": "process/0.20mm Standard @MINI.json" + "name": "0.20mm Speed @MK3S", + "sub_path": "process/0.20mm Speed @MK3S.json" + }, + { + "name": "0.30mm Draft @MK3S", + "sub_path": "process/0.30mm Draft @MK3S.json" }, { "name": "0.08mm Standard @MK4", diff --git a/resources/profiles/Prusa/machine/Prusa MK3S 0.4 nozzle.json b/resources/profiles/Prusa/machine/Prusa MK3S 0.4 nozzle.json index ba1f52a4c2c..9f05eb7c8ea 100644 --- a/resources/profiles/Prusa/machine/Prusa MK3S 0.4 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MK3S 0.4 nozzle.json @@ -9,7 +9,7 @@ "default_filament_profile": [ "Prusa Generic PLA" ], - "default_print_profile": "0.20mm Speed @MK3", + "default_print_profile": "0.20mm Speed @MK3S", "nozzle_diameter": [ "0.4" ], @@ -42,7 +42,7 @@ "printable_height": "210", "machine_pause_gcode": "M601", "machine_start_gcode": "M862.3 P \"[printer_model]\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM115 U3.13.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\n{if filament_settings_id[initial_tool]=~/.*Prusament PA11.*/}\nG1 Z0.3 F720\nG1 Y-3 F1000 ; go outside print area\nG92 E0\nG1 X60 E9 F1000 ; intro line\nG1 X100 E9 F1000 ; intro line\n{else}\nG1 Z0.2 F720\nG1 Y-3 F1000 ; go outside print area\nG92 E0\nG1 X60 E9 F1000 ; intro line\nG1 X100 E12.5 F1000 ; intro line\n{endif}\nG92 E0\nM221 S{if layer_height<0.075}100{else}95{endif}", - "machine_end_gcode": "{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+1, max_print_height)} F720 ; Move print head up{endif}\nG1 X0 Y200 F3600 ; park\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+49, max_print_height)} F720 ; Move print head further up{endif}\nG4 ; wait\nM221 S100 ; reset flow\nM900 K0 ; reset LA\n{if print_settings_id=~/.*(DETAIL @MK3|QUALITY @MK3|@0.25 nozzle MK3).*/}M907 E538 ; reset extruder motor current{endif}\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM84 ; disable motors\n; max_layer_z = [max_layer_z]", + "machine_end_gcode": "{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+1, max_print_height)} F720 ; Move print head up{endif}\nG1 X0 Y200 F3600 ; park\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+49, max_print_height)} F720 ; Move print head further up{endif}\nG4 ; wait\nM221 S100 ; reset flow\nM900 K0 ; reset LA\n{if print_settings_id=~/.*(DETAIL @MK3S|QUALITY @MK3S|@0.25 nozzle MK3).*/}M907 E538 ; reset extruder motor current{endif}\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM84 ; disable motors\n; max_layer_z = [max_layer_z]", "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n", "printer_notes": "Don't remove the following keywords! These keywords are used in the \"compatible printer\" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_PRUSA3D\nPRINTER_MODEL_MK3\n", diff --git a/resources/profiles/Prusa/process/0.05mm UltraDetail @MK3.json b/resources/profiles/Prusa/process/0.05mm UltraDetail @MK3S.json similarity index 92% rename from resources/profiles/Prusa/process/0.05mm UltraDetail @MK3.json rename to resources/profiles/Prusa/process/0.05mm UltraDetail @MK3S.json index d9f89cde3e7..ab3a95683f3 100644 --- a/resources/profiles/Prusa/process/0.05mm UltraDetail @MK3.json +++ b/resources/profiles/Prusa/process/0.05mm UltraDetail @MK3S.json @@ -1,7 +1,7 @@ { "type": "process", - "print_settings_id": "0.05mm UltraDetail @MK3", - "name": "0.05mm UltraDetail @MK3", + "print_settings_id": "0.05mm UltraDetail @MK3S", + "name": "0.05mm UltraDetail @MK3S", "from": "system", "instantiation": "true", "inherits": "process_common_mk3", diff --git a/resources/profiles/Prusa/process/0.07mm UltraDetail @MK3.json b/resources/profiles/Prusa/process/0.07mm UltraDetail @MK3S.json similarity index 92% rename from resources/profiles/Prusa/process/0.07mm UltraDetail @MK3.json rename to resources/profiles/Prusa/process/0.07mm UltraDetail @MK3S.json index a19ae009f45..2b99480459e 100644 --- a/resources/profiles/Prusa/process/0.07mm UltraDetail @MK3.json +++ b/resources/profiles/Prusa/process/0.07mm UltraDetail @MK3S.json @@ -1,7 +1,7 @@ { "type": "process", - "print_settings_id": "0.07mm UltraDetail @MK3", - "name": "0.32mm Standard @MK4", + "print_settings_id": "0.07mm UltraDetail @MK3S", + "name": "0.07mm UltraDetail @MK3S", "from": "system", "instantiation": "true", "inherits": "process_common_mk3", diff --git a/resources/profiles/Prusa/process/0.10mm Detail @MK3.json b/resources/profiles/Prusa/process/0.10mm Detail @MK3S.json similarity index 93% rename from resources/profiles/Prusa/process/0.10mm Detail @MK3.json rename to resources/profiles/Prusa/process/0.10mm Detail @MK3S.json index eee3f0a898e..b6b4251e7ca 100644 --- a/resources/profiles/Prusa/process/0.10mm Detail @MK3.json +++ b/resources/profiles/Prusa/process/0.10mm Detail @MK3S.json @@ -1,7 +1,7 @@ { "type": "process", - "print_settings_id": "0.10mm Detail @MK3", - "name": "0.10mm Detail @MK3", + "print_settings_id": "0.10mm Detail @MK3S", + "name": "0.10mm Detail @MK3S", "from": "system", "instantiation": "true", "inherits": "process_common_mk3", diff --git a/resources/profiles/Prusa/process/0.15mm Quality @MK3.json b/resources/profiles/Prusa/process/0.15mm Quality @MK3S.json similarity index 93% rename from resources/profiles/Prusa/process/0.15mm Quality @MK3.json rename to resources/profiles/Prusa/process/0.15mm Quality @MK3S.json index b225f261ce5..b62d8bd5b5e 100644 --- a/resources/profiles/Prusa/process/0.15mm Quality @MK3.json +++ b/resources/profiles/Prusa/process/0.15mm Quality @MK3S.json @@ -1,7 +1,7 @@ { "type": "process", - "print_settings_id": "0.15mm Quality @MK3", - "name": "0.15mm Quality @MK3", + "print_settings_id": "0.15mm Quality @MK3S", + "name": "0.15mm Quality @MK3S", "from": "system", "instantiation": "true", "inherits": "process_common_mk3", diff --git a/resources/profiles/Prusa/process/0.15mm Speed @MK3.json b/resources/profiles/Prusa/process/0.15mm Speed @MK3S.json similarity index 93% rename from resources/profiles/Prusa/process/0.15mm Speed @MK3.json rename to resources/profiles/Prusa/process/0.15mm Speed @MK3S.json index 43d690b556e..e56d6dfb8d7 100644 --- a/resources/profiles/Prusa/process/0.15mm Speed @MK3.json +++ b/resources/profiles/Prusa/process/0.15mm Speed @MK3S.json @@ -1,7 +1,7 @@ { "type": "process", - "print_settings_id": "0.15mm Speed @MK3", - "name": "0.15mm Speed @MK3", + "print_settings_id": "0.15mm Speed @MK3S", + "name": "0.15mm Speed @MK3S", "from": "system", "instantiation": "true", "inherits": "process_common_mk3", diff --git a/resources/profiles/Prusa/process/0.20mm Quality @MK3.json b/resources/profiles/Prusa/process/0.20mm Quality @MK3S.json similarity index 93% rename from resources/profiles/Prusa/process/0.20mm Quality @MK3.json rename to resources/profiles/Prusa/process/0.20mm Quality @MK3S.json index 4e6ad958896..ce53887663b 100644 --- a/resources/profiles/Prusa/process/0.20mm Quality @MK3.json +++ b/resources/profiles/Prusa/process/0.20mm Quality @MK3S.json @@ -1,7 +1,7 @@ { "type": "process", - "print_settings_id": "0.20mm Quality @MK3", - "name": "0.20mm Quality @MK3", + "print_settings_id": "0.20mm Quality @MK3S", + "name": "0.20mm Quality @MK3S", "from": "system", "instantiation": "true", "inherits": "process_common_mk3", diff --git a/resources/profiles/Prusa/process/0.20mm Speed @MK3.json b/resources/profiles/Prusa/process/0.20mm Speed @MK3S.json similarity index 90% rename from resources/profiles/Prusa/process/0.20mm Speed @MK3.json rename to resources/profiles/Prusa/process/0.20mm Speed @MK3S.json index 778e05b6ff4..e832d59f37b 100644 --- a/resources/profiles/Prusa/process/0.20mm Speed @MK3.json +++ b/resources/profiles/Prusa/process/0.20mm Speed @MK3S.json @@ -1,8 +1,9 @@ { "type": "process", - "print_settings_id": "0.20mm Speed @MK3", - "name": "0.20mm Speed @MK3", + "print_settings_id": "0.20mm Speed @MK3S", + "name": "0.20mm Speed @MK3S", "from": "system", + "renamed_from":"0.20mm Standard @MK3S", "instantiation": "true", "inherits": "process_common_mk3", "bottom_shell_layers": "4", diff --git a/resources/profiles/Prusa/process/0.20mm Standard @MK3S.json b/resources/profiles/Prusa/process/0.20mm Standard @MK3S.json new file mode 100644 index 00000000000..661eba9ad55 --- /dev/null +++ b/resources/profiles/Prusa/process/0.20mm Standard @MK3S.json @@ -0,0 +1,20 @@ +{ + "type": "process", + "setting_id": "GP004", + "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/resources/profiles/Prusa/process/0.30mm Draft @MK3.json b/resources/profiles/Prusa/process/0.30mm Draft @MK3S.json similarity index 93% rename from resources/profiles/Prusa/process/0.30mm Draft @MK3.json rename to resources/profiles/Prusa/process/0.30mm Draft @MK3S.json index 04d5006c21e..50fff5aee50 100644 --- a/resources/profiles/Prusa/process/0.30mm Draft @MK3.json +++ b/resources/profiles/Prusa/process/0.30mm Draft @MK3S.json @@ -1,7 +1,7 @@ { "type": "process", - "print_settings_id": "0.30mm Draft @MK3", - "name": "0.30mm Draft @MK3", + "print_settings_id": "0.30mm Draft @MK3S", + "name": "0.30mm Draft @MK3S", "from": "system", "instantiation": "true", "inherits": "process_common_mk3", diff --git a/resources/profiles/Prusa/process/process_common_mk3.json b/resources/profiles/Prusa/process/process_common_mk3.json index 7cfce02612b..2bed89d15b2 100644 --- a/resources/profiles/Prusa/process/process_common_mk3.json +++ b/resources/profiles/Prusa/process/process_common_mk3.json @@ -2,6 +2,7 @@ "type": "process", "name": "process_common_mk3", "from": "system", + "instantiation": "false", "bottom_shell_thickness": "0.5", "bottom_surface_pattern": "monotonic", "bridge_angle": "0", @@ -49,10 +50,6 @@ "notes": [""], "ooze_prevention": "0", "outer_wall_acceleration": "0", - "overhang_1_4_speed": null, - "overhang_2_4_speed": null, - "overhang_3_4_speed": null, - "overhang_4_4_speed": null, "post_process": [""], "prime_tower_brim_width": "2", "prime_tower_width": "60",