From 20e80b390ead6834a2a665e0006670aedcb08f55 Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Tue, 19 May 2015 17:15:59 +0200
Subject: [PATCH] changed gcode implementation from array to string
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Makes more sense to store it as string rather then store it as array.
Doesn’t work with the doodle box though; think the doodle box adds \n
after each batch
---
 .gitignore                  |   2 ++
 library/three.js            |  12 ++++++++++++
 models/sonder_one_piece.stl | Bin 4284 -> 0 bytes
 slice_test.html             |  16 ++++++----------
 src/box.js                  |  19 +++++++++----------
 src/printer.js              |   5 ++---
 src/slicer.js               |  11 +++++------
 src/utils.js                |  28 ++++------------------------
 8 files changed, 40 insertions(+), 53 deletions(-)
 delete mode 100644 models/sonder_one_piece.stl

diff --git a/.gitignore b/.gitignore
index 8fc7ae8..5a44eb4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,5 @@ bower_components/
 src/oldcode.js
 
 test.html
+
+print_manager.html
diff --git a/library/three.js b/library/three.js
index d5d219a..905568f 100644
--- a/library/three.js
+++ b/library/three.js
@@ -1578,6 +1578,18 @@ THREE.Vector2.prototype = {
 
 		return new THREE.Vector2( this.x, this.y );
 
+	},
+
+	normal : function () {
+
+		var x = this.y;
+		var y = -this.x;
+
+		this.x = x;
+		this.y = y;
+
+		return this;
+
 	}
 
 };
