Merge pull request #6079 from pmjdebruijn/creality_5

Creality Various

resources/profiles/Creality.ini

@@ -37,8 +37,8 @@ name = Creality Ender-3 V2
 variants = 0.4
 technology = FFF
 family = ENDER
-bed_model = ender3_bed.stl
-bed_texture = ender3.svg
+bed_model = ender3v2_bed.stl
+bed_texture = ender3v2.svg
 default_materials = Generic PLA @CREALITY; Generic PETG @CREALITY; Generic ABS @CREALITY; Creality PLA @CREALITY; Prusament PLA @CREALITY; Prusament PETG @CREALITY; AzureFilm PLA @CREALITY; Devil Design PLA @CREALITY; Devil Design PLA (Galaxy) @CREALITY; Extrudr PLA NX2 @CREALITY; Real Filament PLA @CREALITY; Velleman PLA @CREALITY; 3DJAKE ecoPLA @CREALITY; 123-3D Jupiter PLA @CREALITY
 
 #[printer_model:ENDER3MAX]
@@ -50,6 +50,15 @@ default_materials = Generic PLA @CREALITY; Generic PETG @CREALITY; Generic ABS @
 #bed_texture = cr10spro.svg
 #default_materials = Generic PLA @CREALITY; Generic PETG @CREALITY; Generic ABS @CREALITY; Creality PLA @CREALITY; Prusament PLA @CREALITY; Prusament PETG @CREALITY; AzureFilm PLA @CREALITY; Devil Design PLA @CREALITY; Devil Design PLA (Galaxy) @CREALITY; Extrudr PLA NX2 @CREALITY; Real Filament PLA @CREALITY; Velleman PLA @CREALITY; 3DJAKE ecoPLA @CREALITY; 123-3D Jupiter PLA @CREALITY
 
+#[printer_model:ENDER4]
+#name = Creality Ender-4
+#variants = 0.4
+#technology = FFF
+#family = ENDER
+#bed_model = ender3v2_bed.stl
+#bed_texture = ender3v2.svg
+#default_materials = Generic PLA @CREALITY; Generic PETG @CREALITY; Generic ABS @CREALITY; Creality PLA @CREALITY; Prusament PLA @CREALITY; Prusament PETG @CREALITY; AzureFilm PLA @CREALITY; Devil Design PLA @CREALITY; Devil Design PLA (Galaxy) @CREALITY; Extrudr PLA NX2 @CREALITY; Real Filament PLA @CREALITY; Velleman PLA @CREALITY; 3DJAKE ecoPLA @CREALITY; 123-3D Jupiter PLA @CREALITY
+
 [printer_model:ENDER5]
 name = Creality Ender-5
 variants = 0.4
@@ -212,6 +221,15 @@ bed_model = ender3_bed.stl
 bed_texture = cr20.svg
 default_materials = Generic PLA @CREALITY; Generic PETG @CREALITY; Generic ABS @CREALITY; Creality PLA @CREALITY; Prusament PLA @CREALITY; Prusament PETG @CREALITY; AzureFilm PLA @CREALITY; Devil Design PLA @CREALITY; Devil Design PLA (Galaxy) @CREALITY; Extrudr PLA NX2 @CREALITY; Real Filament PLA @CREALITY; Velleman PLA @CREALITY; 3DJAKE ecoPLA @CREALITY; 123-3D Jupiter PLA @CREALITY
 
+#[printer_model:CR8]
+#name = Creality CR-8
+#variants = 0.4
+#technology = FFF
+#family = CR
+#bed_model = cr8_bed.stl
+#bed_texture = cr8.svg
+#default_materials = Generic PLA @CREALITY; Generic PETG @CREALITY; Generic ABS @CREALITY; Creality PLA @CREALITY; Prusament PLA @CREALITY; Prusament PETG @CREALITY; AzureFilm PLA @CREALITY; Devil Design PLA @CREALITY; Devil Design PLA (Galaxy) @CREALITY; Extrudr PLA NX2 @CREALITY; Real Filament PLA @CREALITY; Velleman PLA @CREALITY; 3DJAKE ecoPLA @CREALITY; 123-3D Jupiter PLA @CREALITY
+
 #[printer_model:CRX]
 #name = Creality CR-X
 #variants = 0.4
@@ -794,8 +812,9 @@ start_gcode = G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104
 pause_print_gcode = M25 ; pause print
 
 # Intended for printers where the Z-axis lowers the print bed during printing, like the Ender-5 series
-[printer:*invertedz*]
-end_gcode = {if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+2, max_print_height)} F600{endif} ; Move print bed down\nG1 X50 Y50 F{travel_speed*60} ; present print\n{if max_layer_z < max_print_height-10}G1 Z{z_offset+max_print_height-10} F600{endif} ; Move print bed down further down\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors
+[printer:*descendingz*]
+renamed_from = "*invertedz*"
+end_gcode = {if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+2, max_print_height)} F600{endif} ; Move print bed down\nG1 X50 Y50 F{travel_speed*60} ; move print head out of the way\n{if max_layer_z < max_print_height-10}G1 Z{z_offset+max_print_height-10} F600{endif} ; Move print bed close to the bottom\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors
 
 # Intended for printers with dual extruders and a single hotend/nozzle, like the CR-X series
 [printer:*dualextruder*]
@@ -832,52 +851,59 @@ printer_model = ENDER3BLTOUCH
 inherits = Creality Ender-3
 renamed_from = "Creality Ender-3V2"
 printer_model = ENDER3V2
-bed_shape = 0x0,220x0,220x220,0x220
+bed_shape = 5x0,215x0,215x220,5x220
 
 #[printer:Creality Ender-3 Max]
 #inherits = Creality Ender-3
 #retract_length = 6
 #bed_shape = 5x5,295x5,295x295,5x295
