update custom settings & icons1.42.0-alpha4.0

8 files changed, 281 insertions, 117 deletions

diff --git a/resources/icons/printers/Basic_Custom_1.75mm.png b/resources/icons/printers/Basic_Custom_1.75mm.png
new file mode 100644
index 000000000..ac7a16c9f
--- /dev/null
+++ b/resources/icons/printers/Basic_Custom_1.75mm.png
diff --git a/resources/icons/printers/Creality_CR-10.png b/resources/icons/printers/Creality_CR-10.png
new file mode 100644
index 000000000..a9a7bb000
--- /dev/null
+++ b/resources/icons/printers/Creality_CR-10.png
diff --git a/resources/icons/printers/Creality_CR10.png b/resources/icons/printers/Creality_CR10.png
deleted file mode 100644
index bdcd7295f..000000000
--- a/resources/icons/printers/Creality_CR10.png
+++ /dev/null
diff --git a/resources/icons/printers/Creality_CR10400.png b/resources/icons/printers/Creality_CR10400.png
deleted file mode 100644
index 535523eeb..000000000
--- a/resources/icons/printers/Creality_CR10400.png
+++ /dev/null
diff --git a/resources/icons/printers/Creality_CR10500.png b/resources/icons/printers/Creality_CR10500.png
deleted file mode 100644
index d198ace79..000000000
--- a/resources/icons/printers/Creality_CR10500.png
+++ /dev/null
diff --git a/resources/icons/printers/Creality_ENDER-3.png b/resources/icons/printers/Creality_ENDER-3.png
index 040986ae3..3edf74166 100644
--- a/resources/icons/printers/Creality_ENDER-3.png
+++ b/resources/icons/printers/Creality_ENDER-3.png
diff --git a/resources/profiles/Basic.ini b/resources/profiles/Basic.ini
index 2a1a1cbb2..e815b1280 100644
--- a/resources/profiles/Basic.ini
+++ b/resources/profiles/Basic.ini
@@ -14,13 +14,13 @@ config_update_url =
 #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:Custom175]
+[printer_model:Custom_1.75mm]
 name = Custom 1.75mm
-variants = 0.15; 0.2; 0.25; 0.3; 0.35; 0.4; 0.5; 0.6; 0.8; 1.0; 1.2;
+variants = 0.4; 0.15; 0.2; 0.25; 0.3; 0.35; 0.5; 0.6; 0.8; 1.0; 1.2;
 
-[printer_model:Custom250]
-name = Custom 2.5mm
-variants = 0.15; 0.2; 0.25; 0.3; 0.35; 0.4; 0.5; 0.6; 0.8; 1.0; 1.2;
+#[printer_model:Custom_2.5mm]
+#name = Custom 2.5mm
+#variants = 0.4; 0.15; 0.2; 0.25; 0.3; 0.35; 0.5; 0.6; 0.8; 1.0; 1.2;
 
 # All presets starting with asterisk, for example *common*, are intermediate and they will
 # not make it into the user interface.
@@ -51,7 +51,6 @@ wipe = 1
 z_offset = 0
 bed_shape = 0x0,200x0,200x200,0x200
 max_print_height = 200
-printer_model = Basic
 default_filament_profile = PLA
 
 
@@ -134,33 +133,43 @@ default_print_profile = 0.5mm
 
 [printer:Basic 0.15 nozzle]
 inherits = *common*; *0.15nozzle*
+printer_model = Custom_1.75mm
 
 [printer:Basic 0.2 nozzle]
 inherits = *common*; *0.2nozzle*
+printer_model = Custom_1.75mm
 
 [printer:Basic 0.25 nozzle]
 inherits = *common*; *0.25nozzle*
+printer_model = Custom_1.75mm
 
 [printer:Basic 0.3 nozzle]
 inherits = *common*; *0.3nozzle*
+printer_model = Custom_1.75mm
 
 [printer:Basic 0.4 nozzle]
 inherits = *common*; *0.4nozzle*
