Update to wizzard: add a thumbnail parameter ; don't auto-select prus…

…a mini if no printer installed also some merge for creality printers, and fix some problem in it. relax the min/max version for the profile, i don't have the resource to check & modify these for each release.
supermerill · Mar 26, 2020 · cc96564 · cc96564
1 parent d1bb656
commit cc96564
Show file tree

Hide file tree

Showing 15 changed files with 174 additions and 102 deletions.
diff --git a/resources/profiles/BIBO.idx b/resources/profiles/BIBO.idx
@@ -8,6 +8,6 @@ min_slic3r_version = 2.2.0-alpha3
 0.0.1-alpha8 Available to community Early adopters for testing. Corrected filament settings to prevent duplicates, and reworked start and end gcode.
 # The following line (max_slic3r_version) forces the users of PrusaSlicer 2.2.0-alpha3 and newer to update the profiles to 0.0.1-alpha12 and newer,
 # so they will see the print bed.
-max_slic3r_version = 2.2.0-alpha2
-min_slic3r_version = 2.2.0-alpha0
+max_slic3r_version = 12.2.0
+min_slic3r_version = 2.1.0
 0.0.1-alpha Initial version
diff --git a/resources/profiles/Basic.ini b/resources/profiles/Basic.ini
@@ -17,6 +17,12 @@ config_update_url =
 [printer_model:Custom_1.75mm]
 name = Custom 1.75mm
 variants = 0.4; 0.15; 0.2; 0.25; 0.3; 0.35; 0.5; 0.6; 0.8; 1.0; 1.2;
+thumbnail = Basic_thumbnail.png
+
+[printer_model:Bowden_1.75mm]
+name = Bowden 1.75mm
+variants = 0.4; 0.15; 0.2; 0.25; 0.3; 0.35; 0.5; 0.6; 0.8; 1.0; 1.2;
+thumbnail = Basic_thumbnail.png
 
 #[printer_model:Custom_2.5mm]
 #name = Custom 2.5mm
@@ -173,6 +179,43 @@ printer_model = Custom_1.75mm
 inherits = *common*; *1.2nozzle*
 printer_model = Custom_1.75mm
 
+[printer:*bowden*]
+inherits = *common*
+retract_length = 8
+retract_speed = 60
+deretract_speed = 40
+printer_model = Bowden_1.75mm
+
+
+[printer:Bowden 0.15 nozzle]
+inherits = *bowden*; *0.15nozzle*
+
+[printer:Bowden 0.2 nozzle]
+inherits = *bowden*; *0.2nozzle*
+
+[printer:Bowden 0.25 nozzle]
+inherits = *bowden*; *0.25nozzle*
+
+[printer:Bowden 0.3 nozzle]
+inherits = *bowden*; *0.3nozzle*
+
+[printer:Bowden 0.4 nozzle]
+inherits = *bowden*; *0.4nozzle*
+
+[printer:Bowden 0.5 nozzle]
+inherits = *bowden*; *0.5nozzle*
+
+[printer:Bowden 0.6 nozzle]
+inherits = *bowden*; *0.6nozzle*
+
+[printer:Bowden 0.8 nozzle]
+inherits = *bowden*; *0.8nozzle*
+
+[printer:Bowden 1.0 nozzle]
+inherits = *bowden*; *1.0nozzle*
+
+[printer:Bowden 1.2 nozzle]
+inherits = *bowden*; *1.2nozzle*
 
 # Common print preset, mostly derived from MK2 single material with a 0.4mm nozzle.
 # All other print presets will derive from the *common* print preset.
