diff --git a/web/kiri/filter/FDM/Any.Generic.Marlin b/web/kiri/filter/FDM/Any.Generic.Marlin index c5ce6ce3..5a18283f 100644 --- a/web/kiri/filter/FDM/Any.Generic.Marlin +++ b/web/kiri/filter/FDM/Any.Generic.Marlin @@ -1,29 +1,28 @@ { "pre":[ - "M104 S{temp} T0 ; set extruder temperature", - "M140 S{bed_temp} T0 ; set bed temperature", - "G90 ; set absolute positioning mode", - "M83 ; set relative positioning for extruder", - "M107 ; turn off filament cooling fan", - "G28 ; home axes", - "G29 ; level bed", - "G92 X0 Y0 Z0 E0 ; reset all axes positions", - "G1 X0 Y0 Z0.25 F180 ; move xy to 0,0 and z 0.25mm over bed", - "G92 E0 ; zero the extruded", - "M190 S{bed_temp} T0 ; wait for bed to reach target temp", - "M109 S{temp} T0 ; wait for extruder to reach target temp", - "G1 E15 F200 ; purge 15mm from extruder", - "G92 E0 ; zero the extruded", - "G1 F225 ; set feed speed" + "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", + "G29 ; level bed", + "G92 X0 Y0 Z0 E0 ; reset all axes positions", + "G1 X0 Y0 Z0.25 F180 ; move xy to 0,0 and z 0.25mm over bed", + "G92 E0 ; zero the extruded", + "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", + "G1 E15 F200 ; purge 15mm from extruder", + "G92 E0 ; zero the extruded", + "G1 F225 ; set feed speed" ], "post":[ - "M107 ; turn off filament cooling fan", - "M104 S0 T0 ; turn off right extruder", - "M104 S0 T1 ; turn off left extruder", - "M140 S0 T0 ; turn off bed", - "G1 Z{z_max} F1200 ; drop bed", - "G28 X0 Y0 ; home XY axes", - "M84 ; disable stepper motors" + "M107 ; turn off filament cooling fan", + "M104 S0 T{tool} ; turn off right extruder", + "M140 S0 T{tool} ; turn off bed", + "G1 Z{z_max} F1200 ; drop bed", + "G28 X0 Y0 ; home XY axes", + "M84 ; disable stepper motors" ], "cmd":{ "fan_power": "M106 S{fan_speed}" diff --git a/web/kiri/filter/FDM/Cubicon.Single+ b/web/kiri/filter/FDM/Cubicon.Single+ index 907a5027..273b3850 100644 --- a/web/kiri/filter/FDM/Cubicon.Single+ +++ b/web/kiri/filter/FDM/Cubicon.Single+ @@ -1,9 +1,9 @@ { "pre":[ - "M104 S{temp} T0 ; set extruder temperature", - "M140 S{bed_temp} T0 ; set bed temperature", - "M190 S{bed_temp} T0 ; set bed temperature", - "M109 S{temp} T0 ; set extruder temperature", + "M104 S{temp} T{tool} ; set extruder temperature", + "M140 S{bed_temp} T{tool} ; set bed temperature", + "M190 S{bed_temp} T{tool} ; set bed temperature", + "M109 S{temp} T{tool} ; set extruder temperature", "M901 S35 ; set chamber temperature to 35 (standard)", "G90 ; set absolute positioning mode", "M82 ; set absolute positioning for extruder", @@ -18,7 +18,7 @@ ], "post":[ "M107 ; turn off filament cooling fan", - "M104 S0 T0 ; turn off right extruder", + "M104 S0 T{tool} ; turn off right extruder", "M140 S0 ; turn off bed", "M904 ; park extruder", "M84 ; disable stepper motors" diff --git a/web/kiri/filter/FDM/Cubicon.Style b/web/kiri/filter/FDM/Cubicon.Style index e49c0b7e..e0b14403 100644 --- a/web/kiri/filter/FDM/Cubicon.Style +++ b/web/kiri/filter/FDM/Cubicon.Style @@ -1,10 +1,10 @@ { "pre":[ - "T0 ; select extruder #0", + "T{tool} ; select extruder #0", "M104 S{temp} ; set nozzle temp", - "M140 S{bed_temp} T0 ; set bed temperature", + "M140 S{bed_temp} T{tool} ; set bed temperature", "M109 S{temp} ; wait for nozzle to heat", - "S210 T0 ; wait for heating?", + "S210 T{tool} ; wait for heating?", "M82 ; absolute extrusion mode", "G28 ; home", "G1 Z15 F6000 ; lower platform 15mm", @@ -13,7 +13,7 @@ ], "post":[ "M107 ; turn off filament cooling fan", - "M104 S0 T0 ; turn off right extruder", + "M104 S0 T{tool} ; turn off right extruder", "M140 S0 ; turn off bed", "M904 ; park extruder", "M84 ; disable stepper motors" diff --git a/web/kiri/filter/FDM/DeltaMaker.2T b/web/kiri/filter/FDM/DeltaMaker.2T index bd299b60..6b00a725 100644 --- a/web/kiri/filter/FDM/DeltaMaker.2T +++ b/web/kiri/filter/FDM/DeltaMaker.2T @@ -1,20 +1,20 @@ { "pre":[ - "M104 S{temp} T0 ; set extruder temperature", + "M104 S{temp} T{tool} ; set extruder temperature", "G21 ; Make sure we're in metric mode", "G90 ; set absolute positioning mode", "M83 ; set relative positioning for extruder", "G28 ; home axes", "G92 E0 ; zero the extruded", - "M109 S{temp} T0 ; wait for extruder to reach target temp", + "M109 S{temp} T{tool} ; wait for extruder to reach target temp", "G1 F200 E3.5 ; set feed speed, prime nozzle", "G92 E0 ; zero the extruded", "G1 Z30 ; position near the bed before first position" ], "post":[ "G28 ; home axes", - "M104 S0 T0 ; turn off right extruder", - "M140 S0 T0 ; turn off bed", + "M104 S0 T{tool} ; turn off right extruder", + "M140 S0 T{tool} ; turn off bed", "M84 ; disable stepper motors" ], "cmd":{ diff --git a/web/kiri/filter/FDM/DeltaMaker.Original b/web/kiri/filter/FDM/DeltaMaker.Original index 2407cdd7..947a0d34 100644 --- a/web/kiri/filter/FDM/DeltaMaker.Original +++ b/web/kiri/filter/FDM/DeltaMaker.Original @@ -1,20 +1,20 @@ { "pre":[ - "M104 S{temp} T0 ; set extruder temperature", + "M104 S{temp} T{tool} ; set extruder temperature", "G21 ; Make sure we're in metric mode", "G90 ; set absolute positioning mode", "M83 ; set relative positioning for extruder", "G28 ; home axes", "G92 E0 ; zero the extruded", - "M109 S{temp} T0 ; wait for extruder to reach target temp", + "M109 S{temp} T{tool} ; wait for extruder to reach target temp", "G1 F200 E3.5 ; set feed speed, prime nozzle", "G92 E0 ; zero the extruded", "G1 Z30 ; position near the bed before first position" ], "post":[ "G28 ; home axes", - "M104 S0 T0 ; turn off right extruder", - "M140 S0 T0 ; turn off bed", + "M104 S0 T{tool} ; turn off right extruder", + "M140 S0 T{tool} ; turn off bed", "M84 ; disable stepper motors" ], "cmd":{ diff --git a/web/kiri/filter/FDM/Flashforge.Finder b/web/kiri/filter/FDM/Flashforge.Finder index e2827da2..258b6f9a 100644 --- a/web/kiri/filter/FDM/Flashforge.Finder +++ b/web/kiri/filter/FDM/Flashforge.Finder @@ -1,7 +1,7 @@ { "pre":[ - "M118 X15.00 Y15.00 Z10.00 T0", - "M104 S{temp} T0", + "M118 X15.00 Y15.00 Z10.00 T{tool}", + "M104 S{temp} T{tool}", "M107", "G90", "M132 X Y Z A B", @@ -12,7 +12,7 @@ ], "post":[ "M107", - "M104 S0 T0", + "M104 S0 T{tool}", "G162 Z", "M18" ], diff --git a/web/kiri/filter/FDM/Flashforge.Guider.II b/web/kiri/filter/FDM/Flashforge.Guider.II index 5118d23a..05f409c9 100644 --- a/web/kiri/filter/FDM/Flashforge.Guider.II +++ b/web/kiri/filter/FDM/Flashforge.Guider.II @@ -1,18 +1,18 @@ { "pre":[ "; set bed and nozzle temps", - "M104 S{temp} T0", + "M104 S{temp} T{tool}", "M140 S{bed_temp}", "; absolute positioning and home", "G90", "G28", "; wait for nozzle and bed to reach target temps", "M190 S{bed_temp}", - "M109 S{temp} T0", - "M7 T0", - "M6 T0", + "M109 S{temp} T{tool}", + "M7 T{tool}", + "M6 T{tool}", "; select nozzle 0", - "M108 T0", + "M108 T{tool}", "G92 E0", "G1 E0 F300", "; purge nozzle", @@ -23,7 +23,7 @@ "post":[ "; stop fan, cool nozzle and bed", "M107", - "M104 S0 T0", + "M104 S0 T{tool}", "M140 S0", "; slow descent of bed", "G0 F300", diff --git a/web/kiri/filter/FDM/FolgerTech.FT5 b/web/kiri/filter/FDM/FolgerTech.FT5 index e5953d58..add972eb 100644 --- a/web/kiri/filter/FDM/FolgerTech.FT5 +++ b/web/kiri/filter/FDM/FolgerTech.FT5 @@ -1,16 +1,16 @@ { "pre":[ "M117 Heating", - "M104 S{temp} T0 ; set extruder temperature", - "M140 S{bed_temp} T0 ; set bed temperature", + "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", - "M190 S{bed_temp} T0 ; wait for bed to reach target temp", - "M109 S{temp} T0 ; wait for extruder to reach target temp", + "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", @@ -23,8 +23,8 @@ "post":[ "M117 Done", "M107 ; turn off filament cooling fan", - "M104 S0 T0 ; turn off extruder", - "M140 S0 T0 ; turn off bed", + "M104 S0 T{tool} ; turn off extruder", + "M140 S0 T{tool} ; turn off bed", "G91 ; relative movement", "G1 Z10 F1200 ; drop bed 10mm", "G90 ; absolute positioning", diff --git a/web/kiri/filter/FDM/Leapfrog.CreatrHS b/web/kiri/filter/FDM/Leapfrog.CreatrHS index 99343606..b61f006d 100644 --- a/web/kiri/filter/FDM/Leapfrog.CreatrHS +++ b/web/kiri/filter/FDM/Leapfrog.CreatrHS @@ -1,7 +1,7 @@ { "pre":[ - "M104 S{temp} T0 ; set extruder temperature", - "M140 S{bed_temp} T0 ; set bed temperature", + "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", @@ -10,16 +10,15 @@ "G92 X0 Y0 Z0 E0 ; reset all axes positions", "G1 Z0.25 F180 ; move z to 0.25mm over bed", "G92 E0 ; zero the extruded", - "M109 S{temp} T0 ; wait for extruder to reach target temp", + "M109 S{temp} T{tool} ; wait for extruder to reach target temp", "G1 E15 F300 ; purge 15mm from extruder", "G92 E0 ; zero the extruded", "G1 F225 ; set feed speed" ], "post":[ "M107 ; turn off filament cooling fan", - "M104 S0 T0 ; turn off right extruder", - "M104 S0 T1 ; turn off left extruder", - "M140 S0 T0 ; turn off bed", + "M104 S0 T{tool} ; turn off right extruder", + "M140 S0 T{tool} ; turn off bed", "G1 Z{z_max} F1200 ; drop bed", "G28 X0 Y0 ; home XY axes", "M84 ; disable stepper motors" diff --git a/web/kiri/filter/FDM/MakerGear.M2 b/web/kiri/filter/FDM/MakerGear.M2 index 0ca191b6..250a4937 100644 --- a/web/kiri/filter/FDM/MakerGear.M2 +++ b/web/kiri/filter/FDM/MakerGear.M2 @@ -1,8 +1,8 @@ { "pre":[ "M108 S255 ; set extruder speed", - "M104 S{temp} T0 ; set extruder temperature", - "M140 S{bed_temp} T0 ; set bed temperature", + "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", @@ -11,7 +11,7 @@ "G92 X0 Y0 Z0 E0 ; reset all axes positions", "G1 Z0.25 F180 ; move z to 0.25mm over bed", "G92 E0 ; zero the extruded", - "M109 S{temp} T0 ; wait for extruder to reach target temp", + "M109 S{temp} T{tool} ; wait for extruder to reach target temp", "G1 E15 F300 ; purge 15mm from extruder", "G92 E0 ; zero the extruded", "G1 F225 ; set feed speed" @@ -19,9 +19,8 @@ "post":[ "M108 S0 ; set extruder speed", "M107 ; turn off filament cooling fan", - "M104 S0 T0 ; turn off right extruder", - "M104 S0 T1 ; turn off left extruder", - "M140 S0 T0 ; turn off bed", + "M104 S0 T{tool} ; turn off right extruder", + "M140 S0 T{tool} ; turn off bed", "G1 Z200 F1200 ; drop bed", "G28 X0 Y0 ; home XY axes", "M84 ; disable stepper motors" diff --git a/web/kiri/filter/FDM/Makerbot.Replicator2 b/web/kiri/filter/FDM/Makerbot.Replicator2 index 2dba559e..29070bcb 100644 --- a/web/kiri/filter/FDM/Makerbot.Replicator2 +++ b/web/kiri/filter/FDM/Makerbot.Replicator2 @@ -3,7 +3,7 @@ "M73 P0 ; set progress to 0%", "G90 ; set absolute positioning mode", "M83 ; set relative positioning for extruder", - "M104 S{temp} T0 ; set extruder temperature for T0 (tool 0)", + "M104 S{temp} T{tool} ; set extruder temperature for T{tool} (tool 0)", "M127 ; close extruder valve (if it has one)", "G162 X Y F3000 ; move X,Y axis to maximum position at speed 3000 (top/right of table)", "G161 Z F1200 ; move Z axis to minimum position as speed 1200 (bottom)", @@ -13,7 +13,7 @@ "M132 X Y Z A B ; load EEPROM home offsets for all axis", "G1 X{left} Y{bottom+10} Z30 F9000 ; move to wait position off table", "G130 X20 Y20 Z20 A20 B20 ; lower stepper Vrefs to give more juice to the extruder heater", - "M133 T0 ; wait for extruder T0 temperature to stabilize", + "M133 T{tool} ; wait for extruder T{tool} temperature to stabilize", "G130 X127 Y127 Z40 A127 B127 ; default stepper Vrefs now that extruder is hot", "G92 A0 ; set extruder position value to 0 (no move)", "G1 Z0.4 ; move nozzle just above the bed height", @@ -21,7 +21,7 @@ "G1 X{left+10} Y{bottom+10} Z0.15 F1200 ; slow wipe", "G1 X{left+15} Y{bottom+15} Z0.5 F1200 ; lift", "G92 A0 ; set extruder position value to 0 (no move)", - "M135 T0 ; set toolhead 0" + "M135 T{tool} ; set toolhead 0" ], "post":[ "M127 ; stop filament cooling fan", diff --git a/web/kiri/filter/FDM/Raise3D.N2 b/web/kiri/filter/FDM/Raise3D.N2 index f7208ef3..2935b2dd 100644 --- a/web/kiri/filter/FDM/Raise3D.N2 +++ b/web/kiri/filter/FDM/Raise3D.N2 @@ -1,9 +1,9 @@ { "pre":[ "M140 S{bed_temp}", - "M221 T0 S100.00", - "M104 T0 S{temp}", - "M109 T0 S{temp}", + "M221 T{tool} S100.00", + "M104 T{tool} S{temp}", + "M109 T{tool} S{temp}", "M190 S{bed_temp}", "G21", "G90", @@ -11,7 +11,7 @@ "M107", "G28 X0 Y0", "G28 Z0", - "T0", + "T{tool}", "G1 Z0.05 F6000.00", "G92 E0", "G1 F140 E29", @@ -26,7 +26,7 @@ "G1 Z10", "G90", "M1002", - "M104 T0 S0", + "M104 T{tool} S0", "M104 S0", "M140 S0", "G1 X20 Y20 F6000", diff --git a/web/kiri/filter/FDM/Ulio3D b/web/kiri/filter/FDM/Ulio3D index 727ee7a3..c5e67be5 100644 --- a/web/kiri/filter/FDM/Ulio3D +++ b/web/kiri/filter/FDM/Ulio3D @@ -1,6 +1,6 @@ { "pre":[ - "M104 S{temp} T0 ; set extruder temperature", + "M104 S{temp} T{tool} ; set extruder temperature", "G90 ; set absolute positioning mode", "M83 ; set relative positioning for extruder", "M107 ; turn off filament cooling fan", @@ -8,7 +8,7 @@ "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} T0 ; wait for extruder to reach target temp", + "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", @@ -16,7 +16,7 @@ ], "post":[ "M107 ; turn off filament cooling fan", - "M104 S0 T0 ; turn off right extruder", + "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" diff --git a/web/kiri/filter/FDM/Ultimaker.Ultimaker2 b/web/kiri/filter/FDM/Ultimaker.Ultimaker2 index 43ece2c8..b9806d05 100644 --- a/web/kiri/filter/FDM/Ultimaker.Ultimaker2 +++ b/web/kiri/filter/FDM/Ultimaker.Ultimaker2 @@ -1,7 +1,7 @@ { "pre":[ - "M104 S{temp} T0 ; set extruder temperature", - "M140 S{bed_temp} T0 ; set bed temperature", + "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", @@ -10,16 +10,15 @@ "G92 X0 Y0 Z0 E0 ; reset all axes positions", "G1 Z0.25 F180 ; move z to 0.25mm over bed", "G92 E0 ; zero the extruded", - "M109 S{temp} T0 ; wait for extruder to reach target temp", + "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" ], "post":[ "M107 ; turn off filament cooling fan", - "M104 S0 T0 ; turn off right extruder", - "M104 S0 T1 ; turn off left extruder", - "M140 S0 T0 ; turn off bed", + "M104 S0 T{tool} ; turn off right extruder", + "M140 S0 T{tool} ; turn off bed", "G1 Z205 F1200 ; drop bed", "G28 X0 Y0 ; home XY axes", "M84 ; disable stepper motors" diff --git a/web/kiri/filter/FDM/Wanhao.Duplicator_4s b/web/kiri/filter/FDM/Wanhao.Duplicator_4s index d7f56204..e5aca36d 100644 --- a/web/kiri/filter/FDM/Wanhao.Duplicator_4s +++ b/web/kiri/filter/FDM/Wanhao.Duplicator_4s @@ -1,7 +1,7 @@ { "pre":[ - "M104 S{temp} T0 ; set extruder temperature", - "M140 S{bed_temp} T0 ; set bed temperature", + "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", @@ -10,16 +10,15 @@ "G92 X0 Y0 Z0 E0 ; reset all axes positions", "G1 Z0.25 F180 ; move z to 0.25mm over bed", "G92 E0 ; zero the extruded", - "M109 S{temp} T0 ; wait for extruder to reach target temp", + "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" ], "post":[ "M107 ; turn off filament cooling fan", - "M104 S0 T0 ; turn off right extruder", - "M104 S0 T1 ; turn off left extruder", - "M140 S0 T0 ; turn off bed", + "M104 S0 T{tool} ; turn off right extruder", + "M140 S0 T{tool} ; turn off bed", "G1 Z{z_max} F1200 ; drop bed", "G28 X0 Y0 ; home XY axes", "M84 ; disable stepper motors" diff --git a/web/kiri/filter/FDM/Wanhao.Duplicator_5s b/web/kiri/filter/FDM/Wanhao.Duplicator_5s index 9d646869..280adb3b 100644 --- a/web/kiri/filter/FDM/Wanhao.Duplicator_5s +++ b/web/kiri/filter/FDM/Wanhao.Duplicator_5s @@ -1,7 +1,7 @@ { "pre":[ - "M104 S{temp} T0 ; set extruder temperature", - "M140 S{bed_temp} T0 ; set bed temperature", + "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", @@ -10,16 +10,15 @@ "G92 X0 Y0 Z0 E0 ; reset all axes positions", "G1 Z0.25 F180 ; move z to 0.25mm over bed", "G92 E0 ; zero the extruded", - "M109 S{temp} T0 ; wait for extruder to reach target temp", + "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" ], "post":[ "M107 ; turn off filament cooling fan", - "M104 S0 T0 ; turn off right extruder", - "M104 S0 T1 ; turn off left extruder", - "M140 S0 T0 ; turn off bed", + "M104 S0 T{tool} ; turn off right extruder", + "M140 S0 T{tool} ; turn off bed", "G1 Z{z_max} F1200 ; drop bed", "G28 X0 Y0 ; home XY axes", "M84 ; disable stepper motors" diff --git a/web/kiri/filter/FDM/Wanhao.Duplicator_6 b/web/kiri/filter/FDM/Wanhao.Duplicator_6 index ad758613..54bf135d 100644 --- a/web/kiri/filter/FDM/Wanhao.Duplicator_6 +++ b/web/kiri/filter/FDM/Wanhao.Duplicator_6 @@ -1,7 +1,7 @@ { "pre":[ - "M104 S{temp} T0 ; set extruder temperature", - "M140 S{bed_temp} T0 ; set bed temperature", + "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", @@ -10,16 +10,15 @@ "G92 X0 Y0 Z0 E0 ; reset all axes positions", "G1 Z0.25 F180 ; move z to 0.25mm over bed", "G92 E0 ; zero the extruded", - "M109 S{temp} T0 ; wait for extruder to reach target temp", + "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" ], "post":[ "M107 ; turn off filament cooling fan", - "M104 S0 T0 ; turn off right extruder", - "M104 S0 T1 ; turn off left extruder", - "M140 S0 T0 ; turn off bed", + "M104 S0 T{tool} ; turn off right extruder", + "M140 S0 T{tool} ; turn off bed", "G1 Z{z_max} F1200 ; drop bed", "G28 X0 Y0 ; home XY axes", "M84 ; disable stepper motors" diff --git a/web/kiri/filter/FDM/Wanhao.Duplicator_i3 b/web/kiri/filter/FDM/Wanhao.Duplicator_i3 index ad758613..54bf135d 100644 --- a/web/kiri/filter/FDM/Wanhao.Duplicator_i3 +++ b/web/kiri/filter/FDM/Wanhao.Duplicator_i3 @@ -1,7 +1,7 @@ { "pre":[ - "M104 S{temp} T0 ; set extruder temperature", - "M140 S{bed_temp} T0 ; set bed temperature", + "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", @@ -10,16 +10,15 @@ "G92 X0 Y0 Z0 E0 ; reset all axes positions", "G1 Z0.25 F180 ; move z to 0.25mm over bed", "G92 E0 ; zero the extruded", - "M109 S{temp} T0 ; wait for extruder to reach target temp", + "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" ], "post":[ "M107 ; turn off filament cooling fan", - "M104 S0 T0 ; turn off right extruder", - "M104 S0 T1 ; turn off left extruder", - "M140 S0 T0 ; turn off bed", + "M104 S0 T{tool} ; turn off right extruder", + "M140 S0 T{tool} ; turn off bed", "G1 Z{z_max} F1200 ; drop bed", "G28 X0 Y0 ; home XY axes", "M84 ; disable stepper motors" diff --git a/web/kiri/filter/FDM/XYZ.daVinci.Jr.Pro b/web/kiri/filter/FDM/XYZ.daVinci.Jr.Pro index 31e21dcd..f9cd43bd 100644 --- a/web/kiri/filter/FDM/XYZ.daVinci.Jr.Pro +++ b/web/kiri/filter/FDM/XYZ.daVinci.Jr.Pro @@ -1,6 +1,6 @@ { "pre":[ - "T0 ; select extruder #0", + "T{tool} ; select extruder #0", "M104 S{temp} ; set nozzle temp", "M109 S{temp} ; wait for nozzle to heat", "M82 ; absolute extrusion mode", diff --git a/web/kiri/filter/FDM/XYZ.daVinci.Mini.w b/web/kiri/filter/FDM/XYZ.daVinci.Mini.w index b37611e8..4e945b50 100644 --- a/web/kiri/filter/FDM/XYZ.daVinci.Mini.w +++ b/web/kiri/filter/FDM/XYZ.daVinci.Mini.w @@ -1,6 +1,6 @@ { "pre":[ - "T0 ; select extruder #0", + "T{tool} ; select extruder #0", "M104 S{temp} ; set nozzle temp", "M109 S{temp} ; wait for nozzle to heat", "G21 ; set units to millimeters",