vmario/doodle3d-client
0
0
Fork 0
mirror of https://github.com/Doodle3D/doodle3d-client.git synced 2024-11-22 09:17:56 +01:00
Code Issues Releases Wiki Activity

Did a ajax calls and the gcode sending overhaul/rewrite. All failed calls (temp, process check, preheat, print and stop) are retried automatically. All printer communication is now handled in Printer.js.

Browse Source
This commit is contained in:
peteruithoven 2013-08-14 20:54:48 +02:00
parent 8ec49ed475
commit 7da38d2e98
5 changed files with 118 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
index.html
View File

@ -88,7 +88,6 @@
<script src="js/buttonbehaviors.js"></script> <script src="js/buttonbehaviors.js"></script>
<script src="js/canvasDrawing_v01.js"></script> <script src="js/canvasDrawing_v01.js"></script>
<script src="js/previewRendering_v01.js"></script> <script src="js/previewRendering_v01.js"></script>
<script src="js/doodlePrintCode.js"></script>
<script src="js/gcodeGenerating_v01.js"></script> <script src="js/gcodeGenerating_v01.js"></script>
<script src="js/init_layout.js"></script> <script src="js/init_layout.js"></script>
<script src="js/Printer.js"></script> <script src="js/Printer.js"></script>

144
js/Printer.js
View File

