diff --git a/src/kiri-dev/fdm/Creality.CR-10S b/src/kiri-dev/fdm/Creality.CR-10S index e31c6e5a..5bba9255 100644 --- a/src/kiri-dev/fdm/Creality.CR-10S +++ b/src/kiri-dev/fdm/Creality.CR-10S @@ -7,12 +7,6 @@ "M105 ; Report Temps", "M109 S{temp} ; Wait for hot end to reach target", "M82 ; Absolute extrusion mode", - "M201 X500.00 Y500.00 Z100.00 E5000.00 ; Setup machine max acceleration", - "M203 X500.00 Y500.00 Z10.00 E50.00 ; Setup machine max feedrate", - "M204 P500.00 R1000.00 T500.00 ; Setup Print/Retract/Travel acceleration", - "M205 X8.00 Y8.00 Z0.40 E5.00 ; Setup Jerk", - "M220 S100 ; Reset Feedrate", - "M221 S100 ; Reset Flowrate", "G28 ; Home", "G92 E0 ; Reset Extruder", "G1 Z2.0 F3000 ; Move Z Axis up", diff --git a/src/kiri-dev/fdm/Creality.CR-10S-Pro b/src/kiri-dev/fdm/Creality.CR-10S-Pro index 454ffde5..45acb9f1 100644 --- a/src/kiri-dev/fdm/Creality.CR-10S-Pro +++ b/src/kiri-dev/fdm/Creality.CR-10S-Pro @@ -7,12 +7,6 @@ "M105 ; Report Temps", "M109 S{temp} ; Wait for hot end to reach target", "M82 ; Absolute extrusion mode", - "M201 X500.00 Y500.00 Z100.00 E5000.00 ; Setup machine max acceleration", - "M203 X500.00 Y500.00 Z10.00 E50.00 ; Setup machine max feedrate", - "M204 P500.00 R1000.00 T500.00 ; Setup Print/Retract/Travel acceleration", - "M205 X8.00 Y8.00 Z0.40 E5.00 ; Setup Jerk", - "M220 S100 ; Reset Feedrate", - "M221 S100 ; Reset Flowrate", "G28 ; Home", "G29 ; Auto bed Level", "G92 E0 ; Reset Extruder", diff --git a/src/kiri-dev/fdm/FolgerTech.FT5 b/src/kiri-dev/fdm/FolgerTech.FT5 index add972eb..9cd9fd83 100644 --- a/src/kiri-dev/fdm/FolgerTech.FT5 +++ b/src/kiri-dev/fdm/FolgerTech.FT5 @@ -3,25 +3,21 @@ "M117 Heating", "M104 S{temp} T{tool} ; set extruder temperature", "M140 S{bed_temp} T{tool} ; set bed temperature", - "G90 ; set absolute positioning mode", - "M83 ; set relative positioning for extruder", - "M107 ; turn off filament cooling fan", - "G28 ; home axes", - "G92 X0 Y0 Z0 E0 ; reset all axes positions", - "G1 X0 Y5 Z3 ; move XY to 0,5 and Z 3mm over bed", + "G90 ; set absolute positioning mode", + "M83 ; set relative positioning for extruder", + "M107 ; turn off filament cooling fan", + "G28 ; home axes", + "G92 X0 Y0 Z0 E0 ; reset all axes positions", + "G1 X0 Y5 Z3 ; move XY to 0,5 and Z 3mm over bed", "M190 S{bed_temp} T{tool} ; wait for bed to reach target temp", "M109 S{temp} T{tool} ; wait for extruder to reach target temp", - "G0 Z0.25 ; position 0.25mm over bed", - "M117 Purge Nozzle", - "G1 X100 E30 F600 ; purge 30mm from extruder", - "M201 X1000 Y1000 Z100 E2000 ; max accel", - "M204 P1000 T2000 ; default accel", - "M301 P17.14 I1.12 D65.29 ; pid params", - "M900 K{kfactor} ; k factor", - "M205 X5 ; max xy jerk" + "G0 Z0.25 ; position 0.25mm over bed", + "M117 Purge Nozzle ; announce purge", + "G1 X100 E30 F600 ; purge 30mm from extruder", + "M900 K{kfactor} ; k factor" ], "post":[ - "M117 Done", + "M117 Done ; announce done", "M107 ; turn off filament cooling fan", "M104 S0 T{tool} ; turn off extruder", "M140 S0 T{tool} ; turn off bed",