+printer_model = Custom_1.75mm
 
 [printer:Basic 0.5 nozzle]
 inherits = *common*; *0.5nozzle*
+printer_model = Custom_1.75mm
 
 [printer:Basic 0.6 nozzle]
 inherits = *common*; *0.6nozzle*
+printer_model = Custom_1.75mm
 
 [printer:Basic 0.8 nozzle]
 inherits = *common*; *0.8nozzle*
+printer_model = Custom_1.75mm
 
 [printer:Basic 1.0 nozzle]
 inherits = *common*; *1.0nozzle*
+printer_model = Custom_1.75mm
 
 [printer:Basic 1.2 nozzle]
 inherits = *common*; *1.2nozzle*
+printer_model = Custom_1.75mm
 
 
 # Common print preset, mostly derived from MK2 single material with a 0.4mm nozzle.
@@ -191,7 +200,6 @@ fill_angle = 45
 fill_density = 13%
 fill_pattern = gyroid
 first_layer_acceleration = 1000
-first_layer_extrusion_width = 130%
 first_layer_height = 50%
 first_layer_speed = 30
 gap_fill_speed = 40
@@ -267,64 +275,160 @@ wipe_tower_width = 60
 wipe_tower_x = 180
 wipe_tower_y = 140
 xy_size_compensation = 0
-external_perimeter_extrusion_width = 105%
-first_layer_extrusion_width = 130%
-infill_extrusion_width = 110%
-perimeter_extrusion_width = 110%
-solid_infill_extrusion_width = 110%
-top_infill_extrusion_width = 105%
-support_material_extrusion_width = 110%
 
 [print:*0.15nozzle*]
 perimeters = 6
 infill_overlap = 40%
+first_layer_height = 0.1
+compatible_printers_condition = nozzle_diameter[0]==0.15
+extrusion_width = 0.16
+external_perimeter_extrusion_width = 0.16
+first_layer_extrusion_width = 0.2
+infill_extrusion_width = 0.17
+perimeter_extrusion_width = 0.17
+solid_infill_extrusion_width = 0.17
+top_infill_extrusion_width = 0.16
+support_material_extrusion_width = 0.17
 
 [print:*0.2nozzle*]
 perimeters = 5
 infill_overlap = 35%
+first_layer_height = 0.14
+compatible_printers_condition = nozzle_diameter[0]==0.2
+extrusion_width = 0.21
+external_perimeter_extrusion_width = 0.22
+first_layer_extrusion_width = 0.3
+infill_extrusion_width = 0.22
+perimeter_extrusion_width = 0.22
+solid_infill_extrusion_width = 0.22
+top_infill_extrusion_width = 0.21
+support_material_extrusion_width = 0.22
 
 [print:*0.25nozzle*]
 perimeters = 4
 infill_overlap = 30%
+first_layer_height = 0.17
+compatible_printers_condition = nozzle_diameter[0]==0.25
+extrusion_width = 0.26
+external_perimeter_extrusion_width = 0.26
+first_layer_extrusion_width = 0.35
+infill_extrusion_width = 0.27
+perimeter_extrusion_width = 0.27
+solid_infill_extrusion_width = 0.27
+top_infill_extrusion_width = 0.26
+support_material_extrusion_width = 0.27
 
 [print:*0.3nozzle*]
 perimeters = 4
 infill_overlap = 25%
+first_layer_height = 0.2
+compatible_printers_condition = nozzle_diameter[0]==0.3
+extrusion_width = 0.32
+external_perimeter_extrusion_width = 0.32
+first_layer_extrusion_width = 0.45
+infill_extrusion_width = 0.33
+perimeter_extrusion_width = 0.33
+solid_infill_extrusion_width = 0.33
+top_infill_extrusion_width = 0.32
+support_material_extrusion_width = 0.33
 
 [print:*0.35nozzle*]
 perimeters = 3
 infill_overlap = 25%
