Separated the Marlin G-code flavor from the RepRap G-code flavor

due to the differences in the M203 code
(RepRap firmware has it in mm/min, Marlin in mm/sec).
This difference is important to the G-code time estimator.

Changed the g-code flavor to Marlin for all Prusa3D bundled profiles.

4 files changed, 16 insertions, 16 deletions

diff --git a/resources/profiles/Original Prusa i3 MK2 and MK2S.ini b/resources/profiles/Original Prusa i3 MK2 and MK2S.ini
index d7b116f7e..a186c3775 100644
--- a/resources/profiles/Original Prusa i3 MK2 and MK2S.ini
+++ b/resources/profiles/Original Prusa i3 MK2 and MK2S.ini
@@ -3258,7 +3258,7 @@ deretract_speed = 0
 end_gcode = G4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X0 Y200; home X axis\nM84 ; disable motors
 extruder_colour = #FFFF00
 extruder_offset = 0x0
-gcode_flavor = reprap
+gcode_flavor = marlin
 layer_gcode = ;AFTER_LAYER_CHANGE\n;[layer_z]
 max_layer_height = 0.25
 min_layer_height = 0.07
@@ -3298,7 +3298,7 @@ deretract_speed = 0
 end_gcode = G4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X0 Y200; home X axis\nM84 ; disable motors
 extruder_colour = #FFFF00
 extruder_offset = 0x0
-gcode_flavor = reprap
+gcode_flavor = marlin
 layer_gcode = ;AFTER_LAYER_CHANGE\n;[layer_z]
 max_layer_height = 0.1
 min_layer_height = 0.05
@@ -3338,7 +3338,7 @@ deretract_speed = 0
 end_gcode = G4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X0 Y200; home X axis\nM84 ; disable motors
 extruder_colour = #FFFF00
 extruder_offset = 0x0
-gcode_flavor = reprap
+gcode_flavor = marlin
 layer_gcode = ;AFTER_LAYER_CHANGE\n;[layer_z]
 max_layer_height = 0.35
 min_layer_height = 0.1
diff --git a/resources/profiles/Original Prusa i3 MK2, MK2S, MK2MM and MK3.ini b/resources/profiles/Original Prusa i3 MK2, MK2S, MK2MM and MK3.ini
index 03f48e6f2..5835cfdeb 100644
--- a/resources/profiles/Original Prusa i3 MK2, MK2S, MK2MM and MK3.ini
+++ b/resources/profiles/Original Prusa i3 MK2, MK2S, MK2MM and MK3.ini
@@ -3258,7 +3258,7 @@ deretract_speed = 0
 end_gcode = G4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X0 Y200; home X axis\nM84 ; disable motors
 extruder_colour = #FFFF00
 extruder_offset = 0x0
-gcode_flavor = reprap
+gcode_flavor = marlin
 layer_gcode = ;AFTER_LAYER_CHANGE\n;[layer_z]
 max_layer_height = 0.25
 min_layer_height = 0.07
@@ -3298,7 +3298,7 @@ deretract_speed = 0
 end_gcode = G4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X0 Y200; home X axis\nM84 ; disable motors
 extruder_colour = #FFFF00
 extruder_offset = 0x0
-gcode_flavor = reprap
+gcode_flavor = marlin
 layer_gcode = ;AFTER_LAYER_CHANGE\n;[layer_z]
 max_layer_height = 0.1
 min_layer_height = 0.05
@@ -3338,7 +3338,7 @@ deretract_speed = 0
 end_gcode = G4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X0 Y200; home X axis\nM84 ; disable motors
 extruder_colour = #FFFF00
 extruder_offset = 0x0
-gcode_flavor = reprap
+gcode_flavor = marlin
 layer_gcode = ;AFTER_LAYER_CHANGE\n;[layer_z]
 max_layer_height = 0.35
 min_layer_height = 0.1