@ -6,14 +6,24 @@ function Printer() {
this.maxTempLastMod = 5; // max time (seconds) since the last temp info modification before the printer connection is considered lost this.maxTempLastMod = 5; // max time (seconds) since the last temp info modification before the printer connection is considered lost
this.checkTemperatureInterval = 3000; this.checkTemperatureInterval = 3000;
this.checkTemperatureDelay; this.checkTemperatureDelay;
this.checkProgressInterval = 3000; this.checkProgressInterval = 3000;
this.checkProgressDelay; this.checkProgressDelay;
this.timeoutTime = 3000; this.timeoutTime = 3000;
this.gcode; // gcode to be printed
this.sendLength = 6000; // max amount of gcode lines per post (limited because WiFi box can't handle to much)
this.retryDelay = 2000; // retry setTimout delay
this.retrySendPrintPartDelay; // retry setTimout instance
this.retryCheckTemperatureDelay; // retry setTimout instance
this.retryCheckProgressDelay; // retry setTimout instance
this.retryStopDelay; // retry setTimout instance
this.retryPreheatDelay; // retry setTimout instance
this.maxGCodeSize = 10; // max size of gcode in MB's (estimation)
// Events // Events
Printer.UPDATE = "update"; Printer.UPDATE = "update";
@ -41,29 +51,103 @@ function Printer() {
timeout: this.timeoutTime, timeout: this.timeoutTime,
success: function(data){ success: function(data){
console.log("Printer:preheat response: ",data); console.log("Printer:preheat response: ",data);
}, if(data.status == "error") {
error: function(jqXHR, status, errorThrown){ //the status returned will be "timeout" clearTimeout(self.retryPreheatDelay);
//console.log("Printer:temperature error. Status: ",status,' errorThrown: ',errorThrown); self.retryPreheatDelay = setTimeout(function() { self.preheat() },self.retryDelay); // retry after delay
switch(status) { }
case 'timeout':
console.log("retrieving printer/heatup timeout");
self.preheat();
break;
}
} }
}).fail(function() {
console.log("Printer:preheat: failed");
clearTimeout(self.retryPreheatDelay);
self.retryPreheatDelay = setTimeout(function() { self.preheat() },self.retryDelay); // retry after delay
}); });
} }
this.print = function(gcode) {
console.log("Printer:print");
console.log(" gcode total # of lines: " + gcode.length);
/*for (i = 0; i < gcode.length; i++) {
gcode[i] += " (" + i + ")";
}*/
this.sendIndex = 0;
this.gcode = gcode;
//console.log(" gcode[20]: ",gcode[20]);
var gcodeLineSize = this.byteSize(gcode[20]);
//console.log(" gcodeLineSize: ",gcodeLineSize);
var gcodeSize = gcodeLineSize*gcode.length/1024/1024; // estimate gcode size in MB's
console.log(" gcodeSize: ",gcodeSize);
if(gcodeSize > this.maxGCodeSize) {
console.log("Error: Printer:print: gcode file is probably to big ("+gcodeSize+"MB) (max: "+this.maxGCodeSize+"MB)");
return;
}
this.sendPrintPart(this.sendIndex, this.sendLength);
}
this.byteSize = function(s){
return~-encodeURI(s).split(/%..|./).length;
}
this.sendPrintPart = function(sendIndex,sendLength) {
console.log("Printer:sendPrintPart sendIndex: " + sendIndex + "/" + this.gcode.length + ", sendLength: " + sendLength);
var firstOne = (sendIndex == 0)? true : false;
var lastOne = false;
if (this.gcode.length < (sendIndex + sendLength)) {
console.log(" sending less than max sendLength (and last)");
sendLength = this.gcode.length - sendIndex;
lastOne = true;
}
var gcodePart = this.gcode.slice(sendIndex, sendIndex+sendLength);
var postData = { id: 0, gcode: gcodePart.join("\n"), first: firstOne, last: lastOne};
var self = this;
$.ajax({
url: this.wifiboxURL + "/printer/print",
type: "POST",
data: postData,
dataType: 'json',
timeout: this.timeoutTime,
success: function(data){
console.log("Printer:sendPrintPart response: ",data);
if(data.status == "success") {
if (lastOne) {
console.log("Printer:sendPrintPart:gcode sending completed");
this.gcode = [];
} else {
self.sendPrintPart(sendIndex + sendLength, sendLength);
}
}
}
}).fail(function() {
console.log("Printer:sendPrintPart: failed");
clearTimeout(self.retrySendPrintPartDelay);
self.retrySendPrintPartDelay = setTimeout(function() { self.sendPrintPart(sendIndex, sendLength) },self.retryDelay); // retry after delay
});
}
this.stop = function() { this.stop = function() {
console.log("Printer:stop"); console.log("Printer:stop");
var postData = { id: 0 }; var postData = { id: 0 };
$.post( this.wifiboxURL + "/printer/stop", postData , function(e) { $.ajax({
console.log("Printer:stop response: " + e); url: this.wifiboxURL + "/printer/stop",
type: "POST",
data: postData,
dataType: 'json',
timeout: this.timeoutTime,
success: function(data){
console.log("Printer:stop response: ", data);
}
}).fail(function() {
console.log("Printer:stop: failed");
clearTimeout(self.retryStopDelay);
self.retryStopDelay = setTimeout(function() { self.stop() },self.retryDelay); // retry after delay
});
if (e.success = true) {
console.log(" success");
}
});
} }
this.checkTemperature = function() { this.checkTemperature = function() {
@ -91,16 +175,11 @@ function Printer() {
$(document).trigger(Printer.UPDATE); $(document).trigger(Printer.UPDATE);
self.checkTemperatureDelay = setTimeout(function() { self.checkTemperature() },self.checkTemperatureInterval); self.checkTemperatureDelay = setTimeout(function() { self.checkTemperature() },self.checkTemperatureInterval);
},
error: function(jqXHR, status, errorThrown){ //the status returned will be "timeout"
//console.log("Printer:temperature error. Status: ",status,' errorThrown: ',errorThrown);
switch(status) {
case 'timeout':
console.log("retrieving printer/temperature timeout");
self.checkTemperature();
break;
}
} }
}).fail(function() {
console.log("Printer:checkTemperature: failed");
clearTimeout(self.retryCheckTemperatureDelay);
self.retryCheckTemperatureDelay = setTimeout(function() { self.checkTemperature() },self.retryDelay); // retry after delay
}); });
} }
this.checkProgress = function() { this.checkProgress = function() {
@ -127,16 +206,11 @@ function Printer() {
$(document).trigger(Printer.UPDATE); $(document).trigger(Printer.UPDATE);
self.checkProgressDelay = setTimeout(function() { self.checkProgress() },self.checkProgressInterval); self.checkProgressDelay = setTimeout(function() { self.checkProgress() },self.checkProgressInterval);
},
error: function(jqXHR, status, errorThrown){ //the status returned will be "timeout"
//console.log("Printer:progress error. Status: ",status,' errorThrown: ',errorThrown);
switch(status) {
case 'timeout':
self.checkProgress();
console.log("retrieving printer/progress timeout");
break;
}
} }
}).fail(function() {
console.log("Printer:checkProgress: failed");
clearTimeout(self.retryCheckProgressDelay);
self.retryCheckProgressDelay = setTimeout(function() { self.checkProgress() },self.retryDelay); // retry after delay
}); });
} }

