From c045a34fa03c172c3bc6644b4cceab551c84e41c Mon Sep 17 00:00:00 2001 From: Pascal de Bruijn Date: Wed, 15 Dec 2021 19:43:15 +0100 Subject: [PATCH 1/3] creality.ini: always output layer heights with two decimals --- 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 060556880..401682820 100644 --- a/resources/profiles/Creality.ini +++ b/resources/profiles/Creality.ini @@ -362,7 +362,7 @@ notes = overhangs = 0 only_retract_when_crossing_perimeters = 0 ooze_prevention = 0 -output_filename_format = {input_filename_base}_{print_time}_{layer_height}mm_{temperature[0]}C_{filament_type[0]}_{printer_model}.gcode +output_filename_format = {input_filename_base}_{print_time}_{digits(layer_height,1,2)}mm_{temperature[0]}C_{filament_type[0]}_{printer_model}.gcode perimeters = 2 perimeter_extruder = 1 perimeter_extrusion_width = 0.45 From f5d434901617cbca250847fc2cb36681d128099d Mon Sep 17 00:00:00 2001 From: Pascal de Bruijn Date: Wed, 15 Dec 2021 20:03:45 +0100 Subject: [PATCH 2/3] creality.ini: slight improvements to Ender-2 Pro Replace bed stl with something consistent with the rest Replace bed svg with something simpler consistent with the rest Add tiny safety margin --- resources/profiles/Creality.ini | 4 +- resources/profiles/Creality/ender2pro.svg | 624 +----------------- resources/profiles/Creality/ender2pro_bed.stl | Bin 4072 -> 35884 bytes 3 files changed, 5 insertions(+), 623 deletions(-) diff --git a/resources/profiles/Creality.ini b/resources/profiles/Creality.ini index 401682820..909052ae2 100644 --- a/resources/profiles/Creality.ini +++ b/resources/profiles/Creality.ini @@ -1014,10 +1014,10 @@ printer_notes = Don't remove the following keywords! These keywords are used in [printer:Creality Ender-2 Pro] inherits = *common* renamed_from = "Creality ENDER-2 Pro" -bed_shape = 0x0,165x0,165x165,0x165 +bed_shape = 2.5x2.5,160x2.5,160x160,2.5x160 max_print_height = 180 printer_model = ENDER2PRO -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_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_ENDER2PRO\nPRINTER_HAS_BOWDEN [printer:Creality CR-5 Pro] inherits = *common*; *slowabl*; *descendingz* diff --git a/resources/profiles/Creality/ender2pro.svg b/resources/profiles/Creality/ender2pro.svg index 1f8499d73..d5a14a613 100644 --- a/resources/profiles/Creality/ender2pro.svg +++ b/resources/profiles/Creality/ender2pro.svg @@ -1,622 +1,4 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/resources/profiles/Creality/ender2pro_bed.stl b/resources/profiles/Creality/ender2pro_bed.stl index ec0afb298c7685e1ae3fe2f73e399cb126b73ced..fdce98e1f1cfd8b42b336279480fba892c41859f 100644 GIT binary patch literal 35884 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 literal 4072 zcmcJS!A`?442JJKgi>GZ6F?>H0csINo{M&G->MUIsWqd zkGma*{;Px6z23cTo}S-dhEDf40H50reS+O^_}=zVo0n?LU4Y@|qz}*!!`^-b_|=D# z{)6>>wOWIESXJizb{?}gmm{+zz3ZmM&6S0?07g+XRP3&?yLfEFF0K!hDe7fanP3qj zN(EBBq?tu;KVXKq&|rTzF$d%r%}y#zR1Is*`=?Dlyi&ZBGZW!!6+Gx z-D$SsL>mnOya$)Y(~NV69y>wr2nF{q3fUZoQx0V2(x@QEf}|{=2~m!s#FM6+F6pYl zpA=}C$4fIhm+=d6S_qohWju<2gs4YQUS!?|lrW1es(XTgdDkB%%~F#I=iy_ zqBl#ZMi7d}+$acxVhiFaAwUU`Qc3vPAJ&XF&Ja3wu_WU!JVugfMOQZ-@2s7%mXZTx za2VH8(@e}-QXs5>yjwU+>KofFMxJGV;EDuiNojIFWc`UshrJKY@=B^Btr_cs^TYzF zx@zmTsas>|^Of7o(nOx^J7yq_pJ^_C+yYj(VgPX+_tkvU5_qhjxT9y)qHh(jzW_-9 From 37cfcadaddb76bbabeb1294774dfd4b2ce22c640 Mon Sep 17 00:00:00 2001 From: Pascal de Bruijn Date: Wed, 15 Dec 2021 20:14:01 +0100 Subject: [PATCH 3/3] creality.ini: add preliminary Ender-3 S1 --- resources/profiles/Creality.ini | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/resources/profiles/Creality.ini b/resources/profiles/Creality.ini index 909052ae2..2b05272e2 100644 --- a/resources/profiles/Creality.ini +++ b/resources/profiles/Creality.ini @@ -41,6 +41,15 @@ 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 Matt @CREALITY; Devil Design PLA Galaxy @CREALITY; Extrudr PLA NX2 @CREALITY; Real Filament PLA @CREALITY; Velleman PLA @CREALITY; 3DJAKE ecoPLA @CREALITY; 3DJAKE ecoPLA Matt @CREALITY; 3DJAKE ecoPLA Tough @CREALITY; 123-3D Jupiter PLA @CREALITY +[printer_model:ENDER3S1] +name = Creality Ender-3 S1 +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 Matt @CREALITY; Devil Design PLA Galaxy @CREALITY; Extrudr PLA NX2 @CREALITY; Real Filament PLA @CREALITY; Velleman PLA @CREALITY; 3DJAKE ecoPLA @CREALITY; 3DJAKE ecoPLA Matt @CREALITY; 3DJAKE ecoPLA Tough @CREALITY; 123-3D Jupiter PLA @CREALITY + [printer_model:ENDER3MAX] name = Creality Ender-3 Max variants = 0.4 @@ -952,6 +961,14 @@ max_print_height = 250 printer_model = ENDER3V2 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_ENDER3V2\nPRINTER_HAS_BOWDEN +[printer:Creality Ender-3 S1] +inherits = *common*; *fastabl* +retract_length = 1 +bed_shape = 5x0,215x0,215x220,5x220 +max_print_height = 270 +printer_model = ENDER3S1 +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_ENDER3S1 + [printer:Creality Ender-3 Max] inherits = *common* retract_length = 6