Skip to content

Commit

Permalink
General fixes and improvements to CR-10 SE, Ender-3 V3 KE, Ender-3 S1…
Browse files Browse the repository at this point in the history 
… Plus, & small fix for Ender-3 V3 SE (#4793)

* Replace M109 S[material_print_temperature_layer_0] with M109 S[first_layer_temperature]

* Change line width to match nozzle

* Change line_width for Ender-3 S1 Plus

* Update creality_cr10se_buildplate_model.stl

* Change line width to match nozzle size (Ender3v3SE)

* Fix Ender-3 S1 Plus 0.8 bed size

* Enable Z-hop for Ender-3 S1 Plus

* Trying something

* Update creality_ender3s1plus_buildplate_model.stl

* Fix CR-10 SE print size

* Various Flying Bear fixes

* Try fixing error

* Revert "Try fixing error"

This reverts commit e42e016.

* Add minor Ender-3 V3 KE improvements

* Maybe this will fix the error?

* Revert "Maybe this will fix the error?"

This reverts commit 5e78732.

* Revert "Various Flying Bear fixes"

This reverts commit babca57.

* Fix CR-10 SE G-Code

Recommended by @bkonosky

* Minor changes to Ender-3 V3 KE

* Probe when bed is heated (Ender-3 V3 KE)

* Minor changes to Ender-3 V3 KE

* Fix oozing (Ende-3 V3 KE)

* Change retraction settings

* Use different retraction settings

* Revert "Use different retraction settings"

This reverts commit 854decf.

* try this

* Remove "role_based_wipe_speed": "0",

* Add changes from  CR-10 SE Config #4966

* Add "role_based_wipe_speed" : "0",

* Up retraction speed

* Missed this

* Resolve merge conflicts

* Resolve merge conflicts

* Change retraction & wipe speed

* Revert line removal

* Change wipe_speed to 200mm/s

* Forgot the 0.16mm

* Add BED_MESH_CALIBRATE PROBE_COUNT=6,6

* Improve for Matte PLA

* Compensate for fan speed

* Fix CANCEL_PRINT bug

* Move SET_VELOCITY_LIMIT ACCEL_TO_DECEL=2500 to start g-code

* Disable infill combination for 0.2 & 0.24

* Fix end G-Code

* Disable arc fitting

This fixes the merge conflict

* temp

* Revert "temp"

This reverts commit 4bbc028.
  • Loading branch information
@cochcoder
cochcoder authored May 22, 2024
1 parent 31056f2 commit 9ffe7b0
Show file tree
Hide file tree
Showing 55 changed files with 2,241 additions and 479 deletions.
48 changes: 48 additions & 0 deletions resources/profiles/Creality.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,22 @@
"name": "0.12mm Fine @Creality CR10Max",
"sub_path": "process/0.12mm Fine @Creality CR10Max.json"
},
{
"name": "0.12mm Fine @Creality CR10SE 0.2",
"sub_path": "process/0.12mm Fine @Creality CR10SE 0.2.json"
},
{
"name": "0.12mm Fine @Creality CR10SE 0.4",
"sub_path": "process/0.12mm Fine @Creality CR10SE 0.4.json"
},
{
"name": "0.12mm Fine @Creality CR10SE 0.6",
"sub_path": "process/0.12mm Fine @Creality CR10SE 0.6.json"
},
{
"name": "0.12mm Fine @Creality CR10SE 0.8",
"sub_path": "process/0.12mm Fine @Creality CR10SE 0.8.json"
},
{
"name": "0.12mm Detail @Creality CR-6 0.2",
"sub_path": "process/0.12mm Detail @Creality CR-6 0.2.json"
Expand Down Expand Up @@ -358,6 +374,22 @@
"name": "0.15mm Optimal @Creality CR10Max",
"sub_path": "process/0.15mm Optimal @Creality CR10Max.json"
},
{
"name": "0.16mm Optimal @Creality CR10SE 0.2",
"sub_path": "process/0.16mm Optimal @Creality CR10SE 0.2.json"
},
{
"name": "0.16mm Optimal @Creality CR10SE 0.4",
"sub_path": "process/0.16mm Optimal @Creality CR10SE 0.4.json"
},
{
"name": "0.16mm Optimal @Creality CR10SE 0.6",
"sub_path": "process/0.16mm Optimal @Creality CR10SE 0.6.json"
},
{
"name": "0.16mm Optimal @Creality CR10SE 0.8",
"sub_path": "process/0.16mm Optimal @Creality CR10SE 0.8.json"
},
{
"name": "0.15mm Optimal @Creality Ender3V2",
"sub_path": "process/0.15mm Optimal @Creality Ender3V2.json"
Expand Down Expand Up @@ -670,6 +702,22 @@
"name": "0.24mm Draft @Creality CR10Max",
"sub_path": "process/0.24mm Draft @Creality CR10Max.json"
},
{
"name": "0.24mm Draft @Creality CR10SE 0.2",
"sub_path": "process/0.24mm Draft @Creality CR10SE 0.2.json"
},
{
"name": "0.24mm Draft @Creality CR10SE 0.4",
"sub_path": "process/0.24mm Draft @Creality CR10SE 0.4.json"
},
{
"name": "0.24mm Draft @Creality CR10SE 0.6",
"sub_path": "process/0.24mm Draft @Creality CR10SE 0.6.json"
},
{
"name": "0.24mm Draft @Creality CR10SE 0.8",
"sub_path": "process/0.24mm Draft @Creality CR10SE 0.8.json"
},
{
"name": "0.24mm Draft @Creality CR-6 0.4",
"sub_path": "process/0.24mm Draft @Creality CR-6 0.4.json"
Expand Down
Binary file modified resources/profiles/Creality/creality_cr10se_buildplate_model.stl
View file
Binary file not shown.
Binary file modified resources/profiles/Creality/creality_ender3s1plus_buildplate_model.stl
View file
Binary file not shown.
50 changes: 25 additions & 25 deletions resources/profiles/Creality/machine/Creality CR-10 SE 0.2 nozzle.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
],
"printable_area": [
"0x0",
"250x0",
"250x250",
"0x250"
"220x0",
"220x220",
"0x220"
],
"printable_height": "250",
"printable_height": "265",
"extruder_clearance_height_to_rod": "36",
"extruder_clearance_height_to_lid": "140",
"extruder_clearance_radius": "65",
Expand All @@ -28,8 +28,8 @@
"support_chamber_temp_control": "1",
"auxiliary_fan": "0",
"machine_max_acceleration_extruding": [
"20000",
"20000"
"5000",
"5000"
],
"machine_max_acceleration_retracting": [
"5000",
Expand All @@ -40,12 +40,12 @@
"20000"
],
"machine_max_acceleration_x": [
"20000",
"20000"
"8000",
"8000"
],
"machine_max_acceleration_y": [
"20000",
"20000"
"8000",
"8000"
],
"machine_max_acceleration_z": [
"500",
Expand All @@ -56,36 +56,36 @@
"5000"
],
"machine_max_speed_e": [
"25",
"25"
"100",
"100"
],
"machine_max_speed_x": [
"500",
"200"
"600",
"600"
],
"machine_max_speed_y": [
"500",
"200"
"600",
"600"
],
"machine_max_speed_z": [
"12",
"12"
"30",
"30"
],
"machine_max_jerk_e": [
"2.5",
"2.5"
],
"machine_max_jerk_x": [
"9",
"9"
"10",
"10"
],
"machine_max_jerk_y": [
"9",
"9"
"10",
"10"
],
"machine_max_jerk_z": [
"0.2",
"0.4"
"2",
"2"
],
"max_layer_height": [
"0.32"
Expand Down Expand Up @@ -118,7 +118,7 @@
"default_filament_profile": [
"Creality Generic PLA"
],
"machine_start_gcode": "M220 S100 ;Reset feed rate \nM221 S100 ;Reset flow rate \nG28 ;Home \nG92 E0 ;Reset extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position \nM109 S[material_print_temperature_layer_0] \nG1 X10.1 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line \nG1 X10.4 Y145.0 Z0.28 F5000.0 ;Move to side a little \nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line \nG92 E0 ;Reset extruder \nG1 E-1.0000 F1800 ;Retract a bit \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 E0.0000 F1800",
"machine_start_gcode": "M220 S100 ;Reset feed rate \nM221 S100 ;Reset flow rate \n\nM140 S[bed_temperature_initial_layer_single] ;Set final bed temp\nG28 ;Home \nG92 E0 ;Reset extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position \nM190 S[bed_temperature_initial_layer_single] ;Wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ;Wait for nozzle temp to stabilize\nG1 X10.1 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line \nG1 X10.4 Y145.0 Z0.28 F5000.0 ;Move to side a little \nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line \nG92 E0 ;Reset extruder \nG1 E-1.0000 F1800 ;Retract a bit \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 E0.0000 F1800",
"machine_end_gcode": "G91 ;Relative positioning \nG1 E-2 F2700 ;Retract a bit \nG1 E-2 Z0.2 F2400 ;Retract and raise Z \nG1 X5 Y5 F3000 ;Wipe out \nG1 Z3 ;Raise Z more \nG90 ;Absolute positioning \nG1 X2 Y218 F3000 ;Present print \nM106 S0 ;Turn-off fan \nM104 S0 ;Turn-off hotend \nM140 S0 ;Turn-off bed \nM84 X Y E ;Disable all steppers but Z",
"scan_first_layer": "0",
"thumbnails": [
Expand Down
50 changes: 25 additions & 25 deletions resources/profiles/Creality/machine/Creality CR-10 SE 0.4 nozzle.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
],
"printable_area": [
"0x0",
"250x0",
"250x250",
"0x250"
"220x0",
"220x220",
"0x220"
],
"printable_height": "250",
"printable_height": "265",
"extruder_clearance_height_to_rod": "36",
"extruder_clearance_height_to_lid": "140",
"extruder_clearance_radius": "65",
Expand All @@ -28,8 +28,8 @@
"support_chamber_temp_control": "1",
"auxiliary_fan": "0",
"machine_max_acceleration_extruding": [
"20000",
"20000"
"5000",
"5000"
],
"machine_max_acceleration_retracting": [
"5000",
Expand All @@ -40,12 +40,12 @@
"20000"
],
"machine_max_acceleration_x": [
"20000",
"20000"
"8000",
"8000"
],
"machine_max_acceleration_y": [
"20000",
"20000"
"8000",
"8000"
],
"machine_max_acceleration_z": [
"500",
Expand All @@ -56,36 +56,36 @@
"5000"
],
"machine_max_speed_e": [
"25",
"25"
"100",
"100"
],
"machine_max_speed_x": [
"500",
"200"
"600",
"600"
],
"machine_max_speed_y": [
"500",
"200"
"600",
"600"
],
"machine_max_speed_z": [
"12",
"12"
"30",
"30"
],
"machine_max_jerk_e": [
"2.5",
"2.5"
],
"machine_max_jerk_x": [
"9",
"9"
"10",
"10"
],
"machine_max_jerk_y": [
"9",
"9"
"10",
"10"
],
"machine_max_jerk_z": [
"0.2",
"0.4"
"2",
"2"
],
"max_layer_height": [
"0.32"
Expand Down Expand Up @@ -118,7 +118,7 @@
"default_filament_profile": [
"Creality Generic PLA"
],
"machine_start_gcode": "M220 S100 ;Reset feed rate \nM221 S100 ;Reset flow rate \nG28 ;Home \nG92 E0 ;Reset extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position \nM109 S[material_print_temperature_layer_0] \nG1 X10.1 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line \nG1 X10.4 Y145.0 Z0.28 F5000.0 ;Move to side a little \nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line \nG92 E0 ;Reset extruder \nG1 E-1.0000 F1800 ;Retract a bit \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 E0.0000 F1800",
"machine_start_gcode": "M220 S100 ;Reset feed rate \nM221 S100 ;Reset flow rate \n\nM140 S[bed_temperature_initial_layer_single] ;Set final bed temp\nG28 ;Home \nG92 E0 ;Reset extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position \nM190 S[bed_temperature_initial_layer_single] ;Wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ;Wait for nozzle temp to stabilize\nG1 X10.1 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line \nG1 X10.4 Y145.0 Z0.28 F5000.0 ;Move to side a little \nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line \nG92 E0 ;Reset extruder \nG1 E-1.0000 F1800 ;Retract a bit \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 E0.0000 F1800",
"machine_end_gcode": "G91 ;Relative positioning \nG1 E-2 F2700 ;Retract a bit \nG1 E-2 Z0.2 F2400 ;Retract and raise Z \nG1 X5 Y5 F3000 ;Wipe out \nG1 Z3 ;Raise Z more \nG90 ;Absolute positioning \nG1 X2 Y218 F3000 ;Present print \nM106 S0 ;Turn-off fan \nM104 S0 ;Turn-off hotend \nM140 S0 ;Turn-off bed \nM84 X Y E ;Disable all steppers but Z",
"scan_first_layer": "0",
"thumbnails": [
Expand Down
50 changes: 25 additions & 25 deletions resources/profiles/Creality/machine/Creality CR-10 SE 0.6 nozzle.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
],
"printable_area": [
"0x0",
"250x0",
"250x250",
"0x250"
"220x0",
"220x220",
"0x220"
],
"printable_height": "250",
"printable_height": "265",
"extruder_clearance_height_to_rod": "36",
"extruder_clearance_height_to_lid": "140",
"extruder_clearance_radius": "65",
Expand All @@ -28,8 +28,8 @@
"support_chamber_temp_control": "1",
"auxiliary_fan": "0",
"machine_max_acceleration_extruding": [
"20000",
"20000"
"5000",
"5000"
],
"machine_max_acceleration_retracting": [
"5000",
Expand All @@ -40,12 +40,12 @@
"20000"
],
"machine_max_acceleration_x": [
"20000",
"20000"
"8000",
"8000"
],
"machine_max_acceleration_y": [
"20000",
"20000"
"8000",
"8000"
],
"machine_max_acceleration_z": [
"500",
Expand All @@ -56,36 +56,36 @@
"5000"
],
"machine_max_speed_e": [
"25",
"25"
"100",
"100"
],
"machine_max_speed_x": [
"500",
"200"
"600",
"600"
],
"machine_max_speed_y": [
"500",
"200"
"600",
"600"
],
"machine_max_speed_z": [
"12",
"12"
"30",
"30"
],
"machine_max_jerk_e": [
"2.5",
"2.5"
],
"machine_max_jerk_x": [
"9",
"9"
"10",
"10"
],
"machine_max_jerk_y": [
"9",
"9"
"10",
"10"
],
"machine_max_jerk_z": [
"0.2",
"0.4"
"2",
"2"
],
"max_layer_height": [
"0.32"
Expand Down Expand Up @@ -118,7 +118,7 @@
"default_filament_profile": [
"Creality Generic PLA"
],
"machine_start_gcode": "M220 S100 ;Reset feed rate \nM221 S100 ;Reset flow rate \nG28 ;Home \nG92 E0 ;Reset extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position \nM109 S[material_print_temperature_layer_0] \nG1 X10.1 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line \nG1 X10.4 Y145.0 Z0.28 F5000.0 ;Move to side a little \nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line \nG92 E0 ;Reset extruder \nG1 E-1.0000 F1800 ;Retract a bit \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 E0.0000 F1800",
"machine_start_gcode": "M220 S100 ;Reset feed rate \nM221 S100 ;Reset flow rate \n\nM140 S[bed_temperature_initial_layer_single] ;Set final bed temp\nG28 ;Home \nG92 E0 ;Reset extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position \nM190 S[bed_temperature_initial_layer_single] ;Wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ;Wait for nozzle temp to stabilize\nG1 X10.1 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line \nG1 X10.4 Y145.0 Z0.28 F5000.0 ;Move to side a little \nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line \nG92 E0 ;Reset extruder \nG1 E-1.0000 F1800 ;Retract a bit \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 E0.0000 F1800",
"machine_end_gcode": "G91 ;Relative positioning \nG1 E-2 F2700 ;Retract a bit \nG1 E-2 Z0.2 F2400 ;Retract and raise Z \nG1 X5 Y5 F3000 ;Wipe out \nG1 Z3 ;Raise Z more \nG90 ;Absolute positioning \nG1 X2 Y218 F3000 ;Present print \nM106 S0 ;Turn-off fan \nM104 S0 ;Turn-off hotend \nM140 S0 ;Turn-off bed \nM84 X Y E ;Disable all steppers but Z",
"scan_first_layer": "0",
"thumbnails": [
Expand Down
Loading

0 comments on commit 9ffe7b0

Please sign in to comment.