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

Display hint about wrong printer type setting if connecting takes longer than 15 seconds.

Browse Source
This commit is contained in:
Wouter R 2014-03-05 22:46:43 +01:00
parent e050c8e080
commit 2eaf21a030
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/buttonbehaviors.js
View File

@ -21,10 +21,13 @@ var hasControl;
var gcodeGenerateDelayer; var gcodeGenerateDelayer;
var gcodeGenerateDelay = 50; var gcodeGenerateDelay = 50;
var preheatDelay; var preheatDelay;
var preheatDelayTime = 15*1000; var preheatDelayTime = 15*1000;
var connectingHintDelay = null;
var connectingHintDelayTime = 15 * 1000;
function initButtonBehavior() { function initButtonBehavior() {
console.log("f:initButtonBehavior"); console.log("f:initButtonBehavior");
@ -416,6 +419,11 @@ function setState(newState,newHasControl) {
break; break;
} }
if(connectingHintDelay && newState != Printer.CONNECTING_STATE) {
clearTimeout(connectingHintDelay);
connectingHintDelay = null;
}
if(newState == Printer.WIFIBOX_DISCONNECTED_STATE) { if(newState == Printer.WIFIBOX_DISCONNECTED_STATE) {
message.set("Lost connection to WiFi box",Message.ERROR); message.set("Lost connection to WiFi box",Message.ERROR);
} else if(prevState == Printer.WIFIBOX_DISCONNECTED_STATE) { } else if(prevState == Printer.WIFIBOX_DISCONNECTED_STATE) {
@ -424,6 +432,13 @@ function setState(newState,newHasControl) {
message.set("Printer disconnected",Message.WARNING,true); message.set("Printer disconnected",Message.WARNING,true);
} else if(newState == Printer.CONNECTING_STATE) { } else if(newState == Printer.CONNECTING_STATE) {
message.set("Printer connecting",Message.INFO,false); message.set("Printer connecting",Message.INFO,false);
if (prevState != Printer.CONNECTING_STATE) { //enable 'watchdog' if we entered from a different state
clearTimeout(connectingHintDelay);
connectingHintDelay = setTimeout(function() {
message.set("Printer still not connected, did you select the correct type?", Message.WARNING, false);
connectingHintDelay = null;
}, connectingHintDelayTime);
}
} else if(prevState == Printer.DISCONNECTED_STATE && newState == Printer.IDLE_STATE || } else if(prevState == Printer.DISCONNECTED_STATE && newState == Printer.IDLE_STATE ||
prevState == Printer.UNKNOWN_STATE && newState == Printer.IDLE_STATE || prevState == Printer.UNKNOWN_STATE && newState == Printer.IDLE_STATE ||
prevState == Printer.CONNECTING_STATE && newState == Printer.IDLE_STATE) { prevState == Printer.CONNECTING_STATE && newState == Printer.IDLE_STATE) {