Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp

resources/profiles/PrusaResearch.idx

@@ -1,4 +1,5 @@
 min_slic3r_version = 1.41.0-alpha
+0.2.0-alpha3 Adjusted machine limits for time estimates, added filament density and cost, 
 0.2.0-alpha2 Renamed the key MK3SMMU to MK3MMU2, added a generic PLA MMU2 material
 0.2.0-alpha1 added initial profiles for the i3 MK3 Multi Material Upgrade 2.0
 0.2.0-alpha moved machine limits from the start G-code to the new print profile parameters

resources/profiles/PrusaResearch.ini

@@ -5,7 +5,7 @@
 name = Prusa Research
 # Configuration version of this file. Config file will only be installed, if the config_version differs.
 # This means, the server may force the Slic3r configuration to be downgraded.
-config_version = 0.2.0-alpha2
+config_version = 0.2.0-alpha3
 # Where to get the updates from?
 config_update_url = https://raw.githubusercontent.com/prusa3d/Slic3r-settings/master/live/PrusaResearch/
 
@@ -14,26 +14,27 @@ config_update_url = https://raw.githubusercontent.com/prusa3d/Slic3r-settings/ma
 #TODO: One day we may differentiate variants of the nozzles / hot ends,
 #for example by the melt zone size, or whether the nozzle is hardened.
 # Printer model name will be shown by the installation wizard.
+
 [printer_model:MK3]
 name = Original Prusa i3 MK3
 variants = 0.4; 0.25; 0.6
 
-[printer_model:MK2S]
-name = Original Prusa i3 MK2S
-variants = 0.4; 0.25; 0.6
-
 [printer_model:MK2.5]
 name = Original Prusa i3 MK2.5
 variants = 0.4; 0.25; 0.6
 
-[printer_model:MK2SMM]
-name = Original Prusa i3 MK2S Multi Material Upgrade
-variants = 0.4; 0.6
+[printer_model:MK2S]
+name = Original Prusa i3 MK2/S
+variants = 0.4; 0.25; 0.6
 
-[printer_model:MK3MM2]
-name = Original Prusa i3 MK3 Multi Material Upgrade 2.0
+[printer_model:MK3MMU2]
+name = Original Prusa i3 MK3 MMU 2.0
 variants = 0.4
 
+[printer_model:MK2SMM]
+name = Original Prusa i3 MK2/S MMU 1.0
+variants = 0.4; 0.6
+
 # All presets starting with asterisk, for example *common*, are intermediate and they will
 # not make it into the user interface.
 
@@ -85,7 +86,7 @@ notes =
 overhangs = 0
 only_retract_when_crossing_perimeters = 0
 ooze_prevention = 0
-output_filename_format = [input_filename_base].gcode
+output_filename_format = {input_filename_base}_{layer_height}mm_{filament_type[0]}_{printer_model}.gcode
 perimeters = 2
 perimeter_extruder = 1
 perimeter_extrusion_width = 0.45
@@ -131,8 +132,8 @@ wipe_tower = 1
 wipe_tower_bridging = 10
 wipe_tower_rotation_angle = 0
 wipe_tower_width = 60
-wipe_tower_x = 180
-wipe_tower_y = 140
+wipe_tower_x = 200
+wipe_tower_y = 155
 xy_size_compensation = 0
 
 # Print parameters common to a 0.25mm diameter nozzle.
@@ -259,7 +260,7 @@ bridge_speed = 30
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.4 and ! single_extruder_multi_material
 external_perimeter_speed = 35
 fill_pattern = grid
-infill_acceleration = 1500
+infill_acceleration = 1250
 infill_speed = 200
 max_print_speed = 200
 perimeter_speed = 45
@@ -286,7 +287,7 @@ bridge_speed = 30
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.25
 external_perimeter_speed = 35
 fill_pattern = grid
