diff --git a/src/dev/fdm/Ulio3D b/src/dev/fdm/Ulio3D index c5e67be5..6b6e02ee 100644 --- a/src/dev/fdm/Ulio3D +++ b/src/dev/fdm/Ulio3D @@ -1,25 +1,23 @@ { "pre":[ - "M104 S{temp} T{tool} ; set extruder temperature", + "G21 ; set to mm", "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 Y0 Z20 F180 ; move xy to 0,0 and z 20mm over bed", - "G92 E0 ; zero the extruded", - "M109 S{temp} T{tool} ; wait for extruder to reach target temp", - "G1 E15 F200 ; purge 15mm from extruder", - "G92 E0 ; zero the extruded", - "G1 F225 ; set feed speed", + "M82 ; set absolute positioning for extruder", + "M104 S{temp} ; set extruder temperature", + "M109 S{temp} ; wait for extruder to reach target temp", + "G28 X0 Y0 ; move X/Y to min endstops", + "G28 Z0 ; move Z to min endstops", + "G92 X0 Y0 Z0 ; reset all axes positions", + "G92 E0 ; reset extruder distance position (zero the extruder)", + "G1 F{travel_speed} ; set feed speed", "M117 ULIO Printing ; text for screen" ], "post":[ - "M107 ; turn off filament cooling fan", - "M104 S0 T{tool} ; turn off right extruder", - "G1 Z{z_max} F180 ; drop bed", - "G28 X0 Y0 ; home XY axes", - "M84 ; disable stepper motors" + "M104 S0 ; turn off right extruder", + "M107 ; turn off filament cooling fan", + "G1 Z{z_max} F25 ; drop bed G1 42 mm at travel_speed", + "G28 X0 Y0 ; home XY axes", + "M84 ; disable stepper motors" ], "pause":[ "; --- pause begin ---", diff --git a/src/dev/fdm/Ulio3D.Purge b/src/dev/fdm/Ulio3D.Purge new file mode 100644 index 00000000..08af49f2 --- /dev/null +++ b/src/dev/fdm/Ulio3D.Purge @@ -0,0 +1,59 @@ +{ + "pre":[ + "G21 ; set to mm", + "G90 ; set absolute positioning mode", + "M82 ; set absolute positioning for extruder", + "M104 S{temp} ; set extruder temperature", + "M109 S{temp} ; wait for extruder to reach target temp", + "G28 X0 Y0 ; move X/Y to min endstops", + "G28 Z0 ; move Z to min endstops", + "G92 X0 Y0 Z0 ; reset all axes positions", + "G92 E0 ; reset extruder distance position (zero the extruder)", + "M83 ; set extruder in relative mode", + "G1 X100.0 E12 F1000 ; start perimiter leveling line", + "G1 Y102.0 E12 F1000 ;", + "G1 X2.0 E12 F1000 ;", + "G1 Y2.0 E12 F1000 ;", + "G1 X98.0 E12 F1000 ;", + "G1 Y100.0 E12 F1000 ;", + "G1 X4.0 E12 F1000 ;", + "G1 Y4.0 E12 F1000 ;", + "G1 X96.0 E12 F1000 ;", + "G1 Y98.0 E12 F1000 ;", + "G1 X6.0 E12 F1000 ;", + "G1 Y6.0 E12 F1000 ; finish perimiter leveling line", + "G28 X0 Y0 ; move X/Y to min endstops", + "M82 ; set absolute positioning for extruder", + "G92 E0 ; reset extruder distance position (zero the extruder)", + "G1 F{travel_speed} ; set feed speed", + "M117 ULIO Printing ; text for screen" + ], + "post":[ + "M104 S0 ; turn off right extruder", + "M107 ; turn off filament cooling fan", + "G1 Z{z_max} F25 ; drop bed G1 42 mm at travel_speed", + "G28 X0 Y0 ; home XY axes", + "M84 ; disable stepper motors" + ], + "pause":[ + "; --- pause begin ---", + "G91 ; Relative Positioning", + "G0 Z20 ; Move Bed down 20mm", + "G90 ; Absolute positioning", + "G0 X10 Y10 ; Move to 10,10", + "M2000 ; Pause command", + "G91 ; Relative Positioning", + "G0 Z-20 ; Move Bed up 20mm", + "G90 ; Absolute positioning", + "; --- pause end ---" + ], + "cmd":{ + "fan_power": "M106 S200" + }, + "settings":{ + "origin_center": false, + "bed_width": 103, + "bed_depth": 103, + "build_height": 78 + } +} diff --git a/src/mode/fdm/driver.js b/src/mode/fdm/driver.js index d6ee9dcd..fc9100b6 100644 --- a/src/mode/fdm/driver.js +++ b/src/mode/fdm/driver.js @@ -949,6 +949,7 @@ y: device.bedDepth/2 }, subst = { + travel_speed: seekMMM, retract_speed: retSpeed, retract_distance: retDist, temp: process.firstLayerNozzleTemp || process.outputTemp,