mirror of
https://github.com/Doodle3D/doodle3d-client.git
synced 2024-10-01 15:08:36 +02:00
Compare commits
No commits in common. "master" and "0.10.6" have entirely different histories.
9
.gitignore
vendored
9
.gitignore
vendored
@ -18,11 +18,18 @@ img/logo/logo_smaller.png
|
|||||||
img/logo/logo_smaller_8bit.png
|
img/logo/logo_smaller_8bit.png
|
||||||
img/logo/logo_smaller_wide_8bit.png
|
img/logo/logo_smaller_wide_8bit.png
|
||||||
img/logo/logo_smallest.png
|
img/logo/logo_smallest.png
|
||||||
|
css/_backup20131010/*
|
||||||
|
css/_backup20131011/*
|
||||||
d3d_btns.css
|
d3d_btns.css
|
||||||
|
index.html.orig
|
||||||
|
js/Thermometer.js.orig
|
||||||
|
js/buttonbehaviors.js.orig
|
||||||
|
js/gcodeGenerating_v01.js.orig
|
||||||
|
js/init_layout backup20130918.js
|
||||||
js/main.js.orig
|
js/main.js.orig
|
||||||
|
js/previewRendering_v02.js.orig
|
||||||
less/verticalshapes.css
|
less/verticalshapes.css
|
||||||
less/verticalshapes_backup.css
|
less/verticalshapes_backup.css
|
||||||
__settings.html
|
__settings.html
|
||||||
css/_settings.css
|
css/_settings.css
|
||||||
node_modules/*
|
node_modules/*
|
||||||
js/main.js.out
|
|
||||||
|
@ -1,2 +0,0 @@
|
|||||||
eclipse.preferences.version=1
|
|
||||||
included=//*.js
|
|
33
Gruntfile.js
33
Gruntfile.js
@ -10,32 +10,6 @@ module.exports = function(grunt) {
|
|||||||
'<%= pkg.homepage ? "* " + pkg.homepage + "\\n" : "" %>' +
|
'<%= pkg.homepage ? "* " + pkg.homepage + "\\n" : "" %>' +
|
||||||
'* Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %>;' +
|
'* Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %>;' +
|
||||||
' Licensed <%= _.pluck(pkg.licenses, "type").join(", ") %> */\n',
|
' Licensed <%= _.pluck(pkg.licenses, "type").join(", ") %> */\n',
|
||||||
gitinfo: {
|
|
||||||
options: {},
|
|
||||||
commands: { 'tag': ['tag', '--points-at', 'HEAD'] }
|
|
||||||
},
|
|
||||||
template: {
|
|
||||||
'add_build_info': {
|
|
||||||
options: {
|
|
||||||
data: function() {
|
|
||||||
grunt.task.requires('gitinfo');
|
|
||||||
var gi = grunt.config('gitinfo');
|
|
||||||
var lbc = gi.local.branch.current;
|
|
||||||
|
|
||||||
var tags = (gi.tag == '') ? 'no_tag' : gi.tag;
|
|
||||||
tags = tags.split('\n').join(',');
|
|
||||||
var commitMsg = lbc.lastCommitMessage.slice(1, -1).split('\n')[0].replace(/"/g, '\\\"');
|
|
||||||
|
|
||||||
var buildInfo = lbc.shortSHA + "/" + lbc.name + "/" + tags +
|
|
||||||
" (" + lbc.lastCommitTime.slice(1, -1) + "; \'" + commitMsg + "'";
|
|
||||||
return { 'build_info': buildInfo };
|
|
||||||
}
|
|
||||||
},
|
|
||||||
files: {
|
|
||||||
'js/main.js.out': ['js/main.js']
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
concat: {
|
concat: {
|
||||||
options: {
|
options: {
|
||||||
// separator: ';'
|
// separator: ';'
|
||||||
@ -48,8 +22,7 @@ module.exports = function(grunt) {
|
|||||||
'js/*.js',
|
'js/*.js',
|
||||||
// make sure we put main.js last
|
// make sure we put main.js last
|
||||||
'!js/main.js',
|
'!js/main.js',
|
||||||
'js/main.js.out'
|
'js/main.js', ],
|
||||||
],
|
|
||||||
dest: 'www/js/<%= pkg.name %>.js'
|
dest: 'www/js/<%= pkg.name %>.js'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -156,8 +129,6 @@ module.exports = function(grunt) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
// These plugins provide necessary tasks.
|
// These plugins provide necessary tasks.
|
||||||
grunt.loadNpmTasks('grunt-gitinfo');
|
|
||||||
grunt.loadNpmTasks('grunt-template');
|
|
||||||
grunt.loadNpmTasks('grunt-contrib-less');
|
grunt.loadNpmTasks('grunt-contrib-less');
|
||||||
grunt.loadNpmTasks('grunt-contrib-concat');
|
grunt.loadNpmTasks('grunt-contrib-concat');
|
||||||
grunt.loadNpmTasks('grunt-contrib-uglify');
|
grunt.loadNpmTasks('grunt-contrib-uglify');
|
||||||
@ -168,8 +139,6 @@ module.exports = function(grunt) {
|
|||||||
|
|
||||||
// Default task.
|
// Default task.
|
||||||
grunt.registerTask('default', [
|
grunt.registerTask('default', [
|
||||||
'gitinfo',
|
|
||||||
'template',
|
|
||||||
'less',
|
'less',
|
||||||
'autoprefixer',
|
'autoprefixer',
|
||||||
'cssmin',
|
'cssmin',
|
||||||
|
9
Makefile
9
Makefile
@ -34,7 +34,6 @@ endef
|
|||||||
|
|
||||||
define Build/Prepare
|
define Build/Prepare
|
||||||
mkdir -p $(PKG_BUILD_DIR)
|
mkdir -p $(PKG_BUILD_DIR)
|
||||||
$(CP) js $(PKG_BUILD_DIR)/
|
|
||||||
$(CP) less $(PKG_BUILD_DIR)/
|
$(CP) less $(PKG_BUILD_DIR)/
|
||||||
$(CP) www $(PKG_BUILD_DIR)/
|
$(CP) www $(PKG_BUILD_DIR)/
|
||||||
$(CP) Gruntfile.js $(PKG_BUILD_DIR)/
|
$(CP) Gruntfile.js $(PKG_BUILD_DIR)/
|
||||||
@ -44,16 +43,12 @@ define Build/Prepare
|
|||||||
endef
|
endef
|
||||||
|
|
||||||
define Build/Compile
|
define Build/Compile
|
||||||
# We're running grunt in the shared folder, so
|
|
||||||
# grunt can access git info
|
|
||||||
npm install
|
npm install
|
||||||
ifeq ($(CONFIG_DOODLE3D_CLIENT_MINIFY_JS),y)
|
ifeq ($(CONFIG_DOODLE3D_CLIENT_MINIFY_JS),y)
|
||||||
grunt gitinfo template less autoprefixer cssmin concat uglify
|
grunt less autoprefixer cssmin concat uglify
|
||||||
else
|
else
|
||||||
grunt gitinfo template less autoprefixer cssmin concat
|
grunt less autoprefixer cssmin concat
|
||||||
endif
|
endif
|
||||||
# Copy compiled files to build dir
|
|
||||||
$(CP) www $(PKG_BUILD_DIR)/
|
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/doodle3d-client/install
|
define Package/doodle3d-client/install
|
||||||
|
@ -25,7 +25,7 @@ function Message() {
|
|||||||
this.$element = $element;
|
this.$element = $element;
|
||||||
}
|
}
|
||||||
this.set = function(contents,mode,autoHide,disableEffect) {
|
this.set = function(contents,mode,autoHide,disableEffect) {
|
||||||
//console.log("Message:set: ",contents,mode,autoHide,disableEffect);
|
console.log("Message:set: ",contents,mode,autoHide,disableEffect);
|
||||||
if(disableEffect) {
|
if(disableEffect) {
|
||||||
self.fill(contents,mode,autoHide)
|
self.fill(contents,mode,autoHide)
|
||||||
} else{
|
} else{
|
||||||
|
156
js/Printer.js
156
js/Printer.js
@ -19,7 +19,6 @@ function setPrintprogress(val) {
|
|||||||
//*/
|
//*/
|
||||||
|
|
||||||
function Printer() {
|
function Printer() {
|
||||||
/* CONSTANTS */
|
|
||||||
|
|
||||||
Printer.WIFIBOX_DISCONNECTED_STATE = "wifibox disconnected";
|
Printer.WIFIBOX_DISCONNECTED_STATE = "wifibox disconnected";
|
||||||
Printer.UNKNOWN_STATE = "unknown"; // happens when a printer is connection but there isn't communication yet
|
Printer.UNKNOWN_STATE = "unknown"; // happens when a printer is connection but there isn't communication yet
|
||||||
@ -33,29 +32,11 @@ function Printer() {
|
|||||||
|
|
||||||
Printer.ON_BEFORE_UNLOAD_MESSAGE = "You're doodle is still being sent to the printer, leaving will result in a incomplete 3D print";
|
Printer.ON_BEFORE_UNLOAD_MESSAGE = "You're doodle is still being sent to the printer, leaving will result in a incomplete 3D print";
|
||||||
|
|
||||||
//after buffer full message has been received, wait until the buffer load is below this ratio before sending new data
|
|
||||||
Printer.GCODE_BUFFER_WAIT_LOAD_RATIO = 0.75;
|
|
||||||
Printer.BUFFER_SPACE_WAIT_TIMEOUT = 30000; // how often to recheck buffer load
|
|
||||||
|
|
||||||
//time to wait when wifibox connection is lost while printing
|
|
||||||
Printer.DISCONNECTED_RETRY_DELAY = 5000;
|
|
||||||
|
|
||||||
Printer.MAX_LINES_PER_POST = 500; // max amount of gcode lines per post (limited because WiFi box can't handle too much)
|
|
||||||
Printer.MAX_GCODE_SIZE = 10; // max size of gcode in MB's (estimation)
|
|
||||||
|
|
||||||
// Events
|
|
||||||
Printer.UPDATE = "update";
|
|
||||||
|
|
||||||
|
|
||||||
/* MEMBER VARIABLES */
|
|
||||||
|
|
||||||
this.temperature = 0;
|
this.temperature = 0;
|
||||||
this.targetTemperature = 0;
|
this.targetTemperature = 0;
|
||||||
this.currentLine = 0;
|
this.currentLine = 0;
|
||||||
this.totalLines = 0;
|
this.totalLines = 0;
|
||||||
this.bufferedLines = 0;
|
this.bufferedLines = 0;
|
||||||
this.bufferSize = 0;
|
|
||||||
this.maxBufferSize = 0;
|
|
||||||
this.state = Printer.UNKNOWN_STATE;
|
this.state = Printer.UNKNOWN_STATE;
|
||||||
this.hasControl = true; // whether this client has control access
|
this.hasControl = true; // whether this client has control access
|
||||||
|
|
||||||
@ -66,8 +47,8 @@ function Printer() {
|
|||||||
this.timeoutTime = 3000;
|
this.timeoutTime = 3000;
|
||||||
this.sendPrintPartTimeoutTime = 5000;
|
this.sendPrintPartTimeoutTime = 5000;
|
||||||
|
|
||||||
this.gcode = []; // gcode to be printed
|
this.gcode; // gcode to be printed
|
||||||
this.gcodeNumChunks = 0; //number of chunks to be sent (used for sequence numbering)
|
this.sendLength = 500; // max amount of gcode lines per post (limited because WiFi box can't handle too much)
|
||||||
|
|
||||||
this.retryDelay = 2000; // retry setTimout delay
|
this.retryDelay = 2000; // retry setTimout delay
|
||||||
this.retrySendPrintPartDelay; // retry setTimout instance
|
this.retrySendPrintPartDelay; // retry setTimout instance
|
||||||
@ -75,10 +56,12 @@ function Printer() {
|
|||||||
this.retryStopDelay; // retry setTimout instance
|
this.retryStopDelay; // retry setTimout instance
|
||||||
this.retryPreheatDelay; // retry setTimout instance
|
this.retryPreheatDelay; // retry setTimout instance
|
||||||
|
|
||||||
|
Printer.MAX_GCODE_SIZE = 10; // max size of gcode in MB's (estimation)
|
||||||
|
|
||||||
this.stateOverruled = false;
|
this.stateOverruled = false;
|
||||||
|
|
||||||
|
// Events
|
||||||
/* FUNCTIONS */
|
Printer.UPDATE = "update";
|
||||||
|
|
||||||
var self = this;
|
var self = this;
|
||||||
|
|
||||||
@ -137,7 +120,6 @@ function Printer() {
|
|||||||
|
|
||||||
this.sendIndex = 0;
|
this.sendIndex = 0;
|
||||||
this.gcode = gcode;
|
this.gcode = gcode;
|
||||||
this.gcodeNumChunks = Math.ceil(this.gcode.length / Printer.MAX_LINES_PER_POST);
|
|
||||||
|
|
||||||
//console.log(" gcode[20]: ",gcode[20]);
|
//console.log(" gcode[20]: ",gcode[20]);
|
||||||
var gcodeLineSize = this.byteSize(gcode[20]);
|
var gcodeLineSize = this.byteSize(gcode[20]);
|
||||||
@ -160,7 +142,7 @@ function Printer() {
|
|||||||
|
|
||||||
//this.targetTemperature = settings["printer.temperature"]; // slight hack
|
//this.targetTemperature = settings["printer.temperature"]; // slight hack
|
||||||
|
|
||||||
this.sendPrintPart(this.sendIndex, Printer.MAX_LINES_PER_POST);
|
this.sendPrintPart(this.sendIndex, this.sendLength);
|
||||||
}
|
}
|
||||||
|
|
||||||
this.byteSize = function(s){
|
this.byteSize = function(s){
|
||||||
@ -168,43 +150,26 @@ function Printer() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.sendPrintPart = function(sendIndex,sendLength) {
|
this.sendPrintPart = function(sendIndex,sendLength) {
|
||||||
var self = this;
|
console.log("Printer:sendPrintPart sendIndex: " + sendIndex + "/" + this.gcode.length + ", sendLength: " + sendLength);
|
||||||
// Abort if stopping
|
|
||||||
// sendPrintPart can be called by delayed retry after request timeout for example
|
|
||||||
if (self.state === Printer.STOPPING_STATE) return;
|
var sendPercentage = Math.round(sendIndex/this.gcode.length*100);
|
||||||
|
message.set("Sending doodle to printer: "+sendPercentage+"%",Message.NOTICE,false,true);
|
||||||
|
|
||||||
|
var firstOne = (sendIndex == 0)? true : false;
|
||||||
|
var start = firstOne; // start printing right away
|
||||||
|
|
||||||
var completed = false;
|
var completed = false;
|
||||||
if (this.gcode.length < (sendIndex + sendLength)) {
|
if (this.gcode.length < (sendIndex + sendLength)) {
|
||||||
|
console.log(" sending less than max sendLength (and last)");
|
||||||
sendLength = this.gcode.length - sendIndex;
|
sendLength = this.gcode.length - sendIndex;
|
||||||
|
//lastOne = true;
|
||||||
completed = true;
|
completed = true;
|
||||||
}
|
}
|
||||||
|
var gcodePart = this.gcode.slice(sendIndex, sendIndex+sendLength);
|
||||||
|
|
||||||
|
var postData = { gcode: gcodePart.join("\n"), first: firstOne, start: start};
|
||||||
/* prepare post data */
|
var self = this;
|
||||||
|
|
||||||
var gcodePart = this.gcode.slice(sendIndex, sendIndex + sendLength);
|
|
||||||
var firstOne = (sendIndex == 0) ? true : false;
|
|
||||||
var start = firstOne; // start printing right away
|
|
||||||
var seqNum = Math.floor(sendIndex / Printer.MAX_LINES_PER_POST);
|
|
||||||
var postData = {
|
|
||||||
gcode: gcodePart.join("\n"), total_lines: this.gcode.length,
|
|
||||||
clear: firstOne, start: start,
|
|
||||||
seq_number: seqNum, seq_total: this.gcodeNumChunks
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
/* inform user what's going on */
|
|
||||||
|
|
||||||
var lessThanMaxText = completed ? " (last one, max=" + Printer.MAX_LINES_PER_POST + ")" : "";
|
|
||||||
console.log("Printer:sendPrintPart: sendIndex=" + sendIndex + "/" + this.gcode.length +
|
|
||||||
", sendLength=" + sendLength + lessThanMaxText +
|
|
||||||
", sequence numbers: " + seqNum + "/" + this.gcodeNumChunks);
|
|
||||||
|
|
||||||
var sendPercentage = Math.round(sendIndex / this.gcode.length * 100);
|
|
||||||
message.set("Sending doodle to printer: " + sendPercentage + "%", Message.NOTICE, false, true);
|
|
||||||
|
|
||||||
|
|
||||||
/* send data */
|
|
||||||
if (communicateWithWifibox) {
|
if (communicateWithWifibox) {
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: this.wifiboxURL + "/printer/print",
|
url: this.wifiboxURL + "/printer/print",
|
||||||
@ -213,13 +178,13 @@ function Printer() {
|
|||||||
dataType: 'json',
|
dataType: 'json',
|
||||||
timeout: this.sendPrintPartTimeoutTime,
|
timeout: this.sendPrintPartTimeoutTime,
|
||||||
success: function(data){
|
success: function(data){
|
||||||
//console.log("Printer:sendPrintPart success response: ", data);
|
console.log("Printer:sendPrintPart response: ",data);
|
||||||
|
|
||||||
if(data.status == "success") {
|
if(data.status == "success") {
|
||||||
if (completed) {
|
if (completed) {
|
||||||
console.log("Printer:sendPrintPart: gcode sending completed");
|
console.log("Printer:sendPrintPart:gcode sending completed");
|
||||||
this.gcode = [];
|
this.gcode = [];
|
||||||
this.gcodeNumChunks = 0;
|
btnStop.css("display","block"); // hack
|
||||||
self.removeLeaveWarning();
|
self.removeLeaveWarning();
|
||||||
message.set("Doodle has been sent to printer...",Message.INFO,true);
|
message.set("Doodle has been sent to printer...",Message.INFO,true);
|
||||||
//self.targetTemperature = settings["printer.temperature"]; // slight hack
|
//self.targetTemperature = settings["printer.temperature"]; // slight hack
|
||||||
@ -230,48 +195,23 @@ function Printer() {
|
|||||||
if(self.state == Printer.PRINTING_STATE || self.state == Printer.BUFFERING_STATE) {
|
if(self.state == Printer.PRINTING_STATE || self.state == Printer.BUFFERING_STATE) {
|
||||||
//console.log("Printer:sendPrintPart:sending next part");
|
//console.log("Printer:sendPrintPart:sending next part");
|
||||||
self.sendPrintPart(sendIndex + sendLength, sendLength);
|
self.sendPrintPart(sendIndex + sendLength, sendLength);
|
||||||
} else if (Printer.WIFIBOX_DISCONNECTED_STATE) {
|
|
||||||
console.warn("Printer:sendPrintPart: wifibox connection lost while printing, retrying in " + (Printer.DISCONNECTED_RETRY_DELAY / 1000) + " seconds");
|
|
||||||
clearTimeout(self.retrySendPrintPartDelay);
|
|
||||||
self.retrySendPrintPartDelay = setTimeout(function() {
|
|
||||||
console.log("Printer:sendPrintPart: retrying after wifibox disconnect was detected");
|
|
||||||
self.sendPrintPart(sendIndex, sendLength);
|
|
||||||
}, Printer.DISCONNECTED_RETRY_DELAY);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (data.status == "fail") {
|
|
||||||
if (data.data.status == "buffer_full") {
|
|
||||||
console.log("Printer:sendPrintPart: print server reported buffer full, pausing data transmission");
|
|
||||||
//this will wait in a setTimeout loop until enough room is available and then call sendPrintPart again.
|
|
||||||
self.waitForBufferSpace(sendIndex, sendLength);
|
|
||||||
} else if (data.data.status == "seq_num_mismatch" && data.data.seq_number == seqNum) {
|
|
||||||
console.warn("Printer:sendPrintPart: received sequence error, server is one chunk ahead. Proceeding with next chunk...");
|
|
||||||
self.sendPrintPart(sendIndex + sendLength, sendLength);
|
|
||||||
} else {
|
|
||||||
console.error("Printer:sendPrintPart: unexpected failure response for API endpoint printer/print (" +
|
|
||||||
data.data.status + ", current server seq. info: " + data.data.seq_number + "/" + data.data.seq_total + ")");
|
|
||||||
//sequence errors should not occur, except perhaps when 'stop' was clicked while still sending (https://github.com/Doodle3D/doodle3d-client/issues/226).
|
|
||||||
if (self.state != Printer.STOPPING_STATE) {
|
|
||||||
message.set("Unexpected error sending doodle to printer (" + data.data.status + "), please retry", Message.ERROR, false, true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
// after we know the first gcode packed has bin received or failed
|
||||||
// after we know the first gcode part has been received or failed
|
|
||||||
// (and the driver had time to update the printer.state)
|
// (and the driver had time to update the printer.state)
|
||||||
// we start checking the status again
|
// we start checking the status again
|
||||||
if(sendIndex == 0) {
|
if(sendIndex == 0) {
|
||||||
self.startStatusCheckInterval();
|
self.startStatusCheckInterval();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}).fail(function(jqXHr, textStatus, errorThrown) {
|
}).fail(function() {
|
||||||
console.error("Printer:sendPrintPart: failed (AJAX status: '" + textStatus + "') AJAX exception (if any):", errorThrown);
|
console.log("Printer:sendPrintPart: failed");
|
||||||
console.warn("Printer:sendPrintPart: retrying in " + (Printer.DISCONNECTED_RETRY_DELAY / 1000) + " seconds");
|
|
||||||
clearTimeout(self.retrySendPrintPartDelay);
|
clearTimeout(self.retrySendPrintPartDelay);
|
||||||
self.retrySendPrintPartDelay = setTimeout(function() {
|
self.retrySendPrintPartDelay = setTimeout(function() {
|
||||||
console.log("Printer:sendPrintPart: retrying after AJAX failure");
|
console.log("request printer:sendPrintPart failed retry");
|
||||||
self.sendPrintPart(sendIndex, sendLength)
|
self.sendPrintPart(sendIndex, sendLength)
|
||||||
}, Printer.DISCONNECTED_RETRY_DELAY);
|
},self.retryDelay); // retry after delay
|
||||||
|
|
||||||
// after we know the gcode packed has bin received or failed
|
// after we know the gcode packed has bin received or failed
|
||||||
// (and the driver had time to update the printer.state)
|
// (and the driver had time to update the printer.state)
|
||||||
@ -283,46 +223,12 @@ function Printer() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* Called by sendPrintPart when a buffer_full fail response is received.
|
|
||||||
* This function keeps calling itself until the GCodeBuffer's load ratio
|
|
||||||
* drops below a predefined value and then calls sendPrintPart again.
|
|
||||||
*/
|
|
||||||
this.waitForBufferSpace = function(sendIndex,sendLength) {
|
|
||||||
var fillRatio = this.bufferSize / this.maxBufferSize;
|
|
||||||
var self = this;
|
|
||||||
|
|
||||||
//console.log("buffer fill state: " + self.bufferSize + "/" + self.maxBufferSize + " (" + fillPercent + "%)");
|
|
||||||
|
|
||||||
if (fillRatio >= Printer.GCODE_BUFFER_WAIT_LOAD_RATIO) {
|
|
||||||
var fillPercent = (fillRatio * 100).toFixed(2);
|
|
||||||
console.log("Printer:waitForBufferSpace: waiting until gcode buffer load ratio is below " +
|
|
||||||
(Printer.GCODE_BUFFER_WAIT_LOAD_RATIO * 100) + "% (current: " + fillPercent + "% of " +
|
|
||||||
(self.maxBufferSize / 1024) + "KiB)");
|
|
||||||
self.waitForBufferSpaceDelay = setTimeout(function() { self.waitForBufferSpace(sendIndex, sendLength); }, Printer.BUFFER_SPACE_WAIT_TIMEOUT);
|
|
||||||
} else {
|
|
||||||
if(self.state == Printer.PRINTING_STATE || self.state == Printer.BUFFERING_STATE) {
|
|
||||||
console.log("Printer:waitForBufferSpace: load ratio dropped below " + (Printer.GCODE_BUFFER_WAIT_LOAD_RATIO * 100) + "%, calling sendPrintPart...");
|
|
||||||
self.sendPrintPart(sendIndex, sendLength);
|
|
||||||
} else {
|
|
||||||
console.log("Printer:waitForBufferSpace: load ratio dropped far enough but printer state is not printing or buffering anymore, not resuming.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
this.stop = function() {
|
this.stop = function() {
|
||||||
console.log("Printer:stop");
|
console.log("Printer:stop");
|
||||||
var self = this;
|
|
||||||
if (self.retrySendPrintPartDelay !== undefined) {
|
|
||||||
clearTimeout(self.retrySendPrintPartDelay);
|
|
||||||
}
|
|
||||||
if (self.waitForBufferSpaceDelay !== undefined) {
|
|
||||||
clearTimeout(self.waitForBufferSpaceDelay);
|
|
||||||
}
|
|
||||||
|
|
||||||
endCode = generateEndCode();
|
endCode = generateEndCode();
|
||||||
console.log(" endCode: ",endCode);
|
console.log(" endCode: ",endCode);
|
||||||
var postData = { gcode: endCode.join("\n")};
|
var postData = { gcode: endCode.join("\n")};
|
||||||
|
var self = this;
|
||||||
if (communicateWithWifibox) {
|
if (communicateWithWifibox) {
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: this.wifiboxURL + "/printer/stop",
|
url: this.wifiboxURL + "/printer/stop",
|
||||||
@ -419,9 +325,7 @@ function Printer() {
|
|||||||
// progress
|
// progress
|
||||||
self.currentLine = data.current_line;
|
self.currentLine = data.current_line;
|
||||||
self.totalLines = data.total_lines;
|
self.totalLines = data.total_lines;
|
||||||
self.bufferedLines = data.buffered_lines;
|
self.bufferedLines = data.buffered_lines
|
||||||
self.bufferSize = data.buffer_size;
|
|
||||||
self.maxBufferSize = data.max_buffer_size;
|
|
||||||
|
|
||||||
// access
|
// access
|
||||||
self.hasControl = data.has_control;
|
self.hasControl = data.has_control;
|
||||||
|
@ -25,7 +25,7 @@ function shapeMoveTo(x,y) {
|
|||||||
_points.push([x, y, true]);
|
_points.push([x, y, true]);
|
||||||
adjustBounds(x, y);
|
adjustBounds(x, y);
|
||||||
adjustPreviewTransformation();
|
adjustPreviewTransformation();
|
||||||
draw(x, y, -1);
|
draw(x, y, .5);
|
||||||
}
|
}
|
||||||
|
|
||||||
function shapeLineTo(x,y) {
|
function shapeLineTo(x,y) {
|
||||||
|
@ -116,7 +116,7 @@ function loadFromSvg(svgData) {
|
|||||||
adjustBounds(x, y);
|
adjustBounds(x, y);
|
||||||
adjustPreviewTransformation();
|
adjustPreviewTransformation();
|
||||||
|
|
||||||
if (isMove) draw(x, y, -1);
|
if (isMove) draw(x, y, .5);
|
||||||
else draw(x, y);
|
else draw(x, y);
|
||||||
}
|
}
|
||||||
p++;
|
p++;
|
||||||
|
@ -232,6 +232,8 @@ function print(e) {
|
|||||||
//setState(Printer.BUFFERING_STATE,printer.hasControl);
|
//setState(Printer.BUFFERING_STATE,printer.hasControl);
|
||||||
printer.overruleState(Printer.BUFFERING_STATE);
|
printer.overruleState(Printer.BUFFERING_STATE);
|
||||||
|
|
||||||
|
btnStop.css("display","none"); // hack
|
||||||
|
|
||||||
// we put the gcode generation in a little delay
|
// we put the gcode generation in a little delay
|
||||||
// so that for example the print button is disabled right away
|
// so that for example the print button is disabled right away
|
||||||
clearTimeout(gcodeGenerateDelayer);
|
clearTimeout(gcodeGenerateDelayer);
|
||||||
@ -356,7 +358,7 @@ function setState(newState,newHasControl) {
|
|||||||
|
|
||||||
prevState = state;
|
prevState = state;
|
||||||
|
|
||||||
console.log("setState: " + prevState + " > " + newState + " ( " + newHasControl + ")");
|
console.log("setState: ",prevState," > ",newState," ( ",newHasControl,")");
|
||||||
setDebugText("State: "+newState);
|
setDebugText("State: "+newState);
|
||||||
|
|
||||||
// print button
|
// print button
|
||||||
|
@ -97,66 +97,52 @@ function initDoodleDrawing() {
|
|||||||
* CANVAS DRAWING FUNCTION
|
* CANVAS DRAWING FUNCTION
|
||||||
*
|
*
|
||||||
* * * * * * * * * */
|
* * * * * * * * * */
|
||||||
|
|
||||||
//If _width is not specified, it is calculated from the distance between this and the previous point.
|
|
||||||
//If _width is negative, the path is 'floating', and only drawn if the setting printer.bottomEnableTraveling is true.
|
|
||||||
function draw(_x, _y, _width) {
|
function draw(_x, _y, _width) {
|
||||||
//console.log("canvasDrawing:draw");
|
//console.log("canvasDrawing:draw");
|
||||||
//console.log("f:draw() >> _width: " + _width);
|
// console.log("f:draw() >> _width: " + _width);
|
||||||
|
|
||||||
if (prevX == 0 && prevY == 0) {
|
if (prevX == 0 && prevY ==0) {
|
||||||
prevX = _x;
|
prevX = _x;
|
||||||
prevY = _y;
|
prevY = _y;
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx.beginPath();
|
ctx.beginPath();
|
||||||
ctx.moveTo(prevX, prevY);
|
ctx.moveTo(prevX, prevY);
|
||||||
|
ctx.lineTo(_x, _y);
|
||||||
|
|
||||||
var lineWeight = null;
|
if (_width != undefined) {
|
||||||
if (_width != undefined && _width < 0) {
|
ctx.lineWidth = _width;
|
||||||
if (settings['printer.bottomEnableTraveling']) {
|
|
||||||
ctx.moveTo(_x, _y);
|
|
||||||
} else {
|
|
||||||
lineWeight = 0.5;
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
if (_width != undefined) {
|
if (drawVariableLineWeight) {
|
||||||
lineWeight = _width;
|
var dist = Math.sqrt(Math.pow((prevX - _x), 2) + Math.pow((prevY - _y), 2));
|
||||||
} else {
|
if (dist < 10) {
|
||||||
if (drawVariableLineWeight) {
|
lineweight += .25;
|
||||||
var dist = Math.sqrt(Math.pow((prevX - _x), 2) + Math.pow((prevY - _y), 2));
|
} else if (dist < 20) {
|
||||||
if (dist < 10) {
|
lineweight += .5;
|
||||||
lineWeight += .25;
|
} else if (dist < 30) {
|
||||||
} else if (dist < 20) {
|
lineweight += .75;
|
||||||
lineWeight += .5;
|
} else if (dist < 50) {
|
||||||
} else if (dist < 30) {
|
lineweight += 1;
|
||||||
lineWeight += .75;
|
} else if (dist < 80) {
|
||||||
} else if (dist < 50) {
|
lineweight += 1.5;
|
||||||
lineWeight += 1;
|
} else if (dist < 120) {
|
||||||
} else if (dist < 80) {
|
lineweight += 2.25;
|
||||||
lineWeight += 1.5;
|
} else if (dist < 170) {
|
||||||
} else if (dist < 120) {
|
lineweight += 3.5;
|
||||||
lineWeight += 2.25;
|
|
||||||
} else if (dist < 170) {
|
|
||||||
lineWeight += 3.5;
|
|
||||||
} else {
|
|
||||||
lineWeight += 2;
|
|
||||||
}
|
|
||||||
lineWeight = Math.min(lineWeight, 30);
|
|
||||||
lineWeight *= 0.90;
|
|
||||||
lineWeight = Math.max(lineWeight, 1.0);
|
|
||||||
} else {
|
} else {
|
||||||
lineWeight = 2;
|
lineweight += 2;
|
||||||
}
|
}
|
||||||
|
lineweight = Math.min(lineweight, 30);
|
||||||
|
lineweight *= 0.90;
|
||||||
|
lineweight = Math.max(lineweight, 1.0);
|
||||||
|
} else {
|
||||||
|
lineweight = 2;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (lineWeight != null) {
|
ctx.lineWidth = lineweight;
|
||||||
ctx.lineCap = 'round';
|
|
||||||
ctx.lineWidth = lineWeight;
|
|
||||||
ctx.lineTo(_x, _y);
|
|
||||||
ctx.stroke();
|
|
||||||
}
|
}
|
||||||
|
ctx.lineCap = 'round';
|
||||||
|
ctx.stroke();
|
||||||
|
|
||||||
prevX = _x;
|
prevX = _x;
|
||||||
prevY = _y;
|
prevY = _y;
|
||||||
@ -216,7 +202,7 @@ function redrawDoodle(recalcBoundsAndTransforms) {
|
|||||||
for (var i = 0; i < _points.length; i++) {
|
for (var i = 0; i < _points.length; i++) {
|
||||||
// console.log(" drawing points " + _points[i]);
|
// console.log(" drawing points " + _points[i]);
|
||||||
if (_points[i][2] == true) {
|
if (_points[i][2] == true) {
|
||||||
draw(_points[i][0], _points[i][1], -1);
|
draw(_points[i][0], _points[i][1], 0.5);
|
||||||
} else {
|
} else {
|
||||||
draw(_points[i][0], _points[i][1]);
|
draw(_points[i][0], _points[i][1]);
|
||||||
}
|
}
|
||||||
@ -315,7 +301,7 @@ function onCanvasMouseDown(e) {
|
|||||||
_points.push([x, y, true]);
|
_points.push([x, y, true]);
|
||||||
adjustBounds(x, y);
|
adjustBounds(x, y);
|
||||||
adjustPreviewTransformation();
|
adjustPreviewTransformation();
|
||||||
draw(x, y, -1);
|
draw(x, y, 0.5);
|
||||||
}
|
}
|
||||||
|
|
||||||
var prevPoint = {x:-1, y:-1};
|
var prevPoint = {x:-1, y:-1};
|
||||||
@ -337,9 +323,18 @@ function onCanvasMouseMove(e) {
|
|||||||
y = e.layerY;
|
y = e.layerY;
|
||||||
}
|
}
|
||||||
|
|
||||||
var prevPresent = prevPoint.x != -1 || prevPoint.y != -1;
|
if (prevPoint.x != -1 || prevPoint.y != -1) {
|
||||||
var dist = prevPresent ? Math.sqrt(Math.pow((prevPoint.x - x), 2) + Math.pow((prevPoint.y - y), 2)) : undefined;
|
var dist = Math.sqrt(((prevPoint.x - x) * (prevPoint.x - x)) + ((prevPoint.y - y) * (prevPoint.y - y)));
|
||||||
if (!prevPresent || dist > 5) { // replace dist check by setting: doodle3d.simplify.minDistance
|
if (dist > 5) { // replace by setting: doodle3d.simplify.minDistance
|
||||||
|
_points.push([x, y, false]);
|
||||||
|
adjustBounds(x, y);
|
||||||
|
adjustPreviewTransformation();
|
||||||
|
draw(x, y);
|
||||||
|
prevPoint.x = x;
|
||||||
|
prevPoint.y = y;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// this is called once, every time you start to draw a line
|
||||||
_points.push([x, y, false]);
|
_points.push([x, y, false]);
|
||||||
adjustBounds(x, y);
|
adjustBounds(x, y);
|
||||||
adjustPreviewTransformation();
|
adjustPreviewTransformation();
|
||||||
@ -406,7 +401,7 @@ function onCanvasTouchDown(e) {
|
|||||||
_points.push([x, y, true]);
|
_points.push([x, y, true]);
|
||||||
adjustBounds(x, y);
|
adjustBounds(x, y);
|
||||||
adjustPreviewTransformation();
|
adjustPreviewTransformation();
|
||||||
draw(x, y, -1);
|
draw(x, y, .5);
|
||||||
|
|
||||||
movementCounter = 0;
|
movementCounter = 0;
|
||||||
|
|
||||||
@ -429,11 +424,19 @@ function onCanvasTouchMove(e) {
|
|||||||
|
|
||||||
//console.log("f:onCanvasTouchMove >> x,y = "+x+","+y+" , e: " , e);
|
//console.log("f:onCanvasTouchMove >> x,y = "+x+","+y+" , e: " , e);
|
||||||
|
|
||||||
var prevPresent = prevPoint.x != -1 || prevPoint.y != -1;
|
if (prevPoint.x != -1 || prevPoint.y != -1) {
|
||||||
var dist = prevPresent ? Math.sqrt(Math.pow((prevPoint.x - x), 2) + Math.pow((prevPoint.y - y), 2)) : undefined;
|
var dist = Math.sqrt(Math.pow((prevPoint.x - x), 2) + Math.pow((prevPoint.y - y), 2));
|
||||||
if (!prevPresent || dist > 5) { // replace dist check by setting: doodle3d.simplify.minDistance
|
if (dist > 5) {
|
||||||
|
_points.push([x, y, false]);
|
||||||
|
adjustBounds(x, y)
|
||||||
|
adjustPreviewTransformation();
|
||||||
|
draw(x, y);
|
||||||
|
prevPoint.x = x;
|
||||||
|
prevPoint.y = y;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
_points.push([x, y, false]);
|
_points.push([x, y, false]);
|
||||||
adjustBounds(x, y);
|
adjustBounds(x, y)
|
||||||
adjustPreviewTransformation();
|
adjustPreviewTransformation();
|
||||||
draw(x, y);
|
draw(x, y);
|
||||||
prevPoint.x = x;
|
prevPoint.x = x;
|
||||||
@ -486,3 +489,8 @@ function onCanvasTouchEnd(e) {
|
|||||||
function prevent(e) {
|
function prevent(e) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -20,7 +20,6 @@ function generate_gcode() {
|
|||||||
var bottomSpeed = settings["printer.bottomLayerSpeed"];
|
var bottomSpeed = settings["printer.bottomLayerSpeed"];
|
||||||
var firstLayerSlow = settings["printer.firstLayerSlow"];
|
var firstLayerSlow = settings["printer.firstLayerSlow"];
|
||||||
var bottomFlowRate = settings["printer.bottomFlowRate"];
|
var bottomFlowRate = settings["printer.bottomFlowRate"];
|
||||||
var bottomEnableTraveling = settings["printer.bottomEnableTraveling"];
|
|
||||||
var travelSpeed = settings["printer.travelSpeed"]
|
var travelSpeed = settings["printer.travelSpeed"]
|
||||||
var filamentThickness = settings["printer.filamentThickness"];
|
var filamentThickness = settings["printer.filamentThickness"];
|
||||||
var wallThickness = settings["printer.wallThickness"];
|
var wallThickness = settings["printer.wallThickness"];
|
||||||
@ -160,10 +159,8 @@ function generate_gcode() {
|
|||||||
var isTraveling = !isLoop && i==0;
|
var isTraveling = !isLoop && i==0;
|
||||||
var doRetract = retractionEnabled && prev.distance(to) > retractionminDistance;
|
var doRetract = retractionEnabled && prev.distance(to) > retractionminDistance;
|
||||||
|
|
||||||
//Always travel to first point, then optionally disable traveling for first two layers and use settings for remainder of print.
|
|
||||||
var firstPointEver = (layer == 0 && i == 0 && j == 0);
|
var firstPointEver = (layer == 0 && i == 0 && j == 0);
|
||||||
var travelingAllowed = firstPointEver || bottomEnableTraveling || layer > 2;
|
if (firstPointEver || layer > 2 && enableTraveling && isTraveling) { //always travel to first point, then disable traveling for first two layers and use settings for remainder of print
|
||||||
if (travelingAllowed && enableTraveling && isTraveling) {
|
|
||||||
if (!firstPointEver && doRetract) gcode.push("G0 E" + (extruder - retractionamount).toFixed(3) + " F" + (retractionspeed * 60).toFixed(3)); //retract
|
if (!firstPointEver && doRetract) gcode.push("G0 E" + (extruder - retractionamount).toFixed(3) + " F" + (retractionspeed * 60).toFixed(3)); //retract
|
||||||
gcode.push("G0 X" + to.x.toFixed(3) + " Y" + to.y.toFixed(3) + " Z" + z.toFixed(3) + " F" + (travelSpeed * 60).toFixed(3));
|
gcode.push("G0 X" + to.x.toFixed(3) + " Y" + to.y.toFixed(3) + " Z" + z.toFixed(3) + " F" + (travelSpeed * 60).toFixed(3));
|
||||||
if (!firstPointEver && doRetract) gcode.push("G0 E" + extruder.toFixed(3) + " F" + (retractionspeed * 60).toFixed(3)); // return to normal
|
if (!firstPointEver && doRetract) gcode.push("G0 E" + extruder.toFixed(3) + " F" + (retractionspeed * 60).toFixed(3)); // return to normal
|
||||||
|
@ -34,8 +34,7 @@ var POPUP_SHOW_DURATION = 175;
|
|||||||
var BUTTON_GROUP_SHOW_DURATION = 80;
|
var BUTTON_GROUP_SHOW_DURATION = 80;
|
||||||
|
|
||||||
$(function() {
|
$(function() {
|
||||||
console.log("Doodle3D client ready");
|
console.log("ready");
|
||||||
console.log("Build information - <%= build_info %>)");
|
|
||||||
|
|
||||||
if (getURLParameter("d") != "null") debugMode = (getURLParameter("d") == "1");
|
if (getURLParameter("d") != "null") debugMode = (getURLParameter("d") == "1");
|
||||||
if (getURLParameter("p") != "null") sendPrintCommands = (getURLParameter("p") == "1");
|
if (getURLParameter("p") != "null") sendPrintCommands = (getURLParameter("p") == "1");
|
||||||
|
@ -34,8 +34,7 @@ function SettingsWindow() {
|
|||||||
var _networkPanel = new NetworkPanel();
|
var _networkPanel = new NetworkPanel();
|
||||||
var _networkAPI = new NetworkAPI();
|
var _networkAPI = new NetworkAPI();
|
||||||
|
|
||||||
var _restoreStateField;
|
var _restoreStateField
|
||||||
var _initialLogLevel = undefined;
|
|
||||||
|
|
||||||
var self = this;
|
var self = this;
|
||||||
|
|
||||||
@ -116,10 +115,6 @@ function SettingsWindow() {
|
|||||||
settingsPopup.close();
|
settingsPopup.close();
|
||||||
self.signin();
|
self.signin();
|
||||||
}
|
}
|
||||||
|
|
||||||
//FIXME: instead of this rather ugly call, implement events for changes to settings so we can keep code decoupled
|
|
||||||
redrawDoodle(false);
|
|
||||||
|
|
||||||
_btnOK.removeAttr("disabled");
|
_btnOK.removeAttr("disabled");
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
@ -128,12 +123,6 @@ function SettingsWindow() {
|
|||||||
_form.loadAllSettings(function(loadedSettings){
|
_form.loadAllSettings(function(loadedSettings){
|
||||||
console.log("Settings:loaded settings: ",loadedSettings);
|
console.log("Settings:loaded settings: ",loadedSettings);
|
||||||
settings = loadedSettings;
|
settings = loadedSettings;
|
||||||
|
|
||||||
//only set the initial level once, to make behaviour of restart warning as correctly as possible
|
|
||||||
if (_initialLogLevel == undefined)
|
|
||||||
_initialLogLevel = loadedSettings['system.log.level'];
|
|
||||||
updateLogLevelWarningsVisibility();
|
|
||||||
|
|
||||||
_form.fillForm(settings);
|
_form.fillForm(settings);
|
||||||
$(document).trigger(SettingsWindow.SETTINGS_LOADED);
|
$(document).trigger(SettingsWindow.SETTINGS_LOADED);
|
||||||
if(complete) complete();
|
if(complete) complete();
|
||||||
@ -191,31 +180,6 @@ function SettingsWindow() {
|
|||||||
this.openFileManager = function() {
|
this.openFileManager = function() {
|
||||||
location.href = "filemanager/"+location.search;
|
location.href = "filemanager/"+location.search;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.logLevelChanged = function() {
|
|
||||||
updateLogLevelWarningsVisibility();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/***** LOCAL FUNCTIONS *****/
|
|
||||||
|
|
||||||
function updateLogLevelWarningsVisibility() {
|
|
||||||
var showHideAnimDuration = 100;
|
|
||||||
newLevel = $('#logLevel').val();
|
|
||||||
if (_initialLogLevel != newLevel) {
|
|
||||||
$('#logging-restart-warning').show(showHideAnimDuration);
|
|
||||||
} else {
|
|
||||||
$('#logging-restart-warning').hide(showHideAnimDuration);
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (newLevel) {
|
|
||||||
case "verbose": case "bulk":
|
|
||||||
$('#logging-verbose-warning').show(showHideAnimDuration);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
$('#logging-verbose-warning').hide(showHideAnimDuration);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*************************
|
/*************************
|
||||||
|
@ -204,7 +204,7 @@ function UpdatePanel() {
|
|||||||
this.setState = function(newState,refresh) {
|
this.setState = function(newState,refresh) {
|
||||||
//console.log("UpdatePanel:setState");
|
//console.log("UpdatePanel:setState");
|
||||||
if(!refresh && this.state == newState) return;
|
if(!refresh && this.state == newState) return;
|
||||||
console.log("UpdatePanel:setState: " + this.state + " > " + newState + "(" + this.stateText + ") (in Access Point Mode: " + _inAccessPointMode + ") (newestVersion: " + self.newestVersion + ") (refresh: " + refresh + ")");
|
console.log("UpdatePanel:setState: ",this.state," > ",newState,"(",this.stateText,") (in Access Point Mode: ",_inAccessPointMode,") (newestVersion: ",self.newestVersion,") (refresh: ",refresh,")");
|
||||||
this.state = newState;
|
this.state = newState;
|
||||||
|
|
||||||
// should personal sketches and settings be retained over update?
|
// should personal sketches and settings be retained over update?
|
||||||
@ -314,7 +314,7 @@ function UpdatePanel() {
|
|||||||
var fields = [ ts.substr(0, 4), ts.substr(4, 2), ts.substr(6, 2) ];
|
var fields = [ ts.substr(0, 4), ts.substr(4, 2), ts.substr(6, 2) ];
|
||||||
if (!fields || fields.length != 3 || fields[1] > 12) return null;
|
if (!fields || fields.length != 3 || fields[1] > 12) return null;
|
||||||
|
|
||||||
var abbrMonths = [ 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec' ];
|
var abbrMonths = [ 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Sep', 'Aug', 'Oct', 'Nov', 'Dec' ];
|
||||||
return abbrMonths[fields[1] - 1] + " " + fields[2] + ", " + fields[0];
|
return abbrMonths[fields[1] - 1] + " " + fields[2] + ", " + fields[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -41,7 +41,7 @@ function setSketchModified(_isModified) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function updateSketchButtonStates() {
|
function updateSketchButtonStates() {
|
||||||
console.log('sketch: isModified: ' + isModified + ', curSketch: ' + curSketch + ', sketches.length: ' + sketches.length);
|
console.log('sketch: isModified',isModified,'curSketch',curSketch,'sketches.length',sketches.length);
|
||||||
|
|
||||||
if (isModified) {
|
if (isModified) {
|
||||||
btnSave.enable();
|
btnSave.enable();
|
||||||
@ -72,7 +72,7 @@ function loadSketch(_curSketch) {
|
|||||||
|
|
||||||
var id = sketches[curSketch];
|
var id = sketches[curSketch];
|
||||||
|
|
||||||
console.log('sketch: loadSketch curSketch:' + curSketch + ', id: ' + id);
|
console.log('sketch: loadSketch curSketch',curSketch,'id',id);
|
||||||
|
|
||||||
$.get(wifiboxURL + "/sketch", {id:id}, function(response) {
|
$.get(wifiboxURL + "/sketch", {id:id}, function(response) {
|
||||||
if (response.status=='success') {
|
if (response.status=='success') {
|
||||||
|
@ -3,16 +3,6 @@
|
|||||||
SETTINGS POPUP
|
SETTINGS POPUP
|
||||||
|
|
||||||
*/
|
*/
|
||||||
.warn-box {
|
|
||||||
color: #bb0;
|
|
||||||
border: 1px solid #bb0;
|
|
||||||
width: 99%;
|
|
||||||
border-radius: 5px;
|
|
||||||
margin: 7px 0;
|
|
||||||
padding: 2px;
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
#popupSettings {
|
#popupSettings {
|
||||||
top: 0;
|
top: 0;
|
||||||
left: 0;
|
left: 0;
|
||||||
|
@ -1,10 +1,8 @@
|
|||||||
local M = {
|
local M = {
|
||||||
BASE_PATH = 'js',
|
BASE_PATH = 'js_src',
|
||||||
EXCLUDE_FILES = {},
|
EXCLUDE_FILES = {},
|
||||||
PROCESS_FILES = {
|
PROCESS_FILES = {
|
||||||
['js/[^/]*%.js'] = 'cstyle',
|
['js_src/[^/]*%.js'] = 'cstyle'
|
||||||
['js/api/[^/]*%.js'] = 'cstyle',
|
|
||||||
['js/settings/[^/]*%.js'] = 'cstyle'
|
|
||||||
},
|
},
|
||||||
IGNORE_GIT_CHANGED = false
|
IGNORE_GIT_CHANGED = false
|
||||||
}
|
}
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
"author": "Peter Uithoven, Adriaan Wormgoor, Rick Companje, Wouter Reckman",
|
"author": "Peter Uithoven, Adriaan Wormgoor, Rick Companje, Wouter Reckman",
|
||||||
"readmeFilename": "README.md",
|
"readmeFilename": "README.md",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"grunt": "~0.4.5",
|
"grunt": "~0.4.1",
|
||||||
"grunt-cli": "~0.1.9",
|
"grunt-cli": "~0.1.9",
|
||||||
"grunt-contrib-less": "~0.7.0",
|
"grunt-contrib-less": "~0.7.0",
|
||||||
"grunt-contrib-watch": "~0.5.3",
|
"grunt-contrib-watch": "~0.5.3",
|
||||||
@ -17,11 +17,6 @@
|
|||||||
"grunt-contrib-jshint": "~0.6.4",
|
"grunt-contrib-jshint": "~0.6.4",
|
||||||
"grunt-autoprefixer": "~0.4.0",
|
"grunt-autoprefixer": "~0.4.0",
|
||||||
"grunt-contrib-cssmin": "~0.6.2",
|
"grunt-contrib-cssmin": "~0.6.2",
|
||||||
"grunt-contrib-concat": "~0.3.0",
|
"grunt-contrib-concat": "~0.3.0"
|
||||||
"grunt-gitinfo": "~0.1.7",
|
|
||||||
"grunt-template": "~0.2.3"
|
|
||||||
},
|
|
||||||
"scripts": {
|
|
||||||
"start": "grunt"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -76,10 +76,6 @@ form fieldset.collapsed legend {
|
|||||||
center left;
|
center left;
|
||||||
}
|
}
|
||||||
|
|
||||||
#debugPanel label {
|
|
||||||
min-width: 59px;
|
|
||||||
}
|
|
||||||
|
|
||||||
form label {
|
form label {
|
||||||
min-width: 150px;
|
min-width: 150px;
|
||||||
display: block;
|
display: block;
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
</li>
|
</li>
|
||||||
<li data-id="btnsPrevNext" data-button="Next" data-options="tipLocation:right;tipAdjustmentY:-25">
|
<li data-id="btnsPrevNext" data-button="Next" data-options="tipLocation:right;tipAdjustmentY:-25">
|
||||||
<h2>View saved doodles</h2>
|
<h2>View saved doodles</h2>
|
||||||
<p>Use the buttons '<' and '>' to flip through all the saved doodles on your Wi-Fi box.</p>
|
<p>Use the buttons '<' and '>' to flip through all the saved doodles on your Wi-Fi box.</p>
|
||||||
</li>
|
</li>
|
||||||
<li data-id="btnOops" data-button="Next" data-options="tipLocation:right">
|
<li data-id="btnOops" data-button="Next" data-options="tipLocation:right">
|
||||||
<h2>Oops</h2>
|
<h2>Oops</h2>
|
||||||
|
@ -99,7 +99,6 @@
|
|||||||
<label for="bottomLayerSpeed">Bottom layer speed:</label><input id="bottomLayerSpeed" type="number" name="printer.bottomLayerSpeed" class="small">mm/s<br>
|
<label for="bottomLayerSpeed">Bottom layer speed:</label><input id="bottomLayerSpeed" type="number" name="printer.bottomLayerSpeed" class="small">mm/s<br>
|
||||||
<label for="travelSpeed">Travel speed:</label><input id="travelSpeed" type="number" name="printer.travelSpeed" class="small">mm/s<br>
|
<label for="travelSpeed">Travel speed:</label><input id="travelSpeed" type="number" name="printer.travelSpeed" class="small">mm/s<br>
|
||||||
<label for="enableTraveling">Enable traveling:</label><input id="enableTraveling" type="checkbox" name="printer.enableTraveling" value="enableTraveling"><br>
|
<label for="enableTraveling">Enable traveling:</label><input id="enableTraveling" type="checkbox" name="printer.enableTraveling" value="enableTraveling"><br>
|
||||||
<label for="bottomEnableTraveling">Bottom layers traveling:</label><input id="bottomEnableTraveling" type="checkbox" name="printer.bottomEnableTraveling" value="bottomEnableTraveling"><br>
|
|
||||||
<label for="firstLayerSlow">Bottom layers slow:</label><input id="firstLayerSlow" type="checkbox" name="printer.firstLayerSlow" value="firstLayerSlow"><br>
|
<label for="firstLayerSlow">Bottom layers slow:</label><input id="firstLayerSlow" type="checkbox" name="printer.firstLayerSlow" value="firstLayerSlow"><br>
|
||||||
<label for="bottomFlowRate">Bottom layers flow rate*:</label><input id="bottomFlowRate" type="number" name="printer.bottomFlowRate" class="small"><br>
|
<label for="bottomFlowRate">Bottom layers flow rate*:</label><input id="bottomFlowRate" type="number" name="printer.bottomFlowRate" class="small"><br>
|
||||||
<small>* Multiplier for extrusion rate in first few layers</small>
|
<small>* Multiplier for extrusion rate in first few layers</small>
|
||||||
@ -183,24 +182,8 @@
|
|||||||
|
|
||||||
<fieldset id="debugPanel">
|
<fieldset id="debugPanel">
|
||||||
<legend>Debug</legend>
|
<legend>Debug</legend>
|
||||||
<label for="logLevel">Log level:</label>
|
<input type="button" onclick="settingsWindow.downloadlogs()" name="downloadlogs" value="Download logs" class="button" id="downloadlogs"
|
||||||
<select id="logLevel" name="system.log.level" onchange="settingsWindow.logLevelChanged()">
|
/>
|
||||||
<option value="" disabled="disabled" selected="selected">Please choose a log level</option>
|
|
||||||
<option value="quiet">Quiet</option>
|
|
||||||
<option value="error">Error</option>
|
|
||||||
<option value="warning">Warning</option>
|
|
||||||
<option value="info">Info</option>
|
|
||||||
<option value="verbose">Verbose</option>
|
|
||||||
<option value="bulk">Bulk</option>
|
|
||||||
</select><br/>
|
|
||||||
<div id="logging-restart-warning" class="warn-box">
|
|
||||||
Restart the wifibox for the new log level to take effect.
|
|
||||||
</div>
|
|
||||||
<div id="logging-verbose-warning" class="warn-box">
|
|
||||||
<em>Be careful</em>: when setting a log level higher than info, the Wifibox may quickly run out of memory, causing crashes and other unwanted behaviour.
|
|
||||||
</div>
|
|
||||||
<br/>
|
|
||||||
<input type="button" onclick="settingsWindow.downloadlogs()" name="downloadlogs" value="Download logs" class="button" id="downloadlogs"/>
|
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
|
||||||
<fieldset id="restorePanel">
|
<fieldset id="restorePanel">
|
||||||
|
Loading…
Reference in New Issue
Block a user