From 9cd61c7d0b76ba75ed11938f86706b67e60b165d Mon Sep 17 00:00:00 2001
From: rtyr <36745189+rtyr@users.noreply.github.com>
Date: Thu, 22 Jul 2021 16:51:03 +0200
Subject: [PATCH] Added multiple add:north and Extrudr filament profiles.
 Updated support head settings (SL1S).

+ various changes to flexible filament profiles
---
 resources/profiles/PrusaResearch.idx |   3 +
 resources/profiles/PrusaResearch.ini | 188 ++++++++++++++++++++-------
 2 files changed, 141 insertions(+), 50 deletions(-)

diff --git a/resources/profiles/PrusaResearch.idx b/resources/profiles/PrusaResearch.idx
index a09ebd5b34..d4d05f625b 100644
--- a/resources/profiles/PrusaResearch.idx
+++ b/resources/profiles/PrusaResearch.idx
@@ -1,4 +1,5 @@
 min_slic3r_version = 2.4.0-alpha0
+1.4.0-alpha5 Added multiple add:north and Extrudr filament profiles. Updated support head settings (SL1S).
 1.4.0-alpha4 Decreased Area Fill (SL1S).
 1.4.0-alpha3 Updated SL1S tilt times.
 1.4.0-alpha2 Updated Prusa MINI machine limits.
@@ -8,8 +9,10 @@ min_slic3r_version = 2.4.0-alpha0
 1.3.0-alpha1 Added Prusament PCCF. Increased travel acceleration for Prusa MINI. Updated start g-code for Prusa MINI. Added multiple add:north and Extrudr filament profiles. Updated Z travel speed values.
 1.3.0-alpha0 Disabled thick bridges, updated support settings.
 min_slic3r_version = 2.3.2-alpha0
+1.3.1 Added multiple add:north and Extrudr filament profiles. Updated support head settings (SL1S).
 1.3.0 Added SL1S profiles.
 min_slic3r_version = 2.3.0-rc1
+1.2.8 Added multiple add:north and Extrudr filament profiles.
 1.2.7 Updated "Prusament PC Blend Carbon Fiber" profile for Prusa MINI.
 1.2.6 Added filament profile for "Prusament PC Blend Carbon Fiber".
 1.2.5 Updated firmware version. Added filament profiles. Various improvements.
diff --git a/resources/profiles/PrusaResearch.ini b/resources/profiles/PrusaResearch.ini
index 74fead88d9..0f3fa63648 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 PrusaSlicer configuration to be downgraded.
-config_version = 1.4.0-alpha4
+config_version = 1.4.0-alpha5
 # Where to get the updates from?
 config_update_url = https://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/PrusaResearch/
 changelog_url = https://files.prusa3d.com/?latest=slicer-profiles&lng=%1%
@@ -2025,7 +2025,7 @@ first_layer_temperature = 220
 temperature = 220
 filament_max_volumetric_speed = 10
 compatible_printers_condition = ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
-filament_spool_weight = 0
+filament_spool_weight = 230
 
 [filament:Extrudr PETG]
 inherits = *PET*
@@ -2040,7 +2040,7 @@ temperature = 220
 slowdown_below_layer_time = 20
 filament_retract_length = nil
 filament_retract_lift = nil
-filament_spool_weight = 0
+filament_spool_weight = 262
 full_fan_speed_layer = 0
 compatible_printers_condition = printer_model!="MINI" and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
 
@@ -2056,6 +2056,7 @@ filament_notes = "https://www.extrudr.com/en/products/catalogue/?material=198"
 first_layer_temperature = 235
 temperature = 235
 compatible_printers_condition = nozzle_diameter[0]>=0.4 and printer_model!="MINI" and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
+filament_spool_weight = 230
 
 [filament:Extrudr XPETG CF @MINI]
 inherits = Extrudr XPETG CF; *PETMINI*