+first_layer_height = 0.2
+compatible_printers_condition = nozzle_diameter[0]==0.35
+extrusion_width = 0.37
+external_perimeter_extrusion_width = 0.37
+first_layer_extrusion_width = 0.5
+infill_extrusion_width = 0.39
+perimeter_extrusion_width = 0.39
+solid_infill_extrusion_width = 0.39
+top_infill_extrusion_width = 0.37
+support_material_extrusion_width = 0.39
 
 [print:*0.4nozzle*]
 perimeters = 3
 infill_overlap = 25%
+compatible_printers_condition = nozzle_diameter[0]==0.4
+extrusion_width = 0.42
+external_perimeter_extrusion_width = 0.42
+first_layer_extrusion_width = 0.6
+infill_extrusion_width = 0.44
+perimeter_extrusion_width = 0.44
+solid_infill_extrusion_width = 0.44
+top_infill_extrusion_width = 0.42
+support_material_extrusion_width = 0.44
 
 [print:*0.5nozzle*]
 perimeters = 3
 infill_overlap = 20%
+compatible_printers_condition = nozzle_diameter[0]==0.5
+extrusion_width = 0.52
+external_perimeter_extrusion_width = 0.52
+first_layer_extrusion_width = 0.7
+infill_extrusion_width = 0.55
+perimeter_extrusion_width = 0.55
+solid_infill_extrusion_width = 0.55
+top_infill_extrusion_width = 0.52
+support_material_extrusion_width = 0.52
 
 [print:*0.6nozzle*]
 perimeters = 2
 infill_overlap = 15%
+compatible_printers_condition = nozzle_diameter[0]==0.6
+extrusion_width = 0.63
+external_perimeter_extrusion_width = 0.63
+first_layer_extrusion_width = 0.8
+infill_extrusion_width = 0.66
+perimeter_extrusion_width = 0.66
+solid_infill_extrusion_width = 0.66
+top_infill_extrusion_width = 0.63
+support_material_extrusion_width = 0.66
 
 [print:*0.8nozzle*]
 perimeters = 2
 infill_overlap = 15%
+compatible_printers_condition = nozzle_diameter[0]==0.8
+extrusion_width = 0.84
+external_perimeter_extrusion_width = 0.84
+first_layer_extrusion_width = 1
+infill_extrusion_width = 0.88
+perimeter_extrusion_width = 0.88
+solid_infill_extrusion_width = 0.88
+top_infill_extrusion_width = 0.84
+support_material_extrusion_width = 0.88
 
 [print:*1.0nozzle*]
 perimeters = 1
 infill_overlap = 10%
+compatible_printers_condition = nozzle_diameter[0]==1
+extrusion_width = 1.05
+external_perimeter_extrusion_width = 1.05
+first_layer_extrusion_width = 1.2
+infill_extrusion_width = 1.1
+perimeter_extrusion_width = 1.1
+solid_infill_extrusion_width = 1.1
+top_infill_extrusion_width = 1.05
+support_material_extrusion_width = 1.1
 
 [print:*1.2nozzle*]
 perimeters = 1
 infill_overlap = 10%
+compatible_printers_condition = nozzle_diameter[0]==1.2
+extrusion_width = 1.25
+external_perimeter_extrusion_width = 1.25
+first_layer_extrusion_width = 1.4
+infill_extrusion_width = 1.3
+perimeter_extrusion_width = 1.3
+solid_infill_extrusion_width = 1.3
+top_infill_extrusion_width = 1.25
+support_material_extrusion_width = 1.3
 
 [print:*0.08mm*]
 inherits = *common*
 bottom_solid_layers = 7
 top_solid_layers = 9
 layer_height = 0.08
-first_layer_height = 0.24
 bridge_flow_ratio = 0.7
 perimeter_acceleration = 400
 
@@ -333,7 +437,14 @@ inherits = *common*
 bottom_solid_layers = 5
 top_solid_layers = 6
 layer_height = 0.16
