From 7e2d6bc06032170bb00d207b4168dd0cbf00a7f5 Mon Sep 17 00:00:00 2001
From: Stewart Allen <stewart@neuron.com>
Date: Sat, 20 Jan 2018 22:51:35 -0500
Subject: [PATCH] fix null end layer bug

---
 js/geo-polygon.js     | 2 +-
 js/kiri-driver-fdm.js | 2 +-
 js/kiri-print.js      | 5 +++--
 notes.md              | 2 ++
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/js/geo-polygon.js b/js/geo-polygon.js
index c57ddab2..8d4436d9 100644
--- a/js/geo-polygon.js
+++ b/js/geo-polygon.js
@@ -1050,7 +1050,7 @@ var gs_base_polygon = exports;
         return out;
     };
 
-    PRO.shortestSegmentLength() {
+    PRO.shortestSegmentLength = function() {
         var len = Infinity;
         this.forEachSegment(function(p1, p2) {
             len = Math.min(len, p1.distTo2D(p2));
diff --git a/js/kiri-driver-fdm.js b/js/kiri-driver-fdm.js
index 07c54d33..a334c509 100644
--- a/js/kiri-driver-fdm.js
+++ b/js/kiri-driver-fdm.js
@@ -357,7 +357,7 @@ var gs_kiri_fdm = exports;
             layer++;
             update(layer / maxLayers);
             // retract after last layer
-            if (layer === maxLayers) {
+            if (layer === maxLayers && layerout.length) {
                 layerout.last().retract = true;
             }
 
diff --git a/js/kiri-print.js b/js/kiri-print.js
index 47ac7c55..d7bbe184 100644
--- a/js/kiri-print.js
+++ b/js/kiri-print.js
@@ -484,6 +484,7 @@ var gs_kiri_print = exports;
             minSeek = nozzle * (opt.minSeek || 1.5),
             thinWall = nozzle * (opt.thinWall || 1.75),
             retractDist = opt.retractOver || 2,
+            retractDistFill = opt.retractOverSparse || 10,
             retractDistSparse = opt.retractOverSparse || 5,
             fillMult = opt.mult || process.outputFillMult,
             shellMult = opt.mult || process.outputShellMult || (process.laserSliceHeight >= 0 ? 1 : 0),
@@ -606,8 +607,8 @@ var gs_kiri_print = exports;
                         addOutput(preout, p2, fillMult * (find.d / thinWall), fillSpeed);
                         lastout = 1;
                     } else {
-                        // retract if dist trigger and crosses a slice top polygon
-                        if (dist > retractDist && intersectsTop(startPoint, p1)) {
+                        // retract if dist trigger or crosses a slice top polygon
+                        if (dist > retractDistFill || intersectsTop(startPoint, p1)) {
                             retract();
                         }
 
diff --git a/notes.md b/notes.md
index 4701b814..1d6d7da7 100644
--- a/notes.md
+++ b/notes.md
@@ -59,6 +59,8 @@
 
 # FDM todo
 
+* use fill spacing for top raft fill spacing
+* add first layer raft offset (addition)
 * fix thin fill
 * add pause at specified layers
 * fix slow seek to first point (raft) and wrong first point in general (all modes)