Added CR-10. General improvements.

Based on https://github.com/prusa3d/PrusaSlicer/pull/5030

resources/profiles/Creality.idx

@@ -1,3 +1,5 @@
+min_slic3r_version = 2.3.0-alpha2
+0.0.4 Added initial CR-10 profile, end g-code improvements.
 min_slic3r_version = 2.3.0-alpha0
 0.0.3 Added Ender-2, Ender-3 BLTouch, updated Ender-3 bed texture.
 min_slic3r_version = 2.2.0-alpha3

resources/profiles/Creality.ini

@@ -5,7 +5,7 @@
 name = Creality
 # 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 = 0.0.3
+config_version = 0.0.4
 # Where to get the updates from?
 config_update_url = https://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/Creality/
 # changelog_url = https://files.prusa3d.com/?latest=slicer-profiles&lng=%1%
@@ -21,7 +21,7 @@ technology = FFF
 family = ENDER
 bed_model = ender3_bed.stl
 bed_texture = ender3.svg
-default_materials = Creality PLA @ENDER3; Generic PLA @ENDER3; Generic PETG @ENDER3; Generic ABS @ENDER3; Prusament PLA @ENDER3; Prusament PETG @ENDER3
+default_materials = Creality PLA @CREALITY; Generic PLA @CREALITY; Generic PETG @CREALITY; Generic ABS @CREALITY; Prusament PLA @CREALITY; Prusament PETG @CREALITY
 
 [printer_model:ENDER3BLTOUCH]
 name = Creality Ender-3 BLTouch
@@ -30,7 +30,7 @@ technology = FFF
 family = ENDER
 bed_model = ender3_bed.stl
 bed_texture = ender3.svg
-default_materials = Creality PLA @ENDER3; Generic PLA @ENDER3; Generic PETG @ENDER3; Generic ABS @ENDER3; Prusament PLA @ENDER3; Prusament PETG @ENDER3
+default_materials = Creality PLA @CREALITY; Generic PLA @CREALITY; Generic PETG @CREALITY; Generic ABS @CREALITY; Prusament PLA @CREALITY; Prusament PETG @CREALITY
 
 [printer_model:ENDER2]
 name = Creality Ender-2
@@ -39,7 +39,25 @@ technology = FFF
 family = ENDER
 bed_model = ender2_bed.stl
 bed_texture = ender2.svg
-default_materials = Creality PLA @ENDER3; Generic PLA @ENDER3; Generic PETG @ENDER3; Generic ABS @ENDER3; Prusament PLA @ENDER3; Prusament PETG @ENDER3
+default_materials = Creality PLA @CREALITY; Generic PLA @CREALITY; Generic PETG @CREALITY; Generic ABS @CREALITY; Prusament PLA @CREALITY; Prusament PETG @CREALITY
+
+[printer_model:CR10]
+name = Creality CR-10
+variants = 0.4
+technology = FFF
+family = CR
+bed_model = cr10_bed.stl
+bed_texture = cr10.svg
+default_materials = Creality PLA @CREALITY; Generic PLA @CREALITY; Generic PETG @CREALITY; Generic ABS @CREALITY; Prusament PLA @CREALITY; Prusament PETG @CREALITY
+
+[printer_model:CR10BLTOUCH]
+name = Creality CR-10 BLTouch
+variants = 0.4
+technology = FFF
+family = CR
+bed_model = cr10_bed.stl
+bed_texture = cr10.svg
+default_materials = Creality PLA @CREALITY; Generic PLA @CREALITY; Generic PETG @CREALITY; Generic ABS @CREALITY; Prusament PLA @CREALITY; Prusament PETG @CREALITY
 
 # All presets starting with asterisk, for example *common*, are intermediate and they will
 # not make it into the user interface.
@@ -176,30 +194,30 @@ top_infill_extrusion_width = 0.45
 bottom_solid_layers = 3
 top_solid_layers = 4
 
-[print:0.10mm HIGHDETAIL @ENDER3]
+[print:0.10mm HIGHDETAIL @CREALITY]
 inherits = *0.10mm*
-# alias = 0.10mm HIGHDETAIL
+renamed_from = "0.10mm HIGHDETAIL @ENDER3"
-compatible_printers_condition = printer_model=~/ENDER.*/ and nozzle_diameter[0]==0.4
+compatible_printers_condition = printer_model=~/(ENDER|CR).*/ and nozzle_diameter[0]==0.4
 
-[print:0.12mm DETAIL @ENDER3]
+[print:0.12mm DETAIL @CREALITY]
 inherits = *0.12mm*
-# alias = 0.12mm DETAIL
+renamed_from = "0.12mm DETAIL @ENDER3"
-compatible_printers_condition = printer_model=~/ENDER.*/ and nozzle_diameter[0]==0.4
+compatible_printers_condition = printer_model=~/(ENDER|CR).*/ and nozzle_diameter[0]==0.4
 
-[print:0.15mm OPTIMAL @ENDER3]
+[print:0.15mm OPTIMAL @CREALITY]
 inherits = *0.15mm*
