update finder template. track start filament position in abs extrusion mode
This commit is contained in:
parent
4e4f4d0fec
commit
d54222be4c
3 changed files with 20 additions and 14 deletions
|
|
@ -334,7 +334,15 @@ var gs_kiri_fdm = exports;
|
||||||
append(constReplace("; Bed left:{left} right:{right} top:{top} bottom:{bottom}", consts));
|
append(constReplace("; Bed left:{left} right:{right} top:{top} bottom:{bottom}", consts));
|
||||||
append("; --- startup ---");
|
append("; --- startup ---");
|
||||||
for (var i=0; i<device.gcodePre.length; i++) {
|
for (var i=0; i<device.gcodePre.length; i++) {
|
||||||
append(constReplace(device.gcodePre[i], consts));
|
var line = device.gcodePre[i];
|
||||||
|
if (line.indexOf('E') > 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) {
|
function moveTo(newpos, rate, comment) {
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
var exports = {
|
var exports = {
|
||||||
COPYRIGHT:"Copyright (C) 2014-2017 Stewart Allen <stewart@neuron.com> - All Rights Reserved",
|
COPYRIGHT:"Copyright (C) 2014-2017 Stewart Allen <stewart@neuron.com> - All Rights Reserved",
|
||||||
LICENSE:"Unauthorized copying, modification and re-distribution are strictly prohibited without prior written consent.",
|
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 = {};
|
if (!module) var module = {};
|
||||||
module.exports = exports;
|
module.exports = exports;
|
||||||
|
|
|
||||||
|
|
@ -1,27 +1,25 @@
|
||||||
{
|
{
|
||||||
"pre":[
|
"pre":[
|
||||||
"M118 X15.00 Y15.00 Z10.00 T0",
|
"M118 X15.00 Y15.00 Z10.00 T0",
|
||||||
"M104 S220 T0 ; set nozzle0 temp",
|
"M104 S{temp} T0 ; set nozzle0 temp",
|
||||||
"M107 ; fan off",
|
"M107 ; fan off",
|
||||||
"G90 ; set absolute positioning",
|
"G90 ; set absolute positioning",
|
||||||
"G28 ; move to origin",
|
"G28 ; move to origin",
|
||||||
"M132 X Y Z A B ; set axis limits",
|
"M132 X Y Z A B ; set axis limits",
|
||||||
"G1 Z50.00 F400",
|
"M6 T0 ; tool change T0",
|
||||||
"G161 X Y F3300 ; home axis minimum",
|
|
||||||
"M6 T0 ; tool change t0",
|
|
||||||
"M907 X100 Y100 Z40 A80 B20 ; set digital trimpots",
|
"M907 X100 Y100 Z40 A80 B20 ; set digital trimpots",
|
||||||
"M108 T0 ; set extruder speed",
|
"M108 T0 ; set extruder speed",
|
||||||
"M109 S220 T0 ; set temp and wait",
|
"; pre-extrude",
|
||||||
"G1 X15.00 Y15.00 F4800 ; preExtrude:0.20",
|
"G1 X-75 Y-75 Z0.35 F400",
|
||||||
"G1 Z.20 F400 ; preExtruder0"
|
"G1 X75 E25 F1200",
|
||||||
|
"G1 Y00 E30 F1200"
|
||||||
],
|
],
|
||||||
"post":[
|
"post":[
|
||||||
|
"M107 ; fan off",
|
||||||
"M104 S0 T0 ; set nozzle0 temp",
|
"M104 S0 T0 ; set nozzle0 temp",
|
||||||
"G28 ; move to origin",
|
"G162 Z ; home axes maximum",
|
||||||
"; G162 Z ; home axes maximum",
|
"G28 X Y ; move to origin",
|
||||||
"; G28 X Y ; move to origin",
|
"M132 X Y Z A B ; set axis limits",
|
||||||
"; M132 X Y Z A B ; set axis limits",
|
|
||||||
"G91 ; set relative positioning",
|
|
||||||
"M18 ; disable all steppers"
|
"M18 ; disable all steppers"
|
||||||
],
|
],
|
||||||
"cmd":{
|
"cmd":{
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue