creality.ini: consolidate more properties to *common*

resources/profiles/Creality.ini

@@ -712,7 +712,7 @@ printer_technology = FFF
 before_layer_gcode = ;BEFORE_LAYER_CHANGE\nG92 E0\n;[layer_z]\n\n
 between_objects_gcode = 
 pause_print_gcode = 
-deretract_speed = 0
+deretract_speed = 40
 extruder_colour = #FCE94F
 extruder_offset = 0x0
 gcode_flavor = marlin
@@ -735,23 +735,24 @@ machine_max_jerk_z = 0.4
 machine_min_extruding_rate = 0
 machine_min_travel_rate = 0
 layer_gcode = ;AFTER_LAYER_CHANGE\n;[layer_z]
-max_layer_height = 0.3
+max_layer_height = 0.28
-min_layer_height = 0.07
+min_layer_height = 0.08
 max_print_height = 250
 nozzle_diameter = 0.4
 printer_notes = 
 printer_settings_id = 
-retract_before_travel = 1
+printer_variant = 0.4
-retract_before_wipe = 0%
+retract_before_travel = 2
+retract_before_wipe = 70%
 retract_layer_change = 1
-retract_length = 1
+retract_length = 5
 retract_length_toolchange = 1
 retract_lift = 0
 retract_lift_above = 0
 retract_lift_below = 0
 retract_restart_extra = 0
 retract_restart_extra_toolchange = 0
-retract_speed = 35
+retract_speed = 60
 single_extruder_multi_material = 0
 toolchange_gcode = 
 use_firmware_retraction = 0
@@ -763,39 +764,6 @@ z_offset = 0
 printer_model = 
 default_print_profile = 0.16mm OPTIMAL @CREALITY
 default_filament_profile = Generic PLA @CREALITY