-# alias = 0.15mm OPTIMAL
+renamed_from = "0.15mm OPTIMAL @ENDER3"
-compatible_printers_condition = printer_model=~/ENDER.*/ and nozzle_diameter[0]==0.4
+compatible_printers_condition = printer_model=~/(ENDER|CR).*/ and nozzle_diameter[0]==0.4
 
-[print:0.20mm NORMAL @ENDER3]
+[print:0.20mm NORMAL @CREALITY]
 inherits = *0.20mm*
-# alias = 0.20mm NORMAL
+renamed_from = "0.20mm NORMAL @ENDER3"
-compatible_printers_condition = printer_model=~/ENDER.*/ and nozzle_diameter[0]==0.4
+compatible_printers_condition = printer_model=~/(ENDER|CR).*/ and nozzle_diameter[0]==0.4
 
-[print:0.24mm DRAFT @ENDER3]
+[print:0.24mm DRAFT @CREALITY]
 inherits = *0.24mm*
-# alias = 0.24mm DRAFT
+renamed_from = "0.24mm DRAFT @ENDER3"
-compatible_printers_condition = printer_model=~/ENDER.*/ and nozzle_diameter[0]==0.4
+compatible_printers_condition = printer_model=~/(ENDER|CR).*/ and nozzle_diameter[0]==0.4
 
 # Common filament preset
 [filament:*common*]
@@ -246,7 +264,7 @@ filament_max_volumetric_speed = 8
 filament_type = PETG
 filament_density = 1.27
 filament_cost = 30
-first_layer_bed_temperature =70
+first_layer_bed_temperature = 70
 first_layer_temperature = 240
 fan_always_on = 1
 max_fan_speed = 50
@@ -274,70 +292,71 @@ bridge_fan_speed = 30
 top_fan_speed = 0
 temperature = 245
 
-[filament:Generic PLA @ENDER3]
+[filament:Generic PLA @CREALITY]
 inherits = *PLA*
-# alias = Generic PLA
+renamed_from = "Generic PLA @ENDER3"
 filament_vendor = Generic
 
-[filament:Generic PETG @ENDER3]
+[filament:Generic PETG @CREALITY]
 inherits = *PET*
+renamed_from = "Generic PETG @ENDER3"
 filament_vendor = Generic
 
-[filament:Generic ABS @ENDER3]
+[filament:Generic ABS @CREALITY]
 inherits = *ABS*
-# alias = Generic ABS
+renamed_from = "Generic ABS @ENDER3"
-first_layer_bed_temperature = 90		
+first_layer_bed_temperature = 90
 bed_temperature = 90
 filament_vendor = Generic
 
-[filament:Creality PLA @ENDER3]
+[filament:Creality PLA @CREALITY]
 inherits = *PLA*
-# alias = Creality PLA
+renamed_from = "Creality PLA @ENDER3"
 filament_vendor = Creality
 temperature = 205
 bed_temperature = 40
 first_layer_temperature = 210
-first_layer_bed_temperature =40
+first_layer_bed_temperature = 40
 
-[filament:Creality PETG @ENDER3]
+[filament:Creality PETG @CREALITY]
 inherits = *PET*
-# alias = Creality PETG
+renamed_from = "Creality PETG @ENDER3"
 filament_vendor = Creality
 temperature = 240
 bed_temperature = 70
 first_layer_temperature = 240
-first_layer_bed_temperature =70
+first_layer_bed_temperature = 70
 max_fan_speed = 40
 min_fan_speed = 20
 
-[filament:Creality ABS @ENDER3]
+[filament:Creality ABS @CREALITY]
 inherits = *ABS*
-# alias = Creality ABS
+renamed_from = "Creality ABS @ENDER3"
 filament_vendor = Creality
 temperature = 240
 bed_temperature = 90
 first_layer_temperature = 240
-first_layer_bed_temperature =90
+first_layer_bed_temperature = 90
 
-[filament:Prusament PLA @ENDER3]
+[filament:Prusament PLA @CREALITY]
 inherits = *PLA*
-# alias = Prusament PLA
+renamed_from = "Prusament PLA @ENDER3"
 filament_vendor = Prusa Polymers
 temperature = 215
 bed_temperature = 40
 first_layer_temperature = 215
-first_layer_bed_temperature =40
+first_layer_bed_temperature = 40
 filament_cost = 24.99
 filament_density = 1.24
 
-[filament:Prusament PETG @ENDER3]
+[filament:Prusament PETG @CREALITY]
 inherits = *PET*
-# alias = Prusament PETG
+renamed_from = "Prusament PETG @ENDER3"
 filament_vendor = Prusa Polymers
 temperature = 245
 bed_temperature = 70
 first_layer_temperature = 245
-first_layer_bed_temperature =70
+first_layer_bed_temperature = 70
 filament_cost = 24.99
 filament_density = 1.27
 
@@ -373,6 +392,8 @@ max_layer_height = 0.3
 min_layer_height = 0.07
 max_print_height = 200
 nozzle_diameter = 0.4