@@ -3378,7 +3378,7 @@ deretract_speed = 50
 end_gcode = G1 E-4 F2100.00000\nG91\nG1 Z1 F7200.000\nG90\nG1 X245 Y1\nG1 X240 E4\nG1 F4000\nG1 X190 E2.7  \nG1 F4600\nG1 X110 E2.8\nG1 F5200\nG1 X40 E3  \nG1 E-15.0000 F5000\nG1 E-50.0000 F5400\nG1 E-15.0000 F3000\nG1 E-12.0000 F2000\nG1 F1600\nG1 X0 Y1 E3.0000\nG1 X50 Y1 E-5.0000\nG1 F2000\nG1 X0 Y1 E5.0000\nG1 X50 Y1 E-5.0000\nG1 F2400\nG1 X0 Y1 E5.0000\nG1 X50 Y1 E-5.0000\nG1 F2400\nG1 X0 Y1 E5.0000\nG1 X50 Y1 E-3.0000\nG4 S0\nM107 ; fan off\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nG28 X0  ; home X axis\nM84     ; disable motors\n\n
 extruder_colour = #FFAA55
 extruder_offset = 0x0
-gcode_flavor = reprap
+gcode_flavor = marlin
 layer_gcode = ;AFTER_LAYER_CHANGE\n;[layer_z]
 max_layer_height = 0.25
 min_layer_height = 0.07
@@ -3418,7 +3418,7 @@ deretract_speed = 50
 end_gcode = G1 E-4 F2100.00000\nG91\nG1 Z1 F7200.000\nG90\nG1 X245 Y1\nG1 X240 E4\nG1 F4000\nG1 X190 E2.7  \nG1 F4600\nG1 X110 E2.8\nG1 F5200\nG1 X40 E3  \nG1 E-15.0000 F5000\nG1 E-50.0000 F5400\nG1 E-15.0000 F3000\nG1 E-12.0000 F2000\nG1 F1600\nG1 X0 Y1 E3.0000\nG1 X50 Y1 E-5.0000\nG1 F2000\nG1 X0 Y1 E5.0000\nG1 X50 Y1 E-5.0000\nG1 F2400\nG1 X0 Y1 E5.0000\nG1 X50 Y1 E-5.0000\nG1 F2400\nG1 X0 Y1 E5.0000\nG1 X50 Y1 E-3.0000\nG4 S0\nM107 ; fan off\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nG28 X0  ; home X axis\nM84     ; disable motors\n\n
 extruder_colour = #FFAA55
 extruder_offset = 0x0
-gcode_flavor = reprap
+gcode_flavor = marlin
 layer_gcode = ;AFTER_LAYER_CHANGE\n;[layer_z]
 max_layer_height = 0.25
 min_layer_height = 0.07
@@ -3458,7 +3458,7 @@ deretract_speed = 50,50,50,50
 end_gcode = {if not has_wipe_tower}\n; Pull the filament into the cooling tubes.\nG1 E-4 F2100.00000\nG91\nG1 Z1 F7200.000\nG90\nG1 X245 Y1\nG1 X240 E4\nG1 F4000\nG1 X190 E2.7  \nG1 F4600\nG1 X110 E2.8\nG1 F5200\nG1 X40 E3  \nG1 E-15.0000 F5000\nG1 E-50.0000 F5400\nG1 E-15.0000 F3000\nG1 E-12.0000 F2000\nG1 F1600\nG1 X0 Y1 E3.0000\nG1 X50 Y1 E-5.0000\nG1 F2000\nG1 X0 Y1 E5.0000\nG1 X50 Y1 E-5.0000\nG1 F2400\nG1 X0 Y1 E5.0000\nG1 X50 Y1 E-5.0000\nG1 F2400\nG1 X0 Y1 E5.0000\nG1 X50 Y1 E-3.0000\nG4 S0\n{endif}\nM107 ; fan off\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nG28 X0  ; home X axis\nM84     ; disable motors
 extruder_colour = #FFAA55;#5182DB;#4ECDD3;#FB7259
 extruder_offset = 0x0,0x0,0x0,0x0
-gcode_flavor = reprap
+gcode_flavor = marlin
 layer_gcode = ;AFTER_LAYER_CHANGE\n;[layer_z]
 max_layer_height = 0.25,0.25,0.25,0.25
 min_layer_height = 0.07,0.07,0.07,0.07