-first_layer_height = 0.24
+bridge_flow_ratio = 0.9
+
+
+[print:*0.24mm*]
+inherits = *common*
+bottom_solid_layers = 4
+top_solid_layers = 5
+layer_height = 0.24
 bridge_flow_ratio = 0.9
 
 [print:*0.32mm*]
@@ -341,7 +452,6 @@ inherits = *common*
 bottom_solid_layers = 3
 top_solid_layers = 4
 layer_height = 0.32
-first_layer_height = 0.24
 bridge_flow_ratio = 0.9
 
 [print:*0.48mm*]
@@ -349,7 +459,6 @@ inherits = *common*
 bottom_solid_layers = 2
 top_solid_layers = 3
 layer_height = 0.48
-first_layer_height = 0.24
 bridge_flow_ratio = 0.9
 
 
@@ -390,86 +499,131 @@ top_solid_layers = 3
 layer_height = 0.5
 
 
-[print:0.08mm DETAIL 0.2 nozzle]
-inherits = *0.08mm*; *0.2nozzle*
-compatible_printers_condition = printer_notes=~/.*creality.*/ and nozzle_diameter[0]==0.2
-external_perimeter_speed = 35
-infill_acceleration = 1500
-infill_speed = 100
-max_print_speed = 100
-perimeter_speed = 45
-solid_infill_speed = 60
-top_solid_infill_speed = 40
-bridge_speed = 30
 
-[print:0.08mm DETAIL 0.4 nozzle]
-inherits = *0.08mm*; *0.4nozzle*
-compatible_printers_condition = printer_notes=~/.*creality.*/ and nozzle_diameter[0]==0.4
-
-[print:0.08mm DETAIL 0.6 nozzle]
-inherits = *0.08mm*; *0.6nozzle*
-compatible_printers_condition = printer_notes=~/.*creality.*/ and nozzle_diameter[0]==0.6
-external_perimeter_speed = 35
-fill_pattern = grid
-infill_acceleration = 1500
-infill_speed = 100
-max_print_speed = 100
-perimeter_speed = 45
-solid_infill_speed = 60
-top_solid_infill_speed = 40
-bridge_speed = 30
-
-[print:0.08mm DETAIL 0.8 nozzle]
-inherits = *0.08mm*; *0.8nozzle*
-compatible_printers_condition = printer_notes=~/.*creality.*/ and nozzle_diameter[0]==0.8
-external_perimeter_speed = 35
-fill_pattern = grid
-infill_acceleration = 1500
-infill_speed = 100
-max_print_speed = 100
-perimeter_speed = 45
-solid_infill_speed = 60
-top_solid_infill_speed = 40
-bridge_speed = 30
 
-[print:0.16mm NORMAL 0.2 nozzle]
+[print:0.05mm NORMAL.15N]
+inherits = *0.05mm*; *0.15nozzle*
+[print:0.08mm NORMAL .15N]
+inherits = *0.08mm*; *0.15nozzle*
+[print:0.10mm SPEED .15N]
+inherits = *0.1mm*; *0.15nozzle*
+
+[print:0.05mm FINE .2N]
+inherits = *0.05mm*; *0.2nozzle*
+[print:0.08mm NORMAL .2N]
+inherits = *0.08mm*; *0.2nozzle*
+[print:0.10mm NORMAL .2N]
+inherits = *0.1mm*; *0.2nozzle*
+[print:0.16mm SPEED .2N]
 inherits = *0.16mm*; *0.2nozzle*
-compatible_printers_condition = printer_notes=~/.*creality.*/ and nozzle_diameter[0]==0.2
-fill_pattern = grid
 