+octoprint_apikey = 
+octoprint_host = 
 printer_notes = 
 printer_settings_id = 
 retract_before_travel = 1
@@ -386,6 +407,8 @@ retract_lift_below = 0
 retract_restart_extra = 0
 retract_restart_extra_toolchange = 0
 retract_speed = 35
+serial_port = 
+serial_speed = 250000
 single_extruder_multi_material = 0
 toolchange_gcode = 
 use_firmware_retraction = 0
@@ -400,6 +423,7 @@ default_filament_profile =
 
 [printer:Creality Ender-3]
 inherits = *common*
+renamed_from = "Creality ENDER-3"
 printer_model = ENDER3
 printer_variant = 0.4
 max_layer_height = 0.25
@@ -422,30 +446,46 @@ machine_max_jerk_x = 8
 machine_max_jerk_y = 8
 machine_max_jerk_z = 0.4
 machine_min_extruding_rate = 0
-machine_min_travel_rate = 0 
+machine_min_travel_rate = 0
 nozzle_diameter = 0.4
 retract_before_travel = 2
 retract_length = 5
 retract_speed = 60
 deretract_speed = 40
 retract_before_wipe = 70%
-default_print_profile = 0.15mm OPTIMAL @ENDER3
+default_print_profile = 0.15mm OPTIMAL @CREALITY
-default_filament_profile = Creality PLA @ENDER3
+default_filament_profile = Creality PLA @CREALITY
 start_gcode = G90 ; use absolute coordinates\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 ; home all\nG1 Z2 F240\nG1 X2 Y10 F3000\nG1 Z0.28 F240\nG92 E0.0\nG1 Y190 E15.0 F1500.0 ; intro line\nG1 X2.3 F5000\nG1 Y10 E15.0 F1200.0 ; intro line\nG92 E0.0
-end_gcode = M104 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+10, max_print_height)} F600{endif} ; Move print head up\nG1 X0 Y200 F3000 ; present print\nM84 X Y E ; disable motors
+end_gcode = M104 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+5, max_print_height)} F600{endif} ; Move print head up\nG1 X5 Y170 F3000 ; present print\n{if layer_z < max_print_height}G1 Z{z_offset+min(layer_z+70, max_print_height)} F600{endif} ; Move print head up\nM84 X Y E ; disable motors
 
 [printer:*abl*]
 start_gcode = G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S150 ; set extruder temp for auto bed leveling\nM140 S[first_layer_bed_temperature] ; set bed temp\nG28 ; home all\nG29 ; auto bed levelling\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[first_layer_temperature] ; set extruder temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG1 Z0.28 F240\nG92 E0.0\nG1 Y190 E15.0 F1500.0 ; intro line\nG1 X2.3 F5000\nG1 Y10 E15.0 F1200.0 ; intro line\nG92 E0.0
 
 [printer:Creality Ender-3 BLTouch]
 inherits = Creality Ender-3; *abl*
+renamed_from = "Creality ENDER-3 BLTouch"
 printer_model = ENDER3BLTOUCH
 
 [printer:Creality Ender-2]
 inherits = Creality Ender-3
+renamed_from = "Creality ENDER-2"
 bed_shape = 0x0,150x0,150x150,0x150
 printer_model = ENDER2
 printer_notes = Don't remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_CREALITY\nPRINTER_MODEL_ENDER2\nPRINTER_HAS_BOWDEN
 max_print_height = 200
 start_gcode = G90 ; use absolute coordinates\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 ; home all\nG1 Z2 F240\nG1 X2 Y10 F3000\nG1 Z0.28 F240\nG92 E0.0\nG1 X15 Y135 E15.0 F1500.0 ; intro line\nG1 X2.3 F5000\nG1 Y10 E15.0 F1200.0 ; intro line\nG92 E0.0
-end_gcode = M104 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+10, max_print_height)} F600{endif} ; Move print head up\nG1 X0 Y140 F3000 ; present print\nM84 X Y E ; disable motors
+end_gcode = M104 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+5, max_print_height)} F600{endif} ; Move print head up\nG1 X5 Y140 F3000 ; present print\n{if layer_z < max_print_height}G1 Z{z_offset+min(layer_z+30, max_print_height)} F600{endif} ; Move print head up\nM84 X Y E ; disable motors
+
+[printer:Creality CR-10]
+inherits = Creality Ender-3
+bed_shape = 5x5,305x5,305x305,5x305
+printer_model = CR10
+printer_notes = Don't remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_CREALITY\nPRINTER_MODEL_CR10\nPRINTER_HAS_BOWDEN
+max_print_height = 400
+
+[printer:Creality CR-10 BLTouch]
+inherits = Creality Ender-3; *abl*
+bed_shape = 5x5,305x5,305x305,5x305
+printer_model = CR10BLTOUCH
+printer_notes = Don't remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_CREALITY\nPRINTER_MODEL_CR10\nPRINTER_HAS_BOWDEN
+max_print_height = 400