Merge branch 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client into feature/printerdriver

# By peteruithoven
# Via peteruithoven
* 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client:
  Small css tweak
  Messages! Showing info about buffering, connection to wifibox and printer
  Leave warning while sending
  Added heatup in startgcode and replace {printingTemp} and {preheatTemp} for settings
  Added network reconnect hint
  Integrated progressbar
  Save settings before connect to network / create access point and display validation errors and only close settings when settings are saved

Conflicts:
	css/styles.min.css
	js/main.js

css/settings.css

@@ -93,4 +93,12 @@ form .button {
 
 form #passwordLabel, form #password {
 	display: none;
+}
+
+form input.error, form textarea.error, form select.error {
+	border: #f00 solid 2px;
+}
+form .errorMsg {
+	color: #f00;
+	margin: 0 0 0 1em;
 }

css/styles.css

@@ -658,6 +658,40 @@ SETTINGS POPUP
 	cursor: pointer;
 }
 
+#message {
+	position: absolute;
+	top: 0;
+	right: 0;
+	padding: 0.4em 0.5em;
+	border-radius: 0 0 0 10px;
+	border: 2px solid #333;
+	border-width: 0 0 2px 2px;
+	font-weight: bold;
+
+	-webkit-box-shadow: 0px 2px 6px 0px rgba(16, 16, 16, 0.65);
+	box-shadow: 0px 2px 6px 0px rgba(16, 16, 16, 0.65);
+	color: #333;
+	white-space: nowrap;
+	display: none;
+}
+
+#message.error {
+	background: #EB313C;
+	color: #fff;
+}
+
+#message.warning {
+	background: #E9A86E;
+}
+
+#message.notice {
+	background: #93CAF4;
+}
+
+#message.info {
+	background: #97DD8A;
+}
+
 @media only screen and (max-width: 480px),only screen and (max-width: 720px) and (min-device-pixel-ratio: 1.5),only screen and (max-width: 720px) and (-webkit-min-device-pixel-ratio: 1.5) {
 	/*
 	TOP LOGO

index.html

@@ -66,6 +66,8 @@
       <img class="btnSettings btn" src="img/buttons/btnSettings.png">
       <img class="btnInfo btn" src="img/buttons/btnInfo.png">
     </div>
+    
+    <div id="message"></div>
   </div>
 
   <!-- center panel -->
@@ -141,6 +143,7 @@
 <script src="js/Thermometer.js"></script>
 <script src="js/utils.js"></script>
 <script src="js/sidebar.js"></script>
+<script src="js/message.js"></script>
 <script src="js/main.js"></script>
 
 </body>

js/Printer.js

@@ -12,13 +12,16 @@ function setPrintprogress(val) {
 
 function Printer() {
 	
-	Printer.UNKNOWN_STATE 			= "unknown";
+	Printer.WIFIBOX_DISCONNECTED_STATE 	= "wifibox disconnected";
-	Printer.DISCONNECTED_STATE 	= "disconnected";
+	Printer.UNKNOWN_STATE 							= "unknown";				// happens when a printer is connection but there isn't communication yet
-	Printer.IDLE_STATE 					= "idle"; 					// printer found, but idle
+	Printer.DISCONNECTED_STATE 					= "disconnected";		// printer disconnected
-	Printer.BUFFERING_STATE 		= "buffering";			// printer is buffering (recieving) data, but not yet printing
+	Printer.IDLE_STATE 									= "idle"; 					// printer found, but idle
-	Printer.PRINTING_STATE 			= "printing";
+	Printer.BUFFERING_STATE 						= "buffering";			// printer is buffering (recieving) data, but not yet printing
-	Printer.STOPPING_STATE 			= "stopping";				// when you stop (abort) a print it prints the endcode
+	Printer.PRINTING_STATE 							= "printing";
+	Printer.STOPPING_STATE 							= "stopping";				// when you stop (abort) a print it prints the endcode
 
+	Printer.ON_BEFORE_UNLOAD_MESSAGE = "You're doodle is still being send to the printer, leaving will result in a incomplete 3D print";
+	
 	this.temperature 				= 0;
 	this.targetTemperature 	= 0;
 	this.currentLine 				= 0;
@@ -95,6 +98,9 @@ function Printer() {
     console.log("Printer:print");
     console.log("  gcode total # of lines: " + gcode.length);
     
+    message.set("Sending doodle to printer...",Message.NOTICE);
+    self.addLeaveWarning();
+		
     /*for (i = 0; i < gcode.length; i++) {
 			gcode[i] += " (" + i + ")";
 		}*/
@@ -151,7 +157,9 @@ function Printer() {
 				  	if (completed) {
 		          console.log("Printer:sendPrintPart:gcode sending completed");
 		          this.gcode = [];
-		          btnStop.css("display","block"); // hack 
+		          btnStop.css("display","block"); // hack
+		          self.removeLeaveWarning();
+		          message.set("Doodle is send to printer...",Message.INFO,true);
 		          //self.targetTemperature = settings["printer.temperature"]; // slight hack
 		        } else {
 		        	// only if the state hasn't bin changed (by for example pressing stop) we send more gcode
@@ -234,7 +242,7 @@ function Printer() {
 	this.checkStatus = function() {
 		console.log("Printer:checkStatus");
 		this.stateOverruled = false;
-		console.log("  stateOverruled: ",this.stateOverruled);
+		//console.log("  stateOverruled: ",this.stateOverruled);
     var self = this;
     if (communicateWithWifibox) {
       $.ajax({
@@ -242,7 +250,7 @@ function Printer() {
         dataType: 'json',
         timeout: this.timeoutTime,
         success: function(response){
-          console.log("  Printer:status: ",response.data.state); //," response: ",response);
+          //console.log("  Printer:status: ",response.data.state); //," response: ",response);
           
           self.handleStatusUpdate(response);
           
@@ -252,26 +260,27 @@ function Printer() {
         }
       }).fail(function() {
           console.log("Printer:checkStatus: failed");
-          self.state = Printer.UNKNOWN_STATE;
+          self.state = Printer.WIFIBOX_DISCONNECTED_STATE;
           clearTimeout(self.checkStatusDelay);
           clearTimeout(self.retryCheckStatusDelay);
           self.retryCheckStatusDelay = setTimeout(function() { self.checkStatus() },self.retryDelay); // retry after delay
+          $(document).trigger(Printer.UPDATE);
         });
     } else {
       console.log ("Printer >> f:checkStatus() >> communicateWithWifibox is false, so not executing this function");
     }
 	}
 	this.handleStatusUpdate = function(response) {
-		console.log("Printer:handleStatusUpdate");
+		console.log("Printer:handleStatusUpdate response: ",response);
 		var data = response.data;
 		if(response.status != "success") {
 			self.state = Printer.UNKNOWN_STATE;
 		} else {
 			// state
-			console.log("  stateOverruled: ",this.stateOverruled);
+			//console.log("  stateOverruled: ",this.stateOverruled);
 			if(!this.stateOverruled) {
 				self.state 								= data.state;
-				console.log("  state > ",self.state);
+				//console.log("  state > ",self.state);
 			}
 			
 			// temperature
@@ -302,4 +311,13 @@ function Printer() {
 		
 		this.stopStatusCheckInterval();
 	}
+	
+	this.removeLeaveWarning = function() {
+		window.onbeforeunload = null;
+	}
+	this.addLeaveWarning = function() {
+		window.onbeforeunload = function() {
+				return Printer.ON_BEFORE_UNLOAD_MESSAGE;
+		};
+	}
 }

js/Progressbar.js

@@ -49,7 +49,7 @@ function Progressbar() {
   }
 
   this.update = function(part, total) {
-    console.log("Progressbar.update(" + part + "," + total + ")");
+    //console.log("Progressbar.update(" + part + "," + total + ")");
 
     var pct = part / total;
     if (this.isInitted) {
@@ -59,7 +59,7 @@ function Progressbar() {
       var progress = part / total;
       progress = Math.min(progress, 1.0);
       progress = Math.max(progress, 0);
-      console.log("progressbar >> f:update() >> progress: " + progress);
+      //console.log("progressbar >> f:update() >> progress: " + progress);
 
       // clear
       this.context.clearRect(0, 0, this.canvas.width, this.canvas.height);

js/SettingsWindow.js

@@ -113,8 +113,9 @@ function SettingsWindow() {
 	this.submitwindow = function(e) {
 		e.preventDefault();
 	  e.stopPropagation();
-	  self.saveSettings();
+	  self.saveSettings(self.readForm(),function(){
-	  self.hideSettings();
+	  	self.hideSettings();
+	  });
 	  
 	  clearTimeout(self.retryRetrieveNetworkStatusDelay);
 	}
@@ -146,9 +147,9 @@ function SettingsWindow() {
 		  url: this.wifiboxURL + "/config/all",
 		  dataType: 'json',
 		  timeout: this.timeoutTime,
-		  success: function(data){
+		  success: function(response){
-		  	console.log("Settings:loadSettings response: ",data);
+		  	console.log("Settings:loadSettings response: ",response);
-        settings = data.data;
+        settings = response.data;
 		  	console.log("  settings: ",settings);
 		  	self.fillForm();
 		  	$(document).trigger(SettingsWindow.SETTINGS_LOADED);
@@ -162,45 +163,6 @@ function SettingsWindow() {
     this.refreshNetworks();
     this.retrieveNetworkStatus(false);
 	}
-
-	this.saveSettings = function(callback) {
-	  console.log("Settings:saveSettings");
-
-	  this.readForm();
-
-	  if (communicateWithWifibox) {
-		  $.ajax({
-			  url: this.wifiboxURL + "/config",
-			  type: "POST",
-			  data: settings,
-			  dataType: 'json',
-			  timeout: this.timeoutTime,
-			  success: function(data){
-			  	console.log("Settings:saveSettings response: ",data);
-			  	if(data.status == "error") {
-			  		clearTimeout(self.retrySaveSettingsDelay);
-						self.retrySaveSettingsDelay = setTimeout(function() { self.saveSettings() },self.retryDelay); // retry after delay
-			  	} else {
-			  		var savedSettings = data.data;
-				  	$.each(savedSettings, function(index, val) {
-			        if (val != "ok") {
-			          console.log("ERROR: value '" + index + "' not successfully set. Message: " + val);
-			        }
-			      });
-			      // TODO something like a callback or feedback that saving went well / or failed
-			      if (callback != undefined) {
-			        callback();
-			      }
-			  	}
-				}
-			}).fail(function() {
-				console.log("Settings:saveSettings: failed");
-				clearTimeout(self.retrySaveSettingsDelay);
-				self.retrySaveSettingsDelay = setTimeout(function() { self.saveSettings() },self.retryDelay); // retry after delay
-			});
-	  }
-	}
-
 	this.fillForm = function() {
 		console.log("SettingsWindow:fillForm");
 
@@ -232,15 +194,68 @@ function SettingsWindow() {
 		});
 	}
 
+	this.saveSettings = function(newSettings,complete) {
+	 if (communicateWithWifibox) {
+		  $.ajax({
+			  url: this.wifiboxURL + "/config",
+			  type: "POST",
+			  data: newSettings,
+			  dataType: 'json',
+			  timeout: this.timeoutTime,
+			  success: function(response){
+			  	console.log("Settings:saveSettings response: ",response);
+			  	if(response.status == "error") {
+			  		clearTimeout(self.retrySaveSettingsDelay);
+						self.retrySaveSettingsDelay = setTimeout(function() { self.saveSettings(settings) },self.retryDelay); // retry after delay
+			  	} else {
+			  		var data = response.data;
+			  		var validation = data.validation;
+			  		self.clearValidationErrors();
+			  		var validated = true;
+				  	$.each(validation, function(key, val) {
+			        if (val != "ok") {
+			          console.log("ERROR: setting '" + key + "' not successfully set. Message: " + val);
+			          self.displayValidationError(key,val);
+			          validated = false;
+			        }
+			      });
+				  	settings.substituted_ssid = data.substituted_ssid;
+				  	if(complete && validated) complete();
+			  	}
+				}
+			}).fail(function() {
+				console.log("Settings:saveSettings: failed");
+				clearTimeout(self.retrySaveSettingsDelay);
+				self.retrySaveSettingsDelay = setTimeout(function() { self.saveSettings(settings) },self.retryDelay); // retry after delay
+			});
+	  }
+	}
+	this.displayValidationError = function(key,msg) {
+		var formElement = self.form.find("[name|='"+key+"']");
+		console.log("formElement: ",formElement);
+		formElement.addClass("error");
+		var errorMsg = "<p class='errorMsg'>"+msg+"</p>"
+		formElement.after(errorMsg);
+	}
+	this.clearValidationErrors = function() {
+		var formElements = self.form.find(".error");
+		formElements.each( function(index,element) {
+			$(element).removeClass("error");
+		});
+	}
+	
 	this.readForm = function() {
-		console.log("SettingsWindow:readForm");
+		//console.log("SettingsWindow:readForm");
-		var selects = this.form.find("select");
+		var settings = {};
+		var selects = self.form.find("select");
 		selects.each( function(index,element) {
 			var element = $(element);
-			settings[element.attr('name')] = element.val();
+			if(element.attr('name') != "network.client.network") {
+				settings[element.attr('name')] = element.val();
+			}
 		});
 
-		var inputs = this.form.find("input");
+		var inputs = self.form.find("input");
 		inputs.each( function(index,element) {
 			var element = $(element);
 			switch(element.attr("type")) {
@@ -254,15 +269,15 @@ function SettingsWindow() {
 			}
 		});
 
-		var textareas = this.form.find("textarea");
+		var textareas = self.form.find("textarea");
 		textareas.each( function(index,element) {
 			var element = $(element);
 			settings[element.attr('name')] = element.val();
 		});
-		console.log(settings);
+		//console.log(settings);
+		return settings;
 	}
 
-
 	/*
 	 * Networks ui
 	 */
@@ -379,7 +394,7 @@ function SettingsWindow() {
 								var networkSelector = self.form.find("#network");
 								networkSelector.val(SettingsWindow.NOT_CONNECTED);
 								
-								if(data.ssid) { 
+								if(data.ssid && data.status == SettingsWindow.API_CREATED) { 
 										self.currentAP = data.ssid;
 								}
 								break;
@@ -473,16 +488,16 @@ function SettingsWindow() {
       case SettingsWindow.CONNECTED:
         btnConnect.removeAttr("disabled");
       
-      	var fieldText = "Connected to: "+this.currentNetwork+".";
+      	var fieldText = "Connected to: <b>"+this.currentNetwork+"</b>.";
       	if(this.currentLocalIP != undefined && this.currentLocalIP != "") {
       		var a = "<a href='http://"+this.currentLocalIP+"' target='_black'>"+this.currentLocalIP+"</a>";
-      		fieldText += " Local ip: "+a;
+      		fieldText += " (IP: "+a+")";
       	}
         field.html(fieldText);
         break;
       case SettingsWindow.CONNECTING:
         btnConnect.attr("disabled", true);
-        field.html("Connecting...");
+        field.html("Connecting... Reconnect by connecting your device to <b>"+this.selectedNetwork+"</b> and going to <a href='http://connect.doodle3d.com'>connect.doodle3d.com</a>");
         break;
       case SettingsWindow.CONNECTING_FAILED:
       	btnConnect.removeAttr("disabled");
@@ -501,11 +516,11 @@ function SettingsWindow() {
 				break;
 			case SettingsWindow.AP:
 				btnCreate.removeAttr("disabled");
-				field.html("Is access point: "+this.currentAP);
+				field.html("Is access point: <b>"+this.currentAP+"</b>");
 				break;
 			case SettingsWindow.CREATING_AP:
 				btnCreate.attr("disabled", true);
-				field.html("Creating access point...");
+				field.html("Creating access point... Reconnect by connecting your device to <b>"+settings.substituted_ssid+"</b> and going to <a href='http://draw.doodle3d.com'>draw.doodle3d.com</a>");
 				break;
 		}
 		this.apModeState = state;
@@ -514,26 +529,31 @@ function SettingsWindow() {
 	this.connectToNetwork = function() {
 		console.log("connectToNetwork");
 		if(self.selectedNetwork == undefined) return;
-		postData = {
+		var postData = {
 			ssid:self.selectedNetwork,
 			phrase:self.form.find("#password").val(),
       recreate:true
 		}
 		console.log("  postData: ",postData);
 		if (communicateWithWifibox) {
-		  $.ajax({
+			
-			  url: self.wifiboxCGIBinURL + "/network/associate",
+			// save network related settings and on complete, connect to network
-			  type: "POST",
+			self.saveSettings(self.readForm(),function() {
-			  data: postData,
+				
-			  dataType: 'json',
+				$.ajax({
-			  timeout: self.timeoutTime,
+					url: self.wifiboxCGIBinURL + "/network/associate",
-			  success: function(response){
+					type: "POST",
-			  	console.log("Settings:connectToNetwork response: ",response);
+					data: postData,
-				}
+					dataType: 'json',
-			}).fail(function() {
+					timeout: self.timeoutTime,
-				console.log("Settings:connectToNetwork: timeout (normal behavior)");
+					success: function(response){
-				//clearTimeout(self.retrySaveSettingsDelay);
+						console.log("Settings:connectToNetwork response: ",response);
-				//self.retrySaveSettingsDelay = setTimeout(function() { self.saveSettings() },self.retryDelay); // retry after delay
+					}
+				}).fail(function() {
+					console.log("Settings:connectToNetwork: timeout (normal behavior)");
+					//clearTimeout(self.retrySaveSettingsDelay);
+					//self.retrySaveSettingsDelay = setTimeout(function() { self.saveSettings() },self.retryDelay); // retry after delay
+				});
 			});
 	  }
     self.setClientModeState(SettingsWindow.CONNECTING,"");
@@ -545,28 +565,34 @@ function SettingsWindow() {
 	}
 
   this.createAP = function() {
+  	console.log("createAP");
 		if (communicateWithWifibox) {
-		  $.ajax({
+			
-			  url: self.wifiboxCGIBinURL + "/network/openap",
+			// save network related settings and on complete, create access point
-			  type: "POST",
+			self.saveSettings(self.readForm(),function() {
-			  dataType: 'json',
+				self.setAPModeState(SettingsWindow.CREATING_AP); // get latest substituted ssid
-			  timeout: self.timeoutTime,
+				$.ajax({
-			  success: function(response){
+					url: self.wifiboxCGIBinURL + "/network/openap",
-			  	console.log("Settings:createAP response: ",response);
+					type: "POST",
+					dataType: 'json',
+					timeout: self.timeoutTime,
+					success: function(response){
+						console.log("Settings:createAP response: ",response);
+					}
+				}).fail(function() {
+					console.log("Settings:createAP: timeout (normal behavior)");
+					//clearTimeout(self.retrySaveSettingsDelay);
+					//self.retrySaveSettingsDelay = setTimeout(function() { self.saveSettings() },self.retryDelay); // retry after delay
+				});
+				
+				self.setAPModeState(SettingsWindow.CREATING_AP,"");
 
-				}
+				// after switching wifi network or creating a access point we delay the status retrieval
-			}).fail(function() {
+				// because the webserver needs time to switch
-				console.log("Settings:createAP: timeout (normal behavior)");
+				clearTimeout(self.retrieveNetworkStatusDelay);
-				//clearTimeout(self.retrySaveSettingsDelay);
+				self.retrieveNetworkStatusDelay = setTimeout(function() { self.retrieveNetworkStatus(true) },self.retrieveNetworkStatusDelayTime);
-				//self.retrySaveSettingsDelay = setTimeout(function() { self.saveSettings() },self.retryDelay); // retry after delay
 			});
 	  }
-    self.setAPModeState(SettingsWindow.CREATING_AP,"");
-
-    // after switching wifi network or creating a access point we delay the status retrieval
-    // because the webserver needs time to switch
-    clearTimeout(self.retrieveNetworkStatusDelay);
- 		self.retrieveNetworkStatusDelay = setTimeout(function() { self.retrieveNetworkStatus(true) },self.retrieveNetworkStatusDelayTime);
   }
 }
 

js/buttonbehaviors.js

@@ -12,7 +12,6 @@ var btnOops, btnStop, btnClear;
 var btnMoveUp, btnMoveDown, btnTwistLeft, btnTwistRight;
 var btnInfo, btnSettings;
 //var btnDebug; // debug
-var displayTemp, displayProgress;
 
 var state;
 var prevState;
@@ -35,8 +34,6 @@ function initButtonBehavior() {
   btnNew = $(".btnNew");
   btnPrint= $(".btnPrint");
   btnStop = $(".btnStop");
-  displayTemp = $("#thermometerContainer");
-  displayProgress = $("#printProgressContainer");
 
   btnPrevious = $(".btnPrevious");
   btnNext = $(".btnNext");
@@ -317,13 +314,15 @@ function update() {
 	setState(printer.state,printer.hasControl);
 
 	thermometer.update(printer.temperature, printer.targetTemperature);
-	//TODO: update progress
+	progressbar.update(printer.currentLine, printer.totalLines);
 }
 
-function setState(newState,newHasControl) { //TODO add hasControl
+function setState(newState,newHasControl) { 
 	if(newState == state && newHasControl == hasControl) return;
 
-	console.log("setState: ",state," > ",newState," ( ",newHasControl,")");
+	prevState = state;
+	
+	console.log("setState: ",prevState," > ",newState," ( ",newHasControl,")");
 	setDebugText("State: "+newState);
 
 	// print button
@@ -350,26 +349,38 @@ function setState(newState,newHasControl) { //TODO add hasControl
 
 	// thermometer
 	switch(newState) {
-		case Printer.UNKNOWN_STATE:
+		case Printer.IDLE_STATE:
-		case Printer.DISCONNECTED_STATE:
+		case Printer.BUFFERING_STATE:
-			thermometer.hide();
+		case Printer.PRINTING_STATE:
+		case Printer.STOPPING_STATE:
+			thermometer.show();	
 			break;
 		default:
-			thermometer.show();
+			thermometer.hide();	
 			break;
 	}
 
 	// progress indicator
 	switch(newState) {
 		case Printer.PRINTING_STATE:
-			displayProgress.show(); // TODO: Show progress
+			progressbar.show(); 
 			break;
 		default:
-			displayProgress.hide(); // TODO: hide progress
+			progressbar.hide();
 			break;
 	}
-
+	
-	prevState = state;
+	if(newState == Printer.WIFIBOX_DISCONNECTED_STATE) {
+		message.set("Lost connection to WiFi box",Message.ERROR);
+	}	else if(prevState == Printer.WIFIBOX_DISCONNECTED_STATE) {
+		message.set("Connected to WiFi box",Message.INFO,true);
+	} else if(newState == Printer.DISCONNECTED_STATE) {
+		message.set("Printer disconnected",Message.WARNING,true);
+	} else if(prevState == Printer.DISCONNECTED_STATE && newState == Printer.IDLE_STATE || 
+						prevState == Printer.UNKNOWN_STATE && newState == Printer.IDLE_STATE) {
+		message.set("Printer connected",Message.INFO,true);
+	}
+	
 	state = newState;
 	hasControl = newHasControl;
 }

js/gcodeGenerating.js

@@ -31,39 +31,6 @@ var gcode = [];
 function generate_gcode() {
   console.log("f:generategcode()");
 
-  var startGcode = [];
-  var endGcode = [];
-  
-  // get gcode start statements
-	/*console.log("settings['printer.startgcode']: ",settings["printer.startgcode"]);
-	console.log("settings['printer.endgcode']: ",settings["printer.endgcode"]);
-	
-	if ($("#startgcode").val().trim().length != 0) {
-		console.log("   found contents for start-gcode in settings.html")
-		startGcode = $("#startgcode").val().trim().split("\n");
-	} else {
-		console.log("   no start-gcode in settings.html, using defaults")
-		startGcode = startGcode.concat(gcodeStart);
-	}
-	
-	// get gcode end statements
-	if ($("#endgcode").val().trim().length != 0) {
-		console.log("   found contents for end-gcode in settings.html")
-		endGcode = $("#endgcode").val().trim().split("\n");
-	} else {
-		console.log("   no end-gcode in settings.html, using defaults")
-		endGcode = endGcode.concat(gcodeEnd);
-	}
-
-	console.log("f:generate_gcode() >> startGcode:");
-	console.log(startGcode);
-	console.log("");
-	console.log("f:generate_gcode() >> endGcode:");
-	console.log(endGcode);*/
-	
-	startGcode = settings["printer.startgcode"].split("\n");
-	endGcode = settings["printer.endgcode"].split("\n");
-	
   // TODO 2013-09-18 evaluate if this should stay here
   // this was added when Rick mailed us wrt the Ultimaker delivery of Doodle3D
   var gCodeOffsetX = 110; // mm
@@ -88,7 +55,18 @@ function generate_gcode() {
   var retractionspeed 	      = settings["printer.retraction.speed"];
   var retractionminDistance   = settings["printer.retraction.minDistance"];
   var retractionamount 	      = settings["printer.retraction.amount"];
-
+  var preheatTemperature      = settings["printer.heatup.temperature"];
+  
+  var startGcode = settings["printer.startgcode"];
+	startGcode = startGcode.replace("{printingTemp}",temperature);
+	startGcode = startGcode.replace("{preheatTemp}",preheatTemperature);
+	startGcode = startGcode.split("\n");
+	
+	var endGcode = settings["printer.endgcode"];
+	endGcode = endGcode.replace("{printingTemp}",temperature);
+	endGcode = endGcode.replace("{preheatTemp}",preheatTemperature);
+	endGcode = endGcode.split("\n");
+	
   /*
   console.log("f:generate_gcode >> EFFE CHECKEN:");
   console.log("   speed: " + speed);
@@ -130,13 +108,13 @@ function generate_gcode() {
 //  console.log("f:generategcode() >> paths: " + paths.toString());
 //  console.log("paths.toString(): " + paths.toString());
 //  return;
-
+  
-  console.log("printer temperature: ",temperature);
+  //gcode.push("M104 S" + temperature); // set target temperature and do not wait for the extruder to reach it
-	//gcode.push("M104 S" + temperature); // set target temperature and do not wait for the extruder to reach it
+  //gcode.push("M109 S" + temperature); // set target temperature and wait for the extruder to reach it
-  gcode.push("M109 S" + temperature); // set target temperature and wait for the extruder to reach it
+  
   // add gcode begin commands
   gcode = gcode.concat(startGcode);
-
+  
   //gcode.push("M109 S" + temperature); // set target temperature and wait for the extruder to reach it
 
   var layers = maxObjectHeight / layerHeight; //maxObjectHeight instead of objectHeight

js/main.js

@@ -8,6 +8,7 @@ var printer =  new Printer();
 var progressbar = new Progressbar();
 var thermometer = new Thermometer();
 var settingsWindow = new SettingsWindow();
+var message = new Message();
 
 var firstTimeSettingsLoaded = true;
 
@@ -53,11 +54,10 @@ $(function() {
   initVerticalShapes();
 
 	thermometer.init($("#thermometerCanvas"), $("#thermometerContainer"));
-
-  progressbar = new Progressbar();
   progressbar.init($("#progressbarCanvas"), $("#progressbarCanvasContainer"));
 
-
+  message.init($("#message"));
+  
   printer.init();
 	$(document).on(Printer.UPDATE,update);
 
@@ -132,4 +132,4 @@ function settingsLoaded() {
 
 function setDebugText(text) {
 	$("#debug_display").text(text);
-}
+}

js/message.js

@@ -0,0 +1,52 @@
+function Message() {
+	
+	Message.ERROR 			= "error";
+	Message.WARNING 		= "warning";
+	Message.NOTICE 			= "notice";
+	Message.INFO 				= "info";
+	
+	this.mode						= "";
+	
+	this.$element;
+	
+	var self = this;
+	var autoHideDelay = 2000;
+	var autohideTimeout;
+	
+	this.init = function($element) {
+    console.log("Message:init");
+    
+    this.$element = $element;
+    console.log("$element: ",$element);
+ 	}
+	
+	this.set = function(text,mode,autoHide) {
+		console.log("Message:set: ",text,mode,autoHide);
+		self.hide(function() {
+			self.show();
+			self.clear();
+			
+			self.$element.text(text);
+			self.$element.addClass(mode);
+			self.show();
+			
+			self.mode = mode;
+			
+			clearTimeout(autohideTimeout);
+			if(autoHide) {
+				autohideTimeout = setTimeout(function(){ self.hide()},autoHideDelay);
+			}
+		});
+	}
+	this.clear = function($element) {
+		this.$element.text("");
+		this.$element.removeClass(this.mode);
+	}
+	
+	this.show = function() {
+		this.$element.fadeIn(200);
+	}
+	this.hide = function(complete) {
+		this.$element.fadeOut(200,complete);
+	}
+}

less/message.less

@@ -0,0 +1,31 @@
+#message {
+	position: absolute;
+	top: 0;
+	right: 0;
+	
+	padding: 0.4em 0.5em;
+	border-radius: 0 0 0 10px;
+	border: 2px solid #333;
+	border-width: 0 0 2px 2px;
+	font-weight: bold;
+	box-shadow: 0px 2px 6px 0px rgba(16, 16, 16, 0.65);
+	
+	color: #333;
+	white-space:nowrap; 
+	
+	display:none;
+	
+	&.error {
+		background: #EB313C;
+		color: #fff;
+	}
+	&.warning {
+		background: #E9A86E;	
+	}
+	&.notice {
+		background: #93CAF4;
+	}
+	&.info {
+		background: #97DD8A;
+	}
+}

less/styles.less

@@ -2,6 +2,7 @@
 //@import "normalize.min.less";
 @import "base.less";
 @import "settingsPopup.less";
+@import "message.less";
 
 
 // MOBILE

settings.html

@@ -97,16 +97,23 @@
 	      <legend>Access point settings</legend>
 	      <label for="ssid">Wi-Fi box ssid*:</label><input type="text" class="large" name="network.ap.ssid" id="ssid"> <br>
 	      <small>* The text <em>%%MAC_ADDR_TAIL%%</em> will be replaced by the last 6 digits of your Doodle3D Wi-Fi box's MAC address.</small>
+	      <br>
 	      <label for="apKey">Password:</label><input type="text" class="large" name="network.ap.key" id="apKey"> <br>
 	      <label for="ipaddress">Wi-Fi box IP address:</label><input type="text" name="network.ap.address" id="ipaddress"><br>
 	      <label for="netmask">Wi-Fi box netmask:</label><input type="text" name="network.ap.netmask" id="netmask"><br>
 	      <input type="button" name="create" value="Create" class="button" id="createAP"/>
-          <span id="apModeState"></span>
+        <span id="apModeState"></span><br/>
+        <br/>
+        <small>When you can't connect to your device, you can always use an ethernet cable and go to <a href="http://connect.doodle3d.com">connect.doodle3d.com</a>.</small>
 	    </fieldset>
 
 	    <fieldset id="clientSettings">
 	      <legend>Client mode settings</legend>
 	      
+	      <label for="wifiboxid">Wi-Fi box id*:</label><input type="text" name="network.cl.wifiboxid" id="wifiboxid"><br>
+        <small>* Is used on <a href="http://connect.doodle3d.com">connect.doodle3d.com</a>. <br/>
+        The text <em>%%MAC_ADDR_TAIL%%</em> will be replaced by the last 6 digits of your Doodle3D Wi-Fi box's MAC address.</small>
+	      <br>
 	      <label for="network">Network:</label>
 	      <select id="network" name="network.client.network">
 	      </select>
@@ -115,9 +122,7 @@
 	      <input type="button" name="connect" value="Connect" class="button" id="connectToNetwork"/>
         <span id="clientModeState"></span><br/>
         <br/>
-        <label for="wifiboxid">Wi-Fi box id*:</label><input type="text" name="network.cl.wifiboxid" id="wifiboxid"><br>
+        <small>When you can't connect to your device, you can always use an ethernet cable and go to <a href="http://connect.doodle3d.com">connect.doodle3d.com</a>.</small>
-        <small>* Is used on <a href="http://connect.doodle3d.com">connect.doodle3d.com</a>. <br/>
-        The text <em>%%MAC_ADDR_TAIL%%</em> will be replaced by the last 6 digits of your Doodle3D Wi-Fi box's MAC address.</small>
 	    </fieldset>
 		</fieldset>
 
@@ -134,23 +139,7 @@
         <textarea id="endgcode" class="gcode" name="printer.endgcode">
         </textarea>
       </div>
-      <!-- 2013-10-09 replaced by DIV solution (but keeping here in comments temporarily as lookup...)
+      <small>The text <em>{printingTemp}</em> will be replaced by the printing temperature and <em>{preheatTemp}</em> will be replaced by the preaheat temperature.</small>
-      <table>
-        <tr>
-          <td>
-            <label for="startgcode">Start:</label><br>
-            <textarea id="startgcode" class="gcode" name="printer.startgcode">
-            </textarea>
-
-          </td>
-          <td>
-            <label for="endgcode">End:</label><br>
-            <textarea id="endgcode" class="gcode" name="printer.endgcode">
-            </textarea>
-          </td>
-        </tr>
-      </table>
-      -->
     </fieldset>
   </form><br/>
 </div>