diff --git a/models/sonder_one_piece.stl b/models/sonder_one_piece.stl
deleted file mode 100644
index a5d4e098f15406c5d809d8098cb3dbae0abb57c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4284
zcmbW4dr;I>6vwYwS}7_T+Em0^Dgo7Kppe43zq`I7Nk{VqTH*qV=!n6-^1&n2fEm)p
zeBn%xwA55Y3c9ERD`>tk^TFukq>TodkIHGREVJL;o!|Jq%k0#&f54snp3m<*?z!jw
zHaC0Gf^<`E_Tu!6oH^NxGfYbsWTa)7{`Y4pGd=|#x%#|qrAUi98z<MtF7EfPhdA%@
z#OGSQ>o2<gA*3chJ|e2D-m3&nf6`nNb5fJETn8plL82yRikG%z_BH!F7(P_uo|S8L
zgqO%a%lrs;$~vzipMyEg>e<F+gk_n1{PI8r3G}T-g#=m|-?!a*H-HbRAfe{b?{c`O
z<J6<P$9vbPR<DURzgm+uaqHEM>~ccutyfnPuGYUaU*>0Kt?=9zvNyWO-B%&dO06yu
zs34(6<;%T*%l|S%>0Rc5#I@6h#c}<6t>2b=nR^LTWM4^I_LZ!(T>GBx``g(E(uQwk
z2bHL#g2cc3kOW%E?(vUG##X?w+pkY55FLM4Xg&QpU(E$O9Ely<t)gUql_t+hU;?e0
z!m`DlVwcvd6M@Q&L`{rLt@m1?@4!Bgc-|T;cEs-U_E=y7t*|Q@t6Q_gyBA|ZYYA(G
z-JYt?lJstsTB~=KtZ2*k61VpSHx`v16G5MD)3y%j5NL%oV}S^?8d7*v1ZN%B%6c5p
zI}r&~kid>n2~?24`52f$E9`v6Qg=H@*7%hSrw6+at>pK{Jnl>w3KHl~*+CC>HTuI@
z*_kkWAfZO}hBMbAxuvo1H{t0-f5uGoomzjwn8--@N9DV1q#whFoIb`{KG*PJ%w3g`
zJ^~TGsAi|;d-GU!{+$GzYK9ME+Q}#R=B__sC`hPL&FsziTngto%Y!*~xT*cHILj)v
z>Fs|CJU5IXfeI3@PuMRWyIY}^X32XH2~<33b>h`7mD;#(x|{JyDuD_TKQw<P%sTzn
zfrtHkAc0m_cWo3sbt34&NBjs>e(zr7&3xC>q5m-|ByMbbOO)$%+mIOQ=L4fcE1bcM
zy>LE`f}gSR^4%E}-E>%JNjtUDO_#;n;~Pc)gGV&ih;w3i^hVJX*{r4fD64yBkf7l~
zHr};5m9RcoX?zl6)knwBhD}z!bdKr+3EWM_HeZe-OOTyso}Q-o*zB$n-(RZHZdP?O
zW2G4@SrSbZd3L^d!W2RUiD|pmih9#0+OH@3=y}{uA4V-#>^vqUNg>b*_ldFgLlM;I
za_~)&V+a)_aBmoUplUD`U2*W56f>cMMD2=YB654RHsk)s^{5&mo}w<(oIIf-ULnv5
zcayPSu9&Db#mP^MNFY>@z+05D^%fJ&b2@p_i=z|*t<)|lP6?wYn3JzOFqYg&7SU@&
zgVvuy%y@I+9n9FlQ(@FV4!*wYRKgn)Z_et-L=iLhh_-rpZ$0zaqQMlu#m*xZ%~A-o
z5|%tsIKN#hzi?H*)zU0c#6#`;=*~HW3KH(xQgL9_Y0YK1r4v7`9!d)fZT#cO^ArND
z@U~;@!lf`8Q0U+rgC`Njj+vuB#s=IPNXK#=d|B>9LInw|p}yw_!-?E>ZmXN25NL%F
zGFCJpimv9^dGc4ugbEVsslE8}Fv=;n@x-8Xg+MDc^KAo$)2WFzerV7<LInw&5{$+D
z97iKBTDg{)r4VR^Zy${Hua75JgOw-VSwN^Dq0W-VHJoOaSozlGEQLTTe2Zdia@lAa
zX}9vax=ca^33d8>89t6$(yjc$hw~Kzt?=$*jHisE_<S4xcJFJ-yh0y1iS#oV6-%Zv
z8!sN4N~j=#m1e9tZz!ExXy>a;(-i`(aIP@cQXfg(zO(b2$x{dwB(P%`TX}sj{kGY`
zJCa{g2(-evqMzE3ft2@<lYdY-novPPoeb+r!l-4olUrg*A<zmZ5o3p@ev}aP=5l^#
wd_SeH@Erxuze=Ej1WqN!>O-FO>{<JDU4C%_M+JX>s=p?XKt(0){Z?n}AJtAXL;wH)

diff --git a/slice_test.html b/slice_test.html
index 1bbb70d..418d42b 100644
--- a/slice_test.html
+++ b/slice_test.html
@@ -28,7 +28,7 @@ canvas {border: 1px solid black;}
 <script>
 //nieuwe config
 //geimplimenteerd worden in de doodlebox?
-var printerConfig = {
+var printer = new D3D.Printer({
 	"printer.baudrate": "115200", //wat is dit?
 	"printer.bottomFlowRate": 1.0, 
 	"printer.bottomLayerSpeed": 35, 
@@ -56,8 +56,7 @@ var printerConfig = {
 
 	"printer.speed": 50, 
 	"printer.wallThickness": 0.4, //nozzle
-	"printer.layerHeight": 0.2, 
-
+	"printer.layerHeight": 0.3, 
 
 	//variabele toevoegen;
 	//-snelheid, retraction etc voor verschillende types (outerlayer, innerlayer, fill)
@@ -66,8 +65,7 @@ var printerConfig = {
 	"printer.shellThickness": 0.4, 
 	"printer.fillSize": 5, //dit is het raster aan de binnen kant van de geometry
 	"printer.brimOffset": 5
-};
-var printer = new D3D.Printer(printerConfig);
+});
 
 var localIp = location.hash.substring(1);
 var doodleBox = new D3D.Box(localIp);
@@ -75,7 +73,7 @@ var doodleBox = new D3D.Box(localIp);
 
 var scene = new THREE.Scene();
 
-var renderer = new THREE.WebGLRenderer({canvas: document.getElementById("3d-preview")});
+var renderer = new THREE.WebGLRenderer({canvas: document.getElementById("3d-preview"), antialias: true});
 renderer.setClearColor(0xffffff, 1);
 
 var camera = new THREE.PerspectiveCamera(75, renderer.domElement.width/renderer.domElement.height, 1, 10000);
@@ -90,7 +88,7 @@ camera.add(directionalLight);
 applyMouseControls(renderer, camera, new THREE.Vector3(100, 0, 100), 1000);
 
 var loader = new THREE.STLLoader();
-loader.load("models/d20.stl", function (geometry) {
+loader.load("models/pikachu.stl", function (geometry) {
 	//var geometry = new THREE.BoxGeometry(10, 10, 10, 1, 1, 1);
 	//var geometry = new THREE.SphereGeometry(10, 10, 10);
 	//var geometry = new THREE.TorusGeometry(20, 10, 30, 30);
@@ -119,7 +117,6 @@ loader.load("models/d20.stl", function (geometry) {
 		return geometry;
 	})();
 	*/
-
 	var material = new THREE.MeshPhongMaterial({color: 0x00ff00});
 	var mesh = new THREE.Mesh(geometry, material);
 	
@@ -128,11 +125,10 @@ loader.load("models/d20.stl", function (geometry) {
 	mesh.scale.x = mesh.scale.y = mesh.scale.z = 1;
 	mesh.position.x = 100;
 	mesh.position.z = 100;
-	//mesh.position.y = -2;
 
 	scene.add(mesh);
 
-	var slicer = new D3D.Slicer().setMesh(mesh);
+	slicer = new D3D.Slicer().setMesh(mesh);
 
 	var canvas = document.getElementById("canvas");
 	var context = canvas.getContext("2d");
diff --git a/src/box.js b/src/box.js
index b8d9291..520db93 100644
--- a/src/box.js
+++ b/src/box.js
@@ -16,13 +16,15 @@ D3D.Box = function (localIp) {
 	"use strict";
 	var self = this;
 
-	this.batchSize = 512;
-	this.maxBufferedLines = 4096;
+	this.batchSize = 1024 * 10;					//10kb
+	this.maxBufferSize = 1024 * 1024 * 2;		//2mb
+	this.bytesSend = 0;
 
 	this.localIp = localIp;
 	this.api = "http://" + localIp + "/d3dapi/";
 
 	this.config = {};
+	this.status = {};
 
 	this.printBatches = [];
 	this.currentBatch = 0;
@@ -59,7 +61,7 @@ D3D.Box.prototype.update = function () {
 	//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.printer.status["buffered_lines"] + this.batchSize) <= this.maxBufferedLines) {
+	if (this.printBatches.length > 0 && (this.status["buffered_lines"]*30 + this.batchSize) <= this.maxBufferSize) {
 	//if (this.printBatches.length > 0 ) {
 		this.printBatch();
 	}
@@ -73,7 +75,7 @@ D3D.Box.prototype.updateState = function () {
 	var self = this;
 
 	this.getInfoStatus(function (data) {
-		self.printer.status = data;
+		self.status = data;
 
 		if (self.onupdate !== undefined) {
 			self.onupdate(data);
@@ -87,12 +89,9 @@ D3D.Box.prototype.print = function (gcode) {
 
 	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));
+	for (var i = 0; i < gcode.length; i += this.batchSize) {
+		var gcodeBatch = gcode.substring(i, Math.min(i + this.batchSize, gcode.length));
 		this.printBatches.push(gcodeBatch);
 	}
 
@@ -107,7 +106,7 @@ D3D.Box.prototype.printBatch = function () {
 	this.setPrinterPrint({
 		"start": ((this.currentBatch === 0) ? true : false), 
 		"first": ((this.currentBatch === 0) ? true : false), 
-		"gcode": gcode.join("\n")
+		"gcode": gcode
 	}, function (data) {
 		console.log("batch sent: " + self.currentBatch, data);
 
diff --git a/src/printer.js b/src/printer.js
index f69293f..98e3885 100644
--- a/src/printer.js
+++ b/src/printer.js
@@ -8,7 +8,6 @@
 D3D.Printer = function (config) {
 	"use strict";
 
-	this.status = {};
 	this.config = {};
 
 	this.updateConfig(config);	
@@ -30,7 +29,7 @@ D3D.Printer.prototype.getStartCode = function () {
 	var gcode = this.config["printer.startcode"];
 	gcode = this.subsituteVariables(gcode);
 
-	return gcode.split("\n");
+	return gcode;
 };
 D3D.Printer.prototype.getEndCode = function () {
 	"use strict";
@@ -38,7 +37,7 @@ D3D.Printer.prototype.getEndCode = function () {
 	var gcode = this.config["printer.endcode"];
 	gcode = this.subsituteVariables(gcode);
 
-	return gcode.split("\n");
+	return gcode;
 };
 D3D.Printer.prototype.subsituteVariables = function (gcode) {
 	"use strict";
diff --git a/src/slicer.js b/src/slicer.js
index dc65044..5dce187 100644
--- a/src/slicer.js
+++ b/src/slicer.js
@@ -163,7 +163,7 @@ D3D.Slicer.prototype.slice = function (height, step) {
 						index = connects[j];
 
 						if (intersections[index] && done.indexOf(index) === -1) {
-							var a = new THREE.Vector2().set(intersection.x, intersection.y);
+							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)];
@@ -248,13 +248,13 @@ D3D.Slicer.prototype.slicesToData = function (slices, printer) {
 
 	var layerHeight = printer.config["printer.layerHeight"] * scale;
 	var dimensionsZ = printer.config["printer.dimensions.z"] * scale;
-	var wallThickness = printer.config["printer.wallThickness"] * 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);
 
@@ -452,7 +452,7 @@ D3D.Slicer.prototype.dataToGcode = function (data, printer) {
 		return gcode;
 	}
 
-	var gcode = printer.getStartCode();
+	var gcode = printer.getStartCode().split("\n");
 
 	var extruder = 0.0;
 	var speed = firstLayerSlow ? (bottomSpeed*60).toFixed(3) : (normalSpeed*60).toFixed(3);
@@ -480,8 +480,7 @@ D3D.Slicer.prototype.dataToGcode = function (data, printer) {
 		}
 	}
 
-	gcode = gcode.concat(printer.getEndCode());
-	return gcode;
+	return gcode.join("\n") + "\n" + printer.getEndCode();
 };
 //only for debug purposes
 D3D.Slicer.prototype.drawPaths = function (printer, min, max) {
diff --git a/src/utils.js b/src/utils.js
index a67aac1..d4bc3bf 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -11,16 +11,6 @@ var D3D = {
 	"contact": "develop@doodle3d.com"
 };
 
-//add normal function to Three.js Vector class
-THREE.Vector2.prototype.normal = function () {
-	"use strict";
-
-	var x = this.y;
-	var y = -this.x;
-
-	return this.set(x, y);
-};
-
 function sendAPI (url, data, callback) {
 	"use strict";
 
@@ -72,20 +62,10 @@ function getAPI (url, callback) {
 function downloadFile (file, data) {
 	"use strict";
 
+	var blob = new Blob([data], {type:'text/plain'});
+
 	var button = document.createElement("a");
 	button.download = file;
-	button.href = "data:text/plain," + data;
+	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;
-};
\ No newline at end of file
+}
\ No newline at end of file