@@ -2086,7 +2087,7 @@ max_fan_speed = 45
 min_fan_speed = 25
 slowdown_below_layer_time = 20
 start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.02{elsif nozzle_diameter[0]==0.6}0.04{else}0.07{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K18{elsif nozzle_diameter[0]==0.8};{else}M900 K43{endif} ; Filament gcode LA 1.0"
-filament_spool_weight = 0
+filament_spool_weight = 230
 
 [filament:Extrudr Flax]
 inherits = *PLA*
@@ -2100,19 +2101,19 @@ max_fan_speed = 80
 min_fan_speed = 30
 full_fan_speed_layer = 0
 slowdown_below_layer_time = 20
-filament_max_volumetric_speed = 10
-filament_spool_weight = 0
+filament_max_volumetric_speed = 11
+filament_spool_weight = 262
 
 [filament:Extrudr GreenTEC]
 inherits = *PLA*
 filament_vendor = Extrudr
-filament_cost = 23.63
-filament_density = 1.35
+filament_cost = 56
+filament_density = 1.3
 filament_notes = "https://www.extrudr.com/en/products/catalogue/?material=106"
 first_layer_temperature = 208
 temperature = 208
 slowdown_below_layer_time = 20
-filament_spool_weight = 0
+filament_spool_weight = 230
 
 [filament:Extrudr GreenTEC Pro]
 inherits = *PLA*
@@ -2125,7 +2126,7 @@ max_fan_speed = 80
 min_fan_speed = 30
 full_fan_speed_layer = 0
 slowdown_below_layer_time = 20
-filament_spool_weight = 0
+filament_spool_weight = 230
 
 [filament:Extrudr GreenTEC Pro Carbon]
 inherits = *PLA*
@@ -2139,7 +2140,7 @@ min_fan_speed = 30
 temperature = 225
 full_fan_speed_layer = 0
 slowdown_below_layer_time = 20
-filament_spool_weight = 0
+filament_spool_weight = 230
 compatible_printers_condition = nozzle_diameter[0]>=0.4 and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
 
 [filament:Extrudr PLA NX1]
@@ -2156,7 +2157,7 @@ full_fan_speed_layer = 0
 max_fan_speed = 90
 min_fan_speed = 30
 slowdown_below_layer_time = 20
-filament_spool_weight = 0
+filament_spool_weight = 262
 
 [filament:Extrudr PLA NX2]
 inherits = Extrudr PLA NX1
@@ -2176,7 +2177,7 @@ filament_max_volumetric_speed = 3
 filament_notes = "https://www.extrudr.com/en/products/catalogue/?material=115"
 filament_retract_length = 0.4
 filament_wipe = nil
-filament_spool_weight = 0
+filament_spool_weight = 230
 slowdown_below_layer_time = 20
 
 [filament:Extrudr Flex Medium]
@@ -2191,7 +2192,7 @@ filament_max_volumetric_speed = 2
 filament_notes = "https://www.extrudr.com/en/products/catalogue/?material=115"
 filament_retract_length = 0.4
 filament_wipe = nil
-filament_spool_weight = 0
+filament_spool_weight = 230
 slowdown_below_layer_time = 20
 
 [filament:Extrudr Flex SemiSoft]
@@ -2206,7 +2207,7 @@ filament_max_volumetric_speed = 1.2
 filament_notes = "https://www.extrudr.com/en/products/catalogue/?material=115"
 filament_retract_length = 0.4
 filament_wipe = nil
-filament_spool_weight = 0
+filament_spool_weight = 230
 slowdown_below_layer_time = 20
 
 [filament:addnorth Adamant S1]
@@ -2221,6 +2222,7 @@ bed_temperature = 50
 first_layer_temperature = 245
 first_layer_bed_temperature = 50
 slowdown_below_layer_time = 20
+min_print_speed = 20
 fan_below_layer_time = 15
 fan_always_on = 1
 cooling = 1
@@ -2233,6 +2235,7 @@ filament_retract_length = 0.6
 filament_retract_lift = 0.5
 filament_spool_weight = 0
 filament_retract_restart_extra = 0.1
+filament_wipe = nil
 
 [filament:addnorth Adura X]
 inherits = *PET*
@@ -2257,14 +2260,23 @@ full_fan_speed_layer = 0
 filament_retract_length = 1.4
 filament_retract_lift = 0.4
 filament_max_volumetric_speed = 4
-start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.6}0.04{else}0.05{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K18{elsif nozzle_diameter[0]==0.8};{else}M900 K30{endif} ; Filament gcode LA 1.0"
+start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.02{elsif nozzle_diameter[0]==0.6}0.04{else}0.08{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K24{elsif nozzle_diameter[0]==0.8};{else}M900 K45{endif} ; Filament gcode LA 1.0"
 filament_spool_weight = 0
+compatible_printers_condition = nozzle_diameter[0]>=0.4 and printer_model!="MINI" and printer_model!="MK2SMM" and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
 
-## [filament:addnorth Adura X @MINI]
-## inherits = addnorth Adura X
-## filament_retract_length = nil
-## filament_retract_lift = nil
-## compatible_printers_condition = printer_model=="MINI"
+[filament:addnorth Adura X @MINI]
+inherits = addnorth Adura X
+filament_retract_length = nil
+filament_retract_lift = nil
+filament_retract_speed = 40
+filament_deretract_speed = 25
+compatible_printers_condition = nozzle_diameter[0]>=0.4 and printer_model=="MINI"
+
+[filament:addnorth Adura X @MMU1]
+inherits = addnorth Adura X
+filament_retract_length = nil
+filament_retract_lift = nil
+compatible_printers_condition = nozzle_diameter[0]>=0.4 and printer_model=="MK2SMM"
 
 [filament:addnorth E-PLA]
 inherits = *PLA*
@@ -2304,13 +2316,21 @@ filament_retract_lift = 0
 filament_max_volumetric_speed = 2
 filament_spool_weight = 0
 
-## [filament:addnorth ESD-PETG @MINI]
-## inherits = addnorth ESD-PETG
-## filament_retract_length = nil
-## filament_max_volumetric_speed = 2
-## compatible_printers_condition = printer_model=="MINI"
+[filament:addnorth ESD-PETG @MINI]
+inherits = addnorth ESD-PETG
+filament_retract_length = nil
+filament_retract_speed = 40
+filament_deretract_speed = 25
+filament_max_volumetric_speed = 2
+compatible_printers_condition = printer_model=="MINI"
 
-[filament:addnorth OBC]
+[filament:addnorth ESD-PETG @MMU1]
+inherits = addnorth ESD-PETG
+filament_retract_length = nil
+filament_max_volumetric_speed = 2
+compatible_printers_condition = printer_model=="MK2SMM"
+
+[filament:addnorth OBC Polyethylene]
 inherits = *FLEX*
 filament_vendor = addnorth
 disable_fan_first_layers = 3
@@ -2363,9 +2383,18 @@ filament_spool_weight = 0
 inherits = addnorth PETG
 filament_retract_length = nil
 filament_retract_lift = nil
+filament_retract_speed = 40
+filament_deretract_speed = 25
 filament_max_volumetric_speed = 7
 compatible_printers_condition = printer_model=="MINI"
 
+[filament:addnorth PETG @MMU1]
+inherits = addnorth PETG
+filament_retract_length = nil
+filament_retract_lift = nil
+filament_max_volumetric_speed = 7
+compatible_printers_condition = printer_model=="MK2SMM"
+
 [filament:addnorth Rigid X]
 inherits = *PET*
 filament_vendor = addnorth
@@ -2389,14 +2418,21 @@ filament_retract_length = 1.4
 filament_max_volumetric_speed = 5
 filament_spool_weight = 0
 filament_notes = "Please use a nozzle that is resistant to abrasive filaments, like hardened steel."
+compatible_printers_condition = nozzle_diameter[0]>=0.4 and printer_model!="MINI" and printer_model!="MK2SMM" and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
 
-## [filament:addnorth Rigid X @MINI]
-## inherits = addnorth Rigid X
-## filament_retract_length = nil
-## filament_retract_lift = nil
-## filament_max_volumetric_speed = 5
-## filament_notes = "Please use a nozzle that is resistant to abrasive filaments, like hardened steel."
-## compatible_printers_condition = printer_model=="MINI"
+[filament:addnorth Rigid X @MINI]
+inherits = addnorth Rigid X
+filament_retract_length = nil
+filament_retract_lift = nil
+filament_retract_speed = 40
+filament_deretract_speed = 25
+compatible_printers_condition = nozzle_diameter[0]>=0.4 and printer_model=="MINI"
+
+[filament:addnorth Rigid X @MMU1]
+inherits = addnorth Rigid X
+filament_retract_length = nil
+filament_retract_lift = nil
+compatible_printers_condition = nozzle_diameter[0]>=0.4 and printer_model=="MK2SMM"
 
 [filament:addnorth Textura]
 inherits = *PLA*
@@ -2418,10 +2454,15 @@ filament_spool_weight = 0
 filament_retract_length = 1
 compatible_printers_condition = printer_model!="MK2SMM" and printer_model!="MINI" and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)
 
-## [filament:addnorth Textura @MINI]
-## inherits = addnorth Textura
-## filament_retract_length = nil
-## compatible_printers_condition = printer_model=="MINI"
+[filament:addnorth Textura @MINI]
+inherits = addnorth Textura
+filament_retract_length = nil
+compatible_printers_condition = printer_model=="MINI"
+
+[filament:addnorth Textura @MMU1]
+inherits = addnorth Textura
+filament_retract_length = nil
+compatible_printers_condition = printer_model=="MK2SMM"
 
 [filament:Filament PM PETG]
 inherits = *PET*
@@ -2481,16 +2522,43 @@ filament_cost = 33.99
 filament_density = 1.20
 filament_spool_weight = 230
 filament_max_volumetric_speed = 1.2
-filament_retract_length = 0
+filament_retract_length = 0.4
 filament_retract_speed = nil
-filament_retract_lift = nil
+filament_deretract_speed = 20
 fan_always_on = 1
 cooling = 0
-max_fan_speed = 50
-min_fan_speed = 50
+max_fan_speed = 60
+min_fan_speed = 60
 disable_fan_first_layers = 4
 full_fan_speed_layer = 6
 
+[filament:AmazonBasics TPU]
+inherits = *FLEX*
+filament_vendor = AmazonBasics
+fan_always_on = 1
+filament_max_volumetric_speed = 1.8
+extrusion_multiplier = 1.14
+first_layer_temperature = 235
+first_layer_bed_temperature = 50
+temperature = 235
+bed_temperature = 50
+bridge_fan_speed = 100
+max_fan_speed = 80
+min_fan_speed = 80
+filament_retract_before_travel = 3
+filament_cost = 19.99
+filament_density = 1.21
+filament_retract_length = 2
+filament_retract_speed = 45
+filament_deretract_speed = 20
+filament_retract_lift = 0
+filament_wipe = 0
+disable_fan_first_layers = 4
+full_fan_speed_layer = 6
+min_print_speed = 15
+slowdown_below_layer_time = 10
+cooling = 1
+
 [filament:SainSmart TPU]
 inherits = *FLEX*
 filament_vendor = SainSmart
@@ -3068,12 +3136,19 @@ filament_cost = 35.48
 filament_density = 1.24
 filament_spool_weight = 230
 
-[filament:SemiFlex or Flexfill 98A]
+[filament:SemiFlex]
 inherits = *FLEX*
+renamed_from = "SemiFlex or Flexfill 98A"
 filament_vendor = Generic
 filament_cost = 82.26
 filament_density = 1.22
+extrusion_multiplier = 1.12
 filament_max_volumetric_speed = 1.35
+fan_always_on = 1
+cooling = 0
+max_fan_speed = 30
+min_fan_speed = 30
+filament_retract_length = nil
 
 [filament:Fillamentum Flexfill 98A]
 inherits = *FLEX*
@@ -3081,13 +3156,16 @@ filament_vendor = Fillamentum
 filament_cost = 82.26
 filament_density = 1.23
 filament_spool_weight = 230
+extrusion_multiplier = 1.12
 filament_max_volumetric_speed = 1.35
 fan_always_on = 1
 cooling = 0
-max_fan_speed = 50
-min_fan_speed = 50
+max_fan_speed = 60
+min_fan_speed = 60
 disable_fan_first_layers = 4
 full_fan_speed_layer = 6
+filament_retract_length = 1.2
+filament_deretract_speed = 20
 
 [filament:Taulman Bridge]
 inherits = *common*
@@ -3410,16 +3488,22 @@ fan_always_on = 1
 max_fan_speed = 15
 min_fan_speed = 15
 
-[filament:SemiFlex or Flexfill 98A @MMU1]
+[filament:SemiFlex @MMU1]
 inherits = *FLEX*
+renamed_from = "SemiFlex or Flexfill 98A @MMU1"
 filament_vendor = Generic
 filament_cost = 82.26
 filament_density = 1.22
+extrusion_multiplier = 1.12
 filament_max_volumetric_speed = 1.35
 filament_retract_length = nil
 filament_retract_speed = nil
 filament_retract_lift = nil
 compatible_printers_condition = printer_model=="MK2SMM"
+fan_always_on = 1
+cooling = 0
+max_fan_speed = 30
+min_fan_speed = 30
 
 [filament:Generic FLEX @MMU1]
 inherits = *FLEX*
@@ -3550,16 +3634,18 @@ bed_temperature = 100
 compatible_printers_condition = printer_model=="MINI" and nozzle_diameter[0]!=0.8
 
 [filament:Fillamentum Flexfill 98A @MINI]
-inherits = SemiFlex or Flexfill 98A; *FLEXMINI*
+inherits = SemiFlex; *FLEXMINI*
 filament_vendor = Fillamentum
 first_layer_temperature = 240
 temperature = 240
 filament_max_volumetric_speed = 1.35
 filament_cost = 82.26
 filament_spool_weight = 230
+max_fan_speed = 60
+min_fan_speed = 60
 
 [filament:Generic FLEX @MINI]
-inherits = SemiFlex or Flexfill 98A; *FLEXMINI*
+inherits = SemiFlex; *FLEXMINI*
 filament_vendor = Generic
 fan_always_on = 0
 bridge_fan_speed = 80
@@ -3639,8 +3725,8 @@ filament_cost = 33.95
 bridge_fan_speed = 70
 fan_always_on = 1
 cooling = 0
-max_fan_speed = 50
-min_fan_speed = 50
+max_fan_speed = 60
+min_fan_speed = 60
 filament_max_volumetric_speed = 1.2
 compatible_printers_condition = nozzle_diameter[0]>0.35 and printer_model=="MINI"
 disable_fan_first_layers = 4
@@ -4080,6 +4166,8 @@ layer_height = 0.05
 [sla_print:0.1 Fast @SL1S]
 inherits = *SL1S*
 layer_height = 0.1
+support_head_front_diameter = 0.6
+support_head_penetration = 0.6
 
 ########### Materials