' + msg + '
'); + scrollConsole(); +} + +function sendCmd(code, comment, type) { if (type === undefined) { type = "code"; } - clearTimeout(timers); - timers = setTimeout(function() { - $("#gCodeLog").append('' + cmd + ' ; ' + comment +'
'); + + $("#gCodeLog").append('' + code + ' ; ' + comment + '
'); - $.ajax({ url: 'set?' + type + '=' + cmd, cache: false }).done(function(data) { - $("#gCodeLog").append('' + data + '
'); - scrollConsole(); + if (type == 'cmd') { + $.ajax({ url: 'set?' + type + '=' + code, cache: false }).done(function(data) { + feedback(data); }); + } else { + ws.send(code); + } - scrollConsole(); - }, 300); + scrollConsole(); } -function feedback(output) { - $("#gCodeLog").append('' + output + '
'); - scrollConsole(); +function initWebSocket() { + url = window.location.hostname; + + try { + ws = new WebSocket('ws://' + url + ':81'); + ws.onopen = function() { + feedback('Connected'); + }; + ws.onmessage = function(a) { + feedback(a.data); + }; + ws.onclose = function() { + feedback('Disconnected'); + } + } catch (a) { + feedback('Web Socket Error'); + } } -String.prototype.contains = function( it ) { - return this.indexOf( it ) != -1; +function msToTime(duration) { + var milliseconds = parseInt((duration%1000)/100), + seconds = parseInt((duration/1000)%60), + minutes = parseInt((duration/(1000*60))%60), + hours = parseInt((duration/(1000*60*60))%24); + + hours = (hours < 10) ? "0" + hours : hours; + minutes = (minutes < 10) ? "0" + minutes : minutes; + seconds = (seconds < 10) ? "0" + seconds : seconds; + + return hours + ":" + minutes + ":" + seconds + "." + milliseconds; +} + +String.prototype.contains = function(it) { + return this.indexOf(it) != -1; }; -Dropzone.options.mydz = { dictDefaultMessage: "Upload G-code Here", +Dropzone.options.mydz = { accept: function(file, done) { if (file.name.contains('.g')) { + //window.startTimer = new Date(); + done(); + $(".print-actions button").addClass('btn-disable'); + $(".movement button").addClass('btn-disable'); + $("#gCodeSend").addClass('btn-disable'); + $(".temperature button").addClass('btn-disable'); } else { done('Not a valid G-code file.'); } @@ -195,6 +203,19 @@ Dropzone.options.mydz = { dictDefaultMessage: "Upload G-code Here", this.removeFile(this.files[0]); } }); + + this.on('complete', function(file) { + //File upload duration + //endTimer = new Date(); + //duration = endTimer - window.startTimer; + //alert(msToTime(duration)); + + $(".print-actions button").removeClass('btn-disable'); + $(".movement button").removeClass('btn-disable'); + $("#gCodeSend").removeClass('btn-disable'); + $(".temperature button").removeClass('btn-disable'); + sendCmd('M566 ' + file.name, ''); + }); } }; @@ -208,15 +229,70 @@ function cancel_p() { sendCmd('{P:X}', 'Cancel print', 'cmd'); } +function printerStatus() { + $.get("inquiry", function(data, status) { + //console.log(data); + //$("#gCodeLog").append('' + data + '
'); + //scrollConsole(); + + $("#rde").text(data.match( /\d+/g )[0]); + $("#rdp").text(data.match( /\d+/g )[2]); + + delaySyncTemperatures(data.match( /\d+/g )[1], data.match( /\d+/g )[3]); + + var c = data.charAt(data.length - 1); + + if (c == 'I') { + $("#stat").text('Idle'); + $("#pgs").css('width', '0%'); + $(".movement button").removeClass('btn-disable'); + $("#gCodeSend").removeClass('btn-disable'); + } else if (c == 'P') { + $("#stat").text('Printing'); + $("#pgs").css('width', data.match(/\d+/g )[4] + '%'); + $("#pgs").html(data.match(/\d+/g )[4] + '% Complete'); + $(".movement button").addClass('btn-disable'); + $("#gCodeSend").addClass('btn-disable'); + } else { + $("#stat").text('N/A'); + } + }); +} + +function startup() { + initWebSocket(); + + if ($("#stat").text() != 'Printing') { + setTimeout(function() { + sendCmd('M563 S4', 'Enable faster Wi-Fi file uploads'); + sendCmd('G91', 'Set to Relative Positioning'); + }, 1750); + } else { + alert('Printing'); + } +} + +function delaySendTemp(value, device) { + clearTimeout(timers); + timers = setTimeout(function() { + compValue = pad(value, 3); + + if (device == 'extruder') { + sendCmd('{C:T0' + compValue + '}', 'Set extruder preheat to ' + value + '°C', 'cmd'); + } + + if (device == 'platform') { + sendCmd('{C:P' + compValue + '}', 'Set platform preheat to ' + value + '°C', 'cmd'); + } + }, 250); +} + function delaySendSpeed(value) { clearTimeout(timers); timers = setTimeout(function() { actualSpeed = Math.floor(255 * (value/100)); sendCmd('M106 S' + actualSpeed, 'Set fan speed to ' + value + '%'); - $.ajax({ url: "set?code=M106 S" + value, cache: false }).done( - function(data) { feedback(data); } - ); - }, 300); + }, 250); } function delaySyncTemperatures(extruder, platform) { @@ -225,4 +301,8 @@ function delaySyncTemperatures(extruder, platform) { if (!$('#wre').is(":focus")) { $("#wre").val(extruder); } if (!$('#wrp').is(":focus")) { $("#wrp").val(platform); } }, 3000); +} + +function refreshSD() { + sendCmd('M563 S3', 'Enable faster Wi-Fi file uploads'); } \ No newline at end of file diff --git a/source/webui.min.js b/source/webui.min.js index 9b0a4d2..7444f14 100644 --- a/source/webui.min.js +++ b/source/webui.min.js @@ -1 +1 @@ -function pad(e,t){return s="000"+e,s.substr(s.length-t)}function scrollConsole(){$cont=$("#console"),$cont[0].scrollTop=$cont[0].scrollHeight}function sendCmd(e,t,n){void 0===n&&(n="code"),clearTimeout(timers),timers=setTimeout(function(){$("#gCodeLog").append(''+e+' ; '+t+"
"),$.ajax({url:"set?"+n+"="+e,cache:!1}).done(function(e){$("#gCodeLog").append(''+e+"
"),scrollConsole()}),scrollConsole()},300)}function feedback(e){$("#gCodeLog").append(''+e+"
"),scrollConsole()}function start_p(){$("#stat").text("Printing"),sendCmd("M565","Start printing cache.gc")}function cancel_p(){$("#stat").text("Canceling"),sendCmd("{P:X}","Cancel print","cmd")}function delaySendSpeed(e){clearTimeout(timers),timers=setTimeout(function(){actualSpeed=Math.floor(255*(e/100)),sendCmd("M106 S"+actualSpeed,"Set fan speed to "+e+"%"),$.ajax({url:"set?code=M106 S"+e,cache:!1}).done(function(e){feedback(e)})},300)}function delaySyncTemperatures(e,t){clearTimeout(timers),timers=setTimeout(function(){$("#wre").is(":focus")||$("#wre").val(e),$("#wrp").is(":focus")||$("#wrp").val(t)},3e3)}$(document).ready(function(){sendCmd("M563 S5","Enable faster Wi-Fi file uploads"),$.ajax({url:"set?code=G91",cache:!1}).done(),setInterval(function(){$.get("inquiry",function(e,t){console.log(e),$("#rde").text(e.match(/\d+/g)[0]),$("#rdp").text(e.match(/\d+/g)[2]),delaySyncTemperatures(e.match(/\d+/g)[1],e.match(/\d+/g)[3]);var n=e.charAt(e.length-1);"I"==n?($("#stat").text("Idle"),$("#pgs").css("width","0%"),$(".movement button").removeClass("btn-disable"),$("#gCodeSend").removeClass("btn-disable")):"P"==n?($("#stat").text("Printing"),$("#pgs").css("width",e.match(/\d+/g)[4]+"%"),$("#pgs").html(e.match(/\d+/g)[4]+"% Complete"),$(".movement button").addClass("btn-disable"),$("#gCodeSend").addClass("btn-disable")):$("#stat").text("N/A")})},3500),$(".movement .home").click(function(){axis=$(this).attr("data-axis"),"all"==axis?(code="G28 X0 Y0 Z0",comment="all axes"):(code="G28 "+axis,comment=axis+" axis"),sendCmd(code,"Home "+comment)}),$(".movement .direction button").click(function(){return command="G1 ",movement=$(this).attr("data-movement"),rate=$(".movement .rate button.active").attr("data-rate"),axis=$(this).attr("data-axis"),comment="Move "+axis,"up"!=movement&&"left"!=movement||(rate*=-1),"Z"==axis&&"down"==movement&&(comment="Raise Z "),"Z"==axis&&"up"==movement&&(comment="Lower Z "),"E"==axis&&"plus"==movement&&(comment="Extrude "),"E"==axis&&"minus"==movement?(sendCmd(command+axis+"-"+rate,"Retract "+rate+"mm"),!1):"disable"==movement?(sendCmd("M18","Disable motor lock"),!1):void sendCmd(command+axis+rate,comment+" "+rate+"mm")}),$(".movement .rate button").click(function(){rate=$(this).attr("data-rate"),$(".movement .rate button").removeClass("active"),$(this).addClass("active")}),$("#gCodeSend").click(function(){gCode2Send=$("#gcode").val(),""!=gCode2Send&&(sendCmd(gCode2Send,""),$("#gcode").val(""))}),$("#wre").change(function(){var e=pad($("#wre").val(),3);sendCmd("{C:T0"+e+"}","Set extruder preheat to "+$("#wre").val()+"°C","cmd")}),$("#sete").click(function(){var e=pad($("#wre").val(),3);sendCmd("{C:T0"+e+"}","Set extruder preheat to "+$("#wre").val()+"°C","cmd")}),$("#clre").click(function(){sendCmd("{C:T0000}","Turn off extruder preheat","cmd")}),$("#wrp").change(function(){value=pad($("#wrp").val(),3),sendCmd("{C:P"+value+"}","Set platform preheat to "+$("#wrp").val()+"°C","cmd")}),$("#setp").click(function(){value=pad($("#wrp").val(),3),sendCmd("{C:P"+value+"}","Set platform preheat to "+$("#wrp").val()+"°C","cmd")}),$("#clrp").click(function(){sendCmd("{C:P000}","Turn off platform preheat","cmd")}),$("#fanspeed").slider({min:30,max:100,value:50,reversed:!0,orientation:"vertical",formatter:function(e){return e+"%"}}),$("#fanspeed").on("slide",function(e){delaySendSpeed(e.value)}),$("#clrfan").click(function(){sendCmd("M106 S0","Turn off fan")}),$("form").submit(function(){return!1})});var timers={};String.prototype.contains=function(e){return this.indexOf(e)!=-1},Dropzone.options.mydz={dictDefaultMessage:"Upload G-code Here",accept:function(e,t){e.name.contains(".g")?t():t("Not a valid G-code file.")},init:function(){this.on("error",function(e,t){var n=t.errorMessage;$(e.previewElement).find(".dz-error-message").text(n)}),this.on("addedfile",function(){null!=this.files[1]&&this.removeFile(this.files[0])})}}; \ No newline at end of file +function pad(e,t){return s="000"+e,s.substr(s.length-t)}function scrollConsole(){$cont=$("#console"),$cont[0].scrollTop=$cont[0].scrollHeight}function feedback(e){msg=e.replace(/N0 P15 B15/g,""),msg=msg.replace(/N0 P14 B15/g,""),msg=msg.replace(/echo:/g,""),$("#gCodeLog").append(''+msg+"
"),scrollConsole()}function sendCmd(e,t,n){void 0===n&&(n="code"),$("#gCodeLog").append(''+e+' ; '+t+"
"),"cmd"==n?$.ajax({url:"set?"+n+"="+e,cache:!1}).done(function(e){feedback(e)}):ws.send(e),scrollConsole()}function initWebSocket(){url=window.location.hostname;try{ws=new WebSocket("ws://"+url+":81"),ws.onopen=function(){feedback("Connected")},ws.onmessage=function(e){feedback(e.data)},ws.onclose=function(){feedback("Disconnected")}}catch(e){feedback("Web Socket Error")}}function msToTime(e){var t=parseInt(e%1e3/100),n=parseInt(e/1e3%60),a=parseInt(e/6e4%60),o=parseInt(e/36e5%24);return o=o<10?"0"+o:o,a=a<10?"0"+a:a,n=n<10?"0"+n:n,o+":"+a+":"+n+"."+t}function start_p(){$("#stat").text("Printing"),sendCmd("M565","Start printing cache.gc")}function cancel_p(){$("#stat").text("Canceling"),sendCmd("{P:X}","Cancel print","cmd")}function printerStatus(){$.get("inquiry",function(e,t){$("#rde").text(e.match(/\d+/g)[0]),$("#rdp").text(e.match(/\d+/g)[2]),delaySyncTemperatures(e.match(/\d+/g)[1],e.match(/\d+/g)[3]);var n=e.charAt(e.length-1);"I"==n?($("#stat").text("Idle"),$("#pgs").css("width","0%"),$(".movement button").removeClass("btn-disable"),$("#gCodeSend").removeClass("btn-disable")):"P"==n?($("#stat").text("Printing"),$("#pgs").css("width",e.match(/\d+/g)[4]+"%"),$("#pgs").html(e.match(/\d+/g)[4]+"% Complete"),$(".movement button").addClass("btn-disable"),$("#gCodeSend").addClass("btn-disable")):$("#stat").text("N/A")})}function startup(){initWebSocket(),"Printing"!=$("#stat").text()?setTimeout(function(){sendCmd("M563 S4","Enable faster Wi-Fi file uploads"),sendCmd("G91","Set to Relative Positioning")},1750):alert("Printing")}function delaySendTemp(e,t){clearTimeout(timers),timers=setTimeout(function(){compValue=pad(e,3),"extruder"==t&&sendCmd("{C:T0"+compValue+"}","Set extruder preheat to "+e+"°C","cmd"),"platform"==t&&sendCmd("{C:P"+compValue+"}","Set platform preheat to "+e+"°C","cmd")},250)}function delaySendSpeed(e){clearTimeout(timers),timers=setTimeout(function(){actualSpeed=Math.floor(255*(e/100)),sendCmd("M106 S"+actualSpeed,"Set fan speed to "+e+"%")},250)}function delaySyncTemperatures(e,t){clearTimeout(timers),timers=setTimeout(function(){$("#wre").is(":focus")||$("#wre").val(e),$("#wrp").is(":focus")||$("#wrp").val(t)},3e3)}function refreshSD(){sendCmd("M563 S3","Enable faster Wi-Fi file uploads")}$(document).ready(function(){printerStatus(),startup(),setInterval(function(){printerStatus()},2e3),$(".movement .home").click(function(){axis=$(this).attr("data-axis"),"all"==axis?(code="G28 X0 Y0 Z0",comment="all axes"):(code="G28 "+axis,comment=axis+" axis"),sendCmd(code,"Home "+comment)}),$(".movement .direction button").click(function(){return command="G1 ",movement=$(this).attr("data-movement"),rate=$(".movement .rate button.active").attr("data-rate"),axis=$(this).attr("data-axis"),comment="Move "+axis,"up"!=movement&&"left"!=movement||(rate*=-1),"Z"==axis&&"down"==movement&&(comment="Raise Z "),"Z"==axis&&"up"==movement&&(comment="Lower Z "),"E"==axis&&"plus"==movement&&(comment="Extrude "),"E"==axis&&"minus"==movement?(sendCmd(command+axis+"-"+rate,"Retract "+rate+"mm"),!1):"disable"==movement?(sendCmd("M18","Disable motor lock"),!1):void sendCmd(command+axis+rate,comment+" "+rate+"mm")}),$(".movement .rate button").click(function(){rate=$(this).attr("data-rate"),$(".movement .rate button").removeClass("active"),$(this).addClass("active")}),$("#gCodeSend").click(function(){gCode2Send=$("#gcode").val(),""!=gCode2Send&&(sendCmd(gCode2Send,""),$("#gcode").val(""))}),$("#wre").change(function(){delaySendTemp($("#wre").val(),"extruder")}),$("#sete").click(function(){delaySendTemp($("#wre").val(),"extruder")}),$("#clre").click(function(){sendCmd("{C:T0000}","Turn off extruder preheat","cmd")}),$("#wrp").change(function(){delaySendTemp($("#wrp").val(),"platform")}),$("#setp").click(function(){delaySendTemp($("#wrp").val(),"platform")}),$("#clrp").click(function(){sendCmd("{C:P000}","Turn off platform preheat","cmd")}),$("#fanspeed").slider({min:30,max:100,value:50,reversed:!0,orientation:"vertical",formatter:function(e){return e+"%"}}),$("#fanspeed").on("slide",function(e){delaySendSpeed(e.value)}),$("#clrfan").click(function(){sendCmd("M106 S0","Turn off fan")}),$("form").submit(function(){return!1})});var timers={};String.prototype.contains=function(e){return this.indexOf(e)!=-1},Dropzone.options.mydz={accept:function(e,t){e.name.contains(".g")?(t(),$(".print-actions button").addClass("btn-disable"),$(".movement button").addClass("btn-disable"),$("#gCodeSend").addClass("btn-disable"),$(".temperature button").addClass("btn-disable")):t("Not a valid G-code file.")},init:function(){this.on("error",function(e,t){var n=t.errorMessage;$(e.previewElement).find(".dz-error-message").text(n)}),this.on("addedfile",function(){null!=this.files[1]&&this.removeFile(this.files[0])}),this.on("complete",function(e){$(".print-actions button").removeClass("btn-disable"),$(".movement button").removeClass("btn-disable"),$("#gCodeSend").removeClass("btn-disable"),$(".temperature button").removeClass("btn-disable"),sendCmd("M566 "+e.name,"")})}}; \ No newline at end of file diff --git a/webui.html b/webui.html index 0e266d6..5540576 100755 --- a/webui.html +++ b/webui.html @@ -11,16 +11,16 @@ - + - - - - - - + + + + + + @@ -34,7 +34,7 @@Printer Status:
- 
+ 
@@ -51,7 +51,8 @@ Printer Status:
-
+
+
@@ -211,16 +212,20 @@ N/A
-
-
-
-
+
+
+
+
-
+
+
+
+
@@ -51,7 +51,8 @@
Printer Status:
+