+#max_print_height = 340
 #printer_model = ENDER3MAX
 #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
-#max_print_height = 340
+
+#[printer:Creality Ender-4]
+#inherits = Creality Ender-3; *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; *invertedz*
+inherits = Creality Ender-3; *descendingz*
 retract_length = 6
 bed_shape = 5x2.5,225x2.5,225x222.5,5x222.5
+max_print_height = 300
 printer_model = ENDER5
 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_ENDER5\nPRINTER_HAS_BOWDEN
-max_print_height = 300
 machine_max_acceleration_e = 1000
 machine_max_feedrate_z = 5
 
 [printer:Creality Ender-5 Plus]
-inherits = Creality Ender-3; *slowabl*; *invertedz*
+inherits = Creality Ender-3; *slowabl*; *descendingz*
 retract_length = 6
 bed_shape = 5x5,355x5,355x355,5x355
+max_print_height = 400
 printer_model = ENDER5PLUS
 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_ENDER5PLUS\nPRINTER_HAS_BOWDEN
-max_print_height = 400
 machine_max_acceleration_e = 1000
 machine_max_feedrate_z = 5
 machine_max_feedrate_x = 300
 machine_max_feedrate_y = 300
 
 #[printer:Creality Ender-6]
-#inherits = Creality Ender-3; *invertedz*
+#inherits = Creality Ender-3; *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
-#max_print_height = 400
 
 [printer:Creality Ender-2]
 inherits = Creality Ender-3
 renamed_from = "Creality ENDER-2"
 bed_shape = 0x0,150x0,150x150,0x150
+max_print_height = 200
 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
 
 #[printer:Creality CR-6 SE]
 #inherits = Creality Ender-3; *fastabl*; *pauseprint*
@@ -889,89 +915,89 @@ max_print_height = 200
 #inherits = Creality Ender-3; *slowabl*
 #retract_length = 6
 #bed_shape = 5x5,395x5,395x395,5x395
+#max_print_height = 400
 #printer_model = CR6MAX
 #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
-#max_print_height = 400
 
 [printer:Creality CR-10 Mini]
 inherits = Creality Ender-3
 retract_length = 6
 bed_shape = 2.5x5,2.5x225,302.5x225,302.5x5
+max_print_height = 300
 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
-max_print_height = 300
 
 #[printer:Creality CR-10 Max]
 #inherits = Creality Ender-3; *slowabl*
 #retract_length = 6
 #bed_shape = 5x5,445x5,445x445,5x445
+#max_print_height = 470
 #printer_model = CR10MAX
 #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
-#max_print_height = 470
 
 [printer:Creality CR-10]
 inherits = Creality Ender-3
 retract_length = 6
 bed_shape = 5x5,305x5,305x305,5x305
+max_print_height = 400
 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 V2]
 inherits = Creality Ender-3
 retract_length = 6
 bed_shape = 5x5,305x5,305x305,5x305
+max_print_height = 400
 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
-max_print_height = 400
 
 [printer:Creality CR-10 V3]
 inherits = Creality Ender-3
 retract_length = 1
 bed_shape = 5x5,305x5,305x305,5x305
+max_print_height = 400
 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
-max_print_height = 400
 
 [printer:Creality CR-10 S]
 inherits = Creality Ender-3
 retract_length = 6
 bed_shape = 5x5,305x5,305x305,5x305
+max_print_height = 400
 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
-max_print_height = 400
 
 [printer:Creality CR-10 S Pro]
 inherits = Creality Ender-3; *slowabl*
 retract_length = 6
 bed_shape = 5x5,295x5,295x295,5x295
+max_print_height = 400
 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
-max_print_height = 400
 
 [printer:Creality CR-10 S Pro V2]
 inherits = Creality Ender-3; *slowabl*
 retract_length = 6
 bed_shape = 5x5,305x5,305x305,5x305
+max_print_height = 400
 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
-max_print_height = 400
 
 [printer:Creality CR-10 S4]
 inherits = Creality Ender-3
 retract_length = 6
 bed_shape = 5x5,395x5,395x395,5x395
+max_print_height = 400
 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
-max_print_height = 400
 
 [printer:Creality CR-10 S5]
 inherits = Creality Ender-3
 retract_length = 6
 bed_shape = 5x5,505x5,505x505,5x505
+max_print_height = 500
 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
-max_print_height = 500
 
 [printer:Creality CR-20]
 inherits = Creality Ender-3
@@ -984,18 +1010,25 @@ 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
+#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*
 #retract_length = 6,6
 #bed_shape = 5x5,295x5,295x295,5x295
+#max_print_height = 400
 #printer_model = CRX
 #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
-#max_print_height = 400
 
 #[printer:Creality CR-X Pro]
 #inherits = Creality Ender-3; *dualextruder*; *slowabl*
 #retract_length = 6,6
 #bed_shape = 5x5,295x5,295x295,5x295
+#max_print_height = 400
 #printer_model = CRXPRO
 #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_CRXPRO\nPRINTER_HAS_BOWDEN
-#max_print_height = 400

resources/profiles/Creality/cr8.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="210mm" height="210mm" version="1.1" viewBox="0 0 210 210" xmlns="http://www.w3.org/2000/svg">
+  <rect x=".25" y=".25" width="209.5" height="209.5" fill="none" stroke="#fff" stroke-width=".5"/>
+</svg>

resources/profiles/Creality/ender3v2.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="210mm" height="220mm" version="1.1" viewBox="0 0 210 220" xmlns="http://www.w3.org/2000/svg">
+  <rect x=".25" y=".25" width="209.5" height="219.5" fill="none" stroke="#fff" stroke-width=".5"/>
+</svg>