-[print:0.16mm NORMAL 0.4 nozzle]
+[print:0.05mm FINE .25N]
+inherits = *0.05mm*; *0.25nozzle*
+[print:0.08mm FINE .25N]
+inherits = *0.08mm*; *0.25nozzle*
+[print:0.10mm NORMAL .25N]
+inherits = *0.1mm*; *0.25nozzle*
+[print:0.16mm NORMAL .25N]
+inherits = *0.16mm*; *0.25nozzle*
+[print:0.20mm SPEED .25N]
+inherits = *0.2mm*; *0.25nozzle*
+
+[print:0.05mm EXTRA FINE .3N]
+inherits = *0.05mm*; *0.3nozzle*
+[print:0.08mm FINE .3N]
+inherits = *0.08mm*; *0.3nozzle*
+[print:0.10mm FINE .3N]
+inherits = *0.1mm*; *0.3nozzle*
+[print:0.16mm NORMAL .3N]
+inherits = *0.16mm*; *0.3nozzle*
+[print:0.20mm SPEED .3N]
+inherits = *0.2mm*; *0.3nozzle*
+[print:0.24mm SPEED .3N]
+inherits = *0.24mm*; *0.3nozzle*
+
+[print:0.05mm EXTRA FINE .4N]
+inherits = *0.05mm*; *0.4nozzle*
+[print:0.08mm EXTRA FINE .4N]
+inherits = *0.08mm*; *0.4nozzle*
+[print:0.10mm FINE .4N]
+inherits = *0.1mm*; *0.4nozzle*
+[print:0.16mm NORMAL .4N]
 inherits = *0.16mm*; *0.4nozzle*
-compatible_printers_condition = printer_notes=~/.*creality.*/ and nozzle_diameter[0]==0.4
-
-[print:0.16mm FINE 0.6 nozzle]
-inherits = *0.16mm*; *0.6nozzle*
-compatible_printers_condition = printer_notes=~/.*creality.*/ and nozzle_diameter[0]==0.6
-
-[print:0.16mm FINE 0.8 nozzle]
-inherits = *0.16mm*; *0.8nozzle*
-compatible_printers_condition = printer_notes=~/.*creality.*/ and nozzle_diameter[0]==0.8
-
-[print:0.32mm SPEED 0.4 nozzle]
+[print:0.20mm NORMAL .4N]
+inherits = *0.2mm*; *0.4nozzle*
+[print:0.24mm SPEED .4N]
+inherits = *0.24mm*; *0.4nozzle*
+[print:0.30mm SPEED .4N]
+inherits = *0.3mm*; *0.4nozzle*
+[print:0.32mm SPEED .4N]
 inherits = *0.32mm*; *0.4nozzle*
-compatible_printers_condition = printer_notes=~/.*creality.*/ and nozzle_diameter[0]==0.4
-fill_pattern = grid
 
-[print:0.32mm SPEED 0.6 nozzle]
+[print:0.10mm FINE .5N]
+inherits = *0.1mm*; *0.5nozzle*
+[print:0.16mm FINE .5N]
+inherits = *0.16mm*; *0.5nozzle*
+[print:0.20mm NORMAL .5N]
+inherits = *0.2mm*; *0.5nozzle*
+[print:0.24mm NORMAL .5N]
+inherits = *0.24mm*; *0.5nozzle*
+[print:0.30mm SPEED .5N]
+inherits = *0.3mm*; *0.5nozzle*
+[print:0.32mm SPEED .5N]
+inherits = *0.32mm*; *0.5nozzle*
+
+[print:0.10mm EXTRA FINE .6N]
+inherits = *0.1mm*; *0.6nozzle*
+[print:0.16mm FINE .6N]
+inherits = *0.16mm*; *0.6nozzle*
+[print:0.20mm FINE .6N]
+inherits = *0.2mm*; *0.6nozzle*
+[print:0.24mm NORMAL .6N]
+inherits = *0.24mm*; *0.6nozzle*
+[print:0.30mm NORMAL .6N]
+inherits = *0.3mm*; *0.6nozzle*
+[print:0.32mm NORMAL .6N]
 inherits = *0.32mm*; *0.6nozzle*
