diff --git a/js/kiri-driver-fdm.js b/js/kiri-driver-fdm.js index 2e3a6c97..701a6536 100644 --- a/js/kiri-driver-fdm.js +++ b/js/kiri-driver-fdm.js @@ -334,7 +334,15 @@ var gs_kiri_fdm = exports; append(constReplace("; Bed left:{left} right:{right} top:{top} bottom:{bottom}", consts)); append("; --- startup ---"); for (var i=0; i 0) { + line.split(' ').forEach(function (tok) { + // use max E position from gcode-preamble + if (tok[0] == 'E') outputLength = Math.max(outputLength, parseFloat(tok.substring(1))); + }); + } + if (device.extrudeAbs) + append(constReplace(line, consts)); } function moveTo(newpos, rate, comment) { diff --git a/js/license.js b/js/license.js index 6d478808..d9e74048 100644 --- a/js/license.js +++ b/js/license.js @@ -1,7 +1,7 @@ var exports = { COPYRIGHT:"Copyright (C) 2014-2017 Stewart Allen - All Rights Reserved", LICENSE:"Unauthorized copying, modification and re-distribution are strictly prohibited without prior written consent.", - VERSION:"1.0.64" + VERSION:"1.0.65" }; if (!module) var module = {}; module.exports = exports; diff --git a/web/kiri/filter/FDM/Flashforge.Finder b/web/kiri/filter/FDM/Flashforge.Finder index 945acec8..6a2a4b74 100644 --- a/web/kiri/filter/FDM/Flashforge.Finder +++ b/web/kiri/filter/FDM/Flashforge.Finder @@ -1,27 +1,25 @@ { "pre":[ "M118 X15.00 Y15.00 Z10.00 T0", - "M104 S220 T0 ; set nozzle0 temp", + "M104 S{temp} T0 ; set nozzle0 temp", "M107 ; fan off", "G90 ; set absolute positioning", "G28 ; move to origin", "M132 X Y Z A B ; set axis limits", - "G1 Z50.00 F400", - "G161 X Y F3300 ; home axis minimum", - "M6 T0 ; tool change t0", + "M6 T0 ; tool change T0", "M907 X100 Y100 Z40 A80 B20 ; set digital trimpots", "M108 T0 ; set extruder speed", - "M109 S220 T0 ; set temp and wait", - "G1 X15.00 Y15.00 F4800 ; preExtrude:0.20", - "G1 Z.20 F400 ; preExtruder0" + "; pre-extrude", + "G1 X-75 Y-75 Z0.35 F400", + "G1 X75 E25 F1200", + "G1 Y00 E30 F1200" ], "post":[ + "M107 ; fan off", "M104 S0 T0 ; set nozzle0 temp", - "G28 ; move to origin", - "; G162 Z ; home axes maximum", - "; G28 X Y ; move to origin", - "; M132 X Y Z A B ; set axis limits", - "G91 ; set relative positioning", + "G162 Z ; home axes maximum", + "G28 X Y ; move to origin", + "M132 X Y Z A B ; set axis limits", "M18 ; disable all steppers" ], "cmd":{