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

9 files changed, 62 insertions, 2 deletions

diff --git a/resources/icons/printers/BarBaz_M1.png b/resources/icons/printers/BarBaz_M1.png
deleted file mode 100644
index 5924cc88b..000000000
--- a/resources/icons/printers/BarBaz_M1.png
+++ /dev/null
diff --git a/resources/icons/printers/BarBaz_M2.png b/resources/icons/printers/BarBaz_M2.png
deleted file mode 100644
index 5924cc88b..000000000
--- a/resources/icons/printers/BarBaz_M2.png
+++ /dev/null
diff --git a/resources/icons/printers/BarBaz_M3.png b/resources/icons/printers/BarBaz_M3.png
deleted file mode 100644
index 5924cc88b..000000000
--- a/resources/icons/printers/BarBaz_M3.png
+++ /dev/null
diff --git a/resources/icons/printers/Foobar_M1.png b/resources/icons/printers/Foobar_M1.png
deleted file mode 100644
index 61a76a63d..000000000
--- a/resources/icons/printers/Foobar_M1.png
+++ /dev/null
diff --git a/resources/icons/printers/Foobar_M2.png b/resources/icons/printers/Foobar_M2.png
deleted file mode 100644
index 61a76a63d..000000000
--- a/resources/icons/printers/Foobar_M2.png
+++ /dev/null
diff --git a/resources/icons/printers/Foobar_M3.png b/resources/icons/printers/Foobar_M3.png
deleted file mode 100644
index 61a76a63d..000000000
--- a/resources/icons/printers/Foobar_M3.png
+++ /dev/null
diff --git a/resources/icons/printers/PrusaResearch_MK2.5.png b/resources/icons/printers/PrusaResearch_MK2.5.png
new file mode 100644
index 000000000..efbbc598d
--- /dev/null
+++ b/resources/icons/printers/PrusaResearch_MK2.5.png
diff --git a/resources/profiles/PrusaResearch.idx b/resources/profiles/PrusaResearch.idx
index 5c68e3c7c..767c372e8 100644
--- a/resources/profiles/PrusaResearch.idx
+++ b/resources/profiles/PrusaResearch.idx
@@ -1,3 +1,4 @@
+0.1.6 Split the MK2.5 profile from the MK2S
 0.1.5 fixed printer_variant fields for the i3 MK3 0.25 and 0.6mm nozzles
 0.1.4 edited fw version, added z-raise after print
 0.1.3 Fixed an incorrect position of the max_print_height parameter
diff --git a/resources/profiles/PrusaResearch.ini b/resources/profiles/PrusaResearch.ini
index 5f1d654a3..fdeefb8c9 100644
--- a/resources/profiles/PrusaResearch.ini
+++ b/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.1.5
+config_version = 0.1.6
 # Where to get the updates from?
 config_update_url = https://raw.githubusercontent.com/prusa3d/Slic3r-settings/master/live/PrusaResearch/
 
@@ -19,7 +19,11 @@ name = Original Prusa i3 MK3
 variants = 0.4; 0.25; 0.6
 
 [printer_model:MK2S]
-name = Original Prusa i3 MK2S, MK2.5
+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]
@@ -166,6 +170,10 @@ support_material_threshold = 80
 support_material_with_sheath = 1
 wipe_tower = 1
 
+# XXXXXXXXXXXXXXXXXXXX
+# XXX--- 0.05mm ---XXX
+# XXXXXXXXXXXXXXXXXXXX
+
 [print:*0.05mm*]
 inherits = *common*
 bottom_solid_layers = 10
@@ -226,6 +234,10 @@ compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and
 fill_pattern = grid
 top_infill_extrusion_width = 0.4
 
+# XXXXXXXXXXXXXXXXXXXX
+# XXX--- 0.10mm ---XXX
+# XXXXXXXXXXXXXXXXXXXX
+
 [print:*0.10mm*]
 inherits = *common*
 bottom_solid_layers = 7
@@ -299,6 +311,10 @@ solid_infill_speed = 200
 top_infill_extrusion_width = 0.4
 top_solid_infill_speed = 50
 
+# XXXXXXXXXXXXXXXXXXXX
+# XXX--- 0.15mm ---XXX
+# XXXXXXXXXXXXXXXXXXXX
+
 [print:*0.15mm*]
 inherits = *common*
 bottom_solid_layers = 5
@@ -420,6 +436,10 @@ perimeter_speed = 45
 solid_infill_speed = 200
 top_solid_infill_speed = 50
 
+# XXXXXXXXXXXXXXXXXXXX
+# XXX--- 0.20mm ---XXX
+# XXXXXXXXXXXXXXXXXXXX
+
 [print:0.20mm 100mms Linear Advance]
 inherits = *0.20mm*
 compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK2.*/ and nozzle_diameter[0]==0.4
@@ -483,6 +503,10 @@ perimeter_speed = 45
 solid_infill_speed = 200
 top_solid_infill_speed = 50
 