-infill_acceleration = 1500
+infill_acceleration = 1250
 infill_speed = 200
 max_print_speed = 200
 perimeter_speed = 45
@@ -299,7 +300,7 @@ bridge_speed = 30
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.6
 external_perimeter_speed = 35
 fill_pattern = grid
-infill_acceleration = 1500
+infill_acceleration = 1250
 infill_speed = 200
 max_print_speed = 200
 perimeter_speed = 45
@@ -362,10 +363,10 @@ compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and
 [print:0.15mm OPTIMAL MK3]
 inherits = *0.15mm*
 bridge_speed = 30
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.4 and ! single_extruder_multi_material
+compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.4
 external_perimeter_speed = 35
 fill_pattern = grid
-infill_acceleration = 1500
+infill_acceleration = 1250
 infill_speed = 200
 max_print_speed = 200
 perimeter_speed = 45
@@ -397,7 +398,7 @@ bridge_speed = 30
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.25
 external_perimeter_speed = 35
 fill_pattern = grid
-infill_acceleration = 1500
+infill_acceleration = 1250
 infill_speed = 200
 max_print_speed = 200
 perimeter_speed = 45
@@ -408,7 +409,7 @@ inherits = *common*
 bottom_solid_layers = 4
 bridge_flow_ratio = 0.95
 external_perimeter_speed = 40
-infill_acceleration = 2000
+infill_acceleration = 1250
 infill_speed = 60
 layer_height = 0.2
 perimeter_acceleration = 800
@@ -423,39 +424,13 @@ bridge_speed = 30
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.6
 external_perimeter_speed = 35
 fill_pattern = grid
-infill_acceleration = 1500
+infill_acceleration = 1250
 infill_speed = 200
 max_print_speed = 200
 perimeter_speed = 45
 solid_infill_speed = 200
 top_solid_infill_speed = 50
 
-[print:0.15mm OPTIMAL MK3 MMU2]
-inherits = 0.15mm OPTIMAL MK3
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and single_extruder_multi_material
-bottom_solid_layers = 4
-external_perimeter_speed = 40
-fill_density = 10%
-infill_overlap = 15%
-perimeter_speed = 60
-small_perimeter_speed = 20
-support_material_threshold = 20
-top_solid_layers = 5
-
-[print:0.20mm FAST MK3 MMU2]
-inherits = 0.20mm FAST MK3
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and single_extruder_multi_material
-bridge_flow_ratio = 0.8
-external_perimeter_speed = 40
-fill_density = 15%
-infill_overlap = 35%
-infill_speed = 150
-perimeter_speed = 50
-small_perimeter_speed = 20
-solid_infill_speed = 150
-wipe_tower_x = 169
-wipe_tower_y = 137
-
 # XXXXXXXXXXXXXXXXXXXX
 # XXX--- 0.20mm ---XXX
 # XXXXXXXXXXXXXXXXXXXX
@@ -475,10 +450,10 @@ top_solid_infill_speed = 70
 [print:0.20mm FAST MK3]
 inherits = *0.20mm*
 bridge_speed = 30
-compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.4 and ! single_extruder_multi_material
+compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.4
 external_perimeter_speed = 35
 fill_pattern = grid
-infill_acceleration = 1500
+infill_acceleration = 1250
 infill_speed = 200
 max_print_speed = 200
 perimeter_speed = 45
@@ -516,7 +491,7 @@ bridge_speed = 30
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.6
 external_perimeter_speed = 35
 fill_pattern = grid
-infill_acceleration = 1500
+infill_acceleration = 1250
 infill_speed = 200
 max_print_speed = 200
 perimeter_speed = 45
@@ -680,6 +655,8 @@ inherits = *PLA*
 # For now, all but selected filaments are disabled for the MMU 2.0
 compatible_printers_condition = nozzle_diameter[0]>0.35 and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and single_extruder_multi_material)
 extrusion_multiplier = 1.2
