From f32947eec0042f7a0e83cdef70879219212eec24 Mon Sep 17 00:00:00 2001 From: Pascal de Bruijn Date: Mon, 12 Oct 2020 17:31:01 +0200 Subject: [PATCH 1/6] creality.ini: add family --- resources/profiles/Creality.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/profiles/Creality.ini b/resources/profiles/Creality.ini index 61e46349092..0c749d3718a 100644 --- a/resources/profiles/Creality.ini +++ b/resources/profiles/Creality.ini @@ -18,6 +18,7 @@ config_update_url = http://files.prusa3d.com/wp-content/uploads/repository/Prusa name = Creality Ender-3 variants = 0.4 technology = FFF +family = ENDER bed_model = ender3_bed.stl bed_texture = ender3.svg default_materials = Generic PLA @ENDER3; Generic PETG @ENDER3; Generic ABS @ENDER3; Prusament PLA @ENDER3; Prusament PETG @ENDER3 @@ -26,6 +27,7 @@ default_materials = Generic PLA @ENDER3; Generic PETG @ENDER3; Generic ABS @ENDE name = Creality Ender-3 BLTouch variants = 0.4 technology = FFF +family = ENDER bed_model = ender3_bed.stl bed_texture = ender3.svg default_materials = Generic PLA @ENDER3; Generic PETG @ENDER3; Generic ABS @ENDER3; Prusament PLA @ENDER3; Prusament PETG @ENDER3 @@ -34,6 +36,7 @@ default_materials = Generic PLA @ENDER3; Generic PETG @ENDER3; Generic ABS @ENDE name = Creality Ender-2 variants = 0.4 technology = FFF +family = ENDER bed_model = ender2_bed.stl bed_texture = ender2.svg default_materials = Generic PLA @ENDER3; Generic PETG @ENDER3; Generic ABS @ENDER3; Prusament PLA @ENDER3; Prusament PETG @ENDER3 From 26758478fd7ab1f7567d0a3570377719516f37be Mon Sep 17 00:00:00 2001 From: Pascal de Bruijn Date: Mon, 12 Oct 2020 17:34:05 +0200 Subject: [PATCH 2/6] creality.ini: fix printer section case --- resources/profiles/Creality.ini | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/profiles/Creality.ini b/resources/profiles/Creality.ini index 0c749d3718a..eb5f3a30a74 100644 --- a/resources/profiles/Creality.ini +++ b/resources/profiles/Creality.ini @@ -403,7 +403,7 @@ printer_model = default_print_profile = default_filament_profile = -[printer:Creality ENDER-3] +[printer:Creality Ender-3] inherits = *common* printer_model = ENDER3 printer_variant = 0.4 @@ -442,12 +442,12 @@ end_gcode = M104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; t [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 Z2 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* +[printer:Creality Ender-3 BLTouch] +inherits = Creality Ender-3; *abl* printer_model = ENDER3BLTOUCH -[printer:Creality ENDER-2] -inherits = Creality ENDER-3 +[printer:Creality Ender-2] +inherits = Creality Ender-3 bed_shape = 0x0,150x0,150x150,0x150 printer_model = ENDER2 max_print_height = 200 From 60af6a910b0847e109656490eeba6187658424ad Mon Sep 17 00:00:00 2001 From: Pascal de Bruijn Date: Mon, 12 Oct 2020 17:36:00 +0200 Subject: [PATCH 3/6] creality.ini: increase hotend wait for temp z height --- resources/profiles/Creality.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/profiles/Creality.ini b/resources/profiles/Creality.ini index eb5f3a30a74..35855786c8c 100644 --- a/resources/profiles/Creality.ini +++ b/resources/profiles/Creality.ini @@ -436,11 +436,11 @@ deretract_speed = 40 retract_before_wipe = 70% default_print_profile = 0.20mm NORMAL default_filament_profile = Creality PLA -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 +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 Z50 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 [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 Z2 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 +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* @@ -451,5 +451,5 @@ inherits = Creality Ender-3 bed_shape = 0x0,150x0,150x150,0x150 printer_model = ENDER2 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 +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 Z50 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 From 61e5735dd3a5ac1d052a3bf0c2e9b881d86fb97d Mon Sep 17 00:00:00 2001 From: Pascal de Bruijn Date: Mon, 12 Oct 2020 18:13:29 +0200 Subject: [PATCH 4/6] creality.ini: add PRINTER_HAS_BOWDEN for future use --- resources/profiles/Creality.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/profiles/Creality.ini b/resources/profiles/Creality.ini index 35855786c8c..331232f96ea 100644 --- a/resources/profiles/Creality.ini +++ b/resources/profiles/Creality.ini @@ -409,7 +409,7 @@ printer_model = ENDER3 printer_variant = 0.4 max_layer_height = 0.25 min_layer_height = 0.1 -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 +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 = 0x0,220x0,220x220,0x220 max_print_height = 250 machine_max_acceleration_e = 5000 From 879fa35fe0ad4d7ca08fb3d1bbd5d551dd96d820 Mon Sep 17 00:00:00 2001 From: Pascal de Bruijn Date: Mon, 12 Oct 2020 18:18:56 +0200 Subject: [PATCH 5/6] creality.ini: add model specific notes for ENDER2 --- resources/profiles/Creality.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/profiles/Creality.ini b/resources/profiles/Creality.ini index 331232f96ea..1f059f1f56a 100644 --- a/resources/profiles/Creality.ini +++ b/resources/profiles/Creality.ini @@ -450,6 +450,7 @@ printer_model = ENDER3BLTOUCH inherits = Creality Ender-3 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 Z50 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 From 8bc1f98ddac9a15e16c7d31a4542ca6ce3b1799a Mon Sep 17 00:00:00 2001 From: Pascal de Bruijn Date: Tue, 13 Oct 2020 17:12:19 +0200 Subject: [PATCH 6/6] creality.ini: partially revert z height for nonbltouch --- resources/profiles/Creality.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/profiles/Creality.ini b/resources/profiles/Creality.ini index 1f059f1f56a..96b81db4ceb 100644 --- a/resources/profiles/Creality.ini +++ b/resources/profiles/Creality.ini @@ -436,7 +436,7 @@ deretract_speed = 40 retract_before_wipe = 70% default_print_profile = 0.20mm NORMAL default_filament_profile = Creality PLA -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 Z50 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 +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 [printer:*abl*] @@ -452,5 +452,5 @@ 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 Z50 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 +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