diff --git a/js/SettingsWindow.js b/js/SettingsWindow.js index a7d058b..60bb14d 100644 --- a/js/SettingsWindow.js +++ b/js/SettingsWindow.js @@ -4,7 +4,6 @@ var settings = { "network.ap.address": "192.168.10.1", "network.ap.netmask": "255.255.255.0", "printer.temperature": 220, -"printer.objectHeight": 20, "printer.maxObjectHeight": 150, "printer.layerHeight": 0.2, "printer.wallThickness": 0.7, diff --git a/js/gcodeGenerating_v01.js b/js/gcodeGenerating_v01.js index 7de1800..7a4908f 100755 --- a/js/gcodeGenerating_v01.js +++ b/js/gcodeGenerating_v01.js @@ -59,13 +59,13 @@ function generate_gcode(callback) { var travelSpeed = settings["printer.travelSpeed"] var filamentThickness = settings["printer.filamentThickness"]; var wallThickness = settings["printer.wallThickness"]; - var screenToMillimeterScale = isNaN(settings["printer.screenToMillimeterScale"]) ? 0.3 : settings["printer.screenToMillimeterScale"]; // TODO add this item to the settings on 'kastje' + var screenToMillimeterScale = settings["printer.screenToMillimeterScale"]; var layerHeight = settings["printer.layerHeight"]; - var objectHeight = settings["printer.objectHeight"]; - var maxObjectHeight = isNaN(settings["printer.maxObjectHeight"]) ? 150 : settings["printer.maxObjectHeight"]; // TODO add this item to the settings on 'kastje' + var maxObjectHeight = settings["printer.maxObjectHeight"]; var temperature = settings["printer.temperature"]; var useSubLayers = settings["printer.useSubLayers"]; - var enableTraveling = isNaN(settings["printer.enableTraveling"]) ? true : settings["printer.enableTraveling"]; // TODO add this item to the settings on 'kastje' + var enableTraveling = settings["printer.enableTraveling"]; + var retractionEnabled = settings["printer.retraction.enabled"]; var retractionspeed = settings["printer.retraction.speed"]; var retractionminDistance = settings["printer.retraction.minDistance"]; var retractionamount = settings["printer.retraction.amount"]; @@ -199,7 +199,7 @@ function generate_gcode(callback) { var z = (sublayer + 1) * layerHeight; // 2013-09-06 removed zOffset (seemed to be useless) var isTraveling = !isLoop && i==0; - var doRetract = prev.distance(to) > retractionminDistance; + var doRetract = retractionEnabled && prev.distance(to) > retractionminDistance; if (enableTraveling && isTraveling) { // console.log("enableTraveling && isTraveling >> doRetract: " + doRetract + ", retractionspeed: " + retractionspeed); diff --git a/settings.html b/settings.html index a0f1d2a..3a80414 100755 --- a/settings.html +++ b/settings.html @@ -11,7 +11,7 @@
-
+
Print settings @@ -64,7 +64,7 @@
mm/s
mm/s
-
+


* Continuously move platform while printing instead of once per layer @@ -80,8 +80,9 @@
Doodle3D settings - mm
px
+ mm
+ px
@@ -137,32 +138,4 @@
- - - + \ No newline at end of file