+filament_cost = 80.65
+filament_density = 4
 filament_colour = #804040
 filament_max_volumetric_speed = 10
 
@@ -700,12 +677,16 @@ temperature = 270
 
 [filament:ColorFabb PLA-PHA]
 inherits = *PLA*
+filament_cost = 55.5
+filament_density = 1.24
 
 [filament:ColorFabb Woodfil]
 inherits = *PLA*
 # For now, all but selected filaments are disabled for the MMU 2.0
 compatible_printers_condition = nozzle_diameter[0]>0.35 and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and single_extruder_multi_material)
 extrusion_multiplier = 1.2
+filament_cost = 62.9
+filament_density = 1.15
 filament_colour = #804040
 filament_max_volumetric_speed = 10
 first_layer_temperature = 200
@@ -714,7 +695,9 @@ temperature = 200
 
 [filament:ColorFabb XT]
 inherits = *PET*
-filament_type = PLA
+filament_type = PET
+filament_cost = 62.9
+filament_density = 1.27
 first_layer_bed_temperature = 90
 first_layer_temperature = 260
 temperature = 270
@@ -722,6 +705,8 @@ temperature = 270
 [filament:ColorFabb XT-CF20]
 inherits = *PET*
 extrusion_multiplier = 1.2
+filament_cost = 80.65
+filament_density = 1.35
 filament_colour = #804040
 filament_max_volumetric_speed = 1
 first_layer_bed_temperature = 90
@@ -731,6 +716,8 @@ temperature = 260
 
 [filament:ColorFabb nGen]
 inherits = *PET*
+filament_cost = 21.2
+filament_density = 1.2
 bridge_fan_speed = 40
 fan_always_on = 0
 fan_below_layer_time = 10
@@ -741,6 +728,8 @@ min_fan_speed = 20
 
 [filament:ColorFabb nGen flex]
 inherits = *FLEX*
+filament_cost = 0
+filament_density = 1
 bed_temperature = 85
 bridge_fan_speed = 40
 cooling = 1
@@ -756,26 +745,36 @@ temperature = 260
 
 [filament:E3D Edge]
 inherits = *PET*
+filament_cost = 0
+filament_density = 1.26
 filament_notes = "List of manufacturers tested with standart PET print settings for MK2:\n\nE3D Edge\nFillamentum CPE GH100\nPlasty Mladeč PETG"
 
 [filament:E3D PC-ABS]
 inherits = *ABS*
+filament_cost = 0
+filament_density = 1.05
 first_layer_temperature = 270
 temperature = 270
 
 [filament:Fillamentum ABS]
 inherits = *ABS*
+filament_cost = 0
+filament_density = 1.04
 first_layer_temperature = 240
 temperature = 240
 
 [filament:Fillamentum ASA]
 inherits = *ABS*
+filament_cost = 0
+filament_density = 1.04
 fan_always_on = 1
 first_layer_temperature = 265
 temperature = 265
 
 [filament:Fillamentum CPE HG100 HM100]
 inherits = *PET*
+filament_cost = 0
+filament_density = 1.25
 filament_notes = "CPE HG100 , CPE HM100"
 first_layer_bed_temperature = 90
 first_layer_temperature = 275
@@ -788,6 +787,8 @@ inherits = *PLA*
 # For now, all but selected filaments are disabled for the MMU 2.0
 compatible_printers_condition = nozzle_diameter[0]>0.35 and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and single_extruder_multi_material)
 extrusion_multiplier = 1.2
+filament_cost = 0
+filament_density = 1.15
 filament_colour = #804040
 filament_max_volumetric_speed = 10
 first_layer_temperature = 190
@@ -796,14 +797,20 @@ temperature = 190
 
 [filament:Generic ABS]
 inherits = *ABS*