-compatible_printers_condition = printer_notes=~/.*creality.*/ and nozzle_diameter[0]==0.6
-fill_pattern = grid
- 
-[print:0.32mm NORMAL 0.8 nozzle]
-inherits = *0.32mm*; *0.8nozzle*
-compatible_printers_condition = printer_notes=~/.*creality.*/ and nozzle_diameter[0]==0.8
-
-[print:0.48mm SPEED 0.6 nozzle]
+[print:0.40mm SPEED .6N]
+inherits = *0.4mm*; *0.6nozzle*
+[print:0.48mm SPEED .6N]
 inherits = *0.48mm*; *0.6nozzle*
-compatible_printers_condition = printer_notes=~/.*creality.*/ and nozzle_diameter[0]==0.6
 
-[print:0.48mm SPEED 0.8 nozzle]
+[print:0.20mm FINE .8N]
+inherits = *0.2mm*; *0.8nozzle*
+[print:0.24mm FINE .8N]
+inherits = *0.24mm*; *0.8nozzle*
+[print:0.30mm NORMAL .8N]
+inherits = *0.3mm*; *0.8nozzle*
+[print:0.32mm NORMAL .8N]
+inherits = *0.32mm*; *0.8nozzle*
+[print:0.40mm NORMAL .8N]
+inherits = *0.4mm*; *0.8nozzle*
+[print:0.48mm NORMAL .8N]
 inherits = *0.48mm*; *0.8nozzle*
-compatible_printers_condition = printer_notes=~/.*creality.*/ and nozzle_diameter[0]==0.8
+[print:0.50mm SPEED .8N]
+inherits = *0.5mm*; *0.8nozzle*
+
+[print:0.30mm FINE 1N]
+inherits = *0.3mm*; *1.0nozzle*
+[print:0.32mm FINE 1N]
+inherits = *0.32mm*; *1.0nozzle*
+[print:0.40mm FINE 1N]
+inherits = *0.4mm*; *1.0nozzle*
+[print:0.48mm NORMAL 1N]
+inherits = *0.48mm*; *1.0nozzle*
+[print:0.50mm NORMAL 1N]
+inherits = *0.5mm*; *1.0nozzle*
+
+[print:0.30mm FINE 1.2N]
+inherits = *0.3mm*; *1.2nozzle*
+[print:0.32mm FINE 1.2N]
+inherits = *0.32mm*; *1.2nozzle*
+[print:0.40mm FINE 1.2N]
+inherits = *0.4mm*; *1.2nozzle*
+[print:0.48mm NORMAL 1.2N]
+inherits = *0.48mm*; *1.2nozzle*
+[print:0.50mm NORMAL 1.2N]
+inherits = *0.5mm*; *1.2nozzle*
 
 
 [filament:*common*]
@@ -502,57 +656,60 @@ start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}200{el
 [filament:PLA Gererique]
 inherits = *common*
 bed_temperature = 60
-bridge_fan_speed = 100
-disable_fan_first_layers = 1
-fan_always_on = 1
 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_temperature = 215
+disable_fan_first_layers = 1
+fan_always_on = 1
 max_fan_speed = 100
 min_fan_speed = 100
+bridge_fan_speed = 100
+top_fan_speed = 100
 temperature = 205
 
 [filament:PET Gererique]
 inherits = *common*
 bed_temperature = 70
-
-bridge_fan_speed = 50
 cooling = 0
 disable_fan_first_layers = 3
-fan_always_on = 1
 fan_below_layer_time = 20
 filament_colour = #FF8000
 filament_max_volumetric_speed = 8
 filament_type = PET
+filament_density = 1.45
+filament_cost = 30
 first_layer_bed_temperature =70
 first_layer_temperature = 230
-max_fan_speed = 30
+fan_always_on = 1
+max_fan_speed = 40
 min_fan_speed = 20
-
-
+bridge_fan_speed = 100
+top_fan_speed = 20
 start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}200{else}45{endif}; Filament gcode"
 temperature = 238
 
 [filament:ABS Gererique]
 inherits = *common*
 bed_temperature = 90
-
-bridge_fan_speed = 30
 cooling = 0
 disable_fan_first_layers = 3