7
js/buttonbehaviors.js
View File

@ -241,8 +241,9 @@ function print(e) {
if (_points.length > 2) { if (_points.length > 2) {
setState(PRINTING_STATE); setState(PRINTING_STATE);
var gencode = generate_gcode(); var gcode = generate_gcode();
startPrint(gencode); //startPrint(gencode);
printer.print(gcode);
// console.log(""); // console.log("");
// console.log(""); // console.log("");
@ -254,7 +255,7 @@ function print(e) {
// console.log(""); // console.log("");
// console.log(""); // console.log("");
$("#textdump").text(gencode.join("\n")); $("#textdump").text(gcode.join("\n"));
// copyToClipboard(gencode); // copyToClipboard(gencode);
//*/ //*/
} else { } else {

63
js/doodlePrintCode.js
View File

@ -1,63 +0,0 @@
var sendIndex;
var sendLength;
var data = "";
function startPrint(gcode) {
console.log("f:startPrint()");
console.log("total # of lines: " + gcode.length);
data = gcode;
for (i = 0; i < data.length; i++) {
data[i] += " (" + i + ")";
}
sendIndex = 0;
sendLength = 2000; // 2000 regels
sendGCodeSlice(sendIndex, sendLength);
}
function sendGCodeSlice(startIndex, sendAmt) {
console.log("f:sendGCodeSlice >> startIndex:" + startIndex + ", sendAmt:" + sendAmt);
if (typeof startIndex == "number" && typeof sendAmt == "number") {
var lastOne = false;
if (data.length < (startIndex + sendAmt)) {
console.log("f:senGCodeSlice >> not enough data left for full slice, sending smaller (and last) one");
sendAmt = data.length - startIndex;
lastOne = true;
}
var _tmp = data.slice(startIndex, startIndex+sendAmt);
// console.log("f:senGCodeSlice >> _tmp.length:" + _tmp.length);
// $.post("/doodle3d.of", { data:data }, function(data) {
// btnPrint.disabled = false;
// });
var firstOne = false;
if (startIndex == 0) { firstOne = true; }
var postData = { id: 0, gcode: _tmp.join("\n"), first: firstOne, last: lastOne};
$.post( wifiboxURL + "/printer/print", postData , function(e) {
console.log("sendBoy callback: " + e);
// console.log(e);
// console.log("e.success: " + e.success);
if (e.success = true) {
if (lastOne) {
console.log("f:sendGCodeSlice >> DONE!");
} else {
sendGCodeSlice(startIndex + sendAmt, sendAmt);
}
}
})
} else {
console.log(" something wrong");
}
}
function sendBoy(sendObj, callback) {
console.log("f:sendBoy() (dummy kastje) >> data length: " + sendObj.data.length + ", lastOne: " + sendObj.last);
console.log("");
if (callback != undefined) callback({success:true});
}

4
js/gcodeGenerating_v01.js
View File

@ -107,13 +107,13 @@ function generate_gcode(callback) {
if (firstLayerSlow) { if (firstLayerSlow) {
//gcode.push("M220 S20"); //slow speed //gcode.push("M220 S20"); //slow speed
speed = bottomSpeed; speed = bottomSpeed;
console.log("> speed: ",speed); //console.log("> speed: ",speed);
} }
} else if (layer == 2) { ////////LET OP, pas bij layer 2 weer op normale snelheid ipv layer 1 } else if (layer == 2) { ////////LET OP, pas bij layer 2 weer op normale snelheid ipv layer 1
gcode.push("M106"); //fan on gcode.push("M106"); //fan on
//gcode.push("M220 S100"); //normal speed //gcode.push("M220 S100"); //normal speed
speed = normalSpeed; speed = normalSpeed;
console.log("> speed: ",speed); //console.log("> speed: ",speed);
} }
var curLayerCommand = 0; var curLayerCommand = 0;