+filament_cost = 0
+filament_density = 1.04
 filament_notes = "List of materials tested with standart ABS print settings for MK2:\n\nEsun ABS\nFil-A-Gehr ABS\nHatchboxABS\nPlasty Mladeč ABS"
 
 [filament:Generic PET]
 inherits = *PET*
+filament_cost = 0
+filament_density = 1.24
 filament_notes = "List of manufacturers tested with standart PET print settings for MK2:\n\nE3D Edge\nFillamentum CPE GH100\nPlasty Mladeč PETG"
 
 [filament:Generic PLA]
 inherits = *PLA*
+filament_cost = 0
+filament_density = 1.27
 filament_notes = "List of materials tested with standart PLA print settings for MK2:\n\nDas Filament\nEsun PLA\nEUMAKERS PLA\nFiberlogy HD-PLA\nFillamentum PLA\nFloreon3D\nHatchbox PLA\nPlasty Mladeč PLA\nPrimavalue PLA\nProto pasta Matte Fiber\nVerbatim PLA\nVerbatim BVOH"
 
 [filament:Polymaker PC-Max]
@@ -830,8 +837,25 @@ temperature = 195
 
 [filament:Prusa ABS]
 inherits = *ABS*
+filament_cost = 27.82
+filament_density = 1.08
 filament_notes = "List of materials tested with standart ABS print settings for MK2:\n\nEsun ABS\nFil-A-Gehr ABS\nHatchboxABS\nPlasty Mladeč ABS"
 
+[filament:*ABS MMU2*]
+inherits = Prusa ABS
+compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and single_extruder_multi_material
+filament_cooling_final_speed = 50 
+filament_cooling_initial_speed = 10
+filament_cooling_moves = 5
+filament_loading_speed = 14
+filament_ramming_parameters = "120 110 5.32258 5.45161 5.67742 6 6.48387 7.12903 7.90323 8.70968 9.3871 9.83871 10.0968 10.2258| 0.05 5.30967 0.45 5.50967 0.95 6.1871 1.45 7.39677 1.95 9.05484 2.45 10 2.95 10.3098 3.45 13.0839 3.95 7.6 4.45 7.6 4.95 7.6";
+
+[filament:Generic ABS MMU2]
+inherits = *ABS MMU2*
+
+[filament:Prusa ABS MMU2]
+inherits = *ABS MMU2*
+
 [filament:Prusa HIPS]
 inherits = *ABS*
 bridge_fan_speed = 50
@@ -850,10 +874,14 @@ temperature = 220
 
 [filament:Prusa PET]
 inherits = *PET*
+filament_cost = 27.82
+filament_density = 1.27
 filament_notes = "List of manufacturers tested with standart PET print settings for MK2:\n\nE3D Edge\nFillamentum CPE GH100\nPlasty Mladeč PETG"
 
 [filament:Prusa PLA]
 inherits = *PLA*
+filament_cost = 25.4
+filament_density = 1.24
 filament_notes = "List of materials tested with standart PLA print settings for MK2:\n\nDas Filament\nEsun PLA\nEUMAKERS PLA\nFiberlogy HD-PLA\nFillamentum PLA\nFloreon3D\nHatchbox PLA\nPlasty Mladeč PLA\nPrimavalue PLA\nProto pasta Matte Fiber\nVerbatim PLA\nVerbatim BVOH"
 
 [filament:*PLA MMU2*]
@@ -873,6 +901,8 @@ inherits = *PLA MMU2*
 
 [filament:SemiFlex or Flexfill 98A]
 inherits = *FLEX*
+filament_cost = 0
+filament_density = 1.22
 
 [filament:Taulman Bridge]
 inherits = *common*
@@ -956,7 +986,7 @@ extruder_offset = 0x0
 gcode_flavor = marlin
 silent_mode = 0
 machine_max_acceleration_e = 10000
-machine_max_acceleration_extruding = 1500
+machine_max_acceleration_extruding = 2000
 machine_max_acceleration_retracting = 1500
 machine_max_acceleration_x = 9000
 machine_max_acceleration_y = 9000
