diff --git a/js/kiri-driver-fdm.js b/js/kiri-driver-fdm.js index 47384507..56e89ee2 100644 --- a/js/kiri-driver-fdm.js +++ b/js/kiri-driver-fdm.js @@ -237,7 +237,7 @@ var gs_kiri_fdm = exports; }); }); - print.addPrintPoints(preout, layerout, startPoint); + print.addPrintPoints(preout, layerout, null); preout.last().retract = true; } @@ -436,8 +436,8 @@ var gs_kiri_fdm = exports; append(constReplace(fan_power,consts)); } - // move up to next layer - if (layer > 0) moveTo({z:zpos}, seekMMM); + // move Z to layer height + moveTo({z:zpos}, seekMMM); zpos += zinc; // iterate through layer outputs diff --git a/js/license.js b/js/license.js index ec78a464..d45f7bc3 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.73" + VERSION:"1.0.74" }; if (!module) var module = {}; module.exports = exports; diff --git a/web/kiri/filter/FDM/Raise3D.N2 b/web/kiri/filter/FDM/Raise3D.N2 index aa30fd71..6db93c95 100644 --- a/web/kiri/filter/FDM/Raise3D.N2 +++ b/web/kiri/filter/FDM/Raise3D.N2 @@ -17,7 +17,6 @@ "G1 F140 E29", "G1 F600 E28", "G1 X15 Y15 Z0.02 F2000", - ";G92 E0", "G1 F6000.00", "M117 Printing...", "M1001" @@ -30,8 +29,8 @@ "M140 S0", "G91", "G1 E-1 F300", - "G1 E-5 X20 Y20 F9000.00", - "G1 Z0.5 E-5 X-20 Y-20 F9000.00", + "G1 E-5 X20 Y20 F6000.00", + "G1 Z0.5 X0 Y0", "G28 X0 Y0", "M84", "G90"