From cfff8b498f31f57fc27a8d380c5a6febcd15edda Mon Sep 17 00:00:00 2001 From: peteruithoven Date: Mon, 28 Oct 2013 11:16:00 +0100 Subject: [PATCH 1/3] Open Settings window after settings are loaded --- js_src/SettingsWindow.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/js_src/SettingsWindow.js b/js_src/SettingsWindow.js index de546fb..a605767 100644 --- a/js_src/SettingsWindow.js +++ b/js_src/SettingsWindow.js @@ -151,12 +151,10 @@ function SettingsWindow() { } this.showSettings = function() { - console.log("f:showSettings()"); - - this.loadSettings(); // reload settings -// this.window.css("display","table"); - $("#contentOverlay").fadeIn(375, function() { - document.body.removeEventListener('touchmove',prevent,false); + this.loadSettings(function() { // reload settings + $("#contentOverlay").fadeIn(375, function() { + document.body.removeEventListener('touchmove',prevent,false); + }); }); } this.hideSettings = function(complete) { @@ -167,7 +165,7 @@ function SettingsWindow() { }); } - this.loadSettings = function() { + this.loadSettings = function(complete) { if (!communicateWithWifibox) { console.log(" communicateWithWifibox is false: settings aren't being loaded from wifibox...") return; @@ -184,6 +182,7 @@ function SettingsWindow() { console.log(" settings: ",settings); self.fillForm(); $(document).trigger(SettingsWindow.SETTINGS_LOADED); + if(complete) complete(); } }).fail(function() { console.log("Settings:loadSettings: failed"); From 9ead4a94160f35dd6d5a5611639ce2c6b01dcc0d Mon Sep 17 00:00:00 2001 From: peteruithoven Date: Mon, 28 Oct 2013 13:50:08 +0100 Subject: [PATCH 2/3] Seperate CGI-bin signin request --- js_src/SettingsWindow.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/js_src/SettingsWindow.js b/js_src/SettingsWindow.js index a605767..96e3ad6 100644 --- a/js_src/SettingsWindow.js +++ b/js_src/SettingsWindow.js @@ -142,6 +142,7 @@ function SettingsWindow() { self.hideSettings(function() { enableButton(self.btnOK,self.submitwindow); }); + self.signin(); } else { enableButton(self.btnOK,self.submitwindow); } @@ -331,6 +332,20 @@ function SettingsWindow() { } } + this.signin = function() { + $.ajax({ + url: self.wifiboxCGIBinURL + "/network/signin", + type: "GET", + dataType: 'json', + timeout: self.timeoutTime, + success: function(response){ + console.log("Settings:signin response: ",response); + } + }).fail(function() { + console.log("Settings:signin: failed"); + }); + } + /* * Networks ui */ From 3e6dde503e8239410bc789e2033d6ec1abd8acbd Mon Sep 17 00:00:00 2001 From: peteruithoven Date: Mon, 28 Oct 2013 17:17:50 +0100 Subject: [PATCH 3/3] Sending endcode with API:printer/stop. Refactored start- and endcode generation --- js_src/Printer.js | 4 +++ js_src/gcodeGenerating.js | 54 +++++++++++++++++++++++++-------------- 2 files changed, 39 insertions(+), 19 deletions(-) diff --git a/js_src/Printer.js b/js_src/Printer.js index bdbd89f..aedb569 100644 --- a/js_src/Printer.js +++ b/js_src/Printer.js @@ -212,11 +212,15 @@ function Printer() { this.stop = function() { console.log("Printer:stop"); + endCode = generateEndCode(); + console.log(" endCode: ",endCode); + var postData = { gcode: endCode.join("\n")}; var self = this; if (communicateWithWifibox) { $.ajax({ url: this.wifiboxURL + "/printer/stop", type: "POST", + data: postData, dataType: 'json', timeout: this.timeoutTime, success: function(data){ diff --git a/js_src/gcodeGenerating.js b/js_src/gcodeGenerating.js index 95eebe9..c4ff2e2 100644 --- a/js_src/gcodeGenerating.js +++ b/js_src/gcodeGenerating.js @@ -35,7 +35,6 @@ function generate_gcode() { gcode = []; console.log("settings: ",settings); - var printerType = settings["printer.type"]; var speed = settings["printer.speed"] var normalSpeed = speed; var bottomSpeed = speed*0.5; @@ -61,24 +60,9 @@ function generate_gcode() { var gCodeOffsetX = printerBedWidth/2; //110; // mm var gCodeOffsetY = printerBedHeight/2; //110; // mm + var startCode = generateStartCode(); + var endCode = generateEndCode(); - var startCode = ""; - 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(" speed: " + speed); @@ -274,7 +258,39 @@ function generate_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(/{printingBedTemp}/gi ,bedTemperature);