From 2cf90ac77ce0e1106c7fc187cbf2bee5574afe86 Mon Sep 17 00:00:00 2001
From: Stewart Allen <stewart.allen@gmail.com>
Date: Wed, 3 Jan 2018 07:39:55 -0500
Subject: [PATCH] add cooling control. remove accelcomp

---
 js/kiri-driver-fdm.js |  4 ++--
 js/kiri-print.js      | 11 -----------
 js/kiri.js            |  8 ++++----
 js/license.js         |  2 +-
 4 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/js/kiri-driver-fdm.js b/js/kiri-driver-fdm.js
index 30335cb9..deef1254 100644
--- a/js/kiri-driver-fdm.js
+++ b/js/kiri-driver-fdm.js
@@ -442,8 +442,8 @@ var gs_kiri_fdm = exports;
             }
 
             // second layer fan on
-            if (layer === 1 && fan_power) {
-                append(constReplace(fan_power,consts));
+            if (layer === 1 && fan_power && process.outputCooling) {
+                append(constReplace(fan_power, consts));
             }
 
             // move Z to layer height
diff --git a/js/kiri-print.js b/js/kiri-print.js
index 44d4d23a..bad866d3 100644
--- a/js/kiri-print.js
+++ b/js/kiri-print.js
@@ -418,7 +418,6 @@ var gs_kiri_print = exports;
 
         var options = options || {},
             process = this.settings.process,
-            accelComp = process.outputAccelComp,
             shortDist = process.outputShortDistance,
             shortDist2 = process.outputShortDistance * 2,
             shortFact = process.outputShortFactor,
@@ -441,16 +440,6 @@ var gs_kiri_print = exports;
                 if (options.shorten && dist > options.shorten && count === points.length) {
                     point = last.offsetPointFrom(point, options.shorten);
                 }
-                if (accelComp && options.accel && dist >= shortDist) {
-                    var sl = dist > shortDist2 ? shortDist : dist / 2,
-                        ml = dist > shortDist2 ? dist - sl - sl : 0,
-                        ps = dist > shortDist2 ? printSpeed : (sl / shortDist) * printSpeed,
-                        p2 = last.offsetPointTo(point, sl),
-                        p3 = last.offsetPointFrom(point, sl);
-                    segmentOutput(output, last, p2, shortSpeed, ps, 5, shellMult);
-                    if (ml) addOutput(output, p3, shellMult, printSpeed);
-                    segmentOutput(output, p3, point, ps, shortSpeed, 5, shellMult);
-                } else
                 if (shortDist && dist < shortDist) {
                     var shortRate = shortSpeed + (printSpeed - shortSpeed) * (dist / shortDist);
                     addOutput(output, point, shellMult, shortRate);
diff --git a/js/kiri.js b/js/kiri.js
index cf9af60b..9773f061 100644
--- a/js/kiri.js
+++ b/js/kiri.js
@@ -81,7 +81,7 @@ self.kiri.license = exports.LICENSE;
                     outputShortDistance: 1,
                     outputShortFactor: 1,
                     outputFinishFactor: 1,
-                    outputAccelComp: 1,
+                    outputCooling: 1,
                     outputOuterFirst: 1,
                     detectThinWalls: 1,
                     outputWipeSpeed: 1,
@@ -285,9 +285,9 @@ self.kiri.license = exports.LICENSE;
                 outputShortDistance: 5.0,
                 outputShortFactor: 0.2,
                 outputFinishFactor: 0,
-                outputAccelComp: false,
                 outputOuterFirst: false,
                 detectThinWalls: false,
+                outputCooling: true,
 
                 // --- LASER ---
 
@@ -2339,6 +2339,7 @@ self.kiri.license = exports.LICENSE;
             outputShellMult: UC.newInput("shell factor", {title:"extrusion multiplier\n0.0 - 2.0", convert:UC.toFloat, bound:UC.bound(0.0,2.0), modes:FDM}),
             outputFillMult: UC.newInput("solid factor", {title:"extrusion multiplier\n0.0 - 2.0", convert:UC.toFloat, bound:UC.bound(0.0,2.0), modes:FDM}),
             outputSparseMult:  UC.newInput("infill factor", {title:"extrusion multiplier\n0.0 - 2.0", convert:UC.toFloat, bound:UC.bound(0.0,2.0), modes:FDM}),
+            outputCooling: UC.newBoolean("cooling", onBooleanClick, {title: "enable cooling fan\nafter first layer", modes:FDM}),
 
             // cam
             camTolerance: UC.newInput("tolerance", {title:"surface precision\nin millimeters", convert:UC.toFloat, bound:UC.bound(0.05,1.0), modes:CAM}),
@@ -2382,9 +2383,8 @@ self.kiri.license = exports.LICENSE;
             outputShortDistance: UC.newInput("short distance", {title:"segment length cutoff\nfor short segments\nin millimeters", bound:UC.bound(0,200), convert:UC.toFloat, modes:FDM}),
             outputShortFactor: UC.newInput("short factor", {title:"max speed reduction factor\nfor short segments\nas % of print speed", bound:UC.bound(0.05,1), convert:UC.toFloat, modes:FDM}),
             outputFinishFactor: UC.newInput("finish factor", {title:"% of nozzle diameter to\nshorten finish path by\nvalues of 0-1", bound:UC.bound(0.0,1), convert:UC.toFloat, modes:FDM}),
-            outputAccelComp: UC.newBoolean("acceleration", onBooleanClick, {title: "acceleration compensation\nexperimental", modes:FDM}),
             outputOuterFirst: UC.newBoolean("outer first", onBooleanClick, {title: "output outermost shell first", modes:FDM}),
-            detectThinWalls: UC.newBoolean("thin wall", onBooleanClick, {title: "thin wall detection\nexperimental", modes:FDM}),
+            detectThinWalls: UC.newBoolean("thin wall", onBooleanClick, {title: "thin wall detection\nexperimental", modes:FDM})
         });
 
         function toolUpdate(a,b,c) {
diff --git a/js/license.js b/js/license.js
index e24aca8c..3cdedf67 100644
--- a/js/license.js
+++ b/js/license.js
@@ -1,7 +1,7 @@
 var exports = {
     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.",
-    VERSION:"1.0.77"
+    VERSION:"1.0.78"
 };
 if (!module) var module = {};
 module.exports = exports;