diff --git a/build/d3d.js b/build/d3d.js deleted file mode 100644 index a6f5bde..0000000 --- a/build/d3d.js +++ /dev/null @@ -1,1319 +0,0 @@ -/****************************************************** -* -* Utils -* requires jQuery, Three.js -* -******************************************************/ - -var D3D = { - "version": "0.1", - "website": "http://www.doodle3d.com/", - "contact": "develop@doodle3d.com" -}; - -function sendAPI (url, data, callback) { - "use strict"; - - $.ajax({ - url: url, - type: "POST", - data: data, - dataType: "json", - timeout: 10000, - success: function (response) { - if (response.status === "success") { - if (callback !== undefined) { - callback(response.data); - } - } - else { - console.warn(response.msg); - } - } - }).fail(function () { - console.warn("Failed connecting to " + url); - sendAPI(url, data, callback); - }); -} - -function getAPI (url, callback) { - "use strict"; - - $.ajax({ - url: url, - dataType: "json", - timeout: 5000, - success: function (response) { - if (response.status === "success") { - if (callback !== undefined) { - callback(response.data); - } - } - else { - console.warn(response.msg); - } - } - }).fail(function () { - console.warn("Failed connecting to " + url); - getAPI(url, callback); - }); -} - -function loadSettings (url, callback) { - "use strict"; - - $.ajax({ - url: url, - dataType: "json", - success: function (response) { - if (callback !== undefined) { - callback(response); - } - } - }); -} - -function downloadFile (file, data) { - "use strict"; - - var blob = new Blob([data], {type:'text/plain'}); - - var button = document.createElement("a"); - button.download = file; - button.href = window.URL.createObjectURL(blob); - button.click(); -} - -Array.prototype.clone = function () { - "use strict"; - var array = []; - - for (var i = 0; i < this.length; i ++) { - array[i] = this[i]; - } - - return array; -} -/****************************************************** -* -* Box -* Representation of de Doodle3DBox -* Handles all communication with the doodle box -* JavaScript shell for api communication -* Check http://www.doodle3d.com/help/api-documentation -* -******************************************************/ - -//TODO -//Als meerdere clients met box zouden verbinden zal de api te veel requests krijgen waardoor hij crasht -//implimentatie van het veranderen van onder andere naam, netwerkverbinding etc - -D3D.Box = function (localIp) { - "use strict"; - var self = this; - - this.batchSize = 512; - this.maxBufferedLines = 4096; - - this.localIp = localIp; - this.api = "http://" + localIp + "/d3dapi/"; - - this.config = {}; - this.status = {}; - - this.printBatches = []; - this.currentBatch = 0; - - this.loaded = false; - - this.getConfigAll(function (data) { - self.updateConfig(data); - - self.update(); - - self.loaded = true; - if (self.onload !== undefined) { - self.onload(); - } - }); -}; -D3D.Box.prototype.updateConfig = function (config) { - "use strict"; - - for (var i in config) { - this.config[i] = config[i]; - } - - return this; -}; -D3D.Box.prototype.update = function () { - "use strict"; - //TODO - //Code is zo op gezet dat maar api call te gelijk is - //Bij error wordt gelijk zelfde data opnieuw gestuurd - //Als DoodleBox ontkoppeld wordt komt er een error in de loop waardoor pagina breekt en ververst moet worden - - if (this.printBatches.length > 0 && (this.status["buffered_lines"] + this.batchSize) <= this.maxBufferedLines) { - //if (this.printBatches.length > 0 ) { - this.printBatch(); - } - else { - this.updateState(); - } -}; -D3D.Box.prototype.updateState = function () { - //que api calls so they don't overload the d3d box - "use strict"; - var self = this; - - this.getInfoStatus(function (data) { - self.status = data; - - if (self.onupdate !== undefined) { - self.onupdate(data); - } - - self.update(); - }); -}; -D3D.Box.prototype.print = function (gcode) { - "use strict"; - - this.currentBatch = 0; - - //clone gcode to remove array links - gcode = gcode.clone(); - - //gcode split in batches - while (gcode.length > 0) { - var gcodeBatch = gcode.splice(0, Math.min(this.batchSize, gcode.length)); - this.printBatches.push(gcodeBatch); - } - - return this; -}; -D3D.Box.prototype.printBatch = function () { - "use strict"; - var self = this; - - var gcode = this.printBatches.shift(); - - this.setPrinterPrint({ - "start": ((this.currentBatch === 0) ? true : false), - "first": ((this.currentBatch === 0) ? true : false), - "gcode": gcode.join("\n") - }, function (data) { - console.log("batch sent: " + self.currentBatch, data); - - if (self.printBatches.length > 0) { - //sent new batch - self.currentBatch ++; - } - else { - //finish sending - } - - self.updateState(); - }); -}; -D3D.Box.prototype.stopPrint = function () { - "use strict"; - - this.printBatches = []; - this.currentBatch = 0; - - var finishMove = [ - "M107 ;fan off", - "G91 ;relative positioning", - "G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure", - "G1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more", - "G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way", - "M84 ;disable axes / steppers", - "G90 ;absolute positioning", - "M104 S180", - ";M140 S70", - "M117 Done ;display message (20 characters to clear whole screen)" - ]; - - this.setPrinterStop({ - //"gcode": {} - "gcode": finishMove.join("\n") - }, function (data) { - console.log("Printer stop command sent"); - }); - - return this; -}; - -//COMMUNICATION SHELL -//see http://www.doodle3d.com/help/api-documentation -D3D.Box.prototype.getConfig = function (keys, callback) { - "use strict"; - - getAPI(this.api + "config/?" + keys.join("=&") + "=", callback); - - return this; -}; -D3D.Box.prototype.getConfigAll = function (callback) { - "use strict"; - - getAPI(this.api + "config/all", callback); - - return this; -}; -D3D.Box.prototype.setConfig = function (data, callback) { - "use strict"; - var self = this; - - sendAPI(this.api + "config", data, function (response) { - for (var i in response.validation) { - if (response.validation[i] === "ok") { - self[i] = data[i]; - } - } - - if (callback !== undefined) { - callback(response); - } - }); - - return this; -}; -D3D.Box.prototype.getInfo = function (callback) { - "use strict"; - - getAPI(this.api + "info", callback); - - return this; -}; -D3D.Box.prototype.getInfoStatus = function (callback) { - "use strict"; - - getAPI(this.api + "info/status", callback); - - return this; -}; -D3D.Box.prototype.downloadInfoLogFiles = function () { - //works in google chrome... not tested in other browsers - //some browsers may redirect using this code - "use strict"; - - window.location = this.api + "info/logfiles"; -}; -D3D.Box.prototype.getInfoAcces = function (callback) { - "use strict"; - - getAPI(this.api + "info/access", callback); - - return this; -}; -D3D.Box.prototype.getNetworkScan = function (callback) { - "use strict"; - - getAPI(this.api + "network/scan", callback); - - return this; -}; -D3D.Box.prototype.getNetworkKnown = function (callback) { - "use strict"; - - getAPI(this.api + "network/known", callback); - - return this; -}; -D3D.Box.prototype.getNetworkStatus = function (callback) { - "use strict"; - - getAPI(this.api + "network/status", callback); - - return this; -}; -D3D.Box.prototype.setNetworkAssosiate = function (data, callback) { - "use strict"; - - sendAPI(this.api + "network/associate", data, callback); - - return this; -}; -D3D.Box.prototype.setNetworkDisassosiate = function (callback) { - //not tested - "use strict"; - - sendAPI(this.api + "network/disassociate", {}, callback); - - return this; -}; -D3D.Box.prototype.setNetworkOpenAP = function (callback) { - //not tested - "use strict"; - - sendAPI(this.api + "network/openap", {}, callback); - - return this; -}; -D3D.Box.prototype.setNetworkRemove = function (ssid, callback) { - "use strict"; - - sendAPI(this.api + "network/remove", { - "ssid": ssid - }, callback); - - return this; -}; -D3D.Box.prototype.getNetworkSignin = function (callback) { - "use strict"; - - getAPI(this.api + "network/signin", callback); - - return this; -}; -D3D.Box.prototype.getNetworkAlive = function (callback) { - "use strict"; - - getAPI(this.api + "network/alive", callback); - - return this; -}; -D3D.Box.prototype.getPrinterTemperature = function (callback) { - "use strict"; - - getAPI(this.api + "printer/temperature", callback); - - return this; -}; -D3D.Box.prototype.getPrinterProgress = function (callback) { - "use strict"; - - getAPI(this.api + "printer/progress", callback); - - return this; -}; -D3D.Box.prototype.getPrinterState = function (callback) { - "use strict"; - - getAPI(this.api + "printer/state", callback); - - return this; -}; -D3D.Box.prototype.getPrinterListAll = function (callback) { - "use strict"; - - getAPI(this.api + "printer/listall", callback); - - return this; -}; -D3D.Box.prototype.setPrinterHeatup = function (callback) { - "use strict"; - - sendAPI(this.api + "printer/heatup", {}, callback); - - return this; -}; -D3D.Box.prototype.setPrinterPrint = function (data, callback) { - "use strict"; - - sendAPI(this.api + "printer/print", data, callback); - - return this; -}; -D3D.Box.prototype.setPrinterStop = function (data, callback) { - "use strict"; - - sendAPI(this.api + "printer/stop", data, callback); - - return this; -}; -D3D.Box.prototype.getSketch = function (id, callback) { - "use strict"; - - getAPI(this.api + "sketch/?id=" + id, callback); - - return this; -}; -D3D.Box.prototype.setSketch = function (data, callback) { - "use strict"; - - sendAPI(this.api + "sketch", { - "data": data - }, callback); - - return this; -}; -D3D.Box.prototype.getSketchStatus = function (callback) { - "use strict"; - - getAPI(this.api + "sketch/status", callback); - - return this; -}; -D3D.Box.prototype.setSketchClear = function (callback) { - "use strict"; - - sendAPI(this.api + "sketch/clear", callback); - - return this; -}; -D3D.Box.prototype.getSystemVersions = function (callback) { - "use strict"; - - getAPI(this.api + "system/fwversions", callback); - - return this; -}; -D3D.Box.prototype.getUpdateStatus = function (callback) { - "use strict"; - - getAPI(this.api + "update/status", callback); - - return this; -}; -D3D.Box.prototype.setUpdateDownload = function (callback) { - //not tested - "use strict"; - - sendAPI(this.api + "update/download", {}, callback); - - return this; -}; -D3D.Box.prototype.setUpdateInstall = function (callback) { - //not tested - "use strict"; - - sendAPI(this.api + "update/install", {}, callback); - - return this; -}; -D3D.Box.prototype.setUpdateClear = function (callback) { - //not tested - "use strict"; - - sendAPI(this.api + "update/clear", {}, callback); - - return this; -}; -/****************************************************** -* -* Printer -* Representation of the connected printer -* -******************************************************/ - -D3D.Printer = function (printerSettings, userSettings) { - "use strict"; - - this.config = {}; - - this.updateConfig(printerSettings); - this.updateConfig(userSettings); -}; -D3D.Printer.prototype.updateConfig = function (config) { - "use strict"; - - for (var i in config) { - if (i.indexOf("printer") === 0) { - this.config[i] = config[i]; - } - } - - return this; -}; -D3D.Printer.prototype.getStartCode = function () { - "use strict"; - - var gcode = this.config["printer.startcode"]; - gcode = this.subsituteVariables(gcode); - - return gcode.split("\n"); -}; -D3D.Printer.prototype.getEndCode = function () { - "use strict"; - - var gcode = this.config["printer.endcode"]; - gcode = this.subsituteVariables(gcode); - - return gcode.split("\n"); -}; -D3D.Printer.prototype.subsituteVariables = function (gcode) { - "use strict"; - - var temperature = this.config["printer.temperature"]; - var bedTemperature = this.config["printer.bed.temperature"]; - var preheatTemperature = this.config["printer.heatup.temperature"]; - var preheatBedTemperature = this.config["printer.heatup.bed.temperature"]; - var printerType = this.config["printer.type"]; - var heatedbed = this.config["printer.heatedbed"]; - - switch (printerType) { - case "makerbot_replicator2": printerType = "r2"; break; - case "makerbot_replicator2x": printerType = "r2x"; break; - case "makerbot_thingomatic": printerType = "t6"; break; - case "makerbot_generic": printerType = "r2"; break; - case "_3Dison_plus": printerType = "r2"; break; - } - var heatedBedReplacement = heatedbed ? "" : ";"; - - gcode = gcode.replace(/{printingTemp}/gi, temperature); - gcode = gcode.replace(/{printingBedTemp}/gi, bedTemperature); - gcode = gcode.replace(/{preheatTemp}/gi, preheatTemperature); - gcode = gcode.replace(/{preheatBedTemp}/gi, preheatBedTemperature); - gcode = gcode.replace(/{printerType}/gi, printerType); - gcode = gcode.replace(/{if heatedBed}/gi, heatedBedReplacement); - - return gcode; -}; -/****************************************************** -* -* Path -* -* Abstraction layer for annoying clipper js -* -******************************************************/ - -D3D.Paths = function (paths, closed) { - "use strict"; - - Array.call(this); - - this.setPaths(paths || []); - - this.closed = (closed !== undefined) ? closed : true; -}; -D3D.Paths.prototype = Object.create(Array.prototype); -D3D.Paths.prototype.setPaths = function (paths) { - "use strict"; - - for (var i = 0; i < paths.length; i ++) { - var path = paths[i]; - if (path.length > 0) { - this.push(path); - } - } - - return this; -}; -D3D.Paths.prototype.clip = function (path, type) { - "use strict"; - - var solution = new ClipperLib.Paths(); - - var clipper = new ClipperLib.Clipper(); - clipper.AddPaths(this, ClipperLib.PolyType.ptSubject, this.closed); - clipper.AddPaths(path, ClipperLib.PolyType.ptClip, path.closed); - clipper.Execute(type, solution); - - return new D3D.Paths(solution, this.closed); -}; -D3D.Paths.prototype.union = function (path) { - "use strict"; - - return this.clip(path, ClipperLib.ClipType.ctUnion); -}; -D3D.Paths.prototype.difference = function (path) { - "use strict"; - - return this.clip(path, ClipperLib.ClipType.ctDifference); -}; -D3D.Paths.prototype.intersect = function (path) { - "use strict"; - - return this.clip(path, ClipperLib.ClipType.ctIntersection); -}; -D3D.Paths.prototype.xor = function () { - "use strict"; - - return this.clip(path, ClipperLib.ClipType.ctXor); -}; -D3D.Paths.prototype.offset = function (offset) { - "use strict"; - - var solution = new ClipperLib.Paths(); - var co = new ClipperLib.ClipperOffset(1, 1); - co.AddPaths(this, ClipperLib.JoinType.jtRound, ClipperLib.EndType.etClosedPolygon); - co.Execute(solution, offset); - - return new D3D.Paths(solution); -}; -D3D.Paths.prototype.scaleUp = function (factor) { - "use strict"; - - var path = ClipperLib.JS.ScaleUpPaths(this, factor); - - return this; -}; -D3D.Paths.prototype.scaleDown = function (factor) { - "use strict"; - - var path = ClipperLib.JS.ScaleDownPaths(this, factor); - - return this; -}; -D3D.Paths.prototype.lastPoint = function () { - "use strict"; - - var lastPath = this[this.length - 1]; - var lastPoint = this.closed ? lastPath[0] : lastPath[lastPath.length - 1]; - return new THREE.Vector2(lastPoint.X, lastPoint.Y); -}; -D3D.Paths.prototype.optimizePath = function (start) { - "use strict"; - - var optimizedPaths = new D3D.Paths([], this.closed); - var donePaths = []; - - while (optimizedPaths.length !== this.length) { - var minLength = false; - var reverse; - var minPath; - var offset; - var pathIndex; - - for (var i = 0; i < this.length; i ++) { - var path = this[i]; - - if (donePaths.indexOf(i) === -1) { - - if (this.closed) { - for (var j = 0; j < path.length; j ++) { - var point = new THREE.Vector2(path[j].X, path[j].Y); - var length = point.sub(start).length(); - if (minLength === false || length < minLength) { - minPath = path; - minLength = length; - offset = j; - pathIndex = i; - } - } - } - else { - var startPoint = new THREE.Vector2(path[0].X, path[0].Y); - var length = startPoint.sub(start).length(); - if (minLength === false || length < minLength) { - minPath = path; - minLength = length; - reverse = false; - pathIndex = i; - } - var endPoint = new THREE.Vector2(path[path.length - 1].X, path[path.length - 1].Y); - var length = endPoint.sub(start).length(); - if (length < minLength) { - minPath = path; - minLength = length; - reverse = true; - pathIndex = i; - } - } - } - } - - if (this.closed) { - minPath = minPath.concat(minPath.splice(0, offset)); - var point = minPath[0]; - } - else { - if (reverse) { - minPath.reverse(); - } - var point = minPath[minPath.length - 1]; - } - donePaths.push(pathIndex); - start = new THREE.Vector2(point.X, point.Y); - optimizedPaths.push(minPath); - } - - return optimizedPaths; -}; -D3D.Paths.prototype.tresholdArea = function (minArea) { - //code not tested yet - "use strict"; - - for (var i = 0; i < this.length; i ++) { - var shape = this[i]; - - var area = ClipperLib.Clipper.Area(shape); - - if (area < minArea) { - this.splice(i, 1); - i --; - } - } - - return areas; -}; -D3D.Paths.prototype.join = function (path) { - "use strict"; - - for (var i = 0; i < path.length; i ++) { - this.push(path[i]); - } - - return this; -}; -D3D.Paths.prototype.clone = function () { - "use strict"; - - return new D3D.Paths(ClipperLib.JS.Clone(this), this.closed); -}; -D3D.Paths.prototype.bounds = function () { - "use strict"; - - return ClipperLib.Clipper.GetBounds(this); -}; -D3D.Paths.prototype.draw = function (context, color) { - "use strict"; - - context.strokeStyle = color; - for (var i = 0; i < this.length; i ++) { - var shape = this[i]; - - //var point = shape[0]; - //context.fillText(i, point.X*2, point.Y*2); - - context.beginPath(); - var length = this.closed ? (shape.length + 1) : shape.length; - for (var j = 0; j < length; j ++) { - var point = shape[j % shape.length]; - - context.lineTo(point.X*2, point.Y*2); - } - context.stroke(); - } -}; -/****************************************************** -* -* Slicer -* -* TODO (optimalisatie) -* sorteer lijnen op laagste hoogte -> stop loop wanneer hij een lijn zonder intersectie heeft gevonden -* verwijder lijnen die ooit interactie gehad hebben, maar nu niet meer -* helft van lijnen toevoegen omdat 4face altijd recht is, en 3face dus te veel data bevat -* -* omliggende lagen -> difference && sum omliggende lijnen -* voor laag 5 = 5 diff (3 && 4 && 6 && 7)) -* -******************************************************/ - -D3D.Slicer = function () { - "use strict"; -}; -D3D.Slicer.prototype.setMesh = function (mesh) { - "use strict"; - - //convert buffergeometry to geometry; - var geometry = mesh.geometry.clone(); - if (geometry instanceof THREE.BufferGeometry) { - geometry = new THREE.Geometry().fromBufferGeometry(geometry); - } - - //remove duplicate vertices; - for (var i = 0; i < geometry.vertices.length; i ++) { - var vertexA = geometry.vertices[i]; - - for (var j = i + 1; j < geometry.vertices.length; j ++) { - var vertexB = geometry.vertices[j]; - - if (vertexA.equals(vertexB)) { - geometry.vertices[j] = vertexA; - } - } - } - geometry.mergeVertices(); - - //apply mesh matrix on geometry; - mesh.updateMatrix(); - geometry.applyMatrix(mesh.matrix); - geometry.computeFaceNormals(); - geometry.computeBoundingBox(); - - this.geometry = geometry; - - //get unique lines from geometry; - this.createLines(); - - return this; -}; -D3D.Slicer.prototype.createLines = function () { - "use strict"; - - this.lines = []; - var lineLookup = {}; - - var self = this; - function addLine (a, b) { - - //think lookup can only be b_a, a_b is only possible when face is flipped - var index = lineLookup[b + "_" + a] || lineLookup[a + "_" + b]; - - if (index === undefined) { - index = self.lines.length; - lineLookup[a + "_" + b] = index; - - self.lines.push({ - line: new THREE.Line3(self.geometry.vertices[a], self.geometry.vertices[b]), - connects: [], - normals: [], - ignore: 0 - }); - } - - return index; - } - - for (var i = 0; i < this.geometry.faces.length; i ++) { - var face = this.geometry.faces[i]; - - if (face.normal.y !== 1 && face.normal.y !== -1) { - var normal = new THREE.Vector2().set(face.normal.z, face.normal.x).normalize(); - - //check for only adding unique lines - //returns index of said line - var a = addLine(face.a, face.b); - var b = addLine(face.b, face.c); - var c = addLine(face.c, face.a); - - //set connecting lines (based on face) - this.lines[a].connects.push(b, c); - this.lines[b].connects.push(c, a); - this.lines[c].connects.push(a, b); - - this.lines[a].normals.push(normal); - this.lines[b].normals.push(normal); - this.lines[c].normals.push(normal); - } - } -}; -D3D.Slicer.prototype.slice = function (height, step) { - "use strict"; - - var layersIntersections = []; - - for (var i = 0; i < this.lines.length; i ++) { - var line = this.lines[i]; - - var min = Math.ceil(Math.min(line.line.start.y, line.line.end.y) / step); - var max = Math.floor(Math.max(line.line.start.y, line.line.end.y) / step); - - for (var layerIndex = min; layerIndex <= max; layerIndex ++) { - if (layerIndex >= 0) { - if (layersIntersections[layerIndex] === undefined) { - layersIntersections[layerIndex] = []; - } - layersIntersections[layerIndex].push(i); - } - } - } - - var slices = []; - - //still error in first layer, so remove first layer & last layer - //see https://github.com/Doodle3D/Doodle3D-Slicer/issues/1 - for (var layer = 1; layer < layersIntersections.length-1; layer ++) { - //for (var layer = 0; layer < layersIntersections.length; layer ++) { - var layerIntersections = layersIntersections[layer]; - var y = layer*step; - - var intersections = []; - for (var i = 0; i < layerIntersections.length; i ++) { - var index = layerIntersections[i]; - var line = this.lines[index].line; - - var alpha = (y - line.start.y) / (line.end.y - line.start.y); - var x = line.end.x * alpha + line.start.x * (1 - alpha); - var z = line.end.z * alpha + line.start.z * (1 - alpha); - - intersections[index] = new THREE.Vector2(z, x); - } - - var done = []; - var slice = []; - for (var i = 0; i < layerIntersections.length; i ++) { - var index = layerIntersections[i]; - - if (done.indexOf(index) === -1) { - var shape = []; - - while (index !== -1) { - var intersection = intersections[index]; - shape.push({X: intersection.x, Y: intersection.y}); - - done.push(index); - - var connects = this.lines[index].connects; - var faceNormals = this.lines[index].normals; - for (var j = 0; j < connects.length; j ++) { - index = connects[j]; - - if (intersections[index] && done.indexOf(index) === -1) { - var a = new THREE.Vector2(intersection.x, intersection.y); - var b = intersections[index]; - var normal = a.sub(b).normal().normalize(); - var faceNormal = faceNormals[Math.floor(j/2)]; - - if (normal.dot(faceNormal) > 0) { - break; - } - else { - index = -1; - } - } - else { - index = -1; - } - } - } - - /* - for (var i = 0; i < shape.length; i ++) { - var point = shape[i]; - var previousPoint = shape[(i + shape.length - 1) % shape.length]; - var nextPoint = shape[(i + 1) % shape.length]; - - var point = new THREE.Vector2(point.X, point.Y); - var previousPoint = new THREE.Vector2(previousPoint.X, previousPoint.Y); - var nextPoint = new THREE.Vector2(nextPoint.X, nextPoint.Y); - //var lineLength = nextPoint.sub(previousPoint).length(); - - var normal = nextPoint.sub(previousPoint).normal().normalize(); - var distance = Math.abs(normal.dot(point.sub(previousPoint))); - - //something better for offset check - if (distance <= 0.01) { - shape.splice(i, 1); - i --; - } - } - */ - - //think this check is not nescesary, always higher as 0 - if (shape.length > 0) { - slice.push(new D3D.Paths([shape])); - } - } - } - - var layerParts = []; - - for (var i = 0; i < slice.length; i ++) { - var layerPart1 = slice[i]; - var merge = false; - - for (var j = 0; j < layerParts.length; j ++) { - var layerPart2 = layerParts[j]; - - if (layerPart2.intersect(layerPart1).length > 0) { - layerPart2.join(layerPart1); - merge = true; - break; - } - } - if (!merge) { - layerParts.push(layerPart1); - } - } - - //stop when ther are no intersects - if (layerParts.length > 0) { - slices.push(layerParts); - } - else { - break; - } - } - - return slices; -}; -D3D.Slicer.prototype.slicesToData = function (slices, printer) { - "use strict"; - - var scale = 100; - - var layerHeight = printer.config["printer.layerHeight"] * scale; - var dimensionsZ = printer.config["printer.dimensions.z"] * scale; - var wallThickness = printer.config["printer.wallThickness"] * scale / 2; - var shellThickness = printer.config["printer.shellThickness"] * scale; - var fillSize = printer.config["printer.fillSize"] * scale; - var brimOffset = printer.config["printer.brimOffset"] * scale; - var bottomThickness = printer.config["printer.bottomThickness"] * scale; - var topThickness = printer.config["printer.topThickness"] * scale; - - var bottomSkinCount = Math.ceil(bottomThickness/layerHeight); - var topSkinCount = Math.ceil(topThickness/layerHeight); - - var start = new THREE.Vector2(0, 0); - - var data = []; - - var lowFillTemplate = this.getFillTemplate({ - left: this.geometry.boundingBox.min.z * scale, - top: this.geometry.boundingBox.min.x * scale, - right: this.geometry.boundingBox.max.z * scale, - bottom: this.geometry.boundingBox.max.x * scale - }, fillSize, true, true); - - for (var layer = 0; layer < slices.length; layer ++) { - var slice = slices[layer]; - - var layerData = []; - data.push(layerData); - - var downSkin = new D3D.Paths([], true); - if (layer - bottomSkinCount >= 0) { - var downLayer = slices[layer - bottomSkinCount]; - for (var i = 0; i < downLayer.length; i ++) { - downSkin.join(downLayer[i]); - } - } - var upSkin = new D3D.Paths([], true); - if (layer + topSkinCount < slices.length) { - var downLayer = slices[layer + topSkinCount]; - for (var i = 0; i < downLayer.length; i ++) { - upSkin.join(downLayer[i]); - } - } - var surroundingLayer = upSkin.intersect(downSkin).scaleUp(scale); - var sliceData = []; - - for (var i = 0; i < slice.length; i ++) { - var part = slice[i]; - - //var outerLayer = part.clone(); - var outerLayer = part.clone().scaleUp(scale).offset(-wallThickness/2); - - if (outerLayer.length > 0) { - var insets = new D3D.Paths([], true); - for (var offset = wallThickness; offset <= shellThickness; offset += wallThickness) { - var inset = outerLayer.offset(-offset); - - insets.join(inset); - } - - var fillArea = (inset || outerLayer).offset(-wallThickness/2); - //var fillArea = (inset || outerLayer).clone(); - - var highFillArea = fillArea.difference(surroundingLayer); - - var lowFillArea = fillArea.difference(highFillArea); - - var fill = new D3D.Paths([], false); - - if (lowFillTemplate.length > 0) { - fill.join(lowFillTemplate.intersect(lowFillArea)); - } - - if (highFillArea.length > 0) { - var bounds = highFillArea.bounds(); - var even = (layer % 2 === 0); - var highFillTemplate = this.getFillTemplate(bounds, wallThickness, even, !even); - fill.join(highFillTemplate.intersect(highFillArea)); - } - - outerLayer = outerLayer.optimizePath(start); - if (insets.length > 0) { - insets = insets.optimizePath(outerLayer.lastPoint()); - fill = fill.optimizePath(insets.lastPoint()); - } - else { - fill = fill.optimizePath(outerLayer.lastPoint()); - } - - if (fill.length > 0) { - start = fill.lastPoint(); - } - else if (insets.length > 0) { - start = insets.lastPoint(); - } - else { - start = outerLayer.lastPoint(); - } - - layerData.push({ - outerLayer: outerLayer.scaleDown(scale), - fill: fill.scaleDown(scale), - insets: insets.scaleDown(scale) - }); - } - } - } - - return data; -}; -D3D.Slicer.prototype.getFillTemplate = function (bounds, size, even, uneven) { - "use strict"; - - var paths = new D3D.Paths([], false); - - if (even) { - for (var length = Math.floor(bounds.left/size)*size; length <= Math.ceil(bounds.right/size)*size; length += size) { - paths.push([{X: length, Y: bounds.top}, {X: length, Y: bounds.bottom}]); - } - } - if (uneven) { - for (var length = Math.floor(bounds.top/size)*size; length <= Math.floor(bounds.bottom/size)*size; length += size) { - paths.push([{X: bounds.left, Y: length}, {X: bounds.right, Y: length}]); - } - } - - //return paths; - return paths; -}; -D3D.Slicer.prototype.dataToGcode = function (data, printer) { - "use strict"; - - var layerHeight = printer.config["printer.layerHeight"]; - var normalSpeed = printer.config["printer.speed"]; - var bottomSpeed = printer.config["printer.bottomLayerSpeed"]; - var firstLayerSlow = printer.config["printer.firstLayerSlow"]; - var bottomFlowRate = printer.config["printer.bottomFlowRate"]; - var travelSpeed = printer.config["printer.travelSpeed"]; - var filamentThickness = printer.config["printer.filamentThickness"]; - var wallThickness = printer.config["printer.wallThickness"]; - var enableTraveling = printer.config["printer.enableTraveling"]; - var retractionEnabled = printer.config["printer.retraction.enabled"]; - var retractionSpeed = printer.config["printer.retraction.speed"]; - var retractionMinDistance = printer.config["printer.retraction.minDistance"]; - var retractionAmount = printer.config["printer.retraction.amount"]; - - function sliceToGcode (slice) { - var gcode = []; - - for (var i = 0; i < slice.length; i ++) { - var shape = slice[i]; - - var previousPoint; - - var length = slice.closed ? (shape.length + 1) : shape.length; - - for (var j = 0; j < length; j ++) { - var point = shape[j % shape.length]; - - if (j === 0) { - //TODO - //add retraction - if (extruder > retractionMinDistance && retractionEnabled) { - gcode.push([ - "G0", - "E" + (extruder - retractionAmount).toFixed(3), - "F" + (retractionSpeed * 60).toFixed(3) - ].join(" ")); - } - - gcode.push([ - "G0", - "X" + point.X.toFixed(3) + " Y" + point.Y.toFixed(3) + " Z" + z, - "F" + (travelSpeed * 60) - ].join(" ")); - - if (extruder > retractionMinDistance && retractionEnabled) { - gcode.push([ - "G0", - "E" + extruder.toFixed(3), - "F" + (retractionSpeed * 60).toFixed(3) - ].join(" ")); - } - } - else { - var a = new THREE.Vector2(point.X, point.Y); - var b = new THREE.Vector2(previousPoint.X, previousPoint.Y); - var lineLength = a.distanceTo(b); - - extruder += lineLength * wallThickness * layerHeight / filamentSurfaceArea * flowRate; - - gcode.push([ - "G1", - "X" + point.X.toFixed(3) + " Y" + point.Y.toFixed(3) + " Z" + z, - "F" + speed, - "E" + extruder.toFixed(3) - ].join(" ")); - } - - previousPoint = point; - } - } - - return gcode; - } - - var gcode = printer.getStartCode(); - - var extruder = 0.0; - var speed = firstLayerSlow ? (bottomSpeed*60).toFixed(3) : (normalSpeed*60).toFixed(3); - var filamentSurfaceArea = Math.pow((filamentThickness/2), 2) * Math.PI; - var flowRate = bottomFlowRate; - - for (var layer = 0; layer < data.length; layer ++) { - var slice = data[layer]; - - //turn on fan on layer 2 - if (layer === 2) { - gcode.push("M106"); - speed = (normalSpeed*60).toFixed(3); - flowRate = 1; - } - - var z = ((layer + 1) * layerHeight).toFixed(3); - - for (var i = 0; i < slice.length; i ++) { - var layerPart = slice[i]; - - gcode = gcode.concat(sliceToGcode(layerPart.outerLayer)); - gcode = gcode.concat(sliceToGcode(layerPart.insets)); - gcode = gcode.concat(sliceToGcode(layerPart.fill)); - } - } - - gcode = gcode.concat(printer.getEndCode()); - - return gcode; -}; -//only for debug purposes -D3D.Slicer.prototype.drawPaths = function (printer, min, max) { - "use strict"; - - var layerHeight = printer.config["printer.layerHeight"]; - var dimensionsZ = printer.config["printer.dimensions.z"]; - - var slices = this.slice(dimensionsZ, layerHeight); - - var data = this.slicesToData(slices, printer); - - var canvas = document.createElement("canvas"); - canvas.width = 400; - canvas.height = 400; - var context = canvas.getContext("2d"); - - for (var layer = min; layer < max; layer ++) { - var slice = data[layer % data.length]; - - for (var i = 0; i < slice.length; i ++) { - var layerPart = slice[i]; - - layerPart.insets.draw(context, "blue"); - layerPart.outerLayer.draw(context, "green"); - layerPart.fill.draw(context, "red"); - } - } - - return canvas; -}; -D3D.Slicer.prototype.getGcode = function (printer) { - "use strict"; - - var layerHeight = printer.config["printer.layerHeight"]; - var dimensionsZ = printer.config["printer.dimensions.z"]; - - var start = new Date().getTime(); - var slices = this.slice(dimensionsZ, layerHeight); - var end = new Date().getTime(); - console.log("Slicing: " + (end - start) + "ms"); - - var start = new Date().getTime(); - var data = this.slicesToData(slices, printer); - var end = new Date().getTime(); - console.log("Data: " + (end - start) + "ms"); - - var start = new Date().getTime(); - var gcode = this.dataToGcode(data, printer); - var end = new Date().getTime(); - console.log("Gcode: " + (end - start) + "ms"); - - return gcode; -}; \ No newline at end of file diff --git a/build/d3d.min.js b/build/d3d.min.js deleted file mode 100644 index a450e98..0000000 --- a/build/d3d.min.js +++ /dev/null @@ -1 +0,0 @@ -function sendAPI(t,e,i){"use strict";$.ajax({url:t,type:"POST",data:e,dataType:"json",timeout:1e4,success:function(t){"success"===t.status?void 0!==i&&i(t.data):console.warn(t.msg)}}).fail(function(){console.warn("Failed connecting to "+t),sendAPI(t,e,i)})}function getAPI(t,e){"use strict";$.ajax({url:t,dataType:"json",timeout:5e3,success:function(t){"success"===t.status?void 0!==e&&e(t.data):console.warn(t.msg)}}).fail(function(){console.warn("Failed connecting to "+t),getAPI(t,e)})}function loadSettings(t,e){"use strict";$.ajax({url:t,dataType:"json",success:function(t){void 0!==e&&e(t)}})}function downloadFile(t,e){"use strict";var i=new Blob([e],{type:"text/plain"}),r=document.createElement("a");r.download=t,r.href=window.URL.createObjectURL(i),r.click()}var D3D={version:"0.1",website:"http://www.doodle3d.com/",contact:"develop@doodle3d.com"};Array.prototype.clone=function(){"use strict";for(var t=[],e=0;e0&&this.status.buffered_lines+this.batchSize<=this.maxBufferedLines?this.printBatch():this.updateState()},D3D.Box.prototype.updateState=function(){"use strict";var t=this;this.getInfoStatus(function(e){t.status=e,void 0!==t.onupdate&&t.onupdate(e),t.update()})},D3D.Box.prototype.print=function(t){"use strict";for(this.currentBatch=0,t=t.clone();t.length>0;){var e=t.splice(0,Math.min(this.batchSize,t.length));this.printBatches.push(e)}return this},D3D.Box.prototype.printBatch=function(){"use strict";var t=this,e=this.printBatches.shift();this.setPrinterPrint({start:0===this.currentBatch?!0:!1,first:0===this.currentBatch?!0:!1,gcode:e.join("\n")},function(e){console.log("batch sent: "+t.currentBatch,e),t.printBatches.length>0&&t.currentBatch++,t.updateState()})},D3D.Box.prototype.stopPrint=function(){"use strict";this.printBatches=[],this.currentBatch=0;var t=["M107 ;fan off","G91 ;relative positioning","G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure","G1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more","G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way","M84 ;disable axes / steppers","G90 ;absolute positioning","M104 S180",";M140 S70","M117 Done ;display message (20 characters to clear whole screen)"];return this.setPrinterStop({gcode:t.join("\n")},function(t){console.log("Printer stop command sent")}),this},D3D.Box.prototype.getConfig=function(t,e){"use strict";return getAPI(this.api+"config/?"+t.join("=&")+"=",e),this},D3D.Box.prototype.getConfigAll=function(t){"use strict";return getAPI(this.api+"config/all",t),this},D3D.Box.prototype.setConfig=function(t,e){"use strict";var i=this;return sendAPI(this.api+"config",t,function(r){for(var n in r.validation)"ok"===r.validation[n]&&(i[n]=t[n]);void 0!==e&&e(r)}),this},D3D.Box.prototype.getInfo=function(t){"use strict";return getAPI(this.api+"info",t),this},D3D.Box.prototype.getInfoStatus=function(t){"use strict";return getAPI(this.api+"info/status",t),this},D3D.Box.prototype.downloadInfoLogFiles=function(){"use strict";window.location=this.api+"info/logfiles"},D3D.Box.prototype.getInfoAcces=function(t){"use strict";return getAPI(this.api+"info/access",t),this},D3D.Box.prototype.getNetworkScan=function(t){"use strict";return getAPI(this.api+"network/scan",t),this},D3D.Box.prototype.getNetworkKnown=function(t){"use strict";return getAPI(this.api+"network/known",t),this},D3D.Box.prototype.getNetworkStatus=function(t){"use strict";return getAPI(this.api+"network/status",t),this},D3D.Box.prototype.setNetworkAssosiate=function(t,e){"use strict";return sendAPI(this.api+"network/associate",t,e),this},D3D.Box.prototype.setNetworkDisassosiate=function(t){"use strict";return sendAPI(this.api+"network/disassociate",{},t),this},D3D.Box.prototype.setNetworkOpenAP=function(t){"use strict";return sendAPI(this.api+"network/openap",{},t),this},D3D.Box.prototype.setNetworkRemove=function(t,e){"use strict";return sendAPI(this.api+"network/remove",{ssid:t},e),this},D3D.Box.prototype.getNetworkSignin=function(t){"use strict";return getAPI(this.api+"network/signin",t),this},D3D.Box.prototype.getNetworkAlive=function(t){"use strict";return getAPI(this.api+"network/alive",t),this},D3D.Box.prototype.getPrinterTemperature=function(t){"use strict";return getAPI(this.api+"printer/temperature",t),this},D3D.Box.prototype.getPrinterProgress=function(t){"use strict";return getAPI(this.api+"printer/progress",t),this},D3D.Box.prototype.getPrinterState=function(t){"use strict";return getAPI(this.api+"printer/state",t),this},D3D.Box.prototype.getPrinterListAll=function(t){"use strict";return getAPI(this.api+"printer/listall",t),this},D3D.Box.prototype.setPrinterHeatup=function(t){"use strict";return sendAPI(this.api+"printer/heatup",{},t),this},D3D.Box.prototype.setPrinterPrint=function(t,e){"use strict";return sendAPI(this.api+"printer/print",t,e),this},D3D.Box.prototype.setPrinterStop=function(t,e){"use strict";return sendAPI(this.api+"printer/stop",t,e),this},D3D.Box.prototype.getSketch=function(t,e){"use strict";return getAPI(this.api+"sketch/?id="+t,e),this},D3D.Box.prototype.setSketch=function(t,e){"use strict";return sendAPI(this.api+"sketch",{data:t},e),this},D3D.Box.prototype.getSketchStatus=function(t){"use strict";return getAPI(this.api+"sketch/status",t),this},D3D.Box.prototype.setSketchClear=function(t){"use strict";return sendAPI(this.api+"sketch/clear",t),this},D3D.Box.prototype.getSystemVersions=function(t){"use strict";return getAPI(this.api+"system/fwversions",t),this},D3D.Box.prototype.getUpdateStatus=function(t){"use strict";return getAPI(this.api+"update/status",t),this},D3D.Box.prototype.setUpdateDownload=function(t){"use strict";return sendAPI(this.api+"update/download",{},t),this},D3D.Box.prototype.setUpdateInstall=function(t){"use strict";return sendAPI(this.api+"update/install",{},t),this},D3D.Box.prototype.setUpdateClear=function(t){"use strict";return sendAPI(this.api+"update/clear",{},t),this},D3D.Printer=function(t,e){"use strict";this.config={},this.updateConfig(t),this.updateConfig(e)},D3D.Printer.prototype.updateConfig=function(t){"use strict";for(var e in t)0===e.indexOf("printer")&&(this.config[e]=t[e]);return this},D3D.Printer.prototype.getStartCode=function(){"use strict";var t=this.config["printer.startcode"];return t=this.subsituteVariables(t),t.split("\n")},D3D.Printer.prototype.getEndCode=function(){"use strict";var t=this.config["printer.endcode"];return t=this.subsituteVariables(t),t.split("\n")},D3D.Printer.prototype.subsituteVariables=function(t){"use strict";var e=this.config["printer.temperature"],i=this.config["printer.bed.temperature"],r=this.config["printer.heatup.temperature"],n=this.config["printer.heatup.bed.temperature"],s=this.config["printer.type"],o=this.config["printer.heatedbed"];switch(s){case"makerbot_replicator2":s="r2";break;case"makerbot_replicator2x":s="r2x";break;case"makerbot_thingomatic":s="t6";break;case"makerbot_generic":s="r2";break;case"_3Dison_plus":s="r2"}var a=o?"":";";return t=t.replace(/{printingTemp}/gi,e),t=t.replace(/{printingBedTemp}/gi,i),t=t.replace(/{preheatTemp}/gi,r),t=t.replace(/{preheatBedTemp}/gi,n),t=t.replace(/{printerType}/gi,s),t=t.replace(/{if heatedBed}/gi,a)},D3D.Paths=function(t,e){"use strict";Array.call(this),this.setPaths(t||[]),this.closed=void 0!==e?e:!0},D3D.Paths.prototype=Object.create(Array.prototype),D3D.Paths.prototype.setPaths=function(t){"use strict";for(var e=0;e0&&this.push(i)}return this},D3D.Paths.prototype.clip=function(t,e){"use strict";var i=new ClipperLib.Paths,r=new ClipperLib.Clipper;return r.AddPaths(this,ClipperLib.PolyType.ptSubject,this.closed),r.AddPaths(t,ClipperLib.PolyType.ptClip,t.closed),r.Execute(e,i),new D3D.Paths(i,this.closed)},D3D.Paths.prototype.union=function(t){"use strict";return this.clip(t,ClipperLib.ClipType.ctUnion)},D3D.Paths.prototype.difference=function(t){"use strict";return this.clip(t,ClipperLib.ClipType.ctDifference)},D3D.Paths.prototype.intersect=function(t){"use strict";return this.clip(t,ClipperLib.ClipType.ctIntersection)},D3D.Paths.prototype.xor=function(){"use strict";return this.clip(path,ClipperLib.ClipType.ctXor)},D3D.Paths.prototype.offset=function(t){"use strict";var e=new ClipperLib.Paths,i=new ClipperLib.ClipperOffset(1,1);return i.AddPaths(this,ClipperLib.JoinType.jtRound,ClipperLib.EndType.etClosedPolygon),i.Execute(e,t),new D3D.Paths(e)},D3D.Paths.prototype.scaleUp=function(t){"use strict";ClipperLib.JS.ScaleUpPaths(this,t);return this},D3D.Paths.prototype.scaleDown=function(t){"use strict";ClipperLib.JS.ScaleDownPaths(this,t);return this},D3D.Paths.prototype.lastPoint=function(){"use strict";var t=this[this.length-1],e=this.closed?t[0]:t[t.length-1];return new THREE.Vector2(e.X,e.Y)},D3D.Paths.prototype.optimizePath=function(t){"use strict";for(var e=new D3D.Paths([],this.closed),i=[];e.length!==this.length;){for(var r,n,s,o,a=!1,c=0;cl)&&(n=p,a=l,s=h,o=c)}else{var f=new THREE.Vector2(p[0].X,p[0].Y),l=f.sub(t).length();(a===!1||a>l)&&(n=p,a=l,r=!1,o=c);var g=new THREE.Vector2(p[p.length-1].X,p[p.length-1].Y),l=g.sub(t).length();a>l&&(n=p,a=l,r=!0,o=c)}}if(this.closed){n=n.concat(n.splice(0,s));var u=n[0]}else{r&&n.reverse();var u=n[n.length-1]}i.push(o),t=new THREE.Vector2(u.X,u.Y),e.push(n)}return e},D3D.Paths.prototype.tresholdArea=function(t){"use strict";for(var e=0;er&&(this.splice(e,1),e--)}return areas},D3D.Paths.prototype.join=function(t){"use strict";for(var e=0;es;s++){var o=r[s%r.length];t.lineTo(2*o.X,2*o.Y)}t.stroke()}},D3D.Slicer=function(){"use strict"},D3D.Slicer.prototype.setMesh=function(t){"use strict";var e=t.geometry.clone();e instanceof THREE.BufferGeometry&&(e=(new THREE.Geometry).fromBufferGeometry(e));for(var i=0;i=a;a++)a>=0&&(void 0===i[a]&&(i[a]=[]),i[a].push(r));for(var c=[],p=1;p0)break;f=-1}else f=-1}P.length>0&&v.push(new D3D.Paths([P]))}}for(var S=[],r=0;r0){E.join(C),I=!0;break}}I||S.push(C)}if(!(S.length>0))break;c.push(S)}return c},D3D.Slicer.prototype.slicesToData=function(t,e){"use strict";for(var i=100,r=e.config["printer.layerHeight"]*i,n=(e.config["printer.dimensions.z"]*i,e.config["printer.wallThickness"]*i/2),s=e.config["printer.shellThickness"]*i,o=e.config["printer.fillSize"]*i,a=(e.config["printer.brimOffset"]*i,e.config["printer.bottomThickness"]*i),c=e.config["printer.topThickness"]*i,p=Math.ceil(a/r),h=Math.ceil(c/r),u=new THREE.Vector2(0,0),l=[],f=this.getFillTemplate({left:this.geometry.boundingBox.min.z*i,top:this.geometry.boundingBox.min.x*i,right:this.geometry.boundingBox.max.z*i,bottom:this.geometry.boundingBox.max.x*i},o,!0,!0),g=0;g=0)for(var v=t[g-p],P=0;P0){for(var B=new D3D.Paths([],!0),T=n;s>=T;T+=n){var A=b.offset(-T);B.join(A)}var k=(A||b).offset(-n/2),S=k.difference(w),C=k.difference(S),I=new D3D.Paths([],!1);if(f.length>0&&I.join(f.intersect(C)),S.length>0){var E=S.bounds(),L=g%2===0,F=this.getFillTemplate(E,n,L,!L);I.join(F.intersect(S))}b=b.optimizePath(u),B.length>0?(B=B.optimizePath(b.lastPoint()),I=I.optimizePath(B.lastPoint())):I=I.optimizePath(b.lastPoint()),u=I.length>0?I.lastPoint():B.length>0?B.lastPoint():b.lastPoint(),D.push({outerLayer:b.scaleDown(i),fill:I.scaleDown(i),insets:B.scaleDown(i)})}}}return l},D3D.Slicer.prototype.getFillTemplate=function(t,e,i,r){"use strict";var n=new D3D.Paths([],!1);if(i)for(var s=Math.floor(t.left/e)*e;s<=Math.ceil(t.right/e)*e;s+=e)n.push([{X:s,Y:t.top},{X:s,Y:t.bottom}]);if(r)for(var s=Math.floor(t.top/e)*e;s<=Math.floor(t.bottom/e)*e;s+=e)n.push([{X:t.left,Y:s},{X:t.right,Y:s}]);return n},D3D.Slicer.prototype.dataToGcode=function(t,e){"use strict";function i(t){for(var e=[],i=0;ia;a++){var p=s[a%s.length];if(0===a)D>f&&u&&e.push(["G0","E"+(D-g).toFixed(3),"F"+(60*l).toFixed(3)].join(" ")),e.push(["G0","X"+p.X.toFixed(3)+" Y"+p.Y.toFixed(3)+" Z"+x,"F"+60*c].join(" ")),D>f&&u&&e.push(["G0","E"+D.toFixed(3),"F"+(60*l).toFixed(3)].join(" "));else{var d=new THREE.Vector2(p.X,p.Y),m=new THREE.Vector2(n.X,n.Y),w=d.distanceTo(m);D+=w*h*r/v*P,e.push(["G1","X"+p.X.toFixed(3)+" Y"+p.Y.toFixed(3)+" Z"+x,"F"+y,"E"+D.toFixed(3)].join(" "))}n=p}return e}for(var r=e.config["printer.layerHeight"],n=e.config["printer.speed"],s=e.config["printer.bottomLayerSpeed"],o=e.config["printer.firstLayerSlow"],a=e.config["printer.bottomFlowRate"],c=e.config["printer.travelSpeed"],p=e.config["printer.filamentThickness"],h=e.config["printer.wallThickness"],u=(e.config["printer.enableTraveling"],e.config["printer.retraction.enabled"]),l=e.config["printer.retraction.speed"],f=e.config["printer.retraction.minDistance"],g=e.config["printer.retraction.amount"],d=e.getStartCode(),D=0,y=o?(60*s).toFixed(3):(60*n).toFixed(3),v=Math.pow(p/2,2)*Math.PI,P=a,m=0;mp;p++)for(var h=o[p%o.length],u=0;uWired Printer"); listSliceWebworker.append("
  • Wired Printer
    • "); + listDoodle.append("
  • Node Server
    • "); + listSliceTest.append("
  • Node Server
    • "); + listSliceWebworker.append("
  • Node Server
    • "); + /* printers.push({ name: "wired box", diff --git a/models/ultimaker_robot.stl b/models/ultimaker_robot.stl new file mode 100755 index 0000000..e75b137 Binary files /dev/null and b/models/ultimaker_robot.stl differ diff --git a/settings/printer_settings.json b/settings/printer_settings.json index 537bcf9..0f46a2d 100644 --- a/settings/printer_settings.json +++ b/settings/printer_settings.json @@ -5,7 +5,7 @@ "printer.dimensions.y": 200, "printer.dimensions.z": 200, "printer.endcode": "M107 ;fan off\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;disable axes / steppers\nG90 ;absolute positioning\nM104 S{preheatTemp}\n{if heatedBed}M140 S{preheatBedTemp}\nM117 Done ;display message (20 characters to clear whole screen)", - "printer.filamentThickness": 2.89, + "printer.filamentThickness": 2.85, "printer.heatedbed": false, "printer.heatup.bed.temperature": 70, "printer.heatup.enabled": true, @@ -13,5 +13,35 @@ "printer.nozzleDiameter": 0.4, "printer.startcode": ";Generated with Doodle3D (default)\nM109 S{printingTemp} ;set target temperature \n{if heatedBed}M190 S{printingBedTemp} ;set target bed temperature\nG21 ;metric values\nG91 ;relative positioning\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nG92 E0 ;zero the extruded length again\nG1 F9000\nG90 ;absolute positioning\nM117 Printing Doodle... ;display message (20 characters to clear whole screen)", "printer.type": "ultimaker" + }, + "ultimaker2": { + "printer.baudrate": "115200", + "printer.dimensions.x": 223, + "printer.dimensions.y": 223, + "printer.dimensions.z": 205, + "printer.endcode": "M107 ;fan off\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+5.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 ;home the printer\nM84 ;disable axes / steppers\nG90 ;absolute positioning\nM104 S{preheatTemp}\n{if heatedBed}M140 S{preheatBedTemp}\nM117 Done ;display message (20 characters to clear whole screen)", + "printer.filamentThickness": 2.85, + "printer.heatedbed": true, + "printer.heatup.bed.temperature": 70, + "printer.heatup.enabled": true, + "printer.heatup.temperature": 180, + "printer.nozzleDiameter": 0.4, + "printer.startcode": ";Generated with Doodle3D (ultimaker2)\nM109 S{printingTemp} ;set target temperature \n{if heatedBed}M190 S{printingBedTemp} ;set target bed temperature\nG21 ;metric values\nG90 ;absolute positioning\nM107 ;start with the fan off\nG28 ; home to endstops\nG1 Z15 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\nM117 Printing Doodle... ;display message (20 characters to clear whole screen)", + "printer.type": "ultimaker2" + }, + "ultimaker2go": { + "printer.baudrate": "115200", + "printer.dimensions.x": 120, + "printer.dimensions.y": 120, + "printer.dimensions.z": 115, + "printer.endcode": "M107 ;fan off\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+5.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 ;home the printer\nM84 ;disable axes / steppers\nG90 ;absolute positioning\nM104 S{preheatTemp}\n{if heatedBed}M140 S{preheatBedTemp}\nM117 Done ;display message (20 characters to clear whole screen)", + "printer.filamentThickness": 2.85, + "printer.heatedbed": false, + "printer.heatup.bed.temperature": 70, + "printer.heatup.enabled": true, + "printer.heatup.temperature": 180, + "printer.nozzleDiameter": 0.4, + "printer.startcode": ";Generated with Doodle3D (ultimaker2)\nM109 S{printingTemp} ;set target temperature \n{if heatedBed}M190 S{printingBedTemp} ;set target bed temperature\nG21 ;metric values\nG90 ;absolute positioning\nM107 ;start with the fan off\nG28 ; home to endstops\nG1 Z15 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\nM117 Printing Doodle... ;display message (20 characters to clear whole screen)", + "printer.type": "ultimaker2g0" } } \ No newline at end of file diff --git a/settings/user_settings.json b/settings/user_settings.json index a2f81d7..7206582 100644 --- a/settings/user_settings.json +++ b/settings/user_settings.json @@ -12,7 +12,7 @@ "printer.retraction.minDistance": 5.0, "printer.shellThickness": 0.4, "printer.speed": 50.0, - "printer.temperature": 230.0, + "printer.temperature": 210.0, "printer.topThickness": 0.8, "printer.travelSpeed": 200.0 } \ No newline at end of file diff --git a/slice_test.html b/slice_test.html index e985515..8d2641f 100644 --- a/slice_test.html +++ b/slice_test.html @@ -12,6 +12,7 @@ + - - -
    + +
    +

    State:

    +

    Bed Temp:

    +

    Bed Target Temp:

    +

    Nozzle Temp:

    +

    Nozzle Target Temp:

    +

    Current Line:

    +

    Buffered Lines:

    +

    Total Lines:

    +

    Batches To Send:

    +
    + + +