@@ -595,14 +638,14 @@ start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}200{el
 
 [filament:Basic PLA]
 inherits = *common*
-bed_temperature = 60
+bed_temperature = 55
 fan_below_layer_time = 100
 filament_colour = #FF3232
 filament_max_volumetric_speed = 15
 filament_type = PLA
 filament_density = 1.24
 filament_cost = 20
-first_layer_bed_temperature = 60
+first_layer_bed_temperature = 55
 first_layer_temperature = 215
 disable_fan_first_layers = 1
 fan_always_on = 1
@@ -646,7 +689,7 @@ filament_type = ABS
 filament_density = 1.04
 filament_cost = 20
 first_layer_bed_temperature = 100
-first_layer_temperature = 238
+first_layer_temperature = 250
 fan_always_on = 0
 max_fan_speed = 0
 min_fan_speed = 0

diff --git a/resources/profiles/Creality.idx b/resources/profiles/Creality.idx
@@ -5,6 +5,7 @@ min_slic3r_version = 2.2.0-alpha3
 0.0.2-alpha0 Print bed textures are now configurable from the Preset Bundle. Requires PrusaSlicer 2.2.0-alpha3 and newer.
 # The following line (max_slic3r_version) forces the users of PrusaSlicer 2.2.0-alpha3 and newer to update the profiles to 1.1.1-alpha3 and newer,
 # so they will see the print bed.
-max_slic3r_version = 2.2.0-alpha2
-min_slic3r_version = 2.2.0-alpha0
+max_slic3r_version = 12.2.0
+min_slic3r_version = 2.1.0
 0.0.1 Initial version
+0.0.2 Supermerill version
diff --git a/resources/profiles/Creality.ini b/resources/profiles/Creality.ini
@@ -25,11 +25,27 @@ default_materials = Creality PLA; Creality PETG; Creality ABS
 
 [printer_model:CR-10]
 name = Creality CR-10
-variants = 0.4; 0.2; 0.5; 0.6
+variants = 0.4; 0.2; 0.5; 0.6; 0.8
 technology = FFF
 family = CR-10
 default_materials = Creality PLA; Creality PETG; Creality ABS
 
+[printer_model:CR-10 Max]
+name = Creality CR-10 Max
+variants = 0.4; 0.2; 0.5; 0.6; 0.8
+technology = FFF
+family = CR-10
+default_materials = Creality PLA; Creality PETG; Creality ABS
+thumbnail = CR-10_thumbnail.png
+
+[printer_model:CR-10 S5]
+name = Creality CR-10 S5
+variants = 0.4; 0.2; 0.5; 0.6; 0.8
+technology = FFF
+family = CR-10
+default_materials = Creality PLA; Creality PETG; Creality ABS
+thumbnail = CR-10_thumbnail.png
+
 # All presets starting with asterisk, for example *common*, are intermediate and they will
 # not make it into the user interface.
 
@@ -155,6 +171,7 @@ machine_max_jerk_y = 8
 machine_max_jerk_z = 0.4
 machine_min_extruding_rate = 0
 machine_min_travel_rate = 0
+retract_length = 6
 retract_before_travel = 2
 retract_speed = 60
 deretract_speed = 40
@@ -166,12 +183,6 @@ printer_notes = Fan-made creality ender-3 printer profile. Please send me a gith
 
 [printer:ENDER-3 0.4 nozzle]
 inherits = *ENDER-3*; *0.4nozzle*
-nozzle_diameter = 0.4
-retract_before_travel = 0.5
-retract_length = 6
-retract_speed = 40
-default_print_profile = 0.16mm NORMAL 0.4 nozzle
-default_filament_profile = Creality PLA
 
 [printer:ENDER-3 0.4N MMU (manual)]
 inherits = *ENDER-3*; *0.4nozzle*
@@ -185,7 +196,6 @@ max_layer_height = 0.32
 min_layer_height = 0.07
 printer_variant = 0.4 manual MMU
 single_extruder_multi_material = 1
-single_extruder_multi_material_priming = 0
 toolchange_gcode = M600
 retract_layer_change = 0
 retract_restart_extra = 0
@@ -196,51 +206,79 @@ cooling_tube_retraction = 100
 
 [printer:ENDER-3 0.2 nozzle]
 inherits = *ENDER-3*; *0.2nozzle*
-nozzle_diameter = 0.4
-retract_before_travel = 0.5
-retract_length = 6
-retract_speed = 40
-default_print_profile = 0.16mm NORMAL 0.4 nozzle
-default_filament_profile = Creality PLA
+
+[printer:ENDER-3 0.5 nozzle]
+inherits = *ENDER-3*; *0.5nozzle*
 
 [printer:ENDER-3 0.6 nozzle]
 inherits = *ENDER-3*; *0.6nozzle*
-nozzle_diameter = 0.4
-retract_before_travel = 0.5
-retract_length = 6
-retract_speed = 40
-default_print_profile = 0.16mm NORMAL 0.4 nozzle
-default_filament_profile = Creality PLA
 
 
 [printer:*CR-10*]
 inherits = *common*
 bed_shape = 0x0,300x0,300x300,0x300
-max_print_height = 250
+max_print_height = 400
 printer_model = CR-10
 printer_notes = Fan-made creality cr-10 printer profile. Please send me a github issue if this profile need tweaking.\nPRINTER_HAS_BOWDEN
 
+[printer:*CR-10Max*]
+inherits = *common*
+bed_shape = 0x0,450x0,450x450,0x450
+max_print_height = 470
+printer_model = CR-10 Max
+printer_notes = Fan-made creality cr-10 printer profile. Please send me a github issue if this profile need tweaking.\nPRINTER_HAS_BOWDEN
+
+[printer:*CR-10S5*]
+inherits = *common*
+bed_shape = 0x0,500x0,500x500,0x500
+max_print_height = 500
+printer_model = CR-10 S5
+printer_notes = Fan-made creality cr-10 printer profile. Please send me a github issue if this profile need tweaking.\nPRINTER_HAS_BOWDEN
+
 [printer:CR-10 0.2 nozzle]
 inherits = *CR-10*; *0.2nozzle*
 
 [printer:CR-10 0.4 nozzle]
 inherits = *CR-10*; *0.4nozzle*
-nozzle_diameter = 0.4
-retract_before_travel = 0.5
-retract_length = 3
-retract_speed = 40
-variable_layer_height = 0
-printer_variant = 0.4
-default_print_profile = 0.16mm NORMAL 0.4 nozzle
+
+[printer:CR-10 0.5 nozzle]
+inherits = *CR-10*; *0.5nozzle*
 
 [printer:CR-10 0.6 nozzle]
 inherits = *CR-10*; *0.6nozzle*
-retract_before_travel = 0.6
-retract_length = 2.5
-retract_speed = 25
-nozzle_diameter = 0.6
-printer_variant = 0.6
-default_print_profile = 0.16mm FINE 0.6 nozzle
+
+[printer:CR-10 0.8 nozzle]
+inherits = *CR-10*; *0.8nozzle*
+
+[printer:CR-10 Max 0.2 nozzle]
+inherits = *CR-10Max*; *0.2nozzle*
+
+[printer:CR-10 Max 0.4 nozzle]
+inherits = *CR-10Max*; *0.4nozzle*
+
+[printer:CR-10 Max 0.5 nozzle]
+inherits = *CR-10Max*; *0.5nozzle*
+
+[printer:CR-10 Max 0.6 nozzle]
+inherits = *CR-10Max*; *0.6nozzle*
+
+[printer:CR-10 Max 0.8 nozzle]
+inherits = *CR-10Max*; *0.8nozzle*
+
+[printer:CR-10 S5 0.2 nozzle]
+inherits = *CR-10S5*; *0.2nozzle*
+
+[printer:CR-10 S5 0.4 nozzle]
+inherits = *CR-10S5*; *0.4nozzle*
+
+[printer:CR-10 S5 0.5 nozzle]
+inherits = *CR-10S5*; *0.5nozzle*
+
+[printer:CR-10 S5 0.6 nozzle]
+inherits = *CR-10S5*; *0.6nozzle*
+
+[printer:CR-10 S5 0.8 nozzle]
+inherits = *CR-10S5*; *0.8nozzle*
 
 # Common print preset, mostly derived from MK2 single material with a 0.4mm nozzle.
 # All other print presets will derive from the *common* print preset.
@@ -313,8 +351,9 @@ raft_layers = 0
 resolution = 0
 seam_position = hidden
 skirts = 0
-skirt_distance = 2
+skirt_distance = 6
 skirt_height = 3
+single_extruder_multi_material_priming = 0
 small_perimeter_speed = 25
 solid_infill_below_area = 0
 solid_infill_every_layers = 0
@@ -629,7 +668,6 @@ max_fan_speed = 40
 min_fan_speed = 20
 bridge_fan_speed = 100
 top_fan_speed = 20
-printer_notes=~/.*PRINTER_HAS_BOWDEN.*/
 temperature = 238
 
 [filament:Creality ABS]

diff --git a/resources/profiles/LulzBot.idx b/resources/profiles/LulzBot.idx
@@ -1,2 +1,2 @@
-min_slic3r_version = 2.2.0-alpha3
+min_slic3r_version = 2.1.0
 0.0.1 Initial version
diff --git a/resources/profiles/PrusaResearch.idx b/resources/profiles/PrusaResearch.idx
@@ -6,8 +6,8 @@ min_slic3r_version = 2.2.0-alpha3
 1.1.1-alpha3 Print bed textures are now configurable from the Preset Bundle. Requires PrusaSlicer 2.2.0-alpha3 and newer.
 # The following line (max_slic3r_version) forces the users of PrusaSlicer 2.2.0-alpha3 and newer to update the profiles to 1.1.1-alpha3 and newer,
 # so they will see the print bed.
-max_slic3r_version = 2.2.0-alpha2
-min_slic3r_version = 2.2.0-alpha0
+max_slic3r_version = 12.2.0
+min_slic3r_version = 2.1.0
 1.1.1-alpha2 Bumped up config version, so our in house customer will get updated profiles.
 1.1.0 Filament aliases, Creality profiles and other goodies for PrusaSlicer 2.2.0-alpha0
 min_slic3r_version = 2.1.1-beta0

diff --git a/resources/ui_layout/filament.ui b/resources/ui_layout/filament.ui
@@ -37,7 +37,7 @@ group:Cooling thresholds
 
 page:Advanced:wrench
 group:Filament properties
-	setting:filament_type
+	setting:width$7:filament_type
 	setting:filament_soluble
 group:Multimaterial toolchange temperature 
 	setting:filament_enable_toolchange_temp

diff --git a/resources/ui_layout/print.ui b/resources/ui_layout/print.ui
@@ -9,6 +9,11 @@ group:Horizontal shells
 		setting:top_solid_layers
 		setting:label$Bottom:bottom_solid_layers
 	end_line
+	line:Minimum shell thickness
+		setting:top_solid_min_thickness
+		setting:bottom_solid_min_thickness
+	end_line
+	top_bottom_shell_thickness_explanation
 	setting:enforce_full_fill_volume
 group:Quality (slower slicing)
 	line:Extra perimeters
@@ -120,6 +125,7 @@ group:Skirt
 	setting:skirts
 	setting:skirt_distance
 	setting:skirt_height
+	setting:draft_shield
 	setting:min_skirt_length
 group:Brim
 	setting:brim_width

diff --git a/resources/ui_layout/print.ui.legacy b/resources/ui_layout/print.ui.legacy
@@ -12,6 +12,11 @@ group:Horizontal shells
 		setting:top_solid_layers
 		setting:label$Bottom:bottom_solid_layers
 	end_line
+	line:Minimum shell thickness
+		setting:top_solid_min_thickness
+		setting:bottom_solid_min_thickness
+	end_line
+	top_bottom_shell_thickness_explanation
 	setting:enforce_full_fill_volume
 group:Quality (slower slicing)
 	setting:full_lablel:extra_perimeters
@@ -85,6 +90,7 @@ group:Skirt
 	setting:skirts
 	setting:skirt_distance
 	setting:skirt_height
+	setting:draft_shield
 	setting:min_skirt_length
 group:Brim
 	setting:brim_width

diff --git a/resources/ui_layout/printer_sla.ui b/resources/ui_layout/printer_sla.ui
@@ -28,6 +28,8 @@ group:Corrections
 		setting:label$Z:id$1:relative_correction
 	end_line
 	setting:absolute_correction
+	setting:elefant_foot_compensation
+	setting:elefant_foot_min_width
 	setting:gamma_correction
 group:Exposure
 	setting:min_exposure_time