@@ -1118,11 +1148,11 @@ start_gcode = M115 U3.2.1 ; tell printer latest fw version\nM83  ; extruder rela
 [printer:Original Prusa i3 MK3]
 inherits = *common*
 end_gcode = G4 ; wait\nM221 S100\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\n{if layer_z < max_print_height}G1 Z{z_offset+min(layer_z+30, max_print_height)}{endif} ; Move print head up\nG1 X0 Y200; home X axis\nM84 ; disable motors
-machine_max_acceleration_e = 9000,9000
-machine_max_acceleration_extruding = 1250,960
+machine_max_acceleration_e = 5000,5000
+machine_max_acceleration_extruding = 1250,1250
 machine_max_acceleration_retracting = 1250,1250
-machine_max_acceleration_x = 1000,1000
-machine_max_acceleration_y = 1000,1000
+machine_max_acceleration_x = 1000,960
+machine_max_acceleration_y = 1000,960
 machine_max_acceleration_z = 1000,1000
 machine_max_feedrate_e = 120,120
 machine_max_feedrate_x = 200,172
@@ -1167,8 +1197,8 @@ cooling_tube_retraction = 30
 parking_pos_retraction = 85
 retract_length_toolchange = 3
 extra_loading_move = -13
-printer_model = MK3MM2
-default_print_profile = 0.15mm OPTIMAL MK3 MMU2
+printer_model = MK3MMU2
+default_print_profile = 0.15mm OPTIMAL MK3
 default_filament_profile = Prusa PLA MMU2
 
 [printer:Original Prusa i3 MK3 MMU2 Single]
@@ -1182,11 +1212,11 @@ inherits = *mm2*
 # (for example the retract values) are duplicaed from the first value, so they do not need 
 # to be defined explicitely.
 nozzle_diameter = 0.4,0.4,0.4,0.4,0.4
-extruder_colour = #FFFF00;#FFFFFF;#804040;#0000FF;#C0C0C0
+extruder_colour = #FF8000;#0080FF;#00FFFF;#FF4F4F;#9FFF9F
 start_gcode = M107\n\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\nG21 ; set units to millimeters\nG90 ; use absolute coordinates\nM83 ; use relative distances for extrusion\nG92 E0.0\n
 end_gcode = G1 E-15.0000 F3000\n\nM702 C\n\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X0 Y200; home X axis\nM84 ; disable motors
 
 # The obsolete presets will be removed when upgrading from the legacy configuration structure (up to Slic3r 1.39.2) to 1.40.0 and newer.
 [obsolete_presets]
-print="0.05mm DETAIL 0.25 nozzle";"0.05mm DETAIL MK3";"0.05mm DETAIL";"0.20mm NORMAL MK3";"0.35mm FAST MK3"
+print="0.05mm DETAIL 0.25 nozzle";"0.05mm DETAIL MK3";"0.05mm DETAIL";"0.20mm NORMAL MK3";"0.35mm FAST MK3";"print:0.15mm OPTIMAL MK3 MMU2";"print:0.20mm FAST MK3 MMU2"
 filament="ColorFabb Brass Bronze 1.75mm";"ColorFabb HT 1.75mm";"ColorFabb nGen 1.75mm";"ColorFabb Woodfil 1.75mm";"ColorFabb XT 1.75mm";"ColorFabb XT-CF20 1.75mm";"E3D PC-ABS 1.75mm";"Fillamentum ABS 1.75mm";"Fillamentum ASA 1.75mm";"Generic ABS 1.75mm";"Generic PET 1.75mm";"Generic PLA 1.75mm";"Prusa ABS 1.75mm";"Prusa HIPS 1.75mm";"Prusa PET 1.75mm";"Prusa PLA 1.75mm";"Taulman Bridge 1.75mm";"Taulman T-Glase 1.75mm"