-
-[printer:Creality Ender-3]
-inherits = *common*
-renamed_from = "Creality ENDER-3"
-printer_model = ENDER3
-printer_variant = 0.4
-max_layer_height = 0.28
-min_layer_height = 0.08
-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_ENDER3\nPRINTER_HAS_BOWDEN
-bed_shape = 3x3,228x3,228x228,3x228
-max_print_height = 250
-machine_max_acceleration_e = 5000
-machine_max_acceleration_extruding = 500
-machine_max_acceleration_retracting = 1000
-machine_max_acceleration_x = 500
-machine_max_acceleration_y = 500
-machine_max_acceleration_z = 100
-machine_max_feedrate_e = 60
-machine_max_feedrate_x = 500
-machine_max_feedrate_y = 500
-machine_max_feedrate_z = 10
-machine_max_jerk_e = 5
-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
-nozzle_diameter = 0.4
-retract_before_travel = 2
-retract_length = 5
-retract_speed = 60
-deretract_speed = 40
-retract_before_wipe = 70%
 start_gcode = G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S120 ; set temporary nozzle temp to prevent oozing during homing and auto bed leveling\nM140 S[first_layer_bed_temperature] ; set final bed temp\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[first_layer_temperature] ; set final nozzle temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp to stabilize\nM109 S[first_layer_temperature] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0
 end_gcode = {if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+2, max_print_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < max_print_height-10}G1 Z{z_offset+min(max_layer_z+70, max_print_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{max_print_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors
 
@@ -842,19 +810,28 @@ retract_restart_extra_toolchange = 0,0
 retract_speed = 60,60
 wipe = 1,1
 
+[printer:Creality Ender-3]
+inherits = *common*
+renamed_from = "Creality ENDER-3"
+bed_shape = 3x3,228x3,228x228,3x228
+max_print_height = 250
+printer_model = ENDER3
+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_ENDER3\nPRINTER_HAS_BOWDEN
+
 [printer:Creality Ender-3 BLTouch]
 inherits = Creality Ender-3; *fastabl*
 renamed_from = "Creality ENDER-3 BLTouch"
 printer_model = ENDER3BLTOUCH
 
 [printer:Creality Ender-3 V2]
-inherits = Creality Ender-3
+inherits = *common*
 renamed_from = "Creality Ender-3V2"
-printer_model = ENDER3V2
 bed_shape = 5x0,215x0,215x220,5x220
+max_print_height = 250
+printer_model = ENDER3V2
 
 #[printer:Creality Ender-3 Max]
-#inherits = Creality Ender-3
+#inherits = *common*
 #retract_length = 6
 #bed_shape = 5x5,295x5,295x295,5x295
 #max_print_height = 340
@@ -862,14 +839,14 @@ bed_shape = 5x0,215x0,215x220,5x220
 #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_ENDER3MAX\nPRINTER_HAS_BOWDEN
 
 #[printer:Creality Ender-4]
-#inherits = Creality Ender-3; *descendingz*
+#inherits = *common*; *descendingz*
 #bed_shape = 5x0,215x0,215x220,5x220
 #max_print_height = 300
 #printer_model = ENDER4
 #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_ENDER4\nPRINTER_HAS_BOWDEN
 
 [printer:Creality Ender-5]
-inherits = Creality Ender-3; *descendingz*
+inherits = *common*; *descendingz*
 retract_length = 6
 bed_shape = 5x2.5,225x2.5,225x222.5,5x222.5
 max_print_height = 300
@@ -879,7 +856,7 @@ machine_max_acceleration_e = 1000
 machine_max_feedrate_z = 5
 
 [printer:Creality Ender-5 Plus]
-inherits = Creality Ender-3; *slowabl*; *descendingz*
+inherits = *common*; *slowabl*; *descendingz*
 retract_length = 6
 bed_shape = 5x5,355x5,355x355,5x355
 max_print_height = 400
@@ -891,14 +868,14 @@ machine_max_feedrate_x = 300
 machine_max_feedrate_y = 300
 
 #[printer:Creality Ender-6]
-#inherits = Creality Ender-3; *descendingz*
+#inherits = *common*; *descendingz*
 #bed_shape = 5x5,255x5,255x255,5x255
 #max_print_height = 400
 #printer_model = ENDER6
 #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_ENDER6\nPRINTER_HAS_BOWDEN
 
 [printer:Creality Ender-2]
-inherits = Creality Ender-3
+inherits = *common*
 renamed_from = "Creality ENDER-2"
 bed_shape = 0x0,150x0,150x150,0x150
 max_print_height = 200
@@ -906,13 +883,13 @@ 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
 
 #[printer:Creality CR-6 SE]
-#inherits = Creality Ender-3; *fastabl*; *pauseprint*
+#inherits = *common*; *fastabl*; *pauseprint*
 #bed_shape = 5x0,230x0,230x235,5x235
 #printer_model = CR6SE
 #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_CR6SE\nPRINTER_HAS_BOWDEN
 
 #[printer:Creality CR-6 Max]
-#inherits = Creality Ender-3; *slowabl*
+#inherits = *common*; *slowabl*
 #retract_length = 6
 #bed_shape = 5x5,395x5,395x395,5x395
 #max_print_height = 400
@@ -920,7 +897,7 @@ printer_notes = Don't remove the following keywords! These keywords are used in
 #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_CR6MAX\nPRINTER_HAS_BOWDEN
 
 [printer:Creality CR-10 Mini]
-inherits = Creality Ender-3
+inherits = *common*
 retract_length = 6
 bed_shape = 2.5x5,2.5x225,302.5x225,302.5x5
 max_print_height = 300
@@ -928,7 +905,7 @@ printer_model = CR10MINI
 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_CR10MINI\nPRINTER_HAS_BOWDEN
 
 #[printer:Creality CR-10 Max]
-#inherits = Creality Ender-3; *slowabl*
+#inherits = *common*; *slowabl*
 #retract_length = 6
 #bed_shape = 5x5,445x5,445x445,5x445
 #max_print_height = 470
@@ -936,7 +913,7 @@ printer_notes = Don't remove the following keywords! These keywords are used in
 #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_CR10MAX\nPRINTER_HAS_BOWDEN
 
 [printer:Creality CR-10]
-inherits = Creality Ender-3
+inherits = *common*
 retract_length = 6
 bed_shape = 5x5,305x5,305x305,5x305
 max_print_height = 400
@@ -944,7 +921,7 @@ 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
 
 [printer:Creality CR-10 V2]
-inherits = Creality Ender-3
+inherits = *common*
 retract_length = 6
 bed_shape = 5x5,305x5,305x305,5x305
 max_print_height = 400
@@ -952,7 +929,7 @@ printer_model = CR10V2
 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_CR10V2\nPRINTER_HAS_BOWDEN
 
 [printer:Creality CR-10 V3]
-inherits = Creality Ender-3
+inherits = *common*
 retract_length = 1
 bed_shape = 5x5,305x5,305x305,5x305
 max_print_height = 400
@@ -960,7 +937,7 @@ printer_model = CR10V3
 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_CR10V3
 
 [printer:Creality CR-10 S]
-inherits = Creality Ender-3
+inherits = *common*
 retract_length = 6
 bed_shape = 5x5,305x5,305x305,5x305
 max_print_height = 400
@@ -968,7 +945,7 @@ printer_model = CR10S
 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_CR10S\nPRINTER_HAS_BOWDEN
 
 [printer:Creality CR-10 S Pro]
-inherits = Creality Ender-3; *slowabl*
+inherits = *common*; *slowabl*
 retract_length = 6
 bed_shape = 5x5,295x5,295x295,5x295
 max_print_height = 400
@@ -976,7 +953,7 @@ printer_model = CR10SPRO
 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_CR10SPRO\nPRINTER_HAS_BOWDEN
 
 [printer:Creality CR-10 S Pro V2]
-inherits = Creality Ender-3; *slowabl*
+inherits = *common*; *slowabl*
 retract_length = 6
 bed_shape = 5x5,305x5,305x305,5x305
 max_print_height = 400
@@ -984,7 +961,7 @@ printer_model = CR10SPROV2
 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_CR10SPROV2\nPRINTER_HAS_BOWDEN
 
 [printer:Creality CR-10 S4]
-inherits = Creality Ender-3
+inherits = *common*
 retract_length = 6
 bed_shape = 5x5,395x5,395x395,5x395
 max_print_height = 400
@@ -992,7 +969,7 @@ printer_model = CR10S4
 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_CR10S4\nPRINTER_HAS_BOWDEN
 
 [printer:Creality CR-10 S5]
-inherits = Creality Ender-3
+inherits = *common*
 retract_length = 6
 bed_shape = 5x5,505x5,505x505,5x505
 max_print_height = 500
@@ -1000,25 +977,25 @@ printer_model = CR10S5
 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_CR10S5\nPRINTER_HAS_BOWDEN
 
 [printer:Creality CR-20]
-inherits = Creality Ender-3
+inherits = *common*
 printer_model = CR20
 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_CR20\nPRINTER_HAS_BOWDEN
 
 [printer:Creality CR-20 Pro]
-inherits = Creality Ender-3; *fastabl*
+inherits = *common*; *fastabl*
 retract_length = 4
 printer_model = CR20PRO
 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_CR20PRO\nPRINTER_HAS_BOWDEN
 
 #[printer:Creality CR-8]
-#inherits = Creality Ender-3
+#inherits = *common*
 #bed_shape = 5x5,215x5,215x215,5x215
 #max_print_height = 210
 #printer_model = CR8
 #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_CR8\nPRINTER_HAS_BOWDEN
 
 #[printer:Creality CR-X]
-#inherits = Creality Ender-3; *dualextruder*
+#inherits = *common*; *dualextruder*
 #retract_length = 6,6
 #bed_shape = 5x5,295x5,295x295,5x295
 #max_print_height = 400
@@ -1026,7 +1003,7 @@ printer_notes = Don't remove the following keywords! These keywords are used in
 #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_CRX\nPRINTER_HAS_BOWDEN
 
 #[printer:Creality CR-X Pro]
-#inherits = Creality Ender-3; *dualextruder*; *slowabl*
+#inherits = *common*; *dualextruder*; *slowabl*
 #retract_length = 6,6
 #bed_shape = 5x5,295x5,295x295,5x295
 #max_print_height = 400