-fan_always_on = 0
 fan_below_layer_time = 20
 filament_colour = #3A80CA
 filament_max_volumetric_speed = 11
 filament_ramming_parameters = "120 100 5.70968 6.03226 7 8.25806 9 9.19355 9.3871 9.77419 10.129 10.3226 10.4516 10.5161| 0.05 5.69677 0.45 6.15484 0.95 8.76774 1.45 9.20323 1.95 9.95806 2.45 10.3871 2.95 10.5677 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6"
 filament_type = ABS
+filament_density = 1.04
+filament_cost = 20
 first_layer_bed_temperature = 100
 first_layer_temperature = 238
+fan_always_on = 0
 max_fan_speed = 0
 min_fan_speed = 0
-
-
-temperature = 238
+bridge_fan_speed = 30
+top_fan_speed = 0
+temperature = 238
\ No newline at end of file
diff --git a/resources/profiles/Creality.ini b/resources/profiles/Creality.ini
index 14e8f4513..bafa4a6e7 100644
--- a/resources/profiles/Creality.ini
+++ b/resources/profiles/Creality.ini
@@ -18,6 +18,10 @@ config_update_url =
 name = Creality ENDER-3
 variants = 0.4; 0.2; 0.6
 
+[printer_model:CR-10]
+name = Creality CR-10
+variants = 0.4; 0.2; 0.6
+
 # All presets starting with asterisk, for example *common*, are intermediate and they will
 # not make it into the user interface.
 
@@ -76,7 +80,7 @@ default_print_profile = 0.32mm NORMAL 0.6 nozzle
 
 [printer:*ENDER-3*]
 inherits = *common*
-bed_shape = 0x-10,220x-10,220x220,0x220
+bed_shape = 0x2,220x2,220x220,0x220
 max_print_height = 250
 printer_model = ENDER-3
 machine_max_acceleration_e = 5000
@@ -464,57 +468,60 @@ start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}200{el
 [filament:PLA Gererique]
 inherits = *common*
 bed_temperature = 60
-bridge_fan_speed = 100
-disable_fan_first_layers = 1
-fan_always_on = 1
 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_temperature = 215
+disable_fan_first_layers = 1
+fan_always_on = 1
 max_fan_speed = 100
 min_fan_speed = 100
+bridge_fan_speed = 100
+top_fan_speed = 100
 temperature = 205
 
 [filament:PET Gererique]
 inherits = *common*
 bed_temperature = 70
-
-bridge_fan_speed = 50
 cooling = 0
 disable_fan_first_layers = 3
-fan_always_on = 1
 fan_below_layer_time = 20
 filament_colour = #FF8000
 filament_max_volumetric_speed = 8
 filament_type = PET
+filament_density = 1.45
+filament_cost = 30
 first_layer_bed_temperature =70
 first_layer_temperature = 230
-max_fan_speed = 30
+fan_always_on = 1
+max_fan_speed = 40
 min_fan_speed = 20
-
-
+bridge_fan_speed = 100
+top_fan_speed = 20
 start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}200{else}45{endif}; Filament gcode"
 temperature = 238
 
 [filament:ABS Gererique]
 inherits = *common*
 bed_temperature = 90
-
-bridge_fan_speed = 30
 cooling = 0
 disable_fan_first_layers = 3
-fan_always_on = 0
 fan_below_layer_time = 20
 filament_colour = #3A80CA
 filament_max_volumetric_speed = 11
 filament_ramming_parameters = "120 100 5.70968 6.03226 7 8.25806 9 9.19355 9.3871 9.77419 10.129 10.3226 10.4516 10.5161| 0.05 5.69677 0.45 6.15484 0.95 8.76774 1.45 9.20323 1.95 9.95806 2.45 10.3871 2.95 10.5677 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6"
 filament_type = ABS
+filament_density = 1.04
+filament_cost = 20
 first_layer_bed_temperature = 100
 first_layer_temperature = 238
+fan_always_on = 0
 max_fan_speed = 0
 min_fan_speed = 0
-
-
+bridge_fan_speed = 30
+top_fan_speed = 0
 temperature = 238