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

Sending endcode with API:printer/stop. Refactored start- and endcode generation

Browse Source
This commit is contained in:
peteruithoven 2013-10-28 17:17:50 +01:00
parent 9ead4a9416
commit 3e6dde503e
2 changed files with 39 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js_src/Printer.js
View File

@ -212,11 +212,15 @@ function Printer() {
this.stop = function() { this.stop = function() {
console.log("Printer:stop"); console.log("Printer:stop");
endCode = generateEndCode();
console.log(" endCode: ",endCode);
var postData = { gcode: endCode.join("\n")};
var self = this; var self = this;
if (communicateWithWifibox) { if (communicateWithWifibox) {
$.ajax({ $.ajax({
url: this.wifiboxURL + "/printer/stop", url: this.wifiboxURL + "/printer/stop",
type: "POST", type: "POST",
data: postData,
dataType: 'json', dataType: 'json',
timeout: this.timeoutTime, timeout: this.timeoutTime,
success: function(data){ success: function(data){

54
js_src/gcodeGenerating.js
View File

@ -35,7 +35,6 @@ function generate_gcode() {
gcode = []; gcode = [];
console.log("settings: ",settings); console.log("settings: ",settings);
var printerType = settings["printer.type"];
var speed = settings["printer.speed"] var speed = settings["printer.speed"]
var normalSpeed = speed; var normalSpeed = speed;
var bottomSpeed = speed*0.5; var bottomSpeed = speed*0.5;
@ -61,23 +60,8 @@ function generate_gcode() {
var gCodeOffsetX = printerBedWidth/2; //110; // mm var gCodeOffsetX = printerBedWidth/2; //110; // mm
var gCodeOffsetY = printerBedHeight/2; //110; // mm var gCodeOffsetY = printerBedHeight/2; //110; // mm
var startCode = generateStartCode();
var startCode = ""; var endCode = generateEndCode();
var endCode = "";
if(settingsWindow.isMarlinPrinter(printerType)) {
startCode = settings["printer.startcode.marlin"];
endCode = settings["printer.endcode.marlin"];
} else {
startCode = settings["printer.startcode.x3g"];
endCode = settings["printer.endcode.x3g"];
}
startCode = subsituteVariables(startCode,temperature,bedTemperature,preheatTemperature,preheatBedTemperature);
startCode = startCode.split("\n");
endCode = subsituteVariables(endCode,temperature,bedTemperature,preheatTemperature,preheatBedTemperature);
endCode = endCode.split("\n");
/* /*
console.log("f:generate_gcode >> EFFE CHECKEN:"); console.log("f:generate_gcode >> EFFE CHECKEN:");
@ -274,7 +258,39 @@ function generate_gcode() {
return gcode; return gcode;
} }
function subsituteVariables(gcode,temperature,bedTemperature,preheatTemperature,preheatBedTemperature) { function generateStartCode() {
var printerType = settings["printer.type"];
var startCode = "";
if(settingsWindow.isMarlinPrinter(printerType)) {
startCode = settings["printer.startcode.marlin"];
} else {
startCode = settings["printer.startcode.x3g"];
}
startCode = subsituteVariables(startCode);
startCode = startCode.split("\n");
return startCode;
}
function generateEndCode() {
var printerType = settings["printer.type"];
var endCode = "";
if(settingsWindow.isMarlinPrinter(printerType)) {
endCode = settings["printer.endcode.marlin"];
} else {
endCode = settings["printer.endcode.x3g"];
}
endCode = subsituteVariables(endCode);
endCode = endCode.split("\n");
return endCode;
}
function subsituteVariables(gcode) {
//,temperature,bedTemperature,preheatTemperature,preheatBedTemperature
var temperature = settings["printer.temperature"];
var bedTemperature = settings["printer.bed.temperature"];
var preheatTemperature = settings["printer.heatup.temperature"];
var preheatBedTemperature = settings["printer.heatup.bed.temperature"];
gcode = gcode.replace(/{printingTemp}/gi ,temperature); gcode = gcode.replace(/{printingTemp}/gi ,temperature);
gcode = gcode.replace(/{printingBedTemp}/gi ,bedTemperature); gcode = gcode.replace(/{printingBedTemp}/gi ,bedTemperature);