+# XXXXXXXXXXXXXXXXXXXX
+# XXX--- 0.35mm ---XXX
+# XXXXXXXXXXXXXXXXXXXX
+
 [print:*0.35mm*]
 inherits = *common*
 bottom_solid_layers = 3
@@ -532,6 +556,10 @@ support_material_interface_layers = 2
 support_material_with_sheath = 0
 support_material_xy_spacing = 150%
 
+# XXXXXXxxXXXXXXXXXXXXXX
+# XXX--- filament ---XXX
+# XXXXXXXXxxXXXXXXXXXXXX
+
 [filament:*common*]
 cooling = 1
 compatible_printers = 
@@ -958,6 +986,10 @@ variable_layer_height = 0
 default_print_profile = 0.15mm OPTIMAL
 default_filament_profile = Prusa PLA
 
+# XXXXXXXXXXXXXXXXX
+# XXX--- MK2 ---XXX
+# XXXXXXXXXXXXXXXXX
+
 [printer:Original Prusa i3 MK2]
 inherits = *common*
 
@@ -980,6 +1012,10 @@ nozzle_diameter = 0.6
 printer_variant = 0.6
 default_print_profile = 0.20mm NORMAL 0.6 nozzle
 
+# XXXXXXXXXXXXXXXXXXX
+# XXX--- MK2MM ---XXX
+# XXXXXXXXXXXXXXXXXXX
+
 [printer:Original Prusa i3 MK2 MM Single Mode]
 inherits = *mm-single*
 
@@ -999,6 +1035,29 @@ nozzle_diameter = 0.6,0.6,0.6,0.6
 printer_variant = 0.6
 default_print_profile = 0.20mm NORMAL 0.6 nozzle
 
+# XXXXXXXXXXXXXXXXXXX
+# XXX--- MK2.5 ---XXX
+# XXXXXXXXXXXXXXXXXXX
+
+[printer:Original Prusa i3 MK2.5]
+inherits = Original Prusa i3 MK2
+printer_model = MK2.5
+start_gcode = M115 U3.2.1 ; tell printer latest fw version\nM201 X9000 Y9000 Z500 E10000 ; sets maximum accelerations, mm/sec^2\nM203 X500 Y500 Z12 E120 ; sets maximum feedrates, mm/sec\nM204 S1500 T1500 ; sets acceleration (S) and retract acceleration (T)\nM205 X10 Y10 Z0.2 E2.5 ; sets the jerk limits, mm/sec\nM205 S0 T0 ; sets the minimum extruding and travel feed rate, mm/sec\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\nG1 Y-3.0 F1000.0 ; go outside print area\nG92 E0.0\nG1 X60.0 E9.0  F1000.0 ; intro line\nG1 X100.0 E12.5  F1000.0 ; intro line\nG92 E0.0
+
+[printer:Original Prusa i3 MK2.5 0.25 nozzle]
+inherits = Original Prusa i3 MK2 0.25 nozzle
+printer_model = MK2.5
+start_gcode = M115 U3.2.1 ; tell printer latest fw version\nM201 X9000 Y9000 Z500 E10000 ; sets maximum accelerations, mm/sec^2\nM203 X500 Y500 Z12 E120 ; sets maximum feedrates, mm/sec\nM204 S1500 T1500 ; sets acceleration (S) and retract acceleration (T)\nM205 X10 Y10 Z0.2 E2.5 ; sets the jerk limits, mm/sec\nM205 S0 T0 ; sets the minimum extruding and travel feed rate, mm/sec\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\nG1 Y-3.0 F1000.0 ; go outside print area\nG92 E0.0\nG1 X60.0 E9.0  F1000.0 ; intro line\nG1 X100.0 E12.5  F1000.0 ; intro line\nG92 E0.0
+
+[printer:Original Prusa i3 MK2.5 0.6 nozzle]
+inherits = Original Prusa i3 MK2 0.6 nozzle
+printer_model = MK2.5
+start_gcode = M115 U3.2.1 ; tell printer latest fw version\nM201 X9000 Y9000 Z500 E10000 ; sets maximum accelerations, mm/sec^2\nM203 X500 Y500 Z12 E120 ; sets maximum feedrates, mm/sec\nM204 S1500 T1500 ; sets acceleration (S) and retract acceleration (T)\nM205 X10 Y10 Z0.2 E2.5 ; sets the jerk limits, mm/sec\nM205 S0 T0 ; sets the minimum extruding and travel feed rate, mm/sec\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\nG1 Y-3.0 F1000.0 ; go outside print area\nG92 E0.0\nG1 X60.0 E9.0  F1000.0 ; intro line\nG1 X100.0 E12.5  F1000.0 ; intro line\nG92 E0.0
+
+# XXXXXXXXXXXXXXXXX
+# XXX--- MK3 ---XXX
+# XXXXXXXXXXXXXXXXX
+
 [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