@@ -3498,7 +3498,7 @@ deretract_speed = 50,50,50,50
 end_gcode = {if not has_wipe_tower}\nG1 E-4 F2100.00000\nG91\nG1 Z1 F7200.000\nG90\nG1 X245 Y1\nG1 X240 E4\nG1 F4000\nG1 X190 E2.7  \nG1 F4600\nG1 X110 E2.8\nG1 F5200\nG1 X40 E3  \nG1 E-15.0000 F5000\nG1 E-50.0000 F5400\nG1 E-15.0000 F3000\nG1 E-12.0000 F2000\nG1 F1600\nG1 X0 Y1 E3.0000\nG1 X50 Y1 E-5.0000\nG1 F2000\nG1 X0 Y1 E5.0000\nG1 X50 Y1 E-5.0000\nG1 F2400\nG1 X0 Y1 E5.0000\nG1 X50 Y1 E-5.0000\nG1 F2400\nG1 X0 Y1 E5.0000\nG1 X50 Y1 E-3.0000\nG4 S0\n{endif}\nM107 ; fan off\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nG28 X0  ; home X axis\nM84     ; disable motors\n
 extruder_colour = #FFAA55;#5182DB;#4ECDD3;#FB7259
 extruder_offset = 0x0,0x0,0x0,0x0
-gcode_flavor = reprap
+gcode_flavor = marlin
 layer_gcode = ;AFTER_LAYER_CHANGE\n;[layer_z]
 max_layer_height = 0.25,0.25,0.25,0.25
 min_layer_height = 0.07,0.07,0.07,0.07
@@ -3538,7 +3538,7 @@ deretract_speed = 0
 end_gcode = G4 ; wait\nM221 S100\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X0 Y200; home X axis\nM84 ; disable motors
 extruder_colour = #FFFF00
 extruder_offset = 0x0
-gcode_flavor = reprap
+gcode_flavor = marlin
 layer_gcode = ;AFTER_LAYER_CHANGE\n;[layer_z]
 max_layer_height = 0.25
 min_layer_height = 0.07
diff --git a/resources/profiles/Original Prusa i3 MK2MM.ini b/resources/profiles/Original Prusa i3 MK2MM.ini
index 9776c065e..035d15515 100644
--- a/resources/profiles/Original Prusa i3 MK2MM.ini
+++ b/resources/profiles/Original Prusa i3 MK2MM.ini
@@ -3258,7 +3258,7 @@ deretract_speed = 50
 end_gcode = G1 E-4 F2100.00000\nG91\nG1 Z1 F7200.000\nG90\nG1 X245 Y1\nG1 X240 E4\nG1 F4000\nG1 X190 E2.7  \nG1 F4600\nG1 X110 E2.8\nG1 F5200\nG1 X40 E3  \nG1 E-15.0000 F5000\nG1 E-50.0000 F5400\nG1 E-15.0000 F3000\nG1 E-12.0000 F2000\nG1 F1600\nG1 X0 Y1 E3.0000\nG1 X50 Y1 E-5.0000\nG1 F2000\nG1 X0 Y1 E5.0000\nG1 X50 Y1 E-5.0000\nG1 F2400\nG1 X0 Y1 E5.0000\nG1 X50 Y1 E-5.0000\nG1 F2400\nG1 X0 Y1 E5.0000\nG1 X50 Y1 E-3.0000\nG4 S0\nM107 ; fan off\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nG28 X0  ; home X axis\nM84     ; disable motors\n\n
 extruder_colour = #FFAA55
 extruder_offset = 0x0
-gcode_flavor = reprap
+gcode_flavor = marlin
 layer_gcode = ;AFTER_LAYER_CHANGE\n;[layer_z]
 max_layer_height = 0.25
 min_layer_height = 0.07
@@ -3298,7 +3298,7 @@ deretract_speed = 50
 end_gcode = G1 E-4 F2100.00000\nG91\nG1 Z1 F7200.000\nG90\nG1 X245 Y1\nG1 X240 E4\nG1 F4000\nG1 X190 E2.7  \nG1 F4600\nG1 X110 E2.8\nG1 F5200\nG1 X40 E3  \nG1 E-15.0000 F5000\nG1 E-50.0000 F5400\nG1 E-15.0000 F3000\nG1 E-12.0000 F2000\nG1 F1600\nG1 X0 Y1 E3.0000\nG1 X50 Y1 E-5.0000\nG1 F2000\nG1 X0 Y1 E5.0000\nG1 X50 Y1 E-5.0000\nG1 F2400\nG1 X0 Y1 E5.0000\nG1 X50 Y1 E-5.0000\nG1 F2400\nG1 X0 Y1 E5.0000\nG1 X50 Y1 E-3.0000\nG4 S0\nM107 ; fan off\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nG28 X0  ; home X axis\nM84     ; disable motors\n\n
 extruder_colour = #FFAA55
 extruder_offset = 0x0
-gcode_flavor = reprap
+gcode_flavor = marlin
 layer_gcode = ;AFTER_LAYER_CHANGE\n;[layer_z]
 max_layer_height = 0.25
 min_layer_height = 0.07
@@ -3338,7 +3338,7 @@ deretract_speed = 50,50,50,50
 end_gcode = {if not has_wipe_tower}\n; Pull the filament into the cooling tubes.\nG1 E-4 F2100.00000\nG91\nG1 Z1 F7200.000\nG90\nG1 X245 Y1\nG1 X240 E4\nG1 F4000\nG1 X190 E2.7  \nG1 F4600\nG1 X110 E2.8\nG1 F5200\nG1 X40 E3  \nG1 E-15.0000 F5000\nG1 E-50.0000 F5400\nG1 E-15.0000 F3000\nG1 E-12.0000 F2000\nG1 F1600\nG1 X0 Y1 E3.0000\nG1 X50 Y1 E-5.0000\nG1 F2000\nG1 X0 Y1 E5.0000\nG1 X50 Y1 E-5.0000\nG1 F2400\nG1 X0 Y1 E5.0000\nG1 X50 Y1 E-5.0000\nG1 F2400\nG1 X0 Y1 E5.0000\nG1 X50 Y1 E-3.0000\nG4 S0\n{endif}\nM107 ; fan off\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nG28 X0  ; home X axis\nM84     ; disable motors
 extruder_colour = #FFAA55;#5182DB;#4ECDD3;#FB7259
 extruder_offset = 0x0,0x0,0x0,0x0
-gcode_flavor = reprap
+gcode_flavor = marlin
 layer_gcode = ;AFTER_LAYER_CHANGE\n;[layer_z]
 max_layer_height = 0.25,0.25,0.25,0.25
 min_layer_height = 0.07,0.07,0.07,0.07
@@ -3378,7 +3378,7 @@ deretract_speed = 50,50,50,50
 end_gcode = {if not has_wipe_tower}\nG1 E-4 F2100.00000\nG91\nG1 Z1 F7200.000\nG90\nG1 X245 Y1\nG1 X240 E4\nG1 F4000\nG1 X190 E2.7  \nG1 F4600\nG1 X110 E2.8\nG1 F5200\nG1 X40 E3  \nG1 E-15.0000 F5000\nG1 E-50.0000 F5400\nG1 E-15.0000 F3000\nG1 E-12.0000 F2000\nG1 F1600\nG1 X0 Y1 E3.0000\nG1 X50 Y1 E-5.0000\nG1 F2000\nG1 X0 Y1 E5.0000\nG1 X50 Y1 E-5.0000\nG1 F2400\nG1 X0 Y1 E5.0000\nG1 X50 Y1 E-5.0000\nG1 F2400\nG1 X0 Y1 E5.0000\nG1 X50 Y1 E-3.0000\nG4 S0\n{endif}\nM107 ; fan off\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nG28 X0  ; home X axis\nM84     ; disable motors\n
 extruder_colour = #FFAA55;#5182DB;#4ECDD3;#FB7259
 extruder_offset = 0x0,0x0,0x0,0x0
-gcode_flavor = reprap
+gcode_flavor = marlin
 layer_gcode = ;AFTER_LAYER_CHANGE\n;[layer_z]
 max_layer_height = 0.25,0.25,0.25,0.25
 min_layer_height = 0.07,0.07,0.07,0.07
diff --git a/resources/profiles/Original Prusa i3 MK3.ini b/resources/profiles/Original Prusa i3 MK3.ini
index 1aafb61f9..0afbb35cd 100644
--- a/resources/profiles/Original Prusa i3 MK3.ini
+++ b/resources/profiles/Original Prusa i3 MK3.ini
@@ -3258,7 +3258,7 @@ deretract_speed = 0
 end_gcode = G4 ; wait\nM221 S100\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X0 Y200; home X axis\nM84 ; disable motors
 extruder_colour = #FFFF00
 extruder_offset = 0x0
-gcode_flavor = reprap
+gcode_flavor = marlin
 layer_gcode = ;AFTER_LAYER_CHANGE\n;[layer_z]
 max_layer_height = 0.25
 min_layer_height = 0.07