added more support for doodle box

This commit is contained in:
casperlamboo 2015-05-06 15:06:04 +02:00
parent d17c3ff757
commit 33576ad45b
7 changed files with 788 additions and 60 deletions

211
build/d3d.js vendored
View File

@ -173,8 +173,6 @@ D3D.Box = function (localIp) {
this.onload; this.onload;
getAPI(self.api + "config/all", function (data) { getAPI(self.api + "config/all", function (data) {
//self.config = data;
for (var i in data) { for (var i in data) {
if (i.indexOf("doodle3d") === 0) { if (i.indexOf("doodle3d") === 0) {
self.config[i] = data[i]; self.config[i] = data[i];
@ -229,6 +227,8 @@ D3D.Box.prototype.print = function (gcode) {
var gcodeBatch = gcode.splice(0, Math.min(this.batchSize, gcode.length)); var gcodeBatch = gcode.splice(0, Math.min(this.batchSize, gcode.length));
this.printBatches.push(gcodeBatch); this.printBatches.push(gcodeBatch);
} }
return this;
}; };
D3D.Box.prototype.printBatch = function () { D3D.Box.prototype.printBatch = function () {
"use strict"; "use strict";
@ -279,6 +279,138 @@ D3D.Box.prototype.stop = function () {
}, function (data) { }, function (data) {
console.log("Printer stop command sent"); console.log("Printer stop command sent");
}); });
return this;
};
D3D.Box.prototype.setConfig = function (data) {
"use strict";
sendAPI(this.api + "config", data);
return this;
};
D3D.Box.prototype.getInfoLog = function (callback) {
"use strict";
getAPI(self.api + "info/logfiles", function (data) {
if (callback !== undefined) {
callback(data);
}
});
return this;
};
D3D.Box.prototype.getInfoAcces = function (callback) {
"use strict";
getAPI(self.api + "info/acces", function (data) {
if (callback !== undefined) {
callback(data);
}
});
return this;
};
D3D.Box.prototype.getNetwerkScan = function (callback) {
"use strict";
getAPI(self.api + "network/scan", function (data) {
if (callback !== undefined) {
callback(data);
}
});
return this;
};
D3D.Box.prototype.getNetworkKnown = function (callback) {
"use strict";
getAPI(self.api + "network/known", function (data) {
if (callback !== undefined) {
callback(data);
}
});
return this;
};
D3D.Box.prototype.getNetworkStatus = function (callback) {
"use strict";
getAPI(self.api + "network/status", function (data) {
if (callback !== undefined) {
callback(data);
}
});
return this;
};
D3D.Box.prototype.setNetworkAssosiate = function (data) {
"use strict";
sendAPI(self.api + "network/assosiate", data);
return this;
};
D3D.Box.prototype.setNetworkDisassosiate = function (data) {
"use strict";
sendAPI(self.api + "network/displayassosiate", data);
return this;
};
D3D.Box.prototype.setNetworkOpenap = function (data) {
"use strict";
sendAPI(self.api + "network/openap", data);
return this;
};
D3D.Box.prototype.setNetworkRemove = function (ssid) {
"use strict";
sendAPI(self.api + "network/displayassosiate", {ssid: ssid});
return this;
};
D3D.Box.prototype.getNetworkAlive = function (callback) {
"use strict";
getAPI(self.api + "network/alive", function (data) {
if (callback !== undefined) {
callback(data);
}
});
return this;
};
D3D.Box.prototype.getPrinterListAll = function (callback) {
"use strict";
getAPI(self.api + "printer/listall", function (data) {
if (callback !== undefined) {
callback(data);
}
});
return this;
};
D3D.Box.prototype.setPrinterHeatup = function (data) {
"use strict";
sendAPI(self.api + "printer/heatup", data);
return this;
};
D3D.Box.prototype.getVersion = function (data) {
"use strict";
getAPI(self.api + "system/fwversion", function (data) {
if (callback !== undefined) {
callback(data);
}
});
return this;
}; };
/****************************************************** /******************************************************
* *
@ -363,7 +495,6 @@ D3D.Slicer = function () {
this.geometry; this.geometry;
this.lines = []; this.lines = [];
this.lineLookup = {};
}; };
D3D.Slicer.prototype.setGeometry = function (geometry) { D3D.Slicer.prototype.setGeometry = function (geometry) {
"use strict"; "use strict";
@ -375,30 +506,32 @@ D3D.Slicer.prototype.setGeometry = function (geometry) {
return this; return this;
}; };
D3D.Slicer.prototype.addLine = function (a, b) {
"use strict";
//think lookup can only be b_a, a_b is only possible when face is flipped
var index = this.lineLookup[a + "_" + b] || this.lineLookup[b + "_" + a];
if (index === undefined) {
index = this.lines.length;
this.lineLookup[a + "_" + b] = index;
this.lines.push({
line: new THREE.Line3(this.geometry.vertices[a], this.geometry.vertices[b]),
connects: [],
normals: []
});
}
return index;
};
D3D.Slicer.prototype.createLines = function () { D3D.Slicer.prototype.createLines = function () {
"use strict"; "use strict";
this.lines = []; this.lines = [];
this.lineLookup = {}; var lineLookup = {};
var self = this;
function addLine (a, b) {
"use strict";
//think lookup can only be b_a, a_b is only possible when face is flipped
var index = lineLookup[a + "_" + b] || lineLookup[b + "_" + a];
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: []
});
}
return index;
};
for (var i = 0; i < this.geometry.faces.length; i ++) { for (var i = 0; i < this.geometry.faces.length; i ++) {
var face = this.geometry.faces[i]; var face = this.geometry.faces[i];
@ -406,9 +539,9 @@ D3D.Slicer.prototype.createLines = function () {
//check for only adding unique lines //check for only adding unique lines
//returns index of said line //returns index of said line
var a = this.addLine(face.a, face.b); var a = addLine(face.a, face.b);
var b = this.addLine(face.b, face.c); var b = addLine(face.b, face.c);
var c = this.addLine(face.c, face.a); var c = addLine(face.c, face.a);
//set connecting lines (based on face) //set connecting lines (based on face)
@ -497,6 +630,7 @@ D3D.Slicer.prototype.slice = function (height, step) {
//think this check is not nescesary, always higher as 0 //think this check is not nescesary, always higher as 0
if (shape.length > 0) { if (shape.length > 0) {
shape.push({X: shape[0].X, Y: shape[0].Y});
slice.push(shape); slice.push(shape);
} }
} }
@ -573,13 +707,13 @@ D3D.Slicer.prototype.slicesToData = function (slices, printer) {
innerLayer = innerLayer.concat(inset); innerLayer = innerLayer.concat(inset);
} }
var fillArea = this.getInset((inset || outerLayer), wallThickness); //moet fillArea wel kleiner?
//var fillArea = this.getInset((inset || outerLayer), wallThickness);
var fillArea = (inset || outerLayer);
var highFill; var fillAbove = false;
var fillAbove = undefined;
//for (var i = 1; i < shellThickness/layerHeight; i ++) { //for (var i = 1; i < shellThickness/layerHeight; i ++) {
for (var i = 1; i < shellThickness/layerHeight + 4; i ++) { for (var i = 1; i < shellThickness/layerHeight; i ++) {
var newLayer = ClipperLib.JS.Clone(slices[layer + i]); var newLayer = ClipperLib.JS.Clone(slices[layer + i]);
ClipperLib.JS.ScaleUpPaths(newLayer, scale); ClipperLib.JS.ScaleUpPaths(newLayer, scale);
@ -588,13 +722,13 @@ D3D.Slicer.prototype.slicesToData = function (slices, printer) {
break; break;
} }
else if (fillAbove === undefined) { else if (fillAbove === false) {
fillAbove = newLayer; fillAbove = newLayer;
} }
else { else {
var c = new ClipperLib.Clipper(); var c = new ClipperLib.Clipper();
var solution = new ClipperLib.Paths(); var solution = new ClipperLib.Paths();
c.AddPaths(fillArea, ClipperLib.PolyType.ptSubject, true); c.AddPaths(newLayer, ClipperLib.PolyType.ptSubject, true);
c.AddPaths(fillAbove, ClipperLib.PolyType.ptClip, true); c.AddPaths(fillAbove, ClipperLib.PolyType.ptClip, true);
c.Execute(ClipperLib.ClipType.ctIntersection, solution); c.Execute(ClipperLib.ClipType.ctIntersection, solution);
@ -675,7 +809,7 @@ D3D.Slicer.prototype.dataToGcode = function (data, printer) {
var retractionSpeed = printer.config["printer.retraction.speed"]; var retractionSpeed = printer.config["printer.retraction.speed"];
var retractionMinDistance = printer.config["printer.retraction.minDistance"]; var retractionMinDistance = printer.config["printer.retraction.minDistance"];
var retractionAmount = printer.config["printer.retraction.amount"]; var retractionAmount = printer.config["printer.retraction.amount"];
function sliceToGcode (slice) { function sliceToGcode (slice) {
var gcode = []; var gcode = [];
@ -684,9 +818,8 @@ D3D.Slicer.prototype.dataToGcode = function (data, printer) {
var previousPoint; var previousPoint;
for (var j = 0; j <= shape.length; j ++) { for (var j = 0; j < shape.length; j ++) {
//Finish shape by going to first point var point = shape[j];
var point = shape[(j % shape.length)];
if (j === 0) { if (j === 0) {
//TODO //TODO
@ -782,7 +915,7 @@ D3D.Slicer.prototype.drawPaths = function (printer, min, max) {
var point = path[j]; var point = path[j];
context.lineTo((point.X- 100) * 6.0 + 200, (point.Y- 100) * 6.0 + 200); context.lineTo((point.X- 100) * 6.0 + 200, (point.Y- 100) * 6.0 + 200);
} }
context.closePath(); //context.closePath();
} }
context.stroke(); context.stroke();
} }
@ -798,8 +931,6 @@ D3D.Slicer.prototype.drawPaths = function (printer, min, max) {
var context = canvas.getContext("2d"); var context = canvas.getContext("2d");
for (var layer = min; layer < max; layer ++) { for (var layer = min; layer < max; layer ++) {
var layer = 0;
context.clearRect(0, 0, 400, 400);
var slice = data[layer % data.length]; var slice = data[layer % data.length];
drawPolygons(slice.outerLayer, "red"); drawPolygons(slice.outerLayer, "red");

2
build/d3d.min.js vendored

File diff suppressed because one or more lines are too long

433
library/stl_loader.js Normal file
View File

@ -0,0 +1,433 @@
/**
* @author aleeper / http://adamleeper.com/
* @author mrdoob / http://mrdoob.com/
* @author gero3 / https://github.com/gero3
*
* Description: A THREE loader for STL ASCII files, as created by Solidworks and other CAD programs.
*
* Supports both binary and ASCII encoded files, with automatic detection of type.
*
* Limitations:
* Binary decoding supports "Magics" color format (http://en.wikipedia.org/wiki/STL_(file_format)#Color_in_binary_STL).
* There is perhaps some question as to how valid it is to always assume little-endian-ness.
* ASCII decoding assumes file is UTF-8. Seems to work for the examples...
*
* Usage:
* var loader = new THREE.STLLoader();
* loader.load( './models/stl/slotted_disk.stl', function ( geometry ) {
* scene.add( new THREE.Mesh( geometry ) );
* });
*
* For binary STLs geometry might contain colors for vertices. To use it:
* // use the same code to load STL as above
* if (geometry.hasColors) {
* material = new THREE.MeshPhongMaterial({ opacity: geometry.alpha, vertexColors: THREE.VertexColors });
* } else { .... }
* var mesh = new THREE.Mesh( geometry, material );
*/
THREE.STLLoader = function ( manager ) {
this.manager = ( manager !== undefined ) ? manager : THREE.DefaultLoadingManager;
};
THREE.STLLoader.prototype = {
constructor: THREE.STLLoader,
load: function ( url, onLoad, onProgress, onError ) {
var scope = this;
var loader = new THREE.XHRLoader( scope.manager );
loader.setCrossOrigin( this.crossOrigin );
loader.setResponseType('arraybuffer');
loader.load( url, function ( text ) {
onLoad( scope.parse( text ) );
}, onProgress, onError );
},
parse: function ( data ) {
var isBinary = function () {
var expect, face_size, n_faces, reader;
reader = new DataView( binData );
face_size = (32 / 8 * 3) + ((32 / 8 * 3) * 3) + (16 / 8);
n_faces = reader.getUint32(80, true);
expect = 80 + (32 / 8) + (n_faces * face_size);
if ( expect === reader.byteLength ) {
return true;
}
// some binary files will have different size from expected,
// checking characters higher than ASCII to confirm is binary
var fileLength = reader.byteLength;
for ( var index = 0; index < fileLength; index ++ ) {
if ( reader.getUint8(index, false) > 127 ) {
return true;
}
}
return false;
};
var binData = this.ensureBinary( data );
return isBinary()
? this.parseBinary( binData )
: this.parseASCII( this.ensureString( data ) );
},
parseBinary: function ( data ) {
var reader = new DataView( data );
var faces = reader.getUint32( 80, true );
var r, g, b, hasColors = false, colors;
var defaultR, defaultG, defaultB, alpha;
// process STL header
// check for default color in header ("COLOR=rgba" sequence).
for ( var index = 0; index < 80 - 10; index ++ ) {
if ((reader.getUint32(index, false) == 0x434F4C4F /*COLO*/) &&
(reader.getUint8(index + 4) == 0x52 /*'R'*/) &&
(reader.getUint8(index + 5) == 0x3D /*'='*/)) {
hasColors = true;
colors = new Float32Array( faces * 3 * 3);
defaultR = reader.getUint8(index + 6) / 255;
defaultG = reader.getUint8(index + 7) / 255;
defaultB = reader.getUint8(index + 8) / 255;
alpha = reader.getUint8(index + 9) / 255;
}
}
var dataOffset = 84;
var faceLength = 12 * 4 + 2;
var offset = 0;
var geometry = new THREE.BufferGeometry();
var vertices = new Float32Array( faces * 3 * 3 );
var normals = new Float32Array( faces * 3 * 3 );
for ( var face = 0; face < faces; face ++ ) {
var start = dataOffset + face * faceLength;
var normalX = reader.getFloat32(start, true);
var normalY = reader.getFloat32(start + 4, true);
var normalZ = reader.getFloat32(start + 8, true);
if (hasColors) {
var packedColor = reader.getUint16(start + 48, true);
if ((packedColor & 0x8000) === 0) { // facet has its own unique color
r = (packedColor & 0x1F) / 31;
g = ((packedColor >> 5) & 0x1F) / 31;
b = ((packedColor >> 10) & 0x1F) / 31;
} else {
r = defaultR;
g = defaultG;
b = defaultB;
}
}
for ( var i = 1; i <= 3; i ++ ) {
var vertexstart = start + i * 12;
vertices[ offset ] = reader.getFloat32( vertexstart, true );
vertices[ offset + 1 ] = reader.getFloat32( vertexstart + 4, true );
vertices[ offset + 2 ] = reader.getFloat32( vertexstart + 8, true );
normals[ offset ] = normalX;
normals[ offset + 1 ] = normalY;
normals[ offset + 2 ] = normalZ;
if (hasColors) {
colors[ offset ] = r;
colors[ offset + 1 ] = g;
colors[ offset + 2 ] = b;
}
offset += 3;
}
}
geometry.addAttribute( 'position', new THREE.BufferAttribute( vertices, 3 ) );
geometry.addAttribute( 'normal', new THREE.BufferAttribute( normals, 3 ) );
if (hasColors) {
geometry.addAttribute( 'color', new THREE.BufferAttribute( colors, 3 ) );
geometry.hasColors = true;
geometry.alpha = alpha;
}
return geometry;
},
parseASCII: function ( data ) {
var geometry, length, normal, patternFace, patternNormal, patternVertex, result, text;
geometry = new THREE.Geometry();
patternFace = /facet([\s\S]*?)endfacet/g;
while ( ( result = patternFace.exec( data ) ) !== null ) {
text = result[0];
patternNormal = /normal[\s]+([\-+]?[0-9]+\.?[0-9]*([eE][\-+]?[0-9]+)?)+[\s]+([\-+]?[0-9]*\.?[0-9]+([eE][\-+]?[0-9]+)?)+[\s]+([\-+]?[0-9]*\.?[0-9]+([eE][\-+]?[0-9]+)?)+/g;
while ( ( result = patternNormal.exec( text ) ) !== null ) {
normal = new THREE.Vector3( parseFloat( result[ 1 ] ), parseFloat( result[ 3 ] ), parseFloat( result[ 5 ] ) );
}
patternVertex = /vertex[\s]+([\-+]?[0-9]+\.?[0-9]*([eE][\-+]?[0-9]+)?)+[\s]+([\-+]?[0-9]*\.?[0-9]+([eE][\-+]?[0-9]+)?)+[\s]+([\-+]?[0-9]*\.?[0-9]+([eE][\-+]?[0-9]+)?)+/g;
while ( ( result = patternVertex.exec( text ) ) !== null ) {
geometry.vertices.push( new THREE.Vector3( parseFloat( result[ 1 ] ), parseFloat( result[ 3 ] ), parseFloat( result[ 5 ] ) ) );
}
length = geometry.vertices.length;
geometry.faces.push( new THREE.Face3( length - 3, length - 2, length - 1, normal ) );
}
geometry.computeBoundingBox();
geometry.computeBoundingSphere();
return geometry;
},
ensureString: function ( buf ) {
if (typeof buf !== "string") {
var array_buffer = new Uint8Array(buf);
var str = '';
for (var i = 0; i < buf.byteLength; i ++) {
str += String.fromCharCode(array_buffer[i]); // implicitly assumes little-endian
}
return str;
} else {
return buf;
}
},
ensureBinary: function ( buf ) {
if (typeof buf === "string") {
var array_buffer = new Uint8Array(buf.length);
for (var i = 0; i < buf.length; i ++) {
array_buffer[i] = buf.charCodeAt(i) & 0xff; // implicitly assumes little-endian
}
return array_buffer.buffer || array_buffer;
} else {
return buf;
}
}
};
if ( typeof DataView === 'undefined') {
DataView = function(buffer, byteOffset, byteLength) {
this.buffer = buffer;
this.byteOffset = byteOffset || 0;
this.byteLength = byteLength || buffer.byteLength || buffer.length;
this._isString = typeof buffer === "string";
}
DataView.prototype = {
_getCharCodes:function(buffer,start,length) {
start = start || 0;
length = length || buffer.length;
var end = start + length;
var codes = [];
for (var i = start; i < end; i ++) {
codes.push(buffer.charCodeAt(i) & 0xff);
}
return codes;
},
_getBytes: function (length, byteOffset, littleEndian) {
var result;
// Handle the lack of endianness
if (littleEndian === undefined) {
littleEndian = this._littleEndian;
}
// Handle the lack of byteOffset
if (byteOffset === undefined) {
byteOffset = this.byteOffset;
} else {
byteOffset = this.byteOffset + byteOffset;
}
if (length === undefined) {
length = this.byteLength - byteOffset;
}
// Error Checking
if (typeof byteOffset !== 'number') {
throw new TypeError('DataView byteOffset is not a number');
}
if (length < 0 || byteOffset + length > this.byteLength) {
throw new Error('DataView length or (byteOffset+length) value is out of bounds');
}
if (this.isString) {
result = this._getCharCodes(this.buffer, byteOffset, byteOffset + length);
} else {
result = this.buffer.slice(byteOffset, byteOffset + length);
}
if (!littleEndian && length > 1) {
if (!(result instanceof Array)) {
result = Array.prototype.slice.call(result);
}
result.reverse();
}
return result;
},
// Compatibility functions on a String Buffer
getFloat64: function (byteOffset, littleEndian) {
var b = this._getBytes(8, byteOffset, littleEndian),
sign = 1 - (2 * (b[7] >> 7)),
exponent = ((((b[7] << 1) & 0xff) << 3) | (b[6] >> 4)) - ((1 << 10) - 1),
// Binary operators such as | and << operate on 32 bit values, using + and Math.pow(2) instead
mantissa = ((b[6] & 0x0f) * Math.pow(2, 48)) + (b[5] * Math.pow(2, 40)) + (b[4] * Math.pow(2, 32)) +
(b[3] * Math.pow(2, 24)) + (b[2] * Math.pow(2, 16)) + (b[1] * Math.pow(2, 8)) + b[0];
if (exponent === 1024) {
if (mantissa !== 0) {
return NaN;
} else {
return sign * Infinity;
}
}
if (exponent === -1023) { // Denormalized
return sign * mantissa * Math.pow(2, -1022 - 52);
}
return sign * (1 + mantissa * Math.pow(2, -52)) * Math.pow(2, exponent);
},
getFloat32: function (byteOffset, littleEndian) {
var b = this._getBytes(4, byteOffset, littleEndian),
sign = 1 - (2 * (b[3] >> 7)),
exponent = (((b[3] << 1) & 0xff) | (b[2] >> 7)) - 127,
mantissa = ((b[2] & 0x7f) << 16) | (b[1] << 8) | b[0];
if (exponent === 128) {
if (mantissa !== 0) {
return NaN;
} else {
return sign * Infinity;
}
}
if (exponent === -127) { // Denormalized
return sign * mantissa * Math.pow(2, -126 - 23);
}
return sign * (1 + mantissa * Math.pow(2, -23)) * Math.pow(2, exponent);
},
getInt32: function (byteOffset, littleEndian) {
var b = this._getBytes(4, byteOffset, littleEndian);
return (b[3] << 24) | (b[2] << 16) | (b[1] << 8) | b[0];
},
getUint32: function (byteOffset, littleEndian) {
return this.getInt32(byteOffset, littleEndian) >>> 0;
},
getInt16: function (byteOffset, littleEndian) {
return (this.getUint16(byteOffset, littleEndian) << 16) >> 16;
},
getUint16: function (byteOffset, littleEndian) {
var b = this._getBytes(2, byteOffset, littleEndian);
return (b[1] << 8) | b[0];
},
getInt8: function (byteOffset) {
return (this.getUint8(byteOffset) << 24) >> 24;
},
getUint8: function (byteOffset) {
return this._getBytes(1, byteOffset)[0];
}
};
}

View File

@ -5,6 +5,7 @@
<!--<script src="http://code.jquery.com/jquery-1.11.0.min.js"></script>--> <!--<script src="http://code.jquery.com/jquery-1.11.0.min.js"></script>-->
<script src="library/jquery.js"></script> <script src="library/jquery.js"></script>
<script src="library/three.js"></script> <script src="library/three.js"></script>
<script src="library/stl_loader.js"></script>
<script src="library/clipper.js"></script> <script src="library/clipper.js"></script>
<script src="src/utils.js"></script> <script src="src/utils.js"></script>
@ -42,12 +43,12 @@ var printerConfig = {
"printer.heatup.bed.temperature": 70, "printer.heatup.bed.temperature": 70,
"printer.heatup.enabled": true, "printer.heatup.enabled": true,
"printer.heatup.temperature": 180, "printer.heatup.temperature": 180,
"printer.layerHeight": 0.3, "printer.layerHeight": 0.2,
"printer.retraction.amount": 3, "printer.retraction.amount": 3,
"printer.retraction.enabled": false, "printer.retraction.enabled": true,
"printer.retraction.minDistance": 5, "printer.retraction.minDistance": 5,
"printer.retraction.speed": 50, "printer.retraction.speed": 50,
"printer.screenToMillimeterScale": 0.3, "printer.screenToMillimeterScale": 0.3, //????
"printer.speed": 70, "printer.speed": 70,
"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.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.temperature": 230, "printer.temperature": 230,
@ -102,28 +103,46 @@ var geometry = (function () {
})(); })();
var material = new THREE.MeshLambertMaterial({color: 0x000000, wireframe: true}); var material = new THREE.MeshLambertMaterial({color: 0x000000, wireframe: true});
//var geometry = new THREE.TorusGeometry(20, 10, 10, 10); //var geometry = new THREE.TorusGeometry(20, 10, 30, 30);
//var geometry = new THREE.BoxGeometry(20, 5, 20, 1, 1, 1); //var geometry = new THREE.BoxGeometry(20, 5, 20, 1, 1, 1);
//var geometry = new THREE.SphereGeometry(10, 10, 10); //var geometry = new THREE.SphereGeometry(10, 10, 10);
var mesh = new THREE.Mesh(geometry, material); var mesh = new THREE.Mesh(geometry, material);
scene.add(mesh); scene.add(mesh);
var slicer = new D3D.Slicer().setGeometry(geometry);
var canvas = document.getElementById("canvas"); var canvas = document.getElementById("canvas");
var context = canvas.getContext("2d"); var context = canvas.getContext("2d");
var slicer = new D3D.Slicer().setGeometry(geometry); var slicer = new D3D.Slicer().setGeometry(geometry);
var gcode = slicer.getGcode(printer); gcode = slicer.getGcode(printer);
var canvas = document.getElementById("canvas"); var canvas = document.getElementById("canvas");
var context = canvas.getContext("2d"); var context = canvas.getContext("2d");
var layer = 9; var layer = 149;
var img = slicer.drawPaths(printer, layer, layer + 1); var img = slicer.drawPaths(printer, layer, layer + 1);
context.drawImage(img, 0, 0); context.drawImage(img, 0, 0);
/*var loader = new THREE.STLLoader();
loader.load('stl/overhang_test.stl', function (geometry) {
var matrix = new THREE.Matrix4();
matrix.makeRotationX(Math.PI*1.5);
geometry.applyMatrix(matrix);
var material = new THREE.MeshLambertMaterial({color: 0x000000, wireframe: true});
var mesh = new THREE.Mesh(geometry, material);
scene.add(mesh);
var canvas = document.getElementById("canvas");
var context = canvas.getContext("2d");
var slicer = new D3D.Slicer().setGeometry(geometry);
//gcode = slicer.getGcode(printer);
});*/
(function animate () { (function animate () {
"use strict"; "use strict";

View File

@ -29,8 +29,6 @@ D3D.Box = function (localIp) {
this.onload; this.onload;
getAPI(self.api + "config/all", function (data) { getAPI(self.api + "config/all", function (data) {
//self.config = data;
for (var i in data) { for (var i in data) {
if (i.indexOf("doodle3d") === 0) { if (i.indexOf("doodle3d") === 0) {
self.config[i] = data[i]; self.config[i] = data[i];
@ -85,6 +83,8 @@ D3D.Box.prototype.print = function (gcode) {
var gcodeBatch = gcode.splice(0, Math.min(this.batchSize, gcode.length)); var gcodeBatch = gcode.splice(0, Math.min(this.batchSize, gcode.length));
this.printBatches.push(gcodeBatch); this.printBatches.push(gcodeBatch);
} }
return this;
}; };
D3D.Box.prototype.printBatch = function () { D3D.Box.prototype.printBatch = function () {
"use strict"; "use strict";
@ -135,4 +135,144 @@ D3D.Box.prototype.stop = function () {
}, function (data) { }, function (data) {
console.log("Printer stop command sent"); console.log("Printer stop command sent");
}); });
return this;
};
D3D.Box.prototype.setConfig = function (data) {
"use strict";
sendAPI(this.api + "config", data);
return this;
};
D3D.Box.prototype.getInfoLog = function (callback) {
"use strict";
getAPI(this.api + "info/logfiles", function (data) {
if (callback !== undefined) {
callback(data);
}
});
return this;
};
D3D.Box.prototype.getInfoAcces = function (callback) {
"use strict";
//error
//cannot call function or module 'info/acces' ('module/function 'info/acces' does not exist')
getAPI(this.api + "info/acces", function (data) {
if (callback !== undefined) {
callback(data);
}
});
return this;
};
D3D.Box.prototype.getNetwerkScan = function (callback) {
"use strict";
getAPI(this.api + "network/scan", function (data) {
if (callback !== undefined) {
callback(data);
}
});
return this;
};
D3D.Box.prototype.getNetworkKnown = function (callback) {
"use strict";
getAPI(this.api + "network/known", function (data) {
if (callback !== undefined) {
callback(data);
}
});
return this;
};
D3D.Box.prototype.getNetworkStatus = function (callback) {
"use strict";
getAPI(this.api + "network/status", function (data) {
if (callback !== undefined) {
callback(data);
}
});
return this;
};
D3D.Box.prototype.setNetworkAssosiate = function (data) {
"use strict";
sendAPI(this.api + "network/assosiate", data);
return this;
};
D3D.Box.prototype.setNetworkDisassosiate = function (data) {
"use strict";
sendAPI(this.api + "network/displayassosiate", data);
return this;
};
D3D.Box.prototype.setNetworkOpenap = function (data) {
"use strict";
sendAPI(this.api + "network/openap", data);
return this;
};
D3D.Box.prototype.setNetworkRemove = function (ssid) {
"use strict";
sendAPI(this.api + "network/displayassosiate", {ssid: ssid});
return this;
};
D3D.Box.prototype.getNetworkAlive = function (callback) {
"use strict";
//emty?
getAPI(this.api + "network/alive", function (data) {
if (callback !== undefined) {
callback(data);
}
});
return this;
};
D3D.Box.prototype.getPrinterListAll = function (callback) {
"use strict";
getAPI(this.api + "printer/listall", function (data) {
if (callback !== undefined) {
callback(data);
}
});
return this;
};
D3D.Box.prototype.setPrinterHeatup = function (data) {
"use strict";
sendAPI(this.api + "printer/heatup", data);
return this;
};
D3D.Box.prototype.getVersion = function (data) {
"use strict";
//error
//cannot call function or module 'system/fwversion' ('module/function 'system/fwversion' does not exist')
getAPI(this.api + "system/fwversion", function (data) {
if (callback !== undefined) {
callback(data);
}
});
return this;
}; };

View File

@ -22,7 +22,11 @@ D3D.Slicer = function () {
D3D.Slicer.prototype.setGeometry = function (geometry) { D3D.Slicer.prototype.setGeometry = function (geometry) {
"use strict"; "use strict";
this.geometry = geometry; if (geometry instanceof THREE.BufferGeometry) {
geometry = new THREE.Geometry().fromBufferGeometry(geometry);
}
this.geometry = geometry.clone();
this.geometry.mergeVertices(); this.geometry.mergeVertices();
this.createLines(); this.createLines();
@ -153,6 +157,7 @@ D3D.Slicer.prototype.slice = function (height, step) {
//think this check is not nescesary, always higher as 0 //think this check is not nescesary, always higher as 0
if (shape.length > 0) { if (shape.length > 0) {
shape.push({X: shape[0].X, Y: shape[0].Y});
slice.push(shape); slice.push(shape);
} }
} }
@ -230,7 +235,8 @@ D3D.Slicer.prototype.slicesToData = function (slices, printer) {
} }
//moet fillArea wel kleiner? //moet fillArea wel kleiner?
var fillArea = this.getInset((inset || outerLayer), wallThickness); //var fillArea = this.getInset((inset || outerLayer), wallThickness);
var fillArea = (inset || outerLayer);
var fillAbove = false; var fillAbove = false;
//for (var i = 1; i < shellThickness/layerHeight; i ++) { //for (var i = 1; i < shellThickness/layerHeight; i ++) {
@ -330,7 +336,7 @@ D3D.Slicer.prototype.dataToGcode = function (data, printer) {
var retractionSpeed = printer.config["printer.retraction.speed"]; var retractionSpeed = printer.config["printer.retraction.speed"];
var retractionMinDistance = printer.config["printer.retraction.minDistance"]; var retractionMinDistance = printer.config["printer.retraction.minDistance"];
var retractionAmount = printer.config["printer.retraction.amount"]; var retractionAmount = printer.config["printer.retraction.amount"];
function sliceToGcode (slice) { function sliceToGcode (slice) {
var gcode = []; var gcode = [];
@ -339,9 +345,8 @@ D3D.Slicer.prototype.dataToGcode = function (data, printer) {
var previousPoint; var previousPoint;
for (var j = 0; j <= shape.length; j ++) { for (var j = 0; j < shape.length; j ++) {
//Finish shape by going to first point var point = shape[j];
var point = shape[(j % shape.length)];
if (j === 0) { if (j === 0) {
//TODO //TODO
@ -431,13 +436,13 @@ D3D.Slicer.prototype.drawPaths = function (printer, min, max) {
for (var i = 0; i < paths.length; i ++) { for (var i = 0; i < paths.length; i ++) {
var path = paths[i]; var path = paths[i];
context.moveTo((path[0].X- 100) * 6.0 + 200, (path[0].Y- 100) * 6.0 + 200); context.moveTo((path[0].X * 2), (path[0].Y * 2));
for (var j = 0; j < path.length; j ++) { for (var j = 0; j < path.length; j ++) {
var point = path[j]; var point = path[j];
context.lineTo((point.X- 100) * 6.0 + 200, (point.Y- 100) * 6.0 + 200); context.lineTo((point.X * 2), (point.Y * 2));
} }
context.closePath(); //context.closePath();
} }
context.stroke(); context.stroke();
} }

BIN
stl/overhang_test.stl